Changeset 228079 in webkit

Timestamp:

Feb 4, 2018 9:30:58 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r228050. rdar://problem/37220143

Location:

branches/safari-605-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

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

@@ +1 @@
+2018-02-04  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228050. rdar://problem/37220143
+
+    2018-02-03  Tim Horton  <timothy_horton@apple.com>
+
+            UI process sometimes crashes under -[WKContentView _lookupForWebView:]
+            https://bugs.webkit.org/show_bug.cgi?id=182460
+            <rdar://problem/33260602>
+
+            Reviewed by Wenson Hsieh.
+
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView _lookupForWebView:]):
+            If you have a range selection, but no rects for the selection, retrieving
+            the 0th element of selectionRects will crash the UI process. To fix, in
+            this case, use the rect for the starting caret instead.
+
+            It doesn't seem like the presentationRect is actually currently used for
+            the Lookup service, so the only impact is that we shouldn't crash anymore.
+
 2018-02-04  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1935 +1935 @@
         if (!selectedText)
             return;
-        
-        CGRect presentationRect = view->_page->editorState().selectionIsRange ? view->_page->editorState().postLayoutData().selectionRects[0].rect() : view->_page->editorState().postLayoutData().caretRectAtStart;
+
+        auto& editorState = view->_page->editorState();
+        auto& postLayoutData = editorState.postLayoutData();
+        CGRect presentationRect;
+        if (editorState.selectionIsRange && !postLayoutData.selectionRects.isEmpty())
+            presentationRect = postLayoutData.selectionRects[0].rect();
+        else
+            presentationRect = postLayoutData.caretRectAtStart;
         
         String selectionContext = textBefore + selectedText + textAfter;
-        if (view->_textSelectionAssistant) {
-            [view->_textSelectionAssistant lookup:selectionContext withRange:NSMakeRange(textBefore.length(), selectedText.length()) fromRect:presentationRect];
-        } else {
-            [view->_webSelectionAssistant lookup:selectionContext withRange:NSMakeRange(textBefore.length(), selectedText.length()) fromRect:presentationRect];
-        }
+        NSRange selectedRangeInContext = NSMakeRange(textBefore.length(), selectedText.length());
+
+        if (auto textSelectionAssistant = view->_textSelectionAssistant)
+            [textSelectionAssistant lookup:selectionContext withRange:selectedRangeInContext fromRect:presentationRect];
+        else
+            [view->_webSelectionAssistant lookup:selectionContext withRange:selectedRangeInContext fromRect:presentationRect];
     });
 }