Changeset 245231 in webkit

Timestamp:

May 12, 2019, 11:51:22 PM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r245195. rdar://problem/46548586

Returning incorrect marked text rects
​https://bugs.webkit.org/show_bug.cgi?id=197758
<rdar://problem/46548586>

Reviewed by Tim Horton.

We are not returning marked text rects in the correct view coordinate space.
This is the same translation we are applying to the caret rects.

• WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::platformEditorState const):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@245195 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1.24-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)

branches/safari-608.1.24-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-12  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r245195. rdar://problem/46548586
+
+    Returning incorrect marked text rects
+    https://bugs.webkit.org/show_bug.cgi?id=197758
+    <rdar://problem/46548586>
+    
+    Reviewed by Tim Horton.
+    
+    We are not returning marked text rects in the correct view coordinate space.
+    This is the same translation we are applying to the caret rects.
+    
+    * WebProcess/WebPage/ios/WebPageIOS.mm:
+    (WebKit::WebPage::platformEditorState const):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245195 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-10  Megan Gardner  <megan_gardner@apple.com>
+
+            Returning incorrect marked text rects
+            https://bugs.webkit.org/show_bug.cgi?id=197758
+            <rdar://problem/46548586>
+
+            Reviewed by Tim Horton.
+
+            We are not returning marked text rects in the correct view coordinate space.
+            This is the same translation we are applying to the caret rects.
+
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::WebPage::platformEditorState const):
+
 2019-05-12  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-608.1.24-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -194 +194 @@
 void WebPage::platformEditorState(Frame& frame, EditorState& result, IncludePostLayoutDataHint shouldIncludePostLayoutData) const
 {
+    FrameView* view = frame.view();
     if (frame.editor().hasComposition()) {
         RefPtr<Range> compositionRange = frame.editor().compositionRange();
@@ -200 +201 @@
             compositionRange->collectSelectionRects(compositionRects);
             if (compositionRects.size())
-                result.firstMarkedRect = compositionRects[0].rect();
+                result.firstMarkedRect = view->contentsToRootView(compositionRects[0].rect());
             if (compositionRects.size() > 1)
-                result.lastMarkedRect = compositionRects.last().rect();
+                result.lastMarkedRect = view->contentsToRootView(compositionRects.last().rect());
             else
                 result.lastMarkedRect = result.firstMarkedRect;
@@ -224 +225 @@
 
     auto& postLayoutData = result.postLayoutData();
-    FrameView* view = frame.view();
+    
     const VisibleSelection& selection = frame.selection().selection();
     postLayoutData.isStableStateUpdate = m_isInStableState;