<!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>[224833] 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/224833">224833</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-11-14 12:29:05 -0800 (Tue, 14 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Enable Modern EME tests in DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=179544

Reviewed by Alex Christensen.

Source/WebKitLegacy/mac:

Add a WebPreferences property to enable the (modern) EME API.

* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences encryptedMediaAPIEnabled]):
(-[WebPreferences setEncryptedMediaAPIEnabled:]):
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
(enableExperimentalFeatures):

LayoutTests:

* platform/mac-wk1/TestExpectations:
* platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1fastdomnavigatordetachednocrashexpectedtxt">trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferencesmm">trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebPreferencesPrivateh">trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/LayoutTests/ChangeLog 2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-11-14  Jer Noble  <jer.noble@apple.com>
+
+        Enable Modern EME tests in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=179544
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+        * platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt:
+
</ins><span class="cx"> 2017-11-14  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebSWClientConnection should do IPC to StorageProcess if its WebSWOriginTable is not yet initialized
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations      2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -465,6 +465,3 @@
</span><span class="cx"> webkit.org/b/177563 [ HighSierra ] http/tests/xmlhttprequest/response-empty-arraybuffer.html [ Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/172397 [ Debug ] animations/needs-layout.html [ Pass ImageOnlyFailure ]
</span><del>-
-webkit.org/b/179544 platform/mac/media/encrypted-media/fps-createMediaKeys.html [ Failure ]
-webkit.org/b/179544 platform/mac/media/encrypted-media/fps-requestMediaKeySystemAccess.html [ Skip ]
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1fastdomnavigatordetachednocrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt     2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt        2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> navigator.plugins is OK
</span><span class="cx"> navigator.product is OK
</span><span class="cx"> navigator.productSub is OK
</span><ins>+navigator.requestMediaKeySystemAccess() is OK
</ins><span class="cx"> navigator.userAgent is OK
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="lines">@@ -32,6 +33,7 @@
</span><span class="cx"> navigator.plugins is OK
</span><span class="cx"> navigator.product is OK
</span><span class="cx"> navigator.productSub is OK
</span><ins>+navigator.requestMediaKeySystemAccess() is OK
</ins><span class="cx"> navigator.userAgent is OK
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-11-14  Jer Noble  <jer.noble@apple.com>
+
+        Enable Modern EME tests in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=179544
+
+        Reviewed by Alex Christensen.
+
+        Add a WebPreferences property to enable the (modern) EME API.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences encryptedMediaAPIEnabled]):
+        (-[WebPreferences setEncryptedMediaAPIEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2017-11-14  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Enable display:contents by default
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h    2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -249,5 +249,6 @@
</span><span class="cx"> #define WebKitResourceTimingEnabledPreferenceKey @"WebKitResourceTimingEnabled"
</span><span class="cx"> #define WebKitMediaContentTypesRequiringHardwareSupportPreferenceKey @"WebKitMediaContentTypesRequiringHardwareSupport"
</span><span class="cx"> #define WebKitLegacyEncryptedMediaAPIEnabledKey @"WebKitLegacyEncryptedMediaAPIEnabled"
</span><ins>+#define WebKitEncryptedMediaAPIEnabledKey @"WebKitEncryptedMediaAPIEnabled"
</ins><span class="cx"> #define WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallbackKey @"WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallback"
</span><span class="cx"> #define WebKitInspectorAdditionsEnabledPreferenceKey @"WebKitInspectorAdditionsEnabled"
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm  2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm     2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -674,6 +674,7 @@
</span><span class="cx"> #else
</span><span class="cx">         @YES, WebKitLegacyEncryptedMediaAPIEnabledKey,
</span><span class="cx"> #endif
</span><ins>+        @NO, WebKitEncryptedMediaAPIEnabledKey,
</ins><span class="cx">         @YES, WebKitViewportFitEnabledPreferenceKey,
</span><span class="cx">         @YES, WebKitConstantPropertiesEnabledPreferenceKey,
</span><span class="cx">         @YES, WebKitAllowMediaContentTypesRequiringHardwareSupportAsFallbackKey,
</span><span class="lines">@@ -3205,6 +3206,16 @@
</span><span class="cx">     [self _setBoolValue:flag forKey:WebKitLegacyEncryptedMediaAPIEnabledKey];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)encryptedMediaAPIEnabled
+{
+    return [self _boolValueForKey:WebKitEncryptedMediaAPIEnabledKey];
+}
+
+- (void)setEncryptedMediaAPIEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitEncryptedMediaAPIEnabledKey];
+}
+
</ins><span class="cx"> - (BOOL)viewportFitEnabled
</span><span class="cx"> {
</span><span class="cx">     return [self _boolValueForKey:WebKitViewportFitEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h    2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h       2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -590,6 +590,7 @@
</span><span class="cx"> @property (nonatomic) BOOL mediaUserGestureInheritsFromDocument;
</span><span class="cx"> @property (nonatomic) BOOL isSecureContextAttributeEnabled;
</span><span class="cx"> @property (nonatomic) BOOL legacyEncryptedMediaAPIEnabled;
</span><ins>+@property (nonatomic) BOOL encryptedMediaAPIEnabled;
</ins><span class="cx"> @property (nonatomic) BOOL viewportFitEnabled;
</span><span class="cx"> @property (nonatomic) BOOL constantPropertiesEnabled;
</span><span class="cx"> @property (nonatomic) BOOL inspectorAdditionsEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm    2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -3044,6 +3044,10 @@
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setLegacyEncryptedMediaAPIEnabled(preferences.legacyEncryptedMediaAPIEnabled);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(ENCRYPTED_MEDIA)
+    RuntimeEnabledFeatures::sharedFeatures().setEncryptedMediaAPIEnabled(preferences.encryptedMediaAPIEnabled);
+#endif
+
</ins><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setInspectorAdditionsEnabled(preferences.inspectorAdditionsEnabled);
</span><span class="cx"> 
</span><span class="cx">     settings.setAllowMediaContentTypesRequiringHardwareSupportAsFallback(preferences.allowMediaContentTypesRequiringHardwareSupportAsFallback);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Tools/ChangeLog       2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-11-14  Jer Noble  <jer.noble@apple.com>
+
+        Enable Modern EME tests in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=179544
+
+        Reviewed by Alex Christensen.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (enableExperimentalFeatures):
+
</ins><span class="cx"> 2017-11-14  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r224800.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (224832 => 224833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-11-14 20:28:34 UTC (rev 224832)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm    2017-11-14 20:29:05 UTC (rev 224833)
</span><span class="lines">@@ -854,6 +854,7 @@
</span><span class="cx">     [preferences setCacheAPIEnabled:NO];
</span><span class="cx">     [preferences setReadableByteStreamAPIEnabled:YES];
</span><span class="cx">     [preferences setWritableStreamAPIEnabled:YES];
</span><ins>+    preferences.encryptedMediaAPIEnabled = YES;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Called before each test.
</span></span></pre>
</div>
</div>

</body>
</html>