Changeset 117491 in webkit

Timestamp:

May 17, 2012 1:57:38 PM (12 years ago)

Author:

eae@chromium.org

Message:

Fix rounding in paintSelection
​https://bugs.webkit.org/show_bug.cgi?id=86693

Reviewed by Eric Seidel.

Break out rounding logic from InlineTextBox::paintSelection into separate
function and use it for all the EllipsisBox paintSelection implementation
and selection gap calculation. This ensures that selections are painted
without gaps and overlaps once we turn on subpixel layout.

No new tests, covered by existing tests in editing/selection and
editing/style.

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::paintSelection):

• rendering/InlineTextBox.cpp:

(WebCore::alignSelectionRectToDevicePixels):
(WebCore):
(WebCore::InlineTextBox::paintSelection):

• rendering/InlineTextBox.h:

(WebCore):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::logicalLeftSelectionGap):
(WebCore::RenderBlock::logicalRightSelectionGap):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-17  Emil A Eklund  <eae@chromium.org>
+
+        Fix rounding in paintSelection
+        https://bugs.webkit.org/show_bug.cgi?id=86693
+
+        Reviewed by Eric Seidel.
+
+        Break out rounding logic from InlineTextBox::paintSelection into separate
+        function and use it for all the EllipsisBox paintSelection implementation
+        and selection gap calculation. This ensures that selections are painted
+        without gaps and overlaps once we turn on subpixel layout.
+
+        No new tests, covered by existing tests in editing/selection and
+        editing/style.
+
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::paintSelection):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::alignSelectionRectToDevicePixels):
+        (WebCore):
+        (WebCore::InlineTextBox::paintSelection):
+        * rendering/InlineTextBox.h:
+        (WebCore):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::logicalLeftSelectionGap):
+        (WebCore::RenderBlock::logicalRightSelectionGap):
+
 2012-05-17  Michal Mocny  <mmocny@google.com>
 

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -24 +24 @@
 #include "GraphicsContext.h"
 #include "HitTestResult.h"
+#include "InlineTextBox.h"
 #include "PaintInfo.h"
 #include "RenderBlock.h"
@@ -97 +98 @@
     LayoutUnit top = root()->selectionTop();
     LayoutUnit h = root()->selectionHeight();
-    // FIXME: We'll need to apply the correct clip rounding here: https://bugs.webkit.org/show_bug.cgi?id=63656
-    context->clip(IntRect(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h));
+    LayoutRect clipRect(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h);
+    alignSelectionRectToDevicePixels(clipRect);
+    context->clip(clipRect);
     // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
-    context->drawHighlightForText(font, RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(x() + paintOffset.x(), y() + paintOffset.y() + top), h, c, style->colorSpace());
+    context->drawHighlightForText(font, RenderBlock::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion), roundedIntPoint(LayoutPoint(x() + paintOffset.x(), y() + paintOffset.y() + top)), h, c, style->colorSpace());
 }
 

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)
+{
+    float maxX = floorf(rect.maxX());
+    rect.setX(floorf(rect.x()));
+    rect.setWidth(roundf(maxX - rect.x()));
+}
+#endif
+
 void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font, Color textColor)
 {
@@ -845 +861 @@
     LayoutUnit selectionTop = root()->selectionTopAdjustedForPrecedingBlock();
 
-    int deltaY = renderer()->style()->isFlippedLinesWritingMode() ? selectionBottom - logicalBottom() : logicalTop() - selectionTop;
-    int selHeight = max<LayoutUnit>(0, selectionBottom - selectionTop);
-
+    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
     FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
-
     FloatRect clipRect(localOrigin, FloatSize(m_logicalWidth, selHeight));
-    float maxX = floorf(clipRect.maxX());
-    clipRect.setX(floorf(clipRect.x()));
-    clipRect.setWidth(maxX - clipRect.x());
+    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

@@ -3358 +3358 @@
 
     LayoutRect gapRect = rootBlock->logicalRectToPhysicalRect(rootBlockPhysicalPosition, LayoutRect(rootBlockLogicalLeft, rootBlockLogicalTop, rootBlockLogicalWidth, logicalHeight));
+    alignSelectionRectToDevicePixels(gapRect);
     if (paintInfo)
         paintInfo->context->fillRect(gapRect, selObj->selectionBackgroundColor(), selObj->style()->colorSpace());
@@ -3374 +3375 @@
 
     LayoutRect gapRect = rootBlock->logicalRectToPhysicalRect(rootBlockPhysicalPosition, LayoutRect(rootBlockLogicalLeft, rootBlockLogicalTop, rootBlockLogicalWidth, logicalHeight));
+    alignSelectionRectToDevicePixels(gapRect);
     if (paintInfo)
         paintInfo->context->fillRect(gapRect, selObj->selectionBackgroundColor(), selObj->style()->colorSpace());