Title: [178495] branches/safari-600.5-branch/Source
- Revision
- 178495
- Author
- [email protected]
- Date
- 2015-01-15 00:53:55 -0800 (Thu, 15 Jan 2015)
Log Message
Merged r178378. rdar://problem/19274499
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178494 => 178495)
--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-15 08:51:26 UTC (rev 178494)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-15 08:53:55 UTC (rev 178495)
@@ -1,5 +1,20 @@
2015-01-15 Babak Shafiei <[email protected]>
+ Merge r178378. rdar://problem/19274499
+
+ 2015-01-13 Beth Dakin <[email protected]>
+
+ 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-15 Babak Shafiei <[email protected]>
+
Merge r178304. rdar://problem/19447156
2015-01-12 Timothy Horton <[email protected]>
Modified: branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in (178494 => 178495)
--- branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in 2015-01-15 08:51:26 UTC (rev 178494)
+++ branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in 2015-01-15 08:53:55 UTC (rev 178495)
@@ -861,6 +861,7 @@
__ZN7WebCore19TextResourceDecoder6decodeEPKcm
__ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
__ZN7WebCore19TextResourceDecoderD1Ev
+__ZN7WebCore19applicationIsITunesEv
__ZN7WebCore19enclosingLayoutRectERKNS_9FloatRectE
__ZN7WebCore19floatValueForLengthERKNS_6LengthEf
__ZN7WebCore19getFileCreationTimeERKN3WTF6StringERl
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178494 => 178495)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-15 08:51:26 UTC (rev 178494)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-15 08:53:55 UTC (rev 178495)
@@ -1,5 +1,21 @@
2015-01-15 Babak Shafiei <[email protected]>
+ Merge r178378. rdar://problem/19274499
+
+ 2015-01-13 Beth Dakin <[email protected]>
+
+ 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-15 Babak Shafiei <[email protected]>
+
Merge r178290. rdar://problem/19441243
2015-01-12 Timothy Horton <[email protected]>
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (178494 => 178495)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-15 08:51:26 UTC (rev 178494)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-15 08:53:55 UTC (rev 178495)
@@ -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 = [[_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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
