Changeset 112237 in webkit

Timestamp:

Mar 27, 2012 3:06:49 AM (12 years ago)

Author:

leviw@chromium.org

Message:

Revert linesBoundingBox to integers
​https://bugs.webkit.org/show_bug.cgi?id=82182

Reviewed by Eric Seidel.

LayoutRects are intended to be pixel snapped to determine the ultimate screen
coordinates, but the Inline Box tree is laid out using floats, and pixel snapping
the resulting box from linesBoundingBox would produce a potentially incorrect
rectangle. Keeping this using enclosingIntRect retains the previous accuracy and
prevents misuse.

No new tests. No change in behavior.

• rendering/RenderInline.cpp:

(WebCore::RenderInline::linesBoundingBox):

• rendering/RenderInline.h:

(RenderInline):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateLayerPosition):

• rendering/RenderText.cpp:

(WebCore::RenderText::linesBoundingBox):

• rendering/svg/RenderSVGInlineText.cpp:

(WebCore::RenderSVGInlineText::linesBoundingBox):

• rendering/svg/RenderSVGInlineText.h:

(RenderSVGInlineText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/svg/RenderSVGInlineText.cpp (modified) (1 diff)
• rendering/svg/RenderSVGInlineText.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-27  Levi Weintraub  <leviw@chromium.org>
+
+        Revert linesBoundingBox to integers
+        https://bugs.webkit.org/show_bug.cgi?id=82182
+
+        Reviewed by Eric Seidel.
+
+        LayoutRects are intended to be pixel snapped to determine the ultimate screen
+        coordinates, but the Inline Box tree is laid out using floats, and pixel snapping
+        the resulting box from linesBoundingBox would produce a potentially incorrect
+        rectangle. Keeping this using enclosingIntRect retains the previous accuracy and
+        prevents misuse.
+
+        No new tests. No change in behavior.
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::linesBoundingBox):
+        * rendering/RenderInline.h:
+        (RenderInline):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateLayerPosition):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::linesBoundingBox):
+        * rendering/svg/RenderSVGInlineText.cpp:
+        (WebCore::RenderSVGInlineText::linesBoundingBox):
+        * rendering/svg/RenderSVGInlineText.h:
+        (RenderSVGInlineText):
+
 2012-03-26  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -786 +786 @@
 }
 
-LayoutRect RenderInline::linesBoundingBox() const
+IntRect RenderInline::linesBoundingBox() const
 {
     if (!alwaysCreateLineBoxes()) {
         ASSERT(!firstLineBox());
-        return enclosingLayoutRect(culledInlineBoundingBox(this));
-    }
-
-    LayoutRect result;
+        return enclosingIntRect(culledInlineBoundingBox(this));
+    }
+
+    IntRect result;
     
     // See <rdar://problem/5289721>, for an unknown reason the linked list here is sometimes inconsistent, first is non-zero and last is zero.  We have been
@@ -816 +816 @@
         float width = isHorizontal ? logicalRightSide - logicalLeftSide : lastLineBox()->logicalBottom() - x;
         float height = isHorizontal ? lastLineBox()->logicalBottom() - y : logicalRightSide - logicalLeftSide;
-        result = enclosingLayoutRect(FloatRect(x, y, width, height));
+        result = enclosingIntRect(FloatRect(x, y, width, height));
     }
 

trunk/Source/WebCore/rendering/RenderInline.h

@@ -52 +52 @@
     virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&) const;
 
-    LayoutRect linesBoundingBox() const;
+    IntRect linesBoundingBox() const;
     LayoutRect linesVisualOverflowBoundingBox() const;
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -740 +740 @@
     if (renderer()->isRenderInline()) {
         RenderInline* inlineFlow = toRenderInline(renderer());
-        LayoutRect lineBox = inlineFlow->linesBoundingBox();
+        IntRect lineBox = inlineFlow->linesBoundingBox();
         setSize(lineBox.size());
         inlineBoundingBoxOffset = toSize(lineBox.location());

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1473 +1473 @@
 }
 
-LayoutRect RenderText::linesBoundingBox() const
-{
-    LayoutRect result;
+IntRect RenderText::linesBoundingBox() const
+{
+    IntRect result;
     
     ASSERT(!firstTextBox() == !lastTextBox());  // Either both are null or both exist.

trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp

@@ -166 +166 @@
 }
 
-LayoutRect RenderSVGInlineText::linesBoundingBox() const
+IntRect RenderSVGInlineText::linesBoundingBox() const
 {
     return enclosingIntRect(floatLinesBoundingBox());

trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.h

@@ -60 +60 @@
     virtual VisiblePosition positionForPoint(const LayoutPoint&);
     virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0);
-    virtual LayoutRect linesBoundingBox() const;
+    virtual IntRect linesBoundingBox() const;
     virtual InlineTextBox* createTextBox();