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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 81f01fab283899309be6fad011342a7601f1108d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 18:48:07 2010 +0000

    2010-09-28  Jia Pu  <jpu at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Autocorrection panel is shown at incorrect location when WebView is scrolled.
            https://bugs.webkit.org/show_bug.cgi?id=46531
            <rdar://problem/8455376>
    
            * dom/Range.h: Make getBorderAndTextQuads() public so that it can be used by Editor.
            * editing/Editor.cpp:
            (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Replaced call to textQuads()
              with getBorderAndTextQuads().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68547 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9ea5201..357c044 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-28  Jia Pu  <jpu at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Autocorrection panel is shown at incorrect location when WebView is scrolled.
+        https://bugs.webkit.org/show_bug.cgi?id=46531
+        <rdar://problem/8455376>
+
+        * dom/Range.h: Make getBorderAndTextQuads() public so that it can be used by Editor.
+        * editing/Editor.cpp:
+        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Replaced call to textQuads()
+          with getBorderAndTextQuads().
+
 2010-09-28  Andrei Popescu  <andreip at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/dom/Range.h b/WebCore/dom/Range.h
index 9834aec..aea76e1 100644
--- a/WebCore/dom/Range.h
+++ b/WebCore/dom/Range.h
@@ -109,6 +109,7 @@ public:
     void textRects(Vector<IntRect>&, bool useSelectionHeight = false);
     // Transform-friendly
     void textQuads(Vector<FloatQuad>&, bool useSelectionHeight = false);
+    void getBorderAndTextQuads(Vector<FloatQuad>&) const;
 
     void nodeChildrenChanged(ContainerNode*);
     void nodeChildrenWillBeRemoved(ContainerNode*);
@@ -147,8 +148,6 @@ private:
     enum ActionType { DELETE_CONTENTS, EXTRACT_CONTENTS, CLONE_CONTENTS };
     PassRefPtr<DocumentFragment> processContents(ActionType, ExceptionCode&);
 
-    void getBorderAndTextQuads(Vector<FloatQuad>&) const;
-
     RefPtr<Document> m_ownerDocument;
     RangeBoundaryPoint m_start;
     RangeBoundaryPoint m_end;
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 9b2a88f..b267637 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -2716,7 +2716,7 @@ void Editor::markAllMisspellingsAndBadGrammarInRanges(TextCheckingOptions textCh
                     if (shouldShowCorrectionPanel && resultLocation + resultLength == spellingRangeEndOffset && result->type == TextCheckingTypeCorrection) {
                         // We only show the correction panel on the last word.
                         Vector<FloatQuad> textQuads;
-                        rangeToReplace->textQuads(textQuads);
+                        rangeToReplace->getBorderAndTextQuads(textQuads);
                         Vector<FloatQuad>::const_iterator end = textQuads.end();
                         FloatRect totalBoundingBox;
                         for (Vector<FloatQuad>::const_iterator it = textQuads.begin(); it < end; ++it)

-- 
WebKit Debian packaging