Changeset 118961 in webkit

Timestamp:

May 30, 2012 1:30:51 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Rename offsetTopLeft in RenderBoxModelObject to something better
​https://bugs.webkit.org/show_bug.cgi?id=85915

Patch by Shezan Baig <​shezbaig.wk@gmail.com> on 2012-05-30
Reviewed by Darin Adler.

Renamed offsetTopLeft in RenderBoxModelObject to
adjustedPositionRelativeToOffsetParent, because it returns the given
startPoint after adjusting it to be relative to the top-left corner of
the offsetParent. The definition of offsetParent itself is non-trivial
and is documented within the body of RenderObject::offsetParent,
therefore I decided to reuse this term, as-is, in the name of this
function.

No new tests; no functional or visible changes.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::offsetLeft):
(WebCore::RenderBox::offsetTop):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::adjustedPositionRelativeToOffsetParent):
(WebCore::RenderBoxModelObject::offsetLeft):
(WebCore::RenderBoxModelObject::offsetTop):

• rendering/RenderBoxModelObject.h:

(RenderBoxModelObject):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::offsetLeft):
(WebCore::RenderInline::offsetTop):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (3 diffs)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-30  Shezan Baig  <shezbaig.wk@gmail.com>
+
+        Rename offsetTopLeft in RenderBoxModelObject to something better
+        https://bugs.webkit.org/show_bug.cgi?id=85915
+
+        Reviewed by Darin Adler.
+
+        Renamed offsetTopLeft in RenderBoxModelObject to
+        adjustedPositionRelativeToOffsetParent, because it returns the given
+        startPoint after adjusting it to be relative to the top-left corner of
+        the offsetParent.  The definition of offsetParent itself is non-trivial
+        and is documented within the body of RenderObject::offsetParent,
+        therefore I decided to reuse this term, as-is, in the name of this
+        function.
+
+        No new tests; no functional or visible changes.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::offsetLeft):
+        (WebCore::RenderBox::offsetTop):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::adjustedPositionRelativeToOffsetParent):
+        (WebCore::RenderBoxModelObject::offsetLeft):
+        (WebCore::RenderBoxModelObject::offsetTop):
+        * rendering/RenderBoxModelObject.h:
+        (RenderBoxModelObject):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::offsetLeft):
+        (WebCore::RenderInline::offsetTop):
+
 2012-05-29  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3836 +3836 @@
 LayoutUnit RenderBox::offsetLeft() const
 {
-    return offsetTopLeft(topLeftLocation()).x();
+    return adjustedPositionRelativeToOffsetParent(topLeftLocation()).x();
 }
 
 LayoutUnit RenderBox::offsetTop() const
 {
-    return offsetTopLeft(topLeftLocation()).y();
+    return adjustedPositionRelativeToOffsetParent(topLeftLocation()).y();
 }
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -516 +516 @@
 }
 
-LayoutPoint RenderBoxModelObject::offsetTopLeft(const LayoutPoint& startPoint) const
+LayoutPoint RenderBoxModelObject::adjustedPositionRelativeToOffsetParent(const LayoutPoint& startPoint) const
 {
     // If the element is the HTML body element or does not have an associated box
@@ -554 +554 @@
 {
     // Note that RenderInline and RenderBox override this to pass a different
-    // startPoint to offsetTopLeft.
-    return offsetTopLeft(LayoutPoint()).x();
+    // startPoint to adjustedPositionRelativeToOffsetParent.
+    return adjustedPositionRelativeToOffsetParent(LayoutPoint()).x();
 }
 
@@ -561 +561 @@
 {
     // Note that RenderInline and RenderBox override this to pass a different
-    // startPoint to offsetTopLeft.
-    return offsetTopLeft(LayoutPoint()).y();
+    // startPoint to adjustedPositionRelativeToOffsetParent.
+    return adjustedPositionRelativeToOffsetParent(LayoutPoint()).y();
 }
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -226 +226 @@
     };
 
-    LayoutPoint offsetTopLeft(const LayoutPoint&) const;
+    LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
 
     void calculateBackgroundImageGeometry(const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&);

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -654 +654 @@
     if (InlineBox* firstBox = firstLineBoxIncludingCulling())
         topLeft = flooredLayoutPoint(firstBox->topLeft());
-    return offsetTopLeft(topLeft).x();
+    return adjustedPositionRelativeToOffsetParent(topLeft).x();
 }
 
@@ -662 +662 @@
     if (InlineBox* firstBox = firstLineBoxIncludingCulling())
         topLeft = flooredLayoutPoint(firstBox->topLeft());
-    return offsetTopLeft(topLeft).y();
+    return adjustedPositionRelativeToOffsetParent(topLeft).y();
 }