Title: [179226] branches/safari-600.4-branch/Source
- Revision
- 179226
- Author
- [email protected]
- Date
- 2015-01-27 15:43:10 -0800 (Tue, 27 Jan 2015)
Log Message
Merge r179129. rdar://problem/19489518
Modified Paths
Diff
Modified: branches/safari-600.4-branch/Source/WebCore/ChangeLog (179225 => 179226)
--- branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-27 23:38:02 UTC (rev 179225)
+++ branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-27 23:43:10 UTC (rev 179226)
@@ -1,3 +1,22 @@
+2015-01-27 Matthew Hanson <[email protected]>
+
+ Merge r179129. rdar://problem/19489518
+
+ 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 Matthew Hanson <[email protected]>
Merge r179086. rdar://problem/19566089
Modified: branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in (179225 => 179226)
--- branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in 2015-01-27 23:38:02 UTC (rev 179225)
+++ branches/safari-600.4-branch/Source/WebCore/WebCore.exp.in 2015-01-27 23:43:10 UTC (rev 179226)
@@ -861,6 +861,7 @@
__ZN7WebCore19TextResourceDecoder6decodeEPKcm
__ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
__ZN7WebCore19TextResourceDecoderD1Ev
+__ZN7WebCore19applicationIsIBooksEv
__ZN7WebCore19applicationIsITunesEv
__ZN7WebCore19enclosingLayoutRectERKNS_9FloatRectE
__ZN7WebCore19floatValueForLengthERKNS_6LengthEf
Modified: branches/safari-600.4-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp (179225 => 179226)
--- branches/safari-600.4-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2015-01-27 23:38:02 UTC (rev 179225)
+++ branches/safari-600.4-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2015-01-27 23:43:10 UTC (rev 179226)
@@ -68,6 +68,12 @@
return isAppleMail;
}
+bool applicationIsIBooks()
+{
+ static bool isIBooks = mainBundleIsEqualTo("com.apple.iBooksX");
+ return isIBooks;
+}
+
bool applicationIsITunes()
{
static bool isITunes = mainBundleIsEqualTo("com.apple.iTunes");
Modified: branches/safari-600.4-branch/Source/WebCore/platform/RuntimeApplicationChecks.h (179225 => 179226)
--- branches/safari-600.4-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2015-01-27 23:38:02 UTC (rev 179225)
+++ branches/safari-600.4-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2015-01-27 23:43:10 UTC (rev 179226)
@@ -32,6 +32,7 @@
bool applicationIsAdobeInstaller();
bool applicationIsAperture();
bool applicationIsAppleMail();
+bool applicationIsIBooks();
bool applicationIsITunes();
bool applicationIsMicrosoftMessenger();
bool applicationIsMicrosoftMyDay();
Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179225 => 179226)
--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 23:38:02 UTC (rev 179225)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 23:43:10 UTC (rev 179226)
@@ -1,5 +1,22 @@
2015-01-27 Matthew Hanson <[email protected]>
+ Merge r179129. rdar://problem/19489518
+
+ 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-27 Matthew Hanson <[email protected]>
+
Merge r179195. rdar://problem/19572685
2015-01-27 Beth Dakin <[email protected]>
Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179225 => 179226)
--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 23:38:02 UTC (rev 179225)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 23:43:10 UTC (rev 179226)
@@ -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
