Changeset 225512 in webkit

Timestamp:

Dec 4, 2017, 5:37:20 PM (8 years ago)

Author:

Simon Fraser

Message:

Cleanup code that computes iframe content offsets in FrameView
​https://bugs.webkit.org/show_bug.cgi?id=180385

Reviewed by Zalan Bujtas.

The coordinate conversion functions in FrameView explicitly added borderLeft/paddingLeft
and borderTop/paddingTop to compute the offset from the contents of a frame to its parent renderer.

This is equivalent to the call to contextBoxRect() that RenderWidget::updateWidgetGeometry() does,
which also takes left-side scrollbars into account.

Coordinate offsets don't need height and width, so add RenderBox::contentBoxLocation() that just
computes the top left, and use it in FrameView.

• page/FrameView.cpp:

(WebCore::FrameView::invalidateRect):
(WebCore::FrameView::convertToContainingView const):
(WebCore::FrameView::convertFromContainingView const):

• platform/graphics/FloatPoint.h:

(WebCore::FloatPoint::scaled const):
(WebCore::FloatPoint::scaled): Deleted.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::contentBoxLocation const):

• rendering/RenderBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (5 diffs)
• platform/graphics/FloatPoint.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Cleanup code that computes iframe content offsets in FrameView
+        https://bugs.webkit.org/show_bug.cgi?id=180385
+
+        Reviewed by Zalan Bujtas.
+
+        The coordinate conversion functions in FrameView explicitly added borderLeft/paddingLeft
+        and borderTop/paddingTop to compute the offset from the contents of a frame to its parent renderer.
+        
+        This is equivalent to the call to contextBoxRect() that RenderWidget::updateWidgetGeometry() does,
+        which also takes left-side scrollbars into account.
+        
+        Coordinate offsets don't need height and width, so add RenderBox::contentBoxLocation() that just
+        computes the top left, and use it in FrameView.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::invalidateRect):
+        (WebCore::FrameView::convertToContainingView const):
+        (WebCore::FrameView::convertFromContainingView const):
+        * platform/graphics/FloatPoint.h:
+        (WebCore::FloatPoint::scaled const):
+        (WebCore::FloatPoint::scaled): Deleted.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::contentBoxLocation const):
+        * rendering/RenderBox.h:
+
 2017-12-04  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -431 +431 @@
 
     IntRect repaintRect = rect;
-    repaintRect.move(renderer->borderLeft() + renderer->paddingLeft(), renderer->borderTop() + renderer->paddingTop());
+    repaintRect.moveBy(roundedIntPoint(renderer->contentBoxLocation()));
     renderer->repaintRectangle(repaintRect);
 }
@@ -4385 +4385 @@
                 return localRect;
                 
-            IntRect rect(localRect);
-            // Add borders and padding??
-            rect.move(renderer->borderLeft() + renderer->paddingLeft(),
-                      renderer->borderTop() + renderer->paddingTop());
+            auto rect = localRect;
+            rect.moveBy(roundedIntPoint(renderer->contentBoxLocation()));
             return parentView.convertFromRendererToContainingView(renderer, rect);
         }
@@ -4409 +4407 @@
                 return parentRect;
 
-            IntRect rect = parentView.convertFromContainingViewToRenderer(renderer, parentRect);
-            // Subtract borders and padding
-            rect.move(-renderer->borderLeft() - renderer->paddingLeft(),
-                      -renderer->borderTop() - renderer->paddingTop());
+            auto rect = parentView.convertFromContainingViewToRenderer(renderer, parentRect);
+            rect.moveBy(-roundedIntPoint(renderer->contentBoxLocation()));
             return rect;
         }
@@ -4433 +4429 @@
                 return localPoint;
                 
-            IntPoint point(localPoint);
-
-            // Add borders and padding
-            point.move(renderer->borderLeft() + renderer->paddingLeft(),
-                       renderer->borderTop() + renderer->paddingTop());
+            auto point = localPoint;
+            point.moveBy(roundedIntPoint(renderer->contentBoxLocation()));
             return parentView.convertFromRendererToContainingView(renderer, point);
         }
@@ -4458 +4451 @@
                 return parentPoint;
 
-            IntPoint point = parentView.convertFromContainingViewToRenderer(renderer, parentPoint);
-            // Subtract borders and padding
-            point.move(-renderer->borderLeft() - renderer->paddingLeft(),
-                       -renderer->borderTop() - renderer->paddingTop());
+            auto point = parentView.convertFromContainingViewToRenderer(renderer, parentPoint);
+            point.moveBy(-roundedIntPoint(renderer->contentBoxLocation()));
             return point;
         }

trunk/Source/WebCore/platform/graphics/FloatPoint.h

@@ -128 +128 @@
     }
 
-    FloatPoint scaled(float scale)
+    FloatPoint scaled(float scale) const
     {
         return { m_x * scale, m_y * scale };
     }
 
-    FloatPoint scaled(float scaleX, float scaleY)
+    FloatPoint scaled(float scaleX, float scaleY) const
     {
         return { m_x * scaleX, m_y * scaleY };

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -661 +661 @@
 LayoutRect RenderBox::contentBoxRect() const
 {
-    LayoutUnit x = borderLeft() + paddingLeft();
-    if (shouldPlaceBlockDirectionScrollbarOnLeft())
-        x += verticalScrollbarWidth();
-    LayoutUnit y = borderTop() + paddingTop();
-    return LayoutRect(x, y, contentWidth(), contentHeight());
+    return { contentBoxLocation(), contentSize() };
+}
+
+LayoutPoint RenderBox::contentBoxLocation() const
+{
+    LayoutUnit scrollbarSpace = shouldPlaceBlockDirectionScrollbarOnLeft() ? verticalScrollbarWidth() : 0;
+    return { borderLeft() + paddingLeft() + scrollbarSpace, borderTop() + paddingTop() };
 }
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -161 +161 @@
     // The content area of the box (excludes padding - and intrinsic padding for table cells, etc... - and border).
     LayoutRect contentBoxRect() const;
+    LayoutPoint contentBoxLocation() const;
+
     // The content box in absolute coords. Ignores transforms.
     IntRect absoluteContentBox() const;