Changeset 287619 in webkit

Timestamp:

Jan 5, 2022, 10:20:36 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r285431. rdar://problem/87124705

WKSyntheticTapGestureRecognizer's action targets should be weak pointers
​https://bugs.webkit.org/show_bug.cgi?id=232812

Reviewed by Tim Horton.

Make WKSyntheticTapGestureRecognizer robust against the case where it outlives its WKContentView, by making its
"reset", "gesture identified", and "gesture failed" targets weak pointers instead of raw pointers.

• UIProcess/ios/WKSyntheticTapGestureRecognizer.mm: (-[WKSyntheticTapGestureRecognizer lastTouchedScrollView]):

Drive-by fix: we can also make _lastTouchedScrollView use the weak ivar attribute instead of WeakObjCPtr,
now that weak is enabled in WebKit2.

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

Location:

branches/safari-612-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKSyntheticTapGestureRecognizer.mm (modified) (2 diffs)

branches/safari-612-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-05  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r285431. rdar://problem/87124705
+
+    WKSyntheticTapGestureRecognizer's action targets should be weak pointers
+    https://bugs.webkit.org/show_bug.cgi?id=232812
+    
+    Reviewed by Tim Horton.
+    
+    Make WKSyntheticTapGestureRecognizer robust against the case where it outlives its WKContentView, by making its
+    "reset", "gesture identified", and "gesture failed" targets weak pointers instead of raw pointers.
+    
+    * UIProcess/ios/WKSyntheticTapGestureRecognizer.mm:
+    (-[WKSyntheticTapGestureRecognizer lastTouchedScrollView]):
+    
+    Drive-by fix: we can also make `_lastTouchedScrollView` use the __weak ivar attribute instead of WeakObjCPtr,
+    now that __weak is enabled in WebKit2.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-08  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            WKSyntheticTapGestureRecognizer's action targets should be weak pointers
+            https://bugs.webkit.org/show_bug.cgi?id=232812
+
+            Reviewed by Tim Horton.
+
+            Make WKSyntheticTapGestureRecognizer robust against the case where it outlives its WKContentView, by making its
+            "reset", "gesture identified", and "gesture failed" targets weak pointers instead of raw pointers.
+
+            * UIProcess/ios/WKSyntheticTapGestureRecognizer.mm:
+            (-[WKSyntheticTapGestureRecognizer lastTouchedScrollView]):
+
+            Drive-by fix: we can also make `_lastTouchedScrollView` use the __weak ivar attribute instead of WeakObjCPtr,
+            now that __weak is enabled in WebKit2.
+
 2021-12-22  Alan Coon  <alancoon@apple.com>
 

branches/safari-612-branch/Source/WebKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.mm

@@ -31 +31 @@
 #import <UIKit/UIGestureRecognizerSubclass.h>
 #import <wtf/RetainPtr.h>
-#import <wtf/WeakObjCPtr.h>
 
 @implementation WKSyntheticTapGestureRecognizer {
-    id _gestureIdentifiedTarget;
+    __weak id _gestureIdentifiedTarget;
     SEL _gestureIdentifiedAction;
-    id _gestureFailedTarget;
+    __weak id _gestureFailedTarget;
     SEL _gestureFailedAction;
-    id _resetTarget;
+    __weak id _resetTarget;
     SEL _resetAction;
     RetainPtr<NSNumber> _lastActiveTouchIdentifier;
-    WeakObjCPtr<UIScrollView> _lastTouchedScrollView;
+    __weak UIScrollView *_lastTouchedScrollView;
 }
 
@@ -109 +108 @@
 - (UIScrollView *)lastTouchedScrollView
 {
-    return _lastTouchedScrollView.get().get();
+    return _lastTouchedScrollView;
 }