Changeset 139037 in webkit

Timestamp:

Jan 7, 2013 11:46:58 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Use toSize() to convert from Int/FloatPoint to Int/FloatSize
​https://bugs.webkit.org/show_bug.cgi?id=105992

Patch by Steve Block <​steveblock@chromium.org> on 2013-01-07
Reviewed by Kentaro Hara.

Source/WebCore:

Refactoring only, no change in behavior.

• html/HTMLAreaElement.cpp:

(WebCore::HTMLAreaElement::computePath):

• platform/ScrollView.h:

(WebCore::ScrollView::scrollOffset):

• platform/graphics/FloatPoint.h:

(WebCore::toFloatSize):
Add 'inline FloatSize toFloatSize(const FloatPoint&)' to match IntPoint.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

Source/WebKit/chromium:

• src/LinkHighlight.cpp:

(WebKit::LinkHighlight::computeHighlightLayerPathAndPosition):

• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::minimumScrollOffset):
(WebKit::WebFrameImpl::maximumScrollOffset):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLAreaElement.cpp (modified) (1 diff)
• WebCore/platform/ScrollView.h (modified) (1 diff)
• WebCore/platform/graphics/FloatPoint.h (modified) (1 diff)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (5 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/LinkHighlight.cpp (modified) (1 diff)
• WebKit/chromium/src/WebFrameImpl.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Steve Block  <steveblock@chromium.org>
+
+        Use toSize() to convert from Int/FloatPoint to Int/FloatSize
+        https://bugs.webkit.org/show_bug.cgi?id=105992
+
+        Reviewed by Kentaro Hara.
+
+        Refactoring only, no change in behavior.
+
+        * html/HTMLAreaElement.cpp:
+        (WebCore::HTMLAreaElement::computePath):
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::scrollOffset):
+        * platform/graphics/FloatPoint.h:
+        (WebCore::toFloatSize):
+        Add 'inline FloatSize toFloatSize(const FloatPoint&)' to match IntPoint.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+
 2013-01-07  Kunihiko Sakamoto  <ksakamoto@chromium.org>
 

trunk/Source/WebCore/html/HTMLAreaElement.cpp

@@ -116 +116 @@
     }
 
-    p.translate(absPos - FloatPoint());
+    p.translate(toFloatSize(absPos));
     return p;
 }

trunk/Source/WebCore/platform/ScrollView.h

@@ -171 +171 @@
     // Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values).
     virtual IntPoint scrollPosition() const OVERRIDE { return visibleContentRect().location(); }
-    IntSize scrollOffset() const { return visibleContentRect().location() - IntPoint(); } // Gets the scrolled position as an IntSize. Convenient for adding to other sizes.
+    IntSize scrollOffset() const { return toSize(visibleContentRect().location()); } // Gets the scrolled position as an IntSize. Convenient for adding to other sizes.
     virtual IntPoint maximumScrollPosition() const OVERRIDE; // The maximum position we can be scrolled to.
     virtual IntPoint minimumScrollPosition() const OVERRIDE; // The minimum position we can be scrolled to.

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

@@ -264 +264 @@
 }
 
+inline FloatSize toFloatSize(const FloatPoint& a)
+{
+    return FloatSize(a.x(), a.y());
+}
+
 float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c);
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -636 +636 @@
 
     m_graphicsLayer->setPosition(FloatPoint(relativeCompositingBounds.location() - graphicsLayerParentLocation));
-    m_graphicsLayer->setOffsetFromRenderer(localCompositingBounds.location() - IntPoint());
+    m_graphicsLayer->setOffsetFromRenderer(toSize(localCompositingBounds.location()));
     
     FloatSize oldSize = m_graphicsLayer->size();
@@ -655 +655 @@
         clipLayer->setPosition(FloatPoint(clippingBox.location() - localCompositingBounds.location()));
         clipLayer->setSize(clippingBox.size());
-        clipLayer->setOffsetFromRenderer(clippingBox.location() - IntPoint());
+        clipLayer->setOffsetFromRenderer(toSize(clippingBox.location()));
     }
     
@@ -710 +710 @@
             // so that it gets correctly sorted with children. In that case, position relative to the clipping layer.
             foregroundSize = FloatSize(clippingBox.size());
-            foregroundOffset = clippingBox.location() - IntPoint();
+            foregroundOffset = toSize(clippingBox.location());
         }
 
@@ -744 +744 @@
 
         IntSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
-        m_scrollingLayer->setOffsetFromRenderer(IntPoint() - paddingBox.location());
+        m_scrollingLayer->setOffsetFromRenderer(-toSize(paddingBox.location()));
 
         bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
@@ -752 +752 @@
             m_scrollingContentsLayer->setNeedsDisplay();
 
-        IntSize scrollingContentsOffset = paddingBox.location() - IntPoint() - scrollOffset;
+        IntSize scrollingContentsOffset = toSize(paddingBox.location() - scrollOffset);
         if (scrollingContentsOffset != m_scrollingContentsLayer->offsetFromRenderer() || scrollSize != m_scrollingContentsLayer->size())
             compositor()->scrollingLayerDidChange(m_owningLayer);

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-07  Steve Block  <steveblock@chromium.org>
+
+        Use toSize() to convert from Int/FloatPoint to Int/FloatSize
+        https://bugs.webkit.org/show_bug.cgi?id=105992
+
+        Reviewed by Kentaro Hara.
+
+        * src/LinkHighlight.cpp:
+        (WebKit::LinkHighlight::computeHighlightLayerPathAndPosition):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::minimumScrollOffset):
+        (WebKit::WebFrameImpl::maximumScrollOffset):
+
 2013-01-07  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebKit/chromium/src/LinkHighlight.cpp

@@ -215 +215 @@
 
     FloatRect boundingRect = newPath.boundingRect();
-    newPath.translate(FloatPoint() - boundingRect.location());
+    newPath.translate(-toFloatSize(boundingRect.location()));
 
     bool pathHasChanged = !m_path.platformPath() || !(*newPath.platformPath() == *m_path.platformPath());

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -603 +603 @@
     if (!view)
         return WebSize();
-    return view->minimumScrollPosition() - IntPoint();
+    return toSize(view->minimumScrollPosition());
 }
 
@@ -611 +611 @@
     if (!view)
         return WebSize();
-    return view->maximumScrollPosition() - IntPoint();
+    return toSize(view->maximumScrollPosition());
 }