Changeset 209230 in webkit

Timestamp:

Dec 1, 2016, 7:30:37 PM (9 years ago)

Author:

jiewen_tan@apple.com

Message:

Add a runtime flag for SubtleCrypto
​https://bugs.webkit.org/show_bug.cgi?id=164982

Reviewed by Brent Fulgham.

Source/WebCore:

• bindings/generic/RuntimeEnabledFeatures.h:

(WebCore::RuntimeEnabledFeatures::setSubtleCryptoEnabled):
(WebCore::RuntimeEnabledFeatures::subtleCryptoEnabled):

• page/Crypto.idl:

Source/WebKit/mac:

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences subtleCryptoEnabled]):
(-[WebPreferences setSubtleCryptoEnabled:]):

• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit2:

• Shared/WebPreferencesDefinitions.h:
• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetSubtleCryptoEnabled):
(WKPreferencesGetSubtleCryptoEnabled):

• UIProcess/API/C/WKPreferencesRefPrivate.h:
• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Tools:

• DumpRenderTree/mac/DumpRenderTree.mm:

(resetWebPreferencesToConsistentValues):

• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting):

• WebKitTestRunner/InjectedBundle/TestRunner.cpp:

(WTR::TestRunner::setSubtleCryptoEnabled):

• WebKitTestRunner/InjectedBundle/TestRunner.h:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (modified) (2 diffs)
• Source/WebCore/page/Crypto.idl (modified) (1 diff)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• Source/WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebPreferencesDefinitions.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Add a runtime flag for SubtleCrypto
+        https://bugs.webkit.org/show_bug.cgi?id=164982
+
+        Reviewed by Brent Fulgham.
+
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setSubtleCryptoEnabled):
+        (WebCore::RuntimeEnabledFeatures::subtleCryptoEnabled):
+        * page/Crypto.idl:
+
 2016-12-01  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h

@@ -241 +241 @@
 #endif
 
+#if ENABLE(SUBTLE_CRYPTO)
+    void setSubtleCryptoEnabled(bool isEnabled) { m_isSubtleCryptoEnabled = isEnabled; }
+    bool subtleCryptoEnabled() const { return m_isSubtleCryptoEnabled; }
+#endif
+
     WEBCORE_EXPORT static RuntimeEnabledFeatures& sharedFeatures();
 
@@ -363 +368 @@
 #endif
 
+#if ENABLE(SUBTLE_CRYPTO)
+    bool m_isSubtleCryptoEnabled;
+#endif
+
     friend class WTF::NeverDestroyed<RuntimeEnabledFeatures>;
 };

trunk/Source/WebCore/page/Crypto.idl

@@ -32 +32 @@
     GenerateIsReachable=ImplScriptExecutionContext,
 ] interface Crypto {
-    [Conditional=SUBTLE_CRYPTO] readonly attribute SubtleCrypto subtle;
+    [Conditional=SUBTLE_CRYPTO, EnabledAtRuntime=SubtleCrypto] readonly attribute SubtleCrypto subtle;
     [Custom, MayThrowException] ArrayBufferView getRandomValues(ArrayBufferView array);
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Add a runtime flag for SubtleCrypto
+        https://bugs.webkit.org/show_bug.cgi?id=164982
+
+        Reviewed by Brent Fulgham.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences subtleCryptoEnabled]):
+        (-[WebPreferences setSubtleCryptoEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2016-11-30  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -174 +174 @@
 #define WebKitModernMediaControlsEnabledPreferenceKey @"WebKitModernMediaControlsEnabled"
 #define WebKitPointerLockEnabledPreferenceKey @"WebKitPointerLockEnabled"
+#define WebKitSubtleCryptoEnabledPreferenceKey @"WebKitSubtleCryptoEnabled"
 
 #if !TARGET_OS_IPHONE

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -631 +631 @@
         [NSNumber numberWithBool:NO], WebKitVisualViewportEnabledPreferenceKey,
         [NSNumber numberWithBool:YES], WebKitNeedsStorageAccessFromFileURLsQuirkKey,
+#if ENABLE(SUBTLE_CRYPTO)
+        [NSNumber numberWithBool:YES], WebKitSubtleCryptoEnabledPreferenceKey,
+#endif
         nil];
 
@@ -2681 +2684 @@
 }
 
