Changeset 258061 in webkit

Timestamp:

Mar 6, 2020 9:46:09 PM (4 years ago)

Author:

Simon Fraser

Message:

Flaky Test: editing/spelling/spellcheck-async.html
​https://bugs.webkit.org/show_bug.cgi?id=160571

Reviewed by Ryosuke Niwa.

Second try to fix this crash; the WebEditorClient can go away before all the NSSpellChecker
callbacks are done (which happens off the main thread), so store a WeakPtr<WebEditorClient>.
We have to create the WeakPtr on the main thread, and it gets copied into the first block.

• WebCoreSupport/WebEditorClient.mm:

(-[WebEditorSpellCheckResponder initWithClient:sequence:results:]):
(-[WebEditorSpellCheckResponder perform]):
(WebEditorClient::requestCheckingOfString):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebEditorClient.mm (modified) (3 diffs)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2020-03-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Flaky Test: editing/spelling/spellcheck-async.html
+        https://bugs.webkit.org/show_bug.cgi?id=160571
+
+        Reviewed by Ryosuke Niwa.
+        
+        Second try to fix this crash; the WebEditorClient can go away before all the NSSpellChecker
+        callbacks are done (which happens off the main thread), so store a WeakPtr<WebEditorClient>.
+        We have to create the WeakPtr on the main thread, and it gets copied into the first block.
+
+        * WebCoreSupport/WebEditorClient.mm:
+        (-[WebEditorSpellCheckResponder initWithClient:sequence:results:]):
+        (-[WebEditorSpellCheckResponder perform]):
+        (WebEditorClient::requestCheckingOfString):
+
 2020-03-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm

@@ -1212 +1212 @@
 @interface WebEditorSpellCheckResponder : NSObject
 {
-    WebEditorClient* _client;
+    WeakPtr<WebEditorClient> _client;
     int _sequence;
     RetainPtr<NSArray> _results;
 }
-- (id)initWithClient:(WebEditorClient*)client sequence:(int)sequence results:(NSArray*)results;
+- (id)initWithClient:(WeakPtr<WebEditorClient>)client sequence:(int)sequence results:(NSArray*)results;
 - (void)perform;
 @end
 
 @implementation WebEditorSpellCheckResponder
-- (id)initWithClient:(WebEditorClient*)client sequence:(int)sequence results:(NSArray*)results
+- (id)initWithClient:(WeakPtr<WebEditorClient>)client sequence:(int)sequence results:(NSArray*)results
 {
     self = [super init];
@@ -1234 +1234 @@
 - (void)perform
 {
-    _client->didCheckSucceed(_sequence, _results.get());
+    if (_client)
+        _client->didCheckSucceed(_sequence, _results.get());
 }
 
@@ -1257 +1258 @@
     NSRange range = NSMakeRange(0, m_textCheckingRequest->data().text().length());
     NSRunLoop* currentLoop = [NSRunLoop currentRunLoop];
+    WeakPtr<WebEditorClient> weakThis = makeWeakPtr(*this);
     NSDictionary *options = @{ NSTextCheckingInsertionPointKey :  [NSNumber numberWithUnsignedInteger:insertionPointFromCurrentSelection(currentSelection)] };
     [[NSSpellChecker sharedSpellChecker] requestCheckingOfString:m_textCheckingRequest->data().text() range:range types:NSTextCheckingAllSystemTypes options:options inSpellDocumentWithTag:0 completionHandler:^(NSInteger, NSArray* results, NSOrthography*, NSInteger) {
-        RetainPtr<WebEditorSpellCheckResponder> responder = adoptNS([[WebEditorSpellCheckResponder alloc] initWithClient:this sequence:sequence results:results]);
+        RetainPtr<WebEditorSpellCheckResponder> responder = adoptNS([[WebEditorSpellCheckResponder alloc] initWithClient:weakThis sequence:sequence results:results]);
         [currentLoop performBlock:^{
             [responder perform];