[webkit-changes] [179129] trunk/Source

Mon, 26 Jan 2015 11:44:56 -0800

Title: [179129] trunk/Source
Revision
179129
Author
[email protected]
Date
2015-01-26 11:44:09 -0800 (Mon, 26 Jan 2015)

Log Message

Blacklist iBooks for WebKit's default immediate actions
https://bugs.webkit.org/show_bug.cgi?id=140854
-and corresponding-
rdar://problem/19489518

Reviewed by Tim Horton.

Source/WebCore:

Add a runtime check for iBooks.
* WebCore.exp.in:
* platform/RuntimeApplicationChecks.cpp:
(WebCore::applicationIsIBooks):
* platform/RuntimeApplicationChecks.h:

Source/WebKit2:

Blacklist iBooks.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _updateImmediateActionItem]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (179128 => 179129)


--- trunk/Source/WebCore/ChangeLog	2015-01-26 19:38:56 UTC (rev 179128)
+++ trunk/Source/WebCore/ChangeLog	2015-01-26 19:44:09 UTC (rev 179129)
@@ -1,3 +1,18 @@
+2015-01-26  Beth Dakin  <[email protected]>
+
+        Blacklist iBooks for WebKit's default immediate actions
+        https://bugs.webkit.org/show_bug.cgi?id=140854
+        -and corresponding-
+        rdar://problem/19489518
+
+        Reviewed by Tim Horton.
+
+        Add a runtime check for iBooks.
+        * WebCore.exp.in:
+        * platform/RuntimeApplicationChecks.cpp:
+        (WebCore::applicationIsIBooks):
+        * platform/RuntimeApplicationChecks.h:
+
 2015-01-26  Myles C. Maxfield  <[email protected]>
 
         [iOS] [SVG -> OTF Converter] Flip the switch off on iOS

Modified: trunk/Source/WebCore/WebCore.exp.in (179128 => 179129)


--- trunk/Source/WebCore/WebCore.exp.in	2015-01-26 19:38:56 UTC (rev 179128)
+++ trunk/Source/WebCore/WebCore.exp.in	2015-01-26 19:44:09 UTC (rev 179129)
@@ -885,6 +885,7 @@
 __ZN7WebCore19TextResourceDecoder6decodeEPKcm
 __ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
 __ZN7WebCore19TextResourceDecoderD1Ev
+__ZN7WebCore19applicationIsIBooksEv
 __ZN7WebCore19applicationIsITunesEv
 __ZN7WebCore19enclosingLayoutRectERKNS_9FloatRectE
 __ZN7WebCore19floatValueForLengthERKNS_6LengthEf

Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp (179128 => 179129)


--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp	2015-01-26 19:38:56 UTC (rev 179128)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.cpp	2015-01-26 19:44:09 UTC (rev 179129)
@@ -67,6 +67,12 @@
     return isAppleMail;
 }
 
+bool applicationIsIBooks()
+{
+    static bool isIBooks = mainBundleIsEqualTo("com.apple.iBooksX");
+    return isIBooks;
+}
+
 bool applicationIsITunes()
 {
     static bool isITunes = mainBundleIsEqualTo("com.apple.iTunes");

Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (179128 => 179129)


--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h	2015-01-26 19:38:56 UTC (rev 179128)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h	2015-01-26 19:44:09 UTC (rev 179129)
@@ -32,6 +32,7 @@
 WEBCORE_EXPORT bool applicationIsAdobeInstaller();
 WEBCORE_EXPORT bool applicationIsAperture();
 WEBCORE_EXPORT bool applicationIsAppleMail();
+WEBCORE_EXPORT bool applicationIsIBooks();
 bool applicationIsITunes();
 WEBCORE_EXPORT bool applicationIsMicrosoftMessenger();
 WEBCORE_EXPORT bool applicationIsMicrosoftMyDay();

Modified: trunk/Source/WebKit2/ChangeLog (179128 => 179129)


--- trunk/Source/WebKit2/ChangeLog	2015-01-26 19:38:56 UTC (rev 179128)
+++ trunk/Source/WebKit2/ChangeLog	2015-01-26 19:44:09 UTC (rev 179129)
@@ -1,3 +1,16 @@
+2015-01-26  Beth Dakin  <[email protected]>
+
+        Blacklist iBooks for WebKit's default immediate actions
+        https://bugs.webkit.org/show_bug.cgi?id=140854
+        -and corresponding-
+        rdar://problem/19489518
+
+        Reviewed by Tim Horton.
+
+        Blacklist iBooks.
+        * UIProcess/mac/WKImmediateActionController.mm:
+        (-[WKImmediateActionController _updateImmediateActionItem]):
+
 2015-01-26  Myles C. Maxfield  <[email protected]>
 
         [iOS] [SVG -> OTF Converter] Flip the switch off on iOS

Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179128 => 179129)


--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm	2015-01-26 19:38:56 UTC (rev 179128)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm	2015-01-26 19:44:09 UTC (rev 179129)
@@ -40,6 +40,7 @@
 #import <WebCore/NSMenuSPI.h>
 #import <WebCore/NSPopoverSPI.h>
 #import <WebCore/QuickLookMacSPI.h>
+#import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/SoftLinking.h>
 #import <WebCore/URL.h>
 
@@ -275,10 +276,13 @@
 
     RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
     id customClientAnimationController = [_wkView _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult.get()) withType:_type userData:toAPI(_userData.get())];
-    if (customClientAnimationController == [NSNull null]) {
+
+    // FIXME: We should not permanently disable this for iBooks. rdar://problem/19585689
+    if (customClientAnimationController == [NSNull null] || applicationIsIBooks()) {
         [self _cancelImmediateAction];
         return;
     }
+
     if (customClientAnimationController && [customClientAnimationController conformsToProtocol:@protocol(NSImmediateActionAnimationController)])
         [_immediateActionRecognizer setAnimationController:(id <NSImmediateActionAnimationController>)customClientAnimationController];
     else

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to