+- (BOOL)subtleCryptoEnabled
+{
+    return [self _boolValueForKey:WebKitSubtleCryptoEnabledPreferenceKey];
+}
+
+- (void)setSubtleCryptoEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitSubtleCryptoEnabledPreferenceKey];
+}
+
+
 - (void)setMetaRefreshEnabled:(BOOL)enabled
 {

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -161 +161 @@
 - (void)setSpatialNavigationEnabled:(BOOL)flag;
 
+- (void)setSubtleCryptoEnabled:(BOOL)flag;
+- (BOOL)subtleCryptoEnabled;
+
 #if !TARGET_OS_IPHONE
 // zero means do AutoScale

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2867 +2867 @@
 #endif
 
+#if ENABLE(SUBTLE_CRYPTO)
+    RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled([preferences subtleCryptoEnabled]);
+#endif
+
     NSTimeInterval timeout = [preferences incrementalRenderingSuppressionTimeoutInSeconds];
     if (timeout > 0)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Add a runtime flag for SubtleCrypto
+        https://bugs.webkit.org/show_bug.cgi?id=164982
+
+        Reviewed by Brent Fulgham.
+
+        * Shared/WebPreferencesDefinitions.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetSubtleCryptoEnabled):
+        (WKPreferencesGetSubtleCryptoEnabled):
+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2016-12-01  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h

@@ -318 +318 @@
     macro(VariationFontsEnabled, variationFontsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Variation Fonts", "Enable variation fonts") \
     macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
+    macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
     macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "WebGL 2.0", "WebGL 2 prototype") \
     macro(ES6ModulesEnabled, es6ModulesEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "ES6 Modules", "Enable ES6 Modules support") \

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -1612 +1612 @@
 }
 
+void WKPreferencesSetSubtleCryptoEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+    toImpl(preferencesRef)->setSubtleCryptoEnabled(flag);
+}
+
+bool WKPreferencesGetSubtleCryptoEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->subtleCryptoEnabled();
+}

trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h

@@ -451 +451 @@
 WK_EXPORT bool WKPreferencesGetIntersectionObserverEnabled(WKPreferencesRef);
 
+// Defaults to true
+WK_EXPORT void WKPreferencesSetSubtleCryptoEnabled(WKPreferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetSubtleCryptoEnabled(WKPreferencesRef);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -222 +222 @@
 #endif
 
+#if ENABLE(SUBTLE_CRYPTO)
+    if (preference == "WebKitSubtleCryptoEnabled")
+        RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled(enabled);
+#endif
+
     // Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
 #define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -3210 +3210 @@
     }
 
+#if ENABLE(SUBTLE_CRYPTO)
+    RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled(store.getBoolValueForKey(WebPreferencesKey::subtleCryptoEnabledKey()));
+#endif
+
     platformPreferencesDidChange(store);
 

trunk/Tools/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        Add a runtime flag for SubtleCrypto
+        https://bugs.webkit.org/show_bug.cgi?id=164982
+
+        Reviewed by Brent Fulgham.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebPreferencesToConsistentValues):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting):
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::setSubtleCryptoEnabled):
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+
 2016-12-01  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1002 +1002 @@
     preferences.modernMediaControlsEnabled = options.enableModernMediaControls;
 
+    [preferences setSubtleCryptoEnabled:YES];
+
     [WebPreferences _clearNetworkLoaderSession];
     [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -336 +336 @@
     m_testRunner->clearTestRunnerCallbacks();
 
+    m_testRunner->setSubtleCryptoEnabled(true);
+
     if (m_timeout > 0)
         m_testRunner->setCustomTimeout(m_timeout);

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

@@ -355 +355 @@
 }
 
+void TestRunner::setSubtleCryptoEnabled(bool enabled)
+{
+    WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitSubtleCryptoEnabled"));
+    auto& injectedBundle = InjectedBundle::singleton();
+    WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
+}
+
 void TestRunner::setDOMIteratorEnabled(bool enabled)
 {

trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

@@ -130 +130 @@
     void setES6ModulesEnabled(bool);
     void setEncryptedMediaAPIEnabled(bool);
+    void setSubtleCryptoEnabled(bool);
 
     // Special DOM functions.