Diff
Modified: trunk/Source/WebKit2/ChangeLog (200329 => 200330)
--- trunk/Source/WebKit2/ChangeLog 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-02 19:08:47 UTC (rev 200330)
@@ -1,3 +1,22 @@
+2016-05-02 Myles C. Maxfield <[email protected]>
+
+ Addressing post-review comments after r200116
+ https://bugs.webkit.org/show_bug.cgi?id=157228
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration encodeWithCoder:]):
+ (-[WKWebViewConfiguration initWithCoder:]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ * UIProcess/WebPageProxy.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2016-05-02 Daniel Bates <[email protected]>
DatabaseTracker::closeAllDatabases calls Database::close from the wrong thread
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (200329 => 200330)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-05-02 19:08:47 UTC (rev 200330)
@@ -257,7 +257,7 @@
macro(StorageBlockingPolicy, storageBlockingPolicy, UInt32, uint32_t, WebCore::SecurityOrigin::BlockThirdPartyStorage, "", "") \
macro(_javascript_RuntimeFlags, _javascript_RuntimeFlags, UInt32, uint32_t, 0, "", "") \
macro(DataDetectorTypes, dataDetectorTypes, UInt32, uint32_t, 0, "", "") \
- macro(UserInterfaceDirection, userInterfaceDirection, UInt32, uint32_t, 0, "", "") \
+ macro(UserInterfaceDirectionPolicy, userInterfaceDirectionPolicy, UInt32, uint32_t, 0, "", "") \
macro(SystemLayoutDirection, systemLayoutDirection, UInt32, uint32_t, 0, "", "") \
\
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (200329 => 200330)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-02 19:08:47 UTC (rev 200330)
@@ -361,6 +361,7 @@
}
#endif
+#if PLATFORM(MAC)
static uint32_t convertUserInterfaceDirectionPolicy(WKUserInterfaceDirectionPolicy policy)
{
switch (policy) {
@@ -372,7 +373,6 @@
return static_cast<uint32_t>(WebCore::UserInterfaceDirectionPolicy::Content);
}
-#if PLATFORM(MAC)
static uint32_t convertSystemLayoutDirection(NSUserInterfaceLayoutDirection direction)
{
switch (direction) {
@@ -434,15 +434,15 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::shouldConvertPositionStyleOnCopyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _convertsPositionStyleOnCopy]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::httpEquivEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsMetaRefresh]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
-
- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionKey(), WebKit::WebPreferencesStore::Value(convertUserInterfaceDirectionPolicy([_configuration userInterfaceDirectionPolicy])));
#if PLATFORM(MAC)
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::showsURLsInToolTipsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _showsURLsInToolTips]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::serviceControlsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _serviceControlsEnabled]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::imageControlsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _imageControlsEnabled]));
+
+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionPolicyKey(), WebKit::WebPreferencesStore::Value(convertUserInterfaceDirectionPolicy([_configuration userInterfaceDirectionPolicy])));
// We are in the View's initialization routine, so our client hasn't had time to set our user interface direction.
- // Therefore, according to the docs[1], "this property contains the value reported by the app’s userInterfaceLayoutDirection property."
+ // Therefore, according to the docs[1], "this property contains the value reported by the app's userInterfaceLayoutDirection property."
// [1] http://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Classes/NSView_Class/index.html#//apple_ref/doc/uid/20000014-SW222
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(convertSystemLayoutDirection(self.userInterfaceLayoutDirection)));
#endif
@@ -454,6 +454,7 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionPolicyKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::UserInterfaceDirectionPolicy::Content)));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::LTR)));
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (200329 => 200330)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2016-05-02 19:08:47 UTC (rev 200330)
@@ -37,6 +37,7 @@
@class WKWebsiteDataStore;
#if TARGET_OS_IPHONE
+
/*! @enum WKSelectionGranularity
@abstract The granularity with which a selection can be created and modified interactively.
@constant WKSelectionGranularityDynamic Selection granularity varies automatically based on the selection.
@@ -49,6 +50,25 @@
WKSelectionGranularityDynamic,
WKSelectionGranularityCharacter,
} WK_ENUM_AVAILABLE_IOS(8_0);
+
+#else
+
+/*! @enum WKUserInterfaceDirectionPolicy
+ @abstract The policy used to determine the directionality of user interface elements inside a web view.
+ @constant WKUserInterfaceDirectionPolicyContent User interface directionality follows CSS / HTML / XHTML
+ specifications.
+ @constant WKUserInterfaceDirectionPolicySystem User interface directionality follows the view's
+ userInterfaceLayoutDirection property
+ @discussion When WKUserInterfaceDirectionPolicyContent is specified, the directionality of user interface
+ elements is affected by the "dir" attribute or the "direction" CSS property. When
+ WKUserInterfaceDirectionPolicySystem is specified, the directionaltiy of user interface elements is
+ affected by the direction of the view.
+*/
+typedef NS_ENUM(NSInteger, WKUserInterfaceDirectionPolicy) {
+ WKUserInterfaceDirectionPolicyContent,
+ WKUserInterfaceDirectionPolicySystem,
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, NA);
+
#endif
/*! @enum WKDataDetectorTypes
@@ -73,20 +93,6 @@
WKDataDetectorTypeAll = NSUIntegerMax
} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
-/*! @enum WKUserInterfaceDirectionPolicy
- @abstract The mechanism by which vertical scrollbars obey an RTL environment
- @constant WKUserInterfaceDirectionPolicyContent Scrollbar placement obeys CSS / HTML / XHTML specifications.
- @constant WKUserInterfaceDirectionPolicySystem Scrollbar placement obeys system platform specifications.
- @discussion When WKUserInterfaceDirectionPolicyContent is specified, the placement of vertical scrollbars is
- affected by the "dir" element or the "direction" CSS property. When WKUserInterfaceDirectionPolicySystem is
- specified, the placement of vertical scrollbars is affected by the direction of the view.
-*/
-typedef NS_ENUM(NSInteger, WKUserInterfaceDirectionPolicy) {
- WKUserInterfaceDirectionPolicyContent = 0,
- WKUserInterfaceDirectionPolicySystem = 1,
-} WK_ENUM_AVAILABLE(WK_MAC_TBA, NA);
-
/*! A WKWebViewConfiguration object is a collection of properties with
which to initialize a web view.
@helps Contains properties used to configure a @link WKWebView @/link.
@@ -138,12 +144,6 @@
*/
@property (nonatomic) WKDataDetectorTypes dataDetectorTypes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-/*! @abstract The placement behavior of vertical scrollbars.
- @discussion Possible values are described in WKUserInterfaceDirectionPolicy.
- The default value is WKUserInterfaceDirectionPolicyContent.
- */
-@property (nonatomic) WKUserInterfaceDirectionPolicy userInterfaceDirectionPolicy WK_AVAILABLE(WK_MAC_TBA, NA);
-
#if TARGET_OS_IPHONE
/*! @abstract A Boolean value indicating whether HTML5 videos play inline
(YES) or use the native full-screen controller (NO).
@@ -170,6 +170,14 @@
*/
@property (nonatomic) BOOL allowsPictureInPictureMediaPlayback WK_AVAILABLE(NA, 9_0);
+#else
+
+/*! @abstract The directionality of user interface elements.
+ @discussion Possible values are described in WKUserInterfaceDirectionPolicy.
+ The default value is WKUserInterfaceDirectionPolicyContent.
+ */
+@property (nonatomic) WKUserInterfaceDirectionPolicy userInterfaceDirectionPolicy WK_AVAILABLE(WK_MAC_TBA, NA);
+
#endif
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (200329 => 200330)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-05-02 19:08:47 UTC (rev 200330)
@@ -199,13 +199,14 @@
[coder encodeObject:self.applicationNameForUserAgent forKey:@"applicationNameForUserAgent"];
[coder encodeBool:self.allowsAirPlayForMediaPlayback forKey:@"allowsAirPlayForMediaPlayback"];
[coder encodeInteger:self.dataDetectorTypes forKey:@"dataDetectorTypes"];
- [coder encodeInteger:self.userInterfaceDirectionPolicy forKey:@"userInterfaceDirectionPolicy"];
#if PLATFORM(IOS)
[coder encodeBool:self.allowsInlineMediaPlayback forKey:@"allowsInlineMediaPlayback"];
[coder encodeBool:self.requiresUserActionForMediaPlayback forKey:@"requiresUserActionForMediaPlayback"];
[coder encodeInteger:self.selectionGranularity forKey:@"selectionGranularity"];
[coder encodeBool:self.allowsPictureInPictureMediaPlayback forKey:@"allowsPictureInPictureMediaPlayback"];
+#else
+ [coder encodeInteger:self.userInterfaceDirectionPolicy forKey:@"userInterfaceDirectionPolicy"];
#endif
}
@@ -223,15 +224,16 @@
self.applicationNameForUserAgent = [coder decodeObjectForKey:@"applicationNameForUserAgent"];
self.allowsAirPlayForMediaPlayback = [coder decodeBoolForKey:@"allowsAirPlayForMediaPlayback"];
self.dataDetectorTypes = [coder decodeIntegerForKey:@"dataDetectorTypes"];
- auto userInterfaceDirectionPolicyCandidate = static_cast<WKUserInterfaceDirectionPolicy>([coder decodeIntegerForKey:@"userInterfaceDirectionPolicy"]);
- if (userInterfaceDirectionPolicyCandidate == WKUserInterfaceDirectionPolicyContent || userInterfaceDirectionPolicyCandidate == WKUserInterfaceDirectionPolicySystem)
- self.userInterfaceDirectionPolicy = userInterfaceDirectionPolicyCandidate;
#if PLATFORM(IOS)
self.allowsInlineMediaPlayback = [coder decodeBoolForKey:@"allowsInlineMediaPlayback"];
self.requiresUserActionForMediaPlayback = [coder decodeBoolForKey:@"requiresUserActionForMediaPlayback"];
self.selectionGranularity = static_cast<WKSelectionGranularity>([coder decodeIntegerForKey:@"selectionGranularity"]);
self.allowsPictureInPictureMediaPlayback = [coder decodeBoolForKey:@"allowsPictureInPictureMediaPlayback"];
+#else
+ auto userInterfaceDirectionPolicyCandidate = static_cast<WKUserInterfaceDirectionPolicy>([coder decodeIntegerForKey:@"userInterfaceDirectionPolicy"]);
+ if (userInterfaceDirectionPolicyCandidate == WKUserInterfaceDirectionPolicyContent || userInterfaceDirectionPolicyCandidate == WKUserInterfaceDirectionPolicySystem)
+ self.userInterfaceDirectionPolicy = userInterfaceDirectionPolicyCandidate;
#endif
return self;
@@ -271,8 +273,6 @@
configuration->_requiresUserActionForAudioPlayback = self->_requiresUserActionForAudioPlayback;
configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
- configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
-
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
@@ -282,6 +282,7 @@
configuration->_selectionGranularity = self->_selectionGranularity;
#endif
#if PLATFORM(MAC)
+ configuration->_userInterfaceDirectionPolicy = self->_userInterfaceDirectionPolicy;
configuration->_showsURLsInToolTips = self->_showsURLsInToolTips;
configuration->_serviceControlsEnabled = self->_serviceControlsEnabled;
configuration->_imageControlsEnabled = self->_imageControlsEnabled;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (200329 => 200330)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-05-02 19:08:47 UTC (rev 200330)
@@ -100,7 +100,6 @@
#include "WebPopupItem.h"
#include "WebPopupMenuProxy.h"
#include "WebPreferences.h"
-#include "WebPreferencesKeys.h"
#include "WebProcessMessages.h"
#include "WebProcessPool.h"
#include "WebProcessProxy.h"
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200329 => 200330)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-02 18:59:28 UTC (rev 200329)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-02 19:08:47 UTC (rev 200330)
@@ -3072,9 +3072,9 @@
settings.setShouldDispatchJavaScriptWindowOnErrorEvents(true);
- auto userInterfaceDirectionCandidate = static_cast<WebCore::UserInterfaceDirectionPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::userInterfaceDirectionKey()));
- if (userInterfaceDirectionCandidate == WebCore::UserInterfaceDirectionPolicy::Content || userInterfaceDirectionCandidate == WebCore::UserInterfaceDirectionPolicy::System)
- settings.setUserInterfaceDirectionPolicy(!store.getUInt32ValueForKey(WebPreferencesKey::userInterfaceDirectionKey()) ? UserInterfaceDirectionPolicy::Content : UserInterfaceDirectionPolicy::System);
+ auto userInterfaceDirectionPolicyCandidate = static_cast<WebCore::UserInterfaceDirectionPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::userInterfaceDirectionPolicyKey()));
+ if (userInterfaceDirectionPolicyCandidate == WebCore::UserInterfaceDirectionPolicy::Content || userInterfaceDirectionPolicyCandidate == WebCore::UserInterfaceDirectionPolicy::System)
+ settings.setUserInterfaceDirectionPolicy(userInterfaceDirectionPolicyCandidate);
TextDirection systemLayoutDirectionCandidate = static_cast<TextDirection>(store.getUInt32ValueForKey(WebPreferencesKey::systemLayoutDirectionKey()));
if (systemLayoutDirectionCandidate == WebCore::LTR || systemLayoutDirectionCandidate == WebCore::RTL)
settings.setSystemLayoutDirection(systemLayoutDirectionCandidate);