Changeset 117659 in webkit

Timestamp:

May 18, 2012 4:58:21 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Revert to float method of selection rect alignment for line box tree
​https://bugs.webkit.org/show_bug.cgi?id=86904

Reviewed by Eric Seidel.

In r117491, we introduced a new method of alignment for the selection rect in the sub-pixel case.
It turns out there is at least one case on Mac where this leaves a gap when painting selection rects
originating in the line box tree. This patch reverts us to the float method for the line box tree,
but retains the LayoutRect snapping for gap rects.

No new tests. Covered by existing tests with sub-pixel layout enabled.

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::paintSelection): Re-enabling the FloatRect flavor of
alignSelectionRectToDevicePixels for the line box tree.

• rendering/InlineTextBox.cpp:

(WebCore::alignSelectionRectToDevicePixels): Moving LayoutRect flavor to RenderBlock.
(WebCore::InlineTextBox::paintSelection): Happily clearing up the bifurcation of algorithms for
sub-pixel layout.

• rendering/InlineTextBox.h: Re-enabling the FloatRect flavor of alignSelectionRectToDevicePixels

for the line box tree.

• rendering/RenderBlock.cpp:

(WebCore::alignSelectionRectToDevicePixels): Re-seating the LayoutRect version of
alignSelectionRectToDevicePixels for use with GapRects.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/EllipsisBox.cpp (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (3 diffs)
• rendering/InlineTextBox.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-18  Levi Weintraub  <leviw@chromium.org>
+
+        Revert to float method of selection rect alignment for line box tree
+        https://bugs.webkit.org/show_bug.cgi?id=86904
+
+        Reviewed by Eric Seidel.
+
+        In r117491, we introduced a new method of alignment for the selection rect in the sub-pixel case.
+        It turns out there is at least one case on Mac where this leaves a gap when painting selection rects
+        originating in the line box tree. This patch reverts us to the float method for the line box tree,
+        but retains the LayoutRect snapping for gap rects.
+
+        No new tests. Covered by existing tests with sub-pixel layout enabled.
+
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::paintSelection): Re-enabling the FloatRect flavor of
+        alignSelectionRectToDevicePixels for the line box tree.
+        * rendering/InlineTextBox.cpp:
+        (WebCore::alignSelectionRectToDevicePixels): Moving LayoutRect flavor to RenderBlock.
+        (WebCore::InlineTextBox::paintSelection): Happily clearing up the bifurcation of algorithms for
+        sub-pixel layout.
+        * rendering/InlineTextBox.h: Re-enabling the FloatRect flavor of alignSelectionRectToDevicePixels
+        for the line box tree.
+        * rendering/RenderBlock.cpp:
+        (WebCore::alignSelectionRectToDevicePixels): Re-seating the LayoutRect version of
+        alignSelectionRectToDevicePixels for use with GapRects.
+
 2012-05-18  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -98 +98 @@
     LayoutUnit top = root()->selectionTop();
     LayoutUnit h = root()->selectionHeight();
-    LayoutRect clipRect(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h);
+    FloatRect clipRect(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h);
     alignSelectionRectToDevicePixels(clipRect);
     context->clip(clipRect);

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -808 +808 @@
 }
 
-void alignSelectionRectToDevicePixels(LayoutRect& rect)
-{
-    LayoutUnit maxX = floorToInt(rect.maxX());
-    rect.setX(floorToInt(rect.x()));
-    rect.setWidth(maxX - rect.x());
-}
-
-#if !ENABLE(SUBPIXEL_LAYOUT)
 void alignSelectionRectToDevicePixels(FloatRect& rect)
 {
@@ -822 +814 @@
     rect.setWidth(roundf(maxX - rect.x()));
 }
-#endif
 
 void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font, Color textColor)
@@ -862 +853 @@
 
     LayoutUnit deltaY = renderer()->style()->isFlippedLinesWritingMode() ? selectionBottom - logicalBottom() : logicalTop() - selectionTop;
-    LayoutUnit selHeight = max<LayoutUnit>(0, selectionBottom - selectionTop);
-
-#if ENABLE(SUBPIXEL_LAYOUT)
-    LayoutPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
-    LayoutRect clipRect(localOrigin, LayoutSize(m_logicalWidth, selHeight));
-    alignSelectionRectToDevicePixels(clipRect);
-#else
+    LayoutUnit selHeight = max<LayoutUnit>(ZERO_LAYOUT_UNIT, selectionBottom - selectionTop);
+
     FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
     FloatRect clipRect(localOrigin, FloatSize(m_logicalWidth, selHeight));
     alignSelectionRectToDevicePixels(clipRect);
-#endif
+
     context->clip(clipRect);
 

trunk/Source/WebCore/rendering/InlineTextBox.h

@@ -214 +214 @@
 }
 
-void alignSelectionRectToDevicePixels(LayoutRect&);
-#if !ENABLE(SUBPIXEL_LAYOUT)
 void alignSelectionRectToDevicePixels(FloatRect&);
-#endif
 
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3347 +3347 @@
 }
 
+static inline void alignSelectionRectToDevicePixels(LayoutRect& rect)
+{
+    LayoutUnit maxX = floorToInt(rect.maxX());
+    rect.setX(floorToInt(rect.x()));
+    rect.setWidth((maxX - rect.x()).round());
+}
+
 LayoutRect RenderBlock::logicalLeftSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
                                                 RenderObject* selObj, LayoutUnit logicalLeft, LayoutUnit logicalTop, LayoutUnit logicalHeight, const PaintInfo* paintInfo)