Changeset 180293 in webkit

Timestamp:

Feb 18, 2015 2:15:44 PM (9 years ago)

Author:

Beth Dakin

Message:

iBooks immediate action blacklist should not even create the gesture recognizer
​https://bugs.webkit.org/show_bug.cgi?id=141768
-and corresponding-
rdar://problem/19806770

Reviewed by Tim Horton.

Move the runtime-application check to the point where the gesture recognizer is
created so that we can avoid doing so.

• UIProcess/API/mac/WKView.mm:

(-[WKView initWithFrame:processPool:configuration:webView:]):

• UIProcess/mac/WKImmediateActionController.mm:

(-[WKImmediateActionController _updateImmediateActionItem]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)
• UIProcess/mac/WKImmediateActionController.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-18  Beth Dakin  <bdakin@apple.com>
+
+        iBooks immediate action blacklist should not even create the gesture recognizer
+        https://bugs.webkit.org/show_bug.cgi?id=141768
+        -and corresponding-
+        rdar://problem/19806770
+
+        Reviewed by Tim Horton.
+
+        Move the runtime-application check to the point where the gesture recognizer is 
+        created so that we can avoid doing so.
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView initWithFrame:processPool:configuration:webView:]):
+        * UIProcess/mac/WKImmediateActionController.mm:
+        (-[WKImmediateActionController _updateImmediateActionItem]):
+
 2015-02-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -96 +96 @@
 #import <WebCore/PlatformScreen.h>
 #import <WebCore/Region.h>
+#import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/SharedBuffer.h>
 #import <WebCore/SoftLinking.h>
@@ -3635 +3636 @@
     }
 
-    if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
+    // FIXME: We should not permanently disable this for iBooks. rdar://problem/19585689
+    Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer");
+    if (gestureClass && !applicationIsIBooks()) {
         _data->_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
         _data->_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data->_page view:self recognizer:_data->_immediateActionGestureRecognizer.get()]);

trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

@@ -41 +41 @@
 #import <WebCore/NSPopoverSPI.h>
 #import <WebCore/QuickLookMacSPI.h>
-#import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/SoftLinking.h>
 #import <WebCore/URL.h>
@@ -285 +284 @@
     id customClientAnimationController = [_wkView _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult.get()) withType:_type userData:toAPI(_userData.get())];
 
-    // FIXME: We should not permanently disable this for iBooks. rdar://problem/19585689
-    if (customClientAnimationController == [NSNull null] || applicationIsIBooks()) {
+    if (customClientAnimationController == [NSNull null]) {
         [self _cancelImmediateAction];
         return;