Changeset 85411 in webkit

Timestamp:

May 1, 2011 2:19:17 AM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9155067> REGRESSION (float-based line boxes): Gaps and overlaps in selection highlight
​https://bugs.webkit.org/show_bug.cgi?id=56658

Reviewed by Anders Carlsson.

Source/WebCore:

Test: fast/text/selection-rect-rounding.html

• platform/graphics/FontFastPath.cpp:

(WebCore::Font::selectionRectForSimpleText): Account for non-integral anchor point coordinates.

• platform/graphics/mac/FontComplexTextMac.cpp:

(WebCore::Font::selectionRectForComplexText): Ditto.

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::selectionRect): Floor the horizontal sides of the clip rect.
(WebCore::InlineTextBox::paintSelection): Pass the logical left location to Font::selectionRectForText(),
since it affects rounding.

LayoutTests:

• fast/text/selection-rect-rounding.html: Added.
• platform/mac/fast/text/selection-rect-rounding-expected.png: Added.
• platform/mac/fast/text/selection-rect-rounding-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/selection-rect-rounding.html (added)
• LayoutTests/platform/mac/fast/text/selection-rect-rounding-expected.png (added)
• LayoutTests/platform/mac/fast/text/selection-rect-rounding-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/FontFastPath.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-01  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/9155067> REGRESSION (float-based line boxes): Gaps and overlaps in selection highlight
+        https://bugs.webkit.org/show_bug.cgi?id=56658
+
+        * fast/text/selection-rect-rounding.html: Added.
+        * platform/mac/fast/text/selection-rect-rounding-expected.png: Added.
+        * platform/mac/fast/text/selection-rect-rounding-expected.txt: Added.
+
 2011-04-30  Justin Schuh  <jschuh@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-01  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/9155067> REGRESSION (float-based line boxes): Gaps and overlaps in selection highlight
+        https://bugs.webkit.org/show_bug.cgi?id=56658
+
+        Test: fast/text/selection-rect-rounding.html
+
+        * platform/graphics/FontFastPath.cpp:
+        (WebCore::Font::selectionRectForSimpleText): Account for non-integral anchor point coordinates.
+        * platform/graphics/mac/FontComplexTextMac.cpp:
+        (WebCore::Font::selectionRectForComplexText): Ditto.
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::selectionRect): Floor the horizontal sides of the clip rect.
+        (WebCore::InlineTextBox::paintSelection): Pass the logical left location to Font::selectionRectForText(),
+        since it affects rounding.
+
 2011-04-30  Justin Schuh  <jschuh@chromium.org>
 

trunk/Source/WebCore/platform/graphics/FontFastPath.cpp

@@ -474 +474 @@
         it.advance(run.length());
         float totalWidth = it.m_runWidthSoFar;
-        return FloatRect(point.x() + floorf(totalWidth - afterWidth), point.y(), roundf(totalWidth - beforeWidth) - floorf(totalWidth - afterWidth), h);
-    }
-
-    return FloatRect(point.x() + floorf(beforeWidth), point.y(), roundf(afterWidth) - floorf(beforeWidth), h);
+        return FloatRect(floorf(point.x() + totalWidth - afterWidth), point.y(), roundf(point.x() + totalWidth - beforeWidth) - floorf(point.x() + totalWidth - afterWidth), h);
+    }
+
+    return FloatRect(floorf(point.x() + beforeWidth), point.y(), roundf(point.x() + afterWidth) - floorf(point.x() + beforeWidth), h);
 }
 

trunk/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp

@@ -51 +51 @@
     if (run.rtl()) {
         float totalWidth = controller.totalWidth();
-        return FloatRect(point.x() + floorf(totalWidth - afterWidth), point.y(), roundf(totalWidth - beforeWidth) - floorf(totalWidth - afterWidth), h);
+        return FloatRect(floorf(point.x() + totalWidth - afterWidth), point.y(), roundf(point.x() + totalWidth - beforeWidth) - floorf(point.x() + totalWidth - afterWidth), h);
     } 
 
-    return FloatRect(point.x() + floorf(beforeWidth), point.y(), roundf(afterWidth) - floorf(beforeWidth), h);
+    return FloatRect(floorf(point.x() + beforeWidth), point.y(), roundf(point.x() + afterWidth) - floorf(point.x() + beforeWidth), h);
 }
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -195 +195 @@
 
     IntRect r = enclosingIntRect(f.selectionRectForText(TextRun(characters, len, textObj->allowTabs(), textPos(), m_expansion, expansionBehavior(), direction(), m_dirOverride),
-                                                        IntPoint(), selHeight, sPos, ePos));
-                                                        
+                                                        FloatPoint(logicalLeft(), selTop), selHeight, sPos, ePos));
+
     int logicalWidth = r.width();
-    if (r.x() > m_logicalWidth)
+    if (r.x() > logicalRight())
         logicalWidth  = 0;
-    else if (r.maxX() > m_logicalWidth)
-        logicalWidth = m_logicalWidth - r.x();
-    
-    IntPoint topPoint = isHorizontal() ? IntPoint(tx + m_x + r.x(), ty + selTop) : IntPoint(tx + selTop, ty + m_y + r.x());
+    else if (r.maxX() > logicalRight())
+        logicalWidth = logicalRight() - r.x();
+
+    IntPoint topPoint = isHorizontal() ? IntPoint(r.x(), ty + selTop) : IntPoint(tx + selTop, r.x());
     int width = isHorizontal() ? logicalWidth : selHeight;
     int height = isHorizontal() ? selHeight : logicalWidth;
-    
+
     return IntRect(topPoint, IntSize(width, height));
 }
@@ -785 +785 @@
 void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, RenderStyle* style, const Font& font)
 {
+    if (context->paintingDisabled())
+        return;
+
     // See if we have a selection to paint at all.
     int sPos, ePos;
@@ -818 +821 @@
     int selHeight = selectionHeight();
     FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
-    context->clip(FloatRect(localOrigin, FloatSize(m_logicalWidth, selHeight)));
+
+    FloatRect clipRect(localOrigin, FloatSize(m_logicalWidth, selHeight));
+    float maxX = floorf(clipRect.maxX());
+    clipRect.setX(floorf(clipRect.x()));
+    clipRect.setWidth(maxX - clipRect.x());
+    context->clip(clipRect);
+
     context->drawHighlightForText(font, TextRun(characters, length, textRenderer()->allowTabs(), textPos(), m_expansion, expansionBehavior(), 
                                   direction(), m_dirOverride || style->visuallyOrdered()),