From e104d896ebcc79bf1e68caeb12fa65dc761f96a8 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Tue, 17 Jun 2025 16:29:06 +0200 Subject: [PATCH] LibWeb: Rename `Navigable::m_size` to `::m_viewport_size` All other viewport-related dimensions are referenced to by 'viewport', so let's rename the member that stores the viewport size to prevent further confusion. --- Libraries/LibWeb/DOM/Element.cpp | 4 ++-- Libraries/LibWeb/HTML/Navigable.cpp | 4 ++-- Libraries/LibWeb/HTML/Navigable.h | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Libraries/LibWeb/DOM/Element.cpp b/Libraries/LibWeb/DOM/Element.cpp index b659e227c36..8985d2f2659 100644 --- a/Libraries/LibWeb/DOM/Element.cpp +++ b/Libraries/LibWeb/DOM/Element.cpp @@ -1803,7 +1803,7 @@ int Element::scroll_width() const // 3. Let viewport width be the width of the viewport excluding the width of the scroll bar, if any, // or zero if there is no viewport. auto viewport_width = document.viewport_rect().width().to_int(); - auto viewport_scroll_width = document.navigable()->size().width().to_int(); + auto viewport_scroll_width = document.navigable()->viewport_size().width().to_int(); // 4. If the element is the root element and document is not in quirks mode // return max(viewport scrolling area width, viewport width). @@ -1842,7 +1842,7 @@ int Element::scroll_height() const // 3. Let viewport height be the height of the viewport excluding the height of the scroll bar, if any, // or zero if there is no viewport. auto viewport_height = document.viewport_rect().height().to_int(); - auto viewport_scroll_height = document.navigable()->size().height().to_int(); + auto viewport_scroll_height = document.navigable()->viewport_size().height().to_int(); // 4. If the element is the root element and document is not in quirks mode // return max(viewport scrolling area height, viewport height). diff --git a/Libraries/LibWeb/HTML/Navigable.cpp b/Libraries/LibWeb/HTML/Navigable.cpp index 3e1e6d724e6..742f347b07e 100644 --- a/Libraries/LibWeb/HTML/Navigable.cpp +++ b/Libraries/LibWeb/HTML/Navigable.cpp @@ -2284,10 +2284,10 @@ CSSPixelPoint Navigable::to_top_level_position(CSSPixelPoint a_position) void Navigable::set_viewport_size(CSSPixelSize size) { - if (m_size == size) + if (m_viewport_size == size) return; - m_size = size; + m_viewport_size = size; if (auto document = active_document()) { // NOTE: Resizing the viewport changes the reference value for viewport-relative CSS lengths. document->invalidate_style(DOM::StyleInvalidationReason::NavigableSetViewportSize); diff --git a/Libraries/LibWeb/HTML/Navigable.h b/Libraries/LibWeb/HTML/Navigable.h index 0a1bcdc15c6..217a1590eb2 100644 --- a/Libraries/LibWeb/HTML/Navigable.h +++ b/Libraries/LibWeb/HTML/Navigable.h @@ -167,10 +167,9 @@ public: CSSPixelPoint to_top_level_position(CSSPixelPoint); CSSPixelRect to_top_level_rect(CSSPixelRect const&); - CSSPixelSize size() const { return m_size; } - CSSPixelPoint viewport_scroll_offset() const { return m_viewport_scroll_offset; } - CSSPixelRect viewport_rect() const { return { m_viewport_scroll_offset, m_size }; } + CSSPixelRect viewport_rect() const { return { m_viewport_scroll_offset, m_viewport_size }; } + CSSPixelSize viewport_size() const { return m_viewport_size; } virtual void set_viewport_size(CSSPixelSize); void perform_scroll_of_viewport(CSSPixelPoint position); @@ -246,7 +245,7 @@ private: bool m_has_been_destroyed { false }; - CSSPixelSize m_size; + CSSPixelSize m_viewport_size; CSSPixelPoint m_viewport_scroll_offset; Web::EventHandler m_event_handler;