Title: [214679] trunk/Source/WebKit2
- Revision
- 214679
- Author
- [email protected]
- Date
- 2017-03-31 12:27:14 -0700 (Fri, 31 Mar 2017)
Log Message
Remove bundle checks for attachmentElementEnabled
https://bugs.webkit.org/show_bug.cgi?id=170329
<rdar://problem/25135244>
Reviewed by Simon Fraser.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]):
Remove bundle checks.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (214678 => 214679)
--- trunk/Source/WebKit2/ChangeLog 2017-03-31 19:18:26 UTC (rev 214678)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-31 19:27:14 UTC (rev 214679)
@@ -1,3 +1,17 @@
+2017-03-31 Tim Horton <[email protected]>
+
+ Remove bundle checks for attachmentElementEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=170329
+ <rdar://problem/25135244>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ Remove bundle checks.
+
2017-03-29 Anders Carlsson <[email protected]>
Adopt PKCanMakePaymentsWithMerchantIdentifierAndDomainAndSourceApplication
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (214678 => 214679)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-31 19:18:26 UTC (rev 214678)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-31 19:27:14 UTC (rev 214679)
@@ -484,14 +484,8 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mainContentUserGestureOverrideEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mainContentUserGestureOverrideEnabled]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::invisibleAutoplayNotPermittedKey(), WebKit::WebPreferencesStore::Value(!![_configuration _invisibleAutoplayNotPermitted]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mediaDataLoadsAutomaticallyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mediaDataLoadsAutomatically]));
+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::attachmentElementEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _attachmentElementEnabled]));
-// FIXME: <rdar://problem/25135244> Remove bundle checks for attachmentElementEnabled
-#if PLATFORM(IOS)
- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::attachmentElementEnabledKey(), WebKit::WebPreferencesStore::Value(WebCore::IOSApplication::isMobileMail() ? true : !![_configuration _attachmentElementEnabled]));
-#else
- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::attachmentElementEnabledKey(), WebKit::WebPreferencesStore::Value(WebCore::MacApplication::isAppleMail() ? true : !![_configuration _attachmentElementEnabled]));
-#endif
-
#if ENABLE(DATA_DETECTION) && PLATFORM(IOS)
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::dataDetectorTypesKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(fromWKDataDetectorTypes([_configuration dataDetectorTypes]))));
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (214678 => 214679)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-03-31 19:18:26 UTC (rev 214678)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2017-03-31 19:27:14 UTC (rev 214679)
@@ -166,15 +166,9 @@
#endif
_mainContentUserGestureOverrideEnabled = NO;
_invisibleAutoplayNotPermitted = NO;
+ _attachmentElementEnabled = NO;
-// FIXME: <rdar://problem/25135244> Should default to NO once clients have adopted the setting.
#if PLATFORM(IOS)
- _attachmentElementEnabled = IOSApplication::isMobileMail();
-#else
- _attachmentElementEnabled = MacApplication::isAppleMail();
-#endif
-
-#if PLATFORM(IOS)
_respectsImageOrientation = YES;
_printsBackgrounds = YES;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
