<!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>[210991] 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/210991">210991</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-20 14:54:49 -0800 (Fri, 20 Jan 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Build Fix for Windows DumpRenderTree after <a href="http://trac.webkit.org/projects/webkit/changeset/210976">r210976</a>

Source/WebKit/win:

* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::setWebAnimationsEnabled):
(WebPreferences::webAnimationsEnabled):
* WebPreferences.h:
* WebView.cpp:
Add toggle APIs for WebAnimations.

Tools:

* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferenceKeysPrivateh">trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencesh">trunk/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/ChangeLog        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-01-20  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Build Fix for Windows DumpRenderTree after r210976
+
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::setWebAnimationsEnabled):
+        (WebPreferences::webAnimationsEnabled):
+        * WebPreferences.h:
+        * WebView.cpp:
+        Add toggle APIs for WebAnimations.
+
</ins><span class="cx"> 2017-01-19  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         iterable&lt;&gt; should be enabled on WK1
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -175,3 +175,5 @@
</span><span class="cx"> #define WebKitCustomElementsEnabledPreferenceKey &quot;WebKitCustomElementsEnabled&quot;
</span><span class="cx"> 
</span><span class="cx"> #define WebKitModernMediaControlsEnabledPreferenceKey &quot;WebKitModernMediaControlsEnabled&quot;
</span><ins>+
+#define WebKitWebAnimationsEnabledPreferenceKey &quot;WebKitWebAnimationsEnabled&quot;
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebPreferences.cpp        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -304,6 +304,8 @@
</span><span class="cx"> 
</span><span class="cx">     CFDictionaryAddValue(defaults, CFSTR(WebKitCustomElementsEnabledPreferenceKey), kCFBooleanFalse);
</span><span class="cx"> 
</span><ins>+    CFDictionaryAddValue(defaults, CFSTR(WebKitWebAnimationsEnabledPreferenceKey), kCFBooleanFalse);
+
</ins><span class="cx">     defaultSettings = defaults;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1994,3 +1996,17 @@
</span><span class="cx">     m_applicationId = String(applicationId).createCFString();
</span><span class="cx">     return S_OK;
</span><span class="cx"> }
</span><ins>+
+HRESULT WebPreferences::setWebAnimationsEnabled(BOOL enabled)
+{
+    setBoolValue(WebKitWebAnimationsEnabledPreferenceKey, enabled);
+    return S_OK;
+}
+
+HRESULT WebPreferences::webAnimationsEnabled(_Out_ BOOL* enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+    *enabled = boolValueForKey(WebKitWebAnimationsEnabledPreferenceKey);
+    return S_OK;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.h (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.h        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebPreferences.h        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -244,6 +244,9 @@
</span><span class="cx">     // IWebPreferencesPrivate4
</span><span class="cx">     virtual HRESULT STDMETHODCALLTYPE setApplicationId(BSTR);
</span><span class="cx"> 
</span><ins>+    virtual HRESULT STDMETHODCALLTYPE webAnimationsEnabled(_Out_ BOOL*);
+    virtual HRESULT STDMETHODCALLTYPE setWebAnimationsEnabled(BOOL);
+
</ins><span class="cx">     // WebPreferences
</span><span class="cx"> 
</span><span class="cx">     // This method accesses a different preference key than developerExtrasEnabled.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebView.cpp        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -5254,6 +5254,13 @@
</span><span class="cx">         return hr;
</span><span class="cx">     RuntimeEnabledFeatures::sharedFeatures().setModernMediaControlsEnabled(!!enabled);
</span><span class="cx"> 
</span><ins>+#if ENABLE(WEB_ANIMATIONS)
+    hr = prefsPrivate-&gt;webAnimationsEnabled(&amp;enabled);
+    if (FAILED(hr))
+        return hr;
+    RuntimeEnabledFeatures::sharedFeatures().setWebAnimationsEnabled(!!enabled);
+#endif
+
</ins><span class="cx">     hr = preferences-&gt;privateBrowsingEnabled(&amp;enabled);
</span><span class="cx">     if (FAILED(hr))
</span><span class="cx">         return hr;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Tools/ChangeLog        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2017-01-20  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Build Fix for Windows DumpRenderTree after r210976
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetWebPreferencesToConsistentValues):
+
</ins><span class="cx"> 2017-01-20  Antoine Quint  &lt;graouts@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Animations should be off by default and enabled as an experimental feature
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (210990 => 210991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp        2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp        2017-01-20 22:54:49 UTC (rev 210991)
</span><span class="lines">@@ -860,10 +860,10 @@
</span><span class="cx">     prefsPrivate3-&gt;setFetchAPIEnabled(TRUE);
</span><span class="cx">     prefsPrivate3-&gt;setShadowDOMEnabled(TRUE);
</span><span class="cx">     prefsPrivate3-&gt;setCustomElementsEnabled(TRUE);
</span><del>-
</del><span class="cx">     prefsPrivate3-&gt;setModernMediaControlsEnabled(FALSE);
</span><del>-    prefsPrivate3-&gt;setWebAnimationsEnabled(TRUE);
</del><span class="cx"> 
</span><ins>+    preferences-&gt;setWebAnimationsEnabled(TRUE);
+
</ins><span class="cx">     setAlwaysAcceptCookies(false);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>