Title: [234234] branches/safari-606-branch/Source/WebKit
Revision
234234
Author
[email protected]
Date
2018-07-26 00:14:33 -0700 (Thu, 26 Jul 2018)

Log Message

Cherry-pick r234067. rdar://problem/42451597

    Occasional crash under -[WKFormInputSession setSuggestions:]
    https://bugs.webkit.org/show_bug.cgi?id=187869
    <rdar://problem/41357063>

    Reviewed by Dean Jackson.

    * UIProcess/ios/WKContentViewInteraction.h:
    * UIProcess/ios/WKContentViewInteraction.mm:
    (-[WKContentView inputDelegate]):
    Make inputDelegate weak.

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

Modified Paths

Diff

Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (234233 => 234234)


--- branches/safari-606-branch/Source/WebKit/ChangeLog	2018-07-26 07:14:30 UTC (rev 234233)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog	2018-07-26 07:14:33 UTC (rev 234234)
@@ -1,5 +1,36 @@
 2018-07-25  Babak Shafiei  <[email protected]>
 
+        Cherry-pick r234067. rdar://problem/42451597
+
+    Occasional crash under -[WKFormInputSession setSuggestions:]
+    https://bugs.webkit.org/show_bug.cgi?id=187869
+    <rdar://problem/41357063>
+    
+    Reviewed by Dean Jackson.
+    
+    * UIProcess/ios/WKContentViewInteraction.h:
+    * UIProcess/ios/WKContentViewInteraction.mm:
+    (-[WKContentView inputDelegate]):
+    Make inputDelegate weak.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234067 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-07-20  Tim Horton  <[email protected]>
+
+            Occasional crash under -[WKFormInputSession setSuggestions:]
+            https://bugs.webkit.org/show_bug.cgi?id=187869
+            <rdar://problem/41357063>
+
+            Reviewed by Dean Jackson.
+
+            * UIProcess/ios/WKContentViewInteraction.h:
+            * UIProcess/ios/WKContentViewInteraction.mm:
+            (-[WKContentView inputDelegate]):
+            Make inputDelegate weak.
+
+2018-07-25  Babak Shafiei  <[email protected]>
+
         Cherry-pick r234054. rdar://problem/42451625
 
     [macOS] Relax WebKit sandbox to permit proper App Store behavior

Modified: branches/safari-606-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (234233 => 234234)


--- branches/safari-606-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h	2018-07-26 07:14:30 UTC (rev 234233)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h	2018-07-26 07:14:33 UTC (rev 234234)
@@ -44,6 +44,7 @@
 #import <wtf/BlockPtr.h>
 #import <wtf/Forward.h>
 #import <wtf/Vector.h>
+#import <wtf/WeakObjCPtr.h>
 #import <wtf/text/WTFString.h>
 
 namespace API {
@@ -182,7 +183,7 @@
 
     std::unique_ptr<WebKit::SmartMagnificationController> _smartMagnificationController;
 
-    id <UITextInputDelegate> _inputDelegate;
+    WeakObjCPtr<id <UITextInputDelegate>> _inputDelegate;
 
     uint64_t _latestTapID;
     struct TapHighlightInformation {

Modified: branches/safari-606-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (234233 => 234234)


--- branches/safari-606-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2018-07-26 07:14:30 UTC (rev 234233)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2018-07-26 07:14:33 UTC (rev 234234)
@@ -899,7 +899,7 @@
 
 - (id <UITextInputDelegate>)inputDelegate
 {
-    return _inputDelegate;
+    return _inputDelegate.getAutoreleased();
 }
 
 - (CGPoint)lastInteractionLocation
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to