[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit da36e02761d17d9e1397259e98ebec31bcd8981b
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 18 23:32:32 2010 +0000

    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:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74319 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 42ff6b0..039b5d0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,16 @@
 
         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 at apple.com>
+
+        Reviewed by Cameron Zwarich.
+
         In flipped writing modes, opposite text emphasis marks from adjacent lines overlap
         https://bugs.webkit.org/show_bug.cgi?id=51298
 
diff --git a/LayoutTests/platform/mac/fast/text/emphasis-expected.checksum b/LayoutTests/platform/mac/fast/text/emphasis-expected.checksum
index a1103bf..caff059 100644
--- a/LayoutTests/platform/mac/fast/text/emphasis-expected.checksum
+++ b/LayoutTests/platform/mac/fast/text/emphasis-expected.checksum
@@ -1 +1 @@
-ac0ea7816c98391f044f711d99596b0f
\ No newline at end of file
+5fe239e2c7c5c28f40a42a0071c8fa86
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/text/emphasis-expected.png b/LayoutTests/platform/mac/fast/text/emphasis-expected.png
index aa3bcb2..6caf678 100644
Binary files a/LayoutTests/platform/mac/fast/text/emphasis-expected.png and b/LayoutTests/platform/mac/fast/text/emphasis-expected.png differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 48adcf6..cd296f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,21 @@
 
         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 at apple.com>
+
+        Reviewed by Cameron Zwarich.
+
         In flipped writing modes, opposite text emphasis marks from adjacent lines overlap
         https://bugs.webkit.org/show_bug.cgi?id=51298
 
diff --git a/WebCore/rendering/RootInlineBox.cpp b/WebCore/rendering/RootInlineBox.cpp
index be326b5..7c2ac98 100644
--- a/WebCore/rendering/RootInlineBox.cpp
+++ b/WebCore/rendering/RootInlineBox.cpp
@@ -405,6 +405,10 @@ InlineBox* RootInlineBox::lastSelectedBox()
 int RootInlineBox::selectionTop() const
 {
     int selectionTop = m_lineTop;
+
+    if (m_hasAnnotationsBefore)
+        selectionTop -= !renderer()->style()->isFlippedLinesWritingMode() ? computeOverAnnotationAdjustment(m_lineTop) : computeUnderAnnotationAdjustment(m_lineTop);
+
     if (renderer()->style()->isFlippedLinesWritingMode())
         return selectionTop;
 
@@ -427,6 +431,10 @@ int RootInlineBox::selectionTop() const
 int RootInlineBox::selectionBottom() const
 {
     int selectionBottom = m_lineBottom;
+
+    if (m_hasAnnotationsAfter)
+        selectionBottom += !renderer()->style()->isFlippedLinesWritingMode() ? computeUnderAnnotationAdjustment(m_lineBottom) : computeOverAnnotationAdjustment(m_lineBottom);
+
     if (!renderer()->style()->isFlippedLinesWritingMode() || !nextRootBox())
         return selectionBottom;
 

-- 
WebKit Debian packaging