Changeset 74319 in webkit

Timestamp:

Dec 18, 2010 3:32:32 PM (13 years ago)

Author:

mitz@apple.com

Message:

Text emphasis marks are not always included in the selection highlight
​https://bugs.webkit.org/show_bug.cgi?id=51299

Reviewed by Cameron Zwarich.

WebCore:

Affects pixel results of fast/text/emphasis.html

Account for annotations in selectionTop() and selectionBottom().

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::selectionTop):
(WebCore::RootInlineBox::selectionBottom):

LayoutTests:

• platform/mac/fast/text/emphasis-expected.checksum:
• platform/mac/fast/text/emphasis-expected.png:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/emphasis-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/emphasis-expected.png (modified) (previous)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RootInlineBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-18  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Cameron Zwarich.
+
+        Text emphasis marks are not always included in the selection highlight
+        https://bugs.webkit.org/show_bug.cgi?id=51299
+
+        * platform/mac/fast/text/emphasis-expected.checksum:
+        * platform/mac/fast/text/emphasis-expected.png:
+
 2010-12-18  Dan Bernstein  <mitz@apple.com>
 

trunk/LayoutTests/platform/mac/fast/text/emphasis-expected.checksum

@@ -1 @@
-ac0ea7816c98391f044f711d99596b0f
+5fe239e2c7c5c28f40a42a0071c8fa86

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-18  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Cameron Zwarich.
+
+        Text emphasis marks are not always included in the selection highlight
+        https://bugs.webkit.org/show_bug.cgi?id=51299
+
+        Affects pixel results of fast/text/emphasis.html
+
+        Account for annotations in selectionTop() and selectionBottom().
+
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::selectionTop):
+        (WebCore::RootInlineBox::selectionBottom):
+
 2010-12-18  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RootInlineBox.cpp

@@ -406 +406 @@
 {
     int selectionTop = m_lineTop;
+
+    if (m_hasAnnotationsBefore)
+        selectionTop -= !renderer()->style()->isFlippedLinesWritingMode() ? computeOverAnnotationAdjustment(m_lineTop) : computeUnderAnnotationAdjustment(m_lineTop);
+
     if (renderer()->style()->isFlippedLinesWritingMode())
         return selectionTop;
@@ -428 +432 @@
 {
     int selectionBottom = m_lineBottom;
+
+    if (m_hasAnnotationsAfter)
+        selectionBottom += !renderer()->style()->isFlippedLinesWritingMode() ? computeUnderAnnotationAdjustment(m_lineBottom) : computeOverAnnotationAdjustment(m_lineBottom);
+
     if (!renderer()->style()->isFlippedLinesWritingMode() || !nextRootBox())
         return selectionBottom;