Title: [178378] trunk/Source
Revision
178378
Author
bda...@apple.com
Date
2015-01-13 14:33:44 -0800 (Tue, 13 Jan 2015)

Log Message

Should disable immediate actions for iTunes
https://bugs.webkit.org/show_bug.cgi?id=140405
-and corresponding-
rdar://problem/19461358

Reviewed by Tim Horton.

Source/WebCore:

* WebCore.exp.in:

Source/WebKit/mac:

* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _updateImmediateActionItem]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (178377 => 178378)


--- trunk/Source/WebCore/ChangeLog	2015-01-13 22:26:57 UTC (rev 178377)
+++ trunk/Source/WebCore/ChangeLog	2015-01-13 22:33:44 UTC (rev 178378)
@@ -1,3 +1,14 @@
+2015-01-13  Beth Dakin  <bda...@apple.com>
+
+        Should disable immediate actions for iTunes
+        https://bugs.webkit.org/show_bug.cgi?id=140405
+        -and corresponding-
+        rdar://problem/19461358
+
+        Reviewed by Tim Horton.
+
+        * WebCore.exp.in:
+
 2015-01-13  Anders Carlsson  <ander...@apple.com>
 
         Remove pure virtual functions from DatabaseBackendBase

Modified: trunk/Source/WebCore/WebCore.exp.in (178377 => 178378)


--- trunk/Source/WebCore/WebCore.exp.in	2015-01-13 22:26:57 UTC (rev 178377)
+++ trunk/Source/WebCore/WebCore.exp.in	2015-01-13 22:33:44 UTC (rev 178378)
@@ -865,6 +865,7 @@
 __ZN7WebCore19TextResourceDecoder6decodeEPKcm
 __ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
 __ZN7WebCore19TextResourceDecoderD1Ev
+__ZN7WebCore19applicationIsITunesEv
 __ZN7WebCore19enclosingLayoutRectERKNS_9FloatRectE
 __ZN7WebCore19floatValueForLengthERKNS_6LengthEf
 __ZN7WebCore19getFileCreationTimeERKN3WTF6StringERl

Modified: trunk/Source/WebKit/mac/ChangeLog (178377 => 178378)


--- trunk/Source/WebKit/mac/ChangeLog	2015-01-13 22:26:57 UTC (rev 178377)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-01-13 22:33:44 UTC (rev 178378)
@@ -1,3 +1,15 @@
+2015-01-13  Beth Dakin  <bda...@apple.com>
+
+        Should disable immediate actions for iTunes
+        https://bugs.webkit.org/show_bug.cgi?id=140405
+        -and corresponding-
+        rdar://problem/19461358
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebImmediateActionController.mm:
+        (-[WebImmediateActionController _updateImmediateActionItem]):
+
 2015-01-11  Sam Weinig  <s...@webkit.org>
 
         Remove support for SharedWorkers

Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178377 => 178378)


--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm	2015-01-13 22:26:57 UTC (rev 178377)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm	2015-01-13 22:33:44 UTC (rev 178378)
@@ -51,6 +51,7 @@
 #import <WebCore/Page.h>
 #import <WebCore/RenderElement.h>
 #import <WebCore/RenderObject.h>
+#import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/SoftLinking.h>
 #import <WebCore/TextIndicator.h>
 #import <objc/objc-class.h>
@@ -223,7 +224,8 @@
         customClientAnimationController = [(id)[_webView UIDelegate] _webView:_webView immediateActionAnimationControllerForHitTestResult:webHitTestResult.get() withType:_type];
     }
 
-    if (customClientAnimationController == [NSNull null]) {
+    // FIXME: We should not permanently disable this for iTunes. rdar://problem/19461358
+    if (customClientAnimationController == [NSNull null] || applicationIsITunes()) {
         [self _cancelImmediateAction];
         return;
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to