Diff
Modified: trunk/Source/WebKit2/ChangeLog (209160 => 209161)
--- 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)
@@ -1,3 +1,17 @@
+2016-11-30 Antoine Quint <[email protected]>
+
+ [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:
+
2016-11-30 Said Abou-Hallawa <[email protected]>
Add separate settings and preferences to enable/disable async decoding for large images and animated images
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (209160 => 209161)
--- 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)
@@ -822,6 +822,16 @@
return toImpl(preferencesRef)->mediaControlsScaleWithPageZoom();
}
+void WKPreferencesSetModernMediaControlsEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setModernMediaControlsEnabled(flag);
+}
+
+bool WKPreferencesGetModernMediaControlsEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->modernMediaControlsEnabled();
+}
+
void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setShowsToolTipOverTruncatedText(flag);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (209160 => 209161)
--- 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)
@@ -205,6 +205,10 @@
WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
// Defaults to false.
+WK_EXPORT void WKPreferencesSetModernMediaControlsEnabled(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetModernMediaControlsEnabled(WKPreferencesRef preferencesRef);
+
+// Defaults to false.
WK_EXPORT void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef);
Modified: trunk/Tools/ChangeLog (209160 => 209161)
--- trunk/Tools/ChangeLog 2016-11-30 23:53:23 UTC (rev 209160)
+++ trunk/Tools/ChangeLog 2016-12-01 00:10:28 UTC (rev 209161)
@@ -1,3 +1,28 @@
+2016-11-30 Antoine Quint <[email protected]>
+
+ [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):
+
2016-11-30 Said Abou-Hallawa <[email protected]>
Add separate settings and preferences to enable/disable async decoding for large images and animated images
Modified: trunk/Tools/DumpRenderTree/TestOptions.h (209160 => 209161)
--- 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)
@@ -29,6 +29,7 @@
struct TestOptions {
bool enableIntersectionObserver { false };
+ bool enableModernMediaControls { false };
TestOptions(NSURL *testURL);
};
Modified: trunk/Tools/DumpRenderTree/TestOptions.mm (209160 => 209161)
--- 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)
@@ -78,6 +78,8 @@
auto value = pairString.substr(equalsLocation + 1, pairEnd - (equalsLocation + 1));
if (key == "enableIntersectionObserver")
this->enableIntersectionObserver = parseBooleanTestHeaderValue(value);
+ else if (key == "enableModernMediaControls")
+ this->enableModernMediaControls = parseBooleanTestHeaderValue(value);
pairStart = pairEnd + 1;
}
}
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (209160 => 209161)
--- 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)
@@ -995,12 +995,11 @@
[preferences setES6ModulesEnabled:YES];
- [preferences setModernMediaControlsEnabled:NO];
-
[preferences setHiddenPageDOMTimerThrottlingEnabled:NO];
[preferences setHiddenPageCSSAnimationSuspensionEnabled:NO];
preferences.intersectionObserverEnabled = options.enableIntersectionObserver;
+ preferences.modernMediaControlsEnabled = options.enableModernMediaControls;
[WebPreferences _clearNetworkLoaderSession];
[WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (209160 => 209161)
--- 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)
@@ -322,8 +322,6 @@
m_testRunner->setWebGL2Enabled(true);
- m_testRunner->setModernMediaControlsEnabled(false);
-
m_testRunner->setFetchAPIEnabled(true);
m_testRunner->setDownloadAttributeEnabled(true);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (209160 => 209161)
--- 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)
@@ -651,6 +651,7 @@
WKPreferencesSetMockScrollbarsEnabled(preferences, options.useMockScrollbars);
WKPreferencesSetNeedsSiteSpecificQuirks(preferences, options.needsSiteSpecificQuirks);
WKPreferencesSetIntersectionObserverEnabled(preferences, options.enableIntersectionObserver);
+ WKPreferencesSetModernMediaControlsEnabled(preferences, options.enableModernMediaControls);
static WKStringRef defaultTextEncoding = WKStringCreateWithUTF8CString("ISO-8859-1");
WKPreferencesSetDefaultTextEncodingName(preferences, defaultTextEncoding);
@@ -960,6 +961,8 @@
testOptions.useCharacterSelectionGranularity = parseBooleanTestHeaderValue(value);
if (key == "enableIntersectionObserver")
testOptions.enableIntersectionObserver = parseBooleanTestHeaderValue(value);
+ if (key == "enableModernMediaControls")
+ testOptions.enableModernMediaControls = parseBooleanTestHeaderValue(value);
pairStart = pairEnd + 1;
}
}
Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (209160 => 209161)
--- 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)
@@ -44,6 +44,7 @@
bool ignoresViewportScaleLimits { false };
bool useCharacterSelectionGranularity { false };
bool enableIntersectionObserver { false };
+ bool enableModernMediaControls { false };
float deviceScaleFactor { 1 };
Vector<String> overrideLanguages;
Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (209160 => 209161)
--- 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)
@@ -281,7 +281,8 @@
if (m_options.overrideLanguages != options.overrideLanguages
|| m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
|| m_options.useCharacterSelectionGranularity != options.useCharacterSelectionGranularity
- || m_options.enableIntersectionObserver != options.enableIntersectionObserver)
+ || m_options.enableIntersectionObserver != options.enableIntersectionObserver
+ || m_options.enableModernMediaControls != options.enableModernMediaControls)
return false;
return true;
Modified: trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm (209160 => 209161)
--- 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)
@@ -277,7 +277,8 @@
|| m_options.overrideLanguages != options.overrideLanguages
|| m_options.useMockScrollbars != options.useMockScrollbars
|| m_options.needsSiteSpecificQuirks != options.needsSiteSpecificQuirks
- || m_options.enableIntersectionObserver != options.enableIntersectionObserver)
+ || m_options.enableIntersectionObserver != options.enableIntersectionObserver
+ || m_options.enableModernMediaControls != options.enableModernMediaControls)
return false;
return true;