Changeset 189942 in webkit

Timestamp:

Sep 17, 2015, 4:22:52 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-09-17  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/editing/mac/DictionaryLookup.mm

@@ -29 +29 @@
 #if PLATFORM(MAC)
 
+#import "BlockExceptions.h"
 #import "Document.h"
 #import "FocusController.h"
@@ -84 +85 @@
     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();
@@ -128 +131 @@
         return nullptr;
 
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(fullCharacterRange->startPosition(), position).get()), 0);
 
@@ -141 +146 @@
 
     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];
@@ -152 +162 @@
     [selection extendSelectionAtEnd:numberOfCharactersToExpand];
     charactersAddedAfterEnd = selection.string.length - originalLength - charactersAddedBeforeStart;
+
+    END_BLOCK_OBJC_EXCEPTIONS;
 }
 
 NSString *DictionaryLookup::stringForPDFSelection(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)
@@ -187 +201 @@
     ASSERT([selection.string isEqualToString:[fullPlainTextString substringWithRange:extractedRange]]);
     return selection.string;
+
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return nil;
 }
 
 static PlatformAnimationController showPopupOrCreateAnimationController(bool createAnimationController, const DictionaryPopupInfo& dictionaryPopupInfo, NSView *view, std::function<void(TextIndicator&)> textIndicatorInstallationCallback)
 {
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     if (!getLULookupDefinitionModuleClass())
         return nil;
@@ -233 +252 @@
     [getLULookupDefinitionModuleClass() showDefinitionForTerm:dictionaryPopupInfo.attributedString.get() atLocation:textBaselineOrigin options:mutableOptions.get()];
     return nil;
+
+    END_BLOCK_OBJC_EXCEPTIONS;
+    return nil;
 }
 
@@ -242 +264 @@
 void DictionaryLookup::hidePopup()
 {
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
     if (!getLULookupDefinitionModuleClass())
         return;
     [getLULookupDefinitionModuleClass() hideDefinition];
+
+    END_BLOCK_OBJC_EXCEPTIONS;
 }