Changeset 273803 in webkit

Timestamp:

Mar 2, 2021, 7:09:23 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r273721. rdar://problem/74952690

Make DictionaryLookup::rangeAtHitTestResult more robust
​https://bugs.webkit.org/show_bug.cgi?id=222301
<rdar://problem/74529831>

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-03-01
Reviewed by Brent Fulgham.

This may be related to r265084 but something is crashing and I'm not sure what.
Adding some Optional checks might fix something, but this is still puzzling to me.

• editing/cocoa/DictionaryLookup.mm: (WebCore::DictionaryLookup::rangeAtHitTestResult):

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

Location:

branches/safari-612.1.5-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/DictionaryLookup.mm (modified) (1 diff)

branches/safari-612.1.5-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-02  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r273721. rdar://problem/74952690
+
+    Make DictionaryLookup::rangeAtHitTestResult more robust
+    https://bugs.webkit.org/show_bug.cgi?id=222301
+    <rdar://problem/74529831>
+    
+    Patch by Alex Christensen <achristensen@webkit.org> on 2021-03-01
+    Reviewed by Brent Fulgham.
+    
+    This may be related to r265084 but something is crashing and I'm not sure what.
+    Adding some Optional checks might fix something, but this is still puzzling to me.
+    
+    * editing/cocoa/DictionaryLookup.mm:
+    (WebCore::DictionaryLookup::rangeAtHitTestResult):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-03-01  Alex Christensen  <achristensen@webkit.org>
+
+            Make DictionaryLookup::rangeAtHitTestResult more robust
+            https://bugs.webkit.org/show_bug.cgi?id=222301
+            <rdar://problem/74529831>
+
+            Reviewed by Brent Fulgham.
+
+            This may be related to r265084 but something is crashing and I'm not sure what.
+            Adding some Optional checks might fix something, but this is still puzzling to me.
+
+            * editing/cocoa/DictionaryLookup.mm:
+            (WebCore::DictionaryLookup::rangeAtHitTestResult):
+
 2021-03-02  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.1.5-branch/Source/WebCore/editing/cocoa/DictionaryLookup.mm

@@ -343 +343 @@
         // As context, we are going to use 250 characters of text before and after the point.
         fullCharacterRange = rangeExpandedAroundPositionByCharacters(position, 250);
+        if (!fullCharacterRange)
+            return WTF::nullopt;
 
         selectionRange = NSMakeRange(NSNotFound, 0);