Changeset 194064 in webkit

Timestamp:

Dec 14, 2015, 3:07:19 PM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r189942. rdar://problem/23886455

Location:

branches/safari-601-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/mac/DictionaryLookup.mm (modified) (6 diffs)

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

@@ +1 @@
+2015-12-14  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r189942. rdar://problem/23886455
+
+    2015-09-17  Tim Horton  <timothy_horton@apple.com>
+
+            Block Objective-C exceptions in DictionaryLookup
+            https://bugs.webkit.org/show_bug.cgi?id=149256
+
+            Reviewed by Anders Carlsson.
+
+            * editing/mac/DictionaryLookup.mm:
+            (WebCore::DictionaryLookup::rangeForSelection):
+            (WebCore::DictionaryLookup::rangeAtHitTestResult):
+            (WebCore::expandSelectionByCharacters):
+            (WebCore::DictionaryLookup::stringForPDFSelection):
+            (WebCore::showPopupOrCreateAnimationController):
+            (WebCore::DictionaryLookup::hidePopup):
+            It is possible for Lookup to throw an exception if one of its
+            related services dies for some reason. This shouldn't take down
+            our UI process, so block the exceptions.
+
 2015-12-14  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-601-branch/Source/WebCore/editing/mac/DictionaryLookup.mm

@@ -29 +29 @@
 #if PLATFORM(MAC)
 
+#import "BlockExceptions.h"
 #import "Document.h"
 #import "FocusController.h"
@@ -98 +99 @@
     String fullPlainTextString = plainText(makeRange(paragraphStart, paragraphEnd).get());
 
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
     // Since we already have the range we want, we just need to grab the returned options.
     if (Class luLookupDefinitionModule = getLULookupDefinitionModuleClass())
         [luLookupDefinitionModule tokenRangeForString:fullPlainTextString range:rangeToPass options:options];
+    END_BLOCK_OBJC_EXCEPTIONS;
 
     return selectedRange.release();
@@ -141 +144 @@
         return nullptr;
 
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(fullCharacterRange->startPosition(), position).get()), 0);
 
@@ -154 +159 @@
 
     return TextIterator::subrange(fullCharacterRange.get(), extractedRange.location, extractedRange.length);
+
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return nullptr;
 }
 
 static void expandSelectionByCharacters(PDFSelection *selection, NSInteger numberOfCharactersToExpand, NSInteger& charactersAddedBeforeStart, NSInteger& charactersAddedAfterEnd)
 {
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     size_t originalLength = selection.string.length;
     [selection extendSelectionAtStart:numberOfCharactersToExpand];
@@ -165 +175 @@
     [selection extendSelectionAtEnd:numberOfCharactersToExpand];
     charactersAddedAfterEnd = selection.string.length - originalLength - charactersAddedBeforeStart;
+
+    END_BLOCK_OBJC_EXCEPTIONS;
 }
 
 NSString *dictionaryLookupForPDFSelection(PDFSelection *selection, NSDictionary **options)
 {
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     // Don't do anything if there is no character at the point.
     if (!selection || !selection.string.length)
@@ -200 +214 @@
     ASSERT([selection.string isEqualToString:[fullPlainTextString substringWithRange:extractedRange]]);
     return selection.string;
+
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return nil;
 }