<!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>[209161] 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/209161">209161</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 16:10:28 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Add an HTML comment flag to turn the feature on
https://bugs.webkit.org/show_bug.cgi?id=165226
Reviewed by Dean Jackson.
Source/WebKit2:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetModernMediaControlsEnabled):
(WKPreferencesGetModernMediaControlsEnabled):
* UIProcess/API/C/WKPreferencesRefPrivate.h:
Tools:
* DumpRenderTree/TestOptions.h:
* DumpRenderTree/TestOptions.mm:
(TestOptions::TestOptions):
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues):
(WTR::updateTestOptionsFromTestHeader):
* WebKitTestRunner/TestOptions.h:
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
(WTR::PlatformWebView::viewSupportsOptions):
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::viewSupportsOptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionsh">trunk/Tools/DumpRenderTree/TestOptions.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionsmm">trunk/Tools/DumpRenderTree/TestOptions.mm</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="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestOptionsh">trunk/Tools/WebKitTestRunner/TestOptions.h</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm">trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacPlatformWebViewMacmm">trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-30 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Add an HTML comment flag to turn the feature on
+ https://bugs.webkit.org/show_bug.cgi?id=165226
+
+ Reviewed by Dean Jackson.
+
+ Add new methods to set the Modern Media Controls preference.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetModernMediaControlsEnabled):
+ (WKPreferencesGetModernMediaControlsEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+
</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="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -822,6 +822,16 @@
</span><span class="cx"> return toImpl(preferencesRef)->mediaControlsScaleWithPageZoom();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetModernMediaControlsEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setModernMediaControlsEnabled(flag);
+}
+
+bool WKPreferencesGetModernMediaControlsEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->modernMediaControlsEnabled();
+}
+
</ins><span class="cx"> void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setShowsToolTipOverTruncatedText(flag);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -205,6 +205,10 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><span class="cx"> // Defaults to false.
</span><ins>+WK_EXPORT void WKPreferencesSetModernMediaControlsEnabled(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetModernMediaControlsEnabled(WKPreferencesRef preferencesRef);
+
+// Defaults to false.
</ins><span class="cx"> WK_EXPORT void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/ChangeLog 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-11-30 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Add an HTML comment flag to turn the feature on
+ https://bugs.webkit.org/show_bug.cgi?id=165226
+
+ Reviewed by Dean Jackson.
+
+ Add a new flag to turn Modern Media Controls on in the test runners.
+
+ * DumpRenderTree/TestOptions.h:
+ * DumpRenderTree/TestOptions.mm:
+ (TestOptions::TestOptions):
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+ (WTR::updateTestOptionsFromTestHeader):
+ * WebKitTestRunner/TestOptions.h:
+ * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+ (WTR::PlatformWebView::viewSupportsOptions):
+ * WebKitTestRunner/mac/PlatformWebViewMac.mm:
+ (WTR::PlatformWebView::viewSupportsOptions):
+
</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="trunkToolsDumpRenderTreeTestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.h (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.h 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/DumpRenderTree/TestOptions.h 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> struct TestOptions {
</span><span class="cx"> bool enableIntersectionObserver { false };
</span><ins>+ bool enableModernMediaControls { false };
</ins><span class="cx">
</span><span class="cx"> TestOptions(NSURL *testURL);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestOptionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.mm (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.mm 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/DumpRenderTree/TestOptions.mm 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx"> auto value = pairString.substr(equalsLocation + 1, pairEnd - (equalsLocation + 1));
</span><span class="cx"> if (key == "enableIntersectionObserver")
</span><span class="cx"> this->enableIntersectionObserver = parseBooleanTestHeaderValue(value);
</span><ins>+ else if (key == "enableModernMediaControls")
+ this->enableModernMediaControls = parseBooleanTestHeaderValue(value);
</ins><span class="cx"> pairStart = pairEnd + 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -995,12 +995,11 @@
</span><span class="cx">
</span><span class="cx"> [preferences setES6ModulesEnabled:YES];
</span><span class="cx">
</span><del>- [preferences setModernMediaControlsEnabled:NO];
-
</del><span class="cx"> [preferences setHiddenPageDOMTimerThrottlingEnabled:NO];
</span><span class="cx"> [preferences setHiddenPageCSSAnimationSuspensionEnabled:NO];
</span><span class="cx">
</span><span class="cx"> preferences.intersectionObserverEnabled = options.enableIntersectionObserver;
</span><ins>+ preferences.modernMediaControlsEnabled = options.enableModernMediaControls;
</ins><span class="cx">
</span><span class="cx"> [WebPreferences _clearNetworkLoaderSession];
</span><span class="cx"> [WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -322,8 +322,6 @@
</span><span class="cx">
</span><span class="cx"> m_testRunner->setWebGL2Enabled(true);
</span><span class="cx">
</span><del>- m_testRunner->setModernMediaControlsEnabled(false);
-
</del><span class="cx"> m_testRunner->setFetchAPIEnabled(true);
</span><span class="cx">
</span><span class="cx"> m_testRunner->setDownloadAttributeEnabled(true);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -651,6 +651,7 @@
</span><span class="cx"> WKPreferencesSetMockScrollbarsEnabled(preferences, options.useMockScrollbars);
</span><span class="cx"> WKPreferencesSetNeedsSiteSpecificQuirks(preferences, options.needsSiteSpecificQuirks);
</span><span class="cx"> WKPreferencesSetIntersectionObserverEnabled(preferences, options.enableIntersectionObserver);
</span><ins>+ WKPreferencesSetModernMediaControlsEnabled(preferences, options.enableModernMediaControls);
</ins><span class="cx">
</span><span class="cx"> static WKStringRef defaultTextEncoding = WKStringCreateWithUTF8CString("ISO-8859-1");
</span><span class="cx"> WKPreferencesSetDefaultTextEncodingName(preferences, defaultTextEncoding);
</span><span class="lines">@@ -960,6 +961,8 @@
</span><span class="cx"> testOptions.useCharacterSelectionGranularity = parseBooleanTestHeaderValue(value);
</span><span class="cx"> if (key == "enableIntersectionObserver")
</span><span class="cx"> testOptions.enableIntersectionObserver = parseBooleanTestHeaderValue(value);
</span><ins>+ if (key == "enableModernMediaControls")
+ testOptions.enableModernMediaControls = parseBooleanTestHeaderValue(value);
</ins><span class="cx"> pairStart = pairEnd + 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestOptions.h 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> bool ignoresViewportScaleLimits { false };
</span><span class="cx"> bool useCharacterSelectionGranularity { false };
</span><span class="cx"> bool enableIntersectionObserver { false };
</span><ins>+ bool enableModernMediaControls { false };
</ins><span class="cx">
</span><span class="cx"> float deviceScaleFactor { 1 };
</span><span class="cx"> Vector<String> overrideLanguages;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -281,7 +281,8 @@
</span><span class="cx"> if (m_options.overrideLanguages != options.overrideLanguages
</span><span class="cx"> || m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
</span><span class="cx"> || m_options.useCharacterSelectionGranularity != options.useCharacterSelectionGranularity
</span><del>- || m_options.enableIntersectionObserver != options.enableIntersectionObserver)
</del><ins>+ || m_options.enableIntersectionObserver != options.enableIntersectionObserver
+ || m_options.enableModernMediaControls != options.enableModernMediaControls)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacPlatformWebViewMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (209160 => 209161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm 2016-12-01 00:10:28 UTC (rev 209161)
</span><span class="lines">@@ -277,7 +277,8 @@
</span><span class="cx"> || m_options.overrideLanguages != options.overrideLanguages
</span><span class="cx"> || m_options.useMockScrollbars != options.useMockScrollbars
</span><span class="cx"> || m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
</span><del>- || m_options.enableIntersectionObserver != options.enableIntersectionObserver)
</del><ins>+ || m_options.enableIntersectionObserver != options.enableIntersectionObserver
+ || m_options.enableModernMediaControls != options.enableModernMediaControls)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>