Changeset 84459 in webkit

Timestamp:

Apr 20, 2011 8:02:28 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-20 Jia Pu <​jpu@apple.com>

Reviewed by Maciej Stachowiak.

[Mac] Correction panel shows up at incorrect location after webpage is scrolled.
​https://bugs.webkit.org/show_bug.cgi?id=59052
<rdar://problem/9312513>

Fixed a regression caused by interaction between patch for bug 57353 and patch for bug 55571.
See bug webpage for detail.

• editing/Editor.cpp: (WebCore::Editor::selectionStartHasMarkerFor):
• editing/SpellingCorrectionController.cpp: (WebCore::SpellingCorrectionController::windowRectForRange):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/Editor.h (modified) (1 diff)
• editing/SpellingCorrectionController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        [Mac] Correction panel shows up at incorrect location after webpage is scrolled.
+        https://bugs.webkit.org/show_bug.cgi?id=59052
+        <rdar://problem/9312513>
+        
+        Fixed a regression caused by interaction between patch for bug 57353 and patch for bug 55571.
+        See bug webpage for detail.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::selectionStartHasMarkerFor):
+        * editing/SpellingCorrectionController.cpp:
+        (WebCore::SpellingCorrectionController::windowRectForRange):
+
 2011-04-20  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -3228 +3228 @@
 
     return false;
-}
-
-FloatRect Editor::windowRectForRange(const Range* range) const
-{
-    FrameView* view = frame()->view();
-    if (!view)
-        return FloatRect();
-    Vector<FloatQuad> textQuads;
-    range->textQuads(textQuads);
-    FloatRect boundingRect;
-    size_t size = textQuads.size();
-    for (size_t i = 0; i < size; ++i)
-        boundingRect.unite(textQuads[i].boundingBox());
-    return view->contentsToWindow(IntRect(boundingRect));
-}        
+}       
 
 TextCheckingTypeMask Editor::textCheckingTypeMaskFor(TextCheckingOptions textCheckingOptions)

trunk/Source/WebCore/editing/Editor.h

@@ -434 +434 @@
     // Return true if correction was applied, false otherwise.
     bool applyAutocorrectionBeforeTypingIfAppropriate();
-    FloatRect windowRectForRange(const Range*) const;
 };
 

trunk/Source/WebCore/editing/SpellingCorrectionController.cpp

@@ -362 +362 @@
 {
     FrameView* view = m_frame->view();
-    return view ? view->contentsToWindow(IntRect(range->boundingRect())) : FloatRect();
+    if (!view)
+        return FloatRect();
+    Vector<FloatQuad> textQuads;
+    range->textQuads(textQuads);
+    FloatRect boundingRect;
+    size_t size = textQuads.size();
+    for (size_t i = 0; i < size; ++i)
+        boundingRect.unite(textQuads[i].boundingBox());
+    return view->contentsToWindow(IntRect(boundingRect));
 }