Attachment 369593 Details for Bug 197758 – Patch for landing

[patch] Patch for landing

bug-197758-20190510133708.patch (text/plain), 2.73 KB, created by Megan Gardner on 2019-05-10 13:37:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Megan Gardner

Created: 2019-05-10 13:37:08 PDT

Size: 2.73 KB

patch

obsolete

>Subversion Revision: 245158
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 0b1a48cbc7efca67cc27a40e1109535092a1ea95..11913c1cd1f8348ee553fd80348b4a43f4deda14 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-09  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-09  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Lazily request keyboard on first hardware keydown when a non-editable element is focused
>diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>index e3ee326588d323eda77db185a20c0f9053cc3635..b38db7995877b379fc06753996e1698caa5e8a73 100644
>--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm
>@@ -193,15 +193,16 @@ static bool enclosingLayerIsTransparentOrFullyClipped(const RenderObject& render
> 
> void WebPage::platformEditorState(Frame& frame, EditorState& result, IncludePostLayoutDataHint shouldIncludePostLayoutData) const
> {
>+    FrameView* view = frame.view();
>     if (frame.editor().hasComposition()) {
>         RefPtr<Range> compositionRange = frame.editor().compositionRange();
>         Vector<WebCore::SelectionRect> compositionRects;
>         if (compositionRange) {
>             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;
>             result.markedText = plainTextReplacingNoBreakSpace(compositionRange.get());
>@@ -223,7 +224,7 @@ void WebPage::platformEditorState(Frame& frame, EditorState& result, IncludePost
>     }
> 
>     auto& postLayoutData = result.postLayoutData();
>-    FrameView* view = frame.view();
>+    
>     const VisibleSelection& selection = frame.selection().selection();
>     postLayoutData.isStableStateUpdate = m_isInStableState;
>     bool startNodeIsInsideFixedPosition = false;

Actions: View | Formatted Diff | Diff

Attachments on bug 197758: 369529 | 369593