<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209230] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209230">209230</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 19:30:37 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh">trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h</a></li>
<li><a href="#trunkSourceWebCorepageCryptoidl">trunk/Source/WebCore/page/Crypto.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebCore/ChangeLog 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-12-01 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename CallFrame::callee() to CallFrame::jsCallee()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgenericRuntimeEnabledFeaturesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -240,6 +240,11 @@
</span><span class="cx"> bool encryptedMediaAPIEnabled() const { return m_encryptedMediaAPIEnabled; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(SUBTLE_CRYPTO)
+ void setSubtleCryptoEnabled(bool isEnabled) { m_isSubtleCryptoEnabled = isEnabled; }
+ bool subtleCryptoEnabled() const { return m_isSubtleCryptoEnabled; }
+#endif
+
</ins><span class="cx"> WEBCORE_EXPORT static RuntimeEnabledFeatures& sharedFeatures();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void reset();
</span><span class="lines">@@ -362,6 +367,10 @@
</span><span class="cx"> bool m_intersectionObserverEnabled { false };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(SUBTLE_CRYPTO)
+ bool m_isSubtleCryptoEnabled;
+#endif
+
</ins><span class="cx"> friend class WTF::NeverDestroyed<RuntimeEnabledFeatures>;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageCryptoidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Crypto.idl (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Crypto.idl 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebCore/page/Crypto.idl 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> Exposed=(Window,Worker),
</span><span class="cx"> GenerateIsReachable=ImplScriptExecutionContext,
</span><span class="cx"> ] interface Crypto {
</span><del>- [Conditional=SUBTLE_CRYPTO] readonly attribute SubtleCrypto subtle;
</del><ins>+ [Conditional=SUBTLE_CRYPTO, EnabledAtRuntime=SubtleCrypto] readonly attribute SubtleCrypto subtle;
</ins><span class="cx"> [Custom, MayThrowException] ArrayBufferView getRandomValues(ArrayBufferView array);
</span><span class="cx">
</span><span class="cx"> // Will be deprecated.
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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:]):
+
</ins><span class="cx"> 2016-11-30 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Add separate settings and preferences to enable/disable async decoding for large images and animated images
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> #define WebKitVisualViewportEnabledPreferenceKey @"WebKitVisualViewportEnabled"
</span><span class="cx"> #define WebKitModernMediaControlsEnabledPreferenceKey @"WebKitModernMediaControlsEnabled"
</span><span class="cx"> #define WebKitPointerLockEnabledPreferenceKey @"WebKitPointerLockEnabled"
</span><ins>+#define WebKitSubtleCryptoEnabledPreferenceKey @"WebKitSubtleCryptoEnabled"
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -630,6 +630,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitVisualViewportEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitNeedsStorageAccessFromFileURLsQuirkKey,
</span><ins>+#if ENABLE(SUBTLE_CRYPTO)
+ [NSNumber numberWithBool:YES], WebKitSubtleCryptoEnabledPreferenceKey,
+#endif
</ins><span class="cx"> nil];
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -2680,6 +2683,17 @@
</span><span class="cx"> [self _setStringValue:directory forKey:WebKitMediaKeysStorageDirectoryKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)subtleCryptoEnabled
+{
+ return [self _boolValueForKey:WebKitSubtleCryptoEnabledPreferenceKey];
+}
+
+- (void)setSubtleCryptoEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitSubtleCryptoEnabledPreferenceKey];
+}
+
+
</ins><span class="cx"> - (void)setMetaRefreshEnabled:(BOOL)enabled
</span><span class="cx"> {
</span><span class="cx"> [self setHTTPEquivEnabled:enabled];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -160,6 +160,9 @@
</span><span class="cx"> - (BOOL)isSpatialNavigationEnabled;
</span><span class="cx"> - (void)setSpatialNavigationEnabled:(BOOL)flag;
</span><span class="cx">
</span><ins>+- (void)setSubtleCryptoEnabled:(BOOL)flag;
+- (BOOL)subtleCryptoEnabled;
+
</ins><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // zero means do AutoScale
</span><span class="cx"> - (float)PDFScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -2866,6 +2866,10 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setIntersectionObserverEnabled(preferences.intersectionObserverEnabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(SUBTLE_CRYPTO)
+ RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled([preferences subtleCryptoEnabled]);
+#endif
+
</ins><span class="cx"> NSTimeInterval timeout = [preferences incrementalRenderingSuppressionTimeoutInSeconds];
</span><span class="cx"> if (timeout > 0)
</span><span class="cx"> settings.setIncrementalRenderingSuppressionTimeoutInSeconds(timeout);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-12-01 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename CallFrame::callee() to CallFrame::jsCallee()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -317,6 +317,7 @@
</span><span class="cx"> macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, false, "Modern Media Controls", "Use modern media controls look") \
</span><span class="cx"> macro(VariationFontsEnabled, variationFontsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Variation Fonts", "Enable variation fonts") \
</span><span class="cx"> macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
</span><ins>+ macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
</ins><span class="cx"> macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "WebGL 2.0", "WebGL 2 prototype") \
</span><span class="cx"> macro(ES6ModulesEnabled, es6ModulesEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "ES6 Modules", "Enable ES6 Modules support") \
</span><span class="cx"> macro(PointerLockEnabled, pointerLockEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "PointerLock", "Pointer Lock API support") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -1611,3 +1611,12 @@
</span><span class="cx"> WebKit::toImpl(preferencesRef)->setApplePayCapabilityDisclosureAllowed(allowed);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetSubtleCryptoEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setSubtleCryptoEnabled(flag);
+}
+
+bool WKPreferencesGetSubtleCryptoEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->subtleCryptoEnabled();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -450,6 +450,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetIntersectionObserverEnabled(WKPreferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetIntersectionObserverEnabled(WKPreferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to true
+WK_EXPORT void WKPreferencesSetSubtleCryptoEnabled(WKPreferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetSubtleCryptoEnabled(WKPreferencesRef);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -221,6 +221,11 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setEncryptedMediaAPIEnabled(enabled);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(SUBTLE_CRYPTO)
+ if (preference == "WebKitSubtleCryptoEnabled")
+ RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled(enabled);
+#endif
+
</ins><span class="cx"> // Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
</span><span class="cx"> #define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
</span><span class="cx"> macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -3209,6 +3209,10 @@
</span><span class="cx"> updateThrottleState();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(SUBTLE_CRYPTO)
+ RuntimeEnabledFeatures::sharedFeatures().setSubtleCryptoEnabled(store.getBoolValueForKey(WebPreferencesKey::subtleCryptoEnabledKey()));
+#endif
+
</ins><span class="cx"> platformPreferencesDidChange(store);
</span><span class="cx">
</span><span class="cx"> if (m_drawingArea)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Tools/ChangeLog 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-12-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove webkitpy dependency on Eliza
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -1001,6 +1001,8 @@
</span><span class="cx"> preferences.intersectionObserverEnabled = options.enableIntersectionObserver;
</span><span class="cx"> preferences.modernMediaControlsEnabled = options.enableModernMediaControls;
</span><span class="cx">
</span><ins>+ [preferences setSubtleCryptoEnabled:YES];
+
</ins><span class="cx"> [WebPreferences _clearNetworkLoaderSession];
</span><span class="cx"> [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -335,6 +335,8 @@
</span><span class="cx"> m_testRunner->setTabKeyCyclesThroughElements(true);
</span><span class="cx"> m_testRunner->clearTestRunnerCallbacks();
</span><span class="cx">
</span><ins>+ m_testRunner->setSubtleCryptoEnabled(true);
+
</ins><span class="cx"> if (m_timeout > 0)
</span><span class="cx"> m_testRunner->setCustomTimeout(m_timeout);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -354,6 +354,13 @@
</span><span class="cx"> WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TestRunner::setSubtleCryptoEnabled(bool enabled)
+{
+ WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitSubtleCryptoEnabled"));
+ auto& injectedBundle = InjectedBundle::singleton();
+ WKBundleOverrideBoolPreferenceForTestRunner(injectedBundle.bundle(), injectedBundle.pageGroup(), key.get(), enabled);
+}
+
</ins><span class="cx"> void TestRunner::setDOMIteratorEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKStringRef> key(AdoptWK, WKStringCreateWithUTF8CString("WebKitDOMIteratorEnabled"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (209229 => 209230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-12-02 02:38:23 UTC (rev 209229)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-12-02 03:30:37 UTC (rev 209230)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> void setAllowsAnySSLCertificate(bool);
</span><span class="cx"> void setES6ModulesEnabled(bool);
</span><span class="cx"> void setEncryptedMediaAPIEnabled(bool);
</span><ins>+ void setSubtleCryptoEnabled(bool);
</ins><span class="cx">
</span><span class="cx"> // Special DOM functions.
</span><span class="cx"> void clearBackForwardList();
</span></span></pre>
</div>
</div>
</body>
</html>