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

[hyatt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1ff044299aabacfcc60661d3dfe29d16576c8c37
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 01:41:02 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=49228
    
    Reviewed by Simon Fraser.
    
    REGRESSION: caret too short when a positive line height is specified.  Now that lineTop no longer
    accidentally incorporates the top leading, we need to use selectionTop/Bottom for the caret rect.
    
    * rendering/RenderText.cpp:
    (WebCore::RenderText::localCaretRect):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3253aec..c7f86b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-08  David Hyatt  <hyatt at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49228
+        
+        REGRESSION: caret too short when a positive line height is specified.  Now that lineTop no longer
+        accidentally incorporates the top leading, we need to use selectionTop/Bottom for the caret rect.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::localCaretRect):
+
 2010-11-08  Pierre-Antoine LaFayette  <pierre.lafayette at gmail.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/rendering/RenderText.cpp b/WebCore/rendering/RenderText.cpp
index 1a2ce30..551c429 100644
--- a/WebCore/rendering/RenderText.cpp
+++ b/WebCore/rendering/RenderText.cpp
@@ -484,8 +484,8 @@ IntRect RenderText::localCaretRect(InlineBox* inlineBox, int caretOffset, int* e
 
     InlineTextBox* box = static_cast<InlineTextBox*>(inlineBox);
 
-    int height = box->root()->lineBottom() - box->root()->lineTop();
-    int top = box->root()->lineTop();
+    int height = box->root()->selectionHeight();
+    int top = box->root()->selectionTop();
 
     int left = box->positionForOffset(caretOffset);
 

-- 
WebKit Debian packaging