Changeset 112756 in webkit

Timestamp:

Mar 30, 2012 5:52:52 PM (12 years ago)

Author:

eae@chromium.org

Message:

Fix return type for virtual borderBoundingBox method
​https://bugs.webkit.org/show_bug.cgi?id=82561

Reviewed by Eric Seidel.

No new tests, no change in functionality.

• editing/DeleteButtonController.cpp:

(WebCore::isDeletableElement):

• rendering/RenderBox.h:

(WebCore::RenderBox::borderBoxRect):
Rename pixelSnappedBorderBoxRect to borderBoxRect and remove LayoutRect
version of same as we always want to use the pixel snapped version to
ensure proper rounding and alignment to device pixels.
(The way this rect is pixel snapped, using the m_frameRect location,
makes it hard for calling code to take the subpixel rect and correctly
snap it).

(WebCore::RenderBox::borderBoundingBox):

• rendering/RenderBoxModelObject.h:

Change pure virtual definition of borderBoundingBox to return an IntRect
to match implementation in RenderBox.

(RenderBoxModelObject):

• rendering/RenderInline.h:

(WebCore::RenderInline::borderBoundingBox):
Change overloaded method to IntRect to match RenderBox implementation.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/DeleteButtonController.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderInline.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Fix return type for virtual borderBoundingBox method
+        https://bugs.webkit.org/show_bug.cgi?id=82561
+
+        Reviewed by Eric Seidel.
+
+        No new tests, no change in functionality.
+
+        * editing/DeleteButtonController.cpp:
+        (WebCore::isDeletableElement):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::borderBoxRect):
+        Rename pixelSnappedBorderBoxRect to borderBoxRect and remove LayoutRect
+        version of same as we always want to use the pixel snapped version to
+        ensure proper rounding and alignment to device pixels.
+        (The way this rect is pixel snapped, using the m_frameRect location,
+        makes it hard for calling code to take the subpixel rect and correctly
+        snap it).
+
+        (WebCore::RenderBox::borderBoundingBox):
+        * rendering/RenderBoxModelObject.h:
+        Change pure virtual definition of borderBoundingBox to return an IntRect
+        to match implementation in RenderBox.
+        
+        (RenderBoxModelObject):
+        * rendering/RenderInline.h:
+        (WebCore::RenderInline::borderBoundingBox):
+        Change overloaded method to IntRect to match RenderBox implementation.
+
 2012-03-30  Bear Travis  <betravis@adobe.com>
 

trunk/Source/WebCore/editing/DeleteButtonController.cpp

@@ -93 +93 @@
 
     RenderBox* box = toRenderBox(renderer);
-    LayoutRect borderBoundingBox = box->borderBoundingBox();
+    IntRect borderBoundingBox = box->borderBoundingBox();
     if (borderBoundingBox.width() < minimumWidth || borderBoundingBox.height() < minimumHeight)
         return false;

trunk/Source/WebCore/rendering/RenderBox.h

@@ -133 +133 @@
     void setFrameRect(const LayoutRect& rect) { m_frameRect = rect; }
 
-    // FIXME: We shouldn't be returning this as a LayoutRect, since it loses its position and won't properly pixel snap.
-    LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); }
-    IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), IntSize(m_frameRect.pixelSnappedWidth(), m_frameRect.pixelSnappedHeight())); }
-    virtual IntRect borderBoundingBox() const { return pixelSnappedBorderBoxRect(); }
+    IntRect borderBoxRect() const { return IntRect(IntPoint(), IntSize(m_frameRect.pixelSnappedWidth(), m_frameRect.pixelSnappedHeight())); }
+    virtual IntRect borderBoundingBox() const { return borderBoxRect(); } 
 
     // The content area of the box (excludes padding and border).

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -78 +78 @@
 
     // This will work on inlines to return the bounding box of all of the lines' border boxes.
-    virtual LayoutRect borderBoundingBox() const = 0;
+    virtual IntRect borderBoundingBox() const = 0;
 
     // Virtual since table cells override

trunk/Source/WebCore/rendering/RenderInline.h

@@ -135 +135 @@
     virtual VisiblePosition positionForPoint(const LayoutPoint&);
 
-    virtual LayoutRect borderBoundingBox() const
+    virtual IntRect borderBoundingBox() const
     {
-        LayoutRect boundingBox = linesBoundingBox();
-        return LayoutRect(0, 0, boundingBox.width(), boundingBox.height());
+        IntRect boundingBox = linesBoundingBox();
+        return IntRect(0, 0, boundingBox.width(), boundingBox.height());
     }