Diff
Modified: trunk/LayoutTests/ChangeLog (229577 => 229578)
--- trunk/LayoutTests/ChangeLog 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/LayoutTests/ChangeLog 2018-03-13 17:16:28 UTC (rev 229578)
@@ -1,3 +1,13 @@
+2018-03-13 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [Win] Layout Test fast/html/menuitem-element.html is failing.
+ https://bugs.webkit.org/show_bug.cgi?id=179299
+
+ Reviewed by Per Arne Vollan.
+
+ * platform/win/TestExpectations:
+ Remove "failure" line.
+
2018-03-13 Danyao Wang <dan...@chromium.org>
LayoutTests/http/tests/navigation/page-cache-iframe-provisional-load.html fails with async policy delegate
Modified: trunk/LayoutTests/platform/win/TestExpectations (229577 => 229578)
--- trunk/LayoutTests/platform/win/TestExpectations 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/LayoutTests/platform/win/TestExpectations 2018-03-13 17:16:28 UTC (rev 229578)
@@ -3834,8 +3834,6 @@
webkit.org/b/179297 http/tests/preload/onerror_event.html [ Crash Pass ]
webkit.org/b/179297 http/wpt/resource-timing/rt-initiatorType-media.html [ Crash Failure ]
-webkit.org/b/179299 fast/html/menuitem-element.html [ Failure ]
-
webkit.org/b/179301 http/tests/security/xss-DENIED-xsl-external-entity.xml [ Pass Failure ]
webkit.org/b/179613 editing/execCommand/underline-selection-containing-image.html [ Failure ]
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (229577 => 229578)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-03-13 17:16:28 UTC (rev 229578)
@@ -1,3 +1,20 @@
+2018-03-13 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [Win] Layout Test fast/html/menuitem-element.html is failing.
+ https://bugs.webkit.org/show_bug.cgi?id=179299
+
+ Reviewed by Per Arne Vollan.
+
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::menuItemElementEnabled):
+ (WebPreferences::setMenuItemElementEnabled):
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+ Add private web preference "menuItemElementEnabled".
+
2018-03-12 Antoine Quint <grao...@apple.com>
[Web Animations] Implement CSS Animations and CSS Transitions as Web Animations
Modified: trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl (229577 => 229578)
--- trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl 2018-03-13 17:16:28 UTC (rev 229578)
@@ -225,4 +225,6 @@
HRESULT setFetchAPIKeepAliveEnabled([in] BOOL enabled);
HRESULT spatialNavigationEnabled([out, retval] BOOL *enabled);
HRESULT setSpatialNavigationEnabled([in] BOOL enabled);
+ HRESULT menuItemElementEnabled([out, retval] BOOL* enabled);
+ HRESULT setMenuItemElementEnabled([in] BOOL enabled);
}
Modified: trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h (229577 => 229578)
--- trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h 2018-03-13 17:16:28 UTC (rev 229578)
@@ -178,6 +178,8 @@
#define WebKitCustomElementsEnabledPreferenceKey "WebKitCustomElementsEnabled"
+#define WebKitMenuItemElementEnabledPreferenceKey "WebKitMenuItemElementEnabled"
+
#define WebKitModernMediaControlsEnabledPreferenceKey "WebKitModernMediaControlsEnabled"
#define WebKitWebAnimationsEnabledPreferenceKey "WebKitWebAnimationsEnabled"
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (229577 => 229578)
--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2018-03-13 17:16:28 UTC (rev 229578)
@@ -2015,6 +2015,20 @@
return S_OK;
}
+HRESULT WebPreferences::menuItemElementEnabled(_Out_ BOOL* enabled)
+{
+ if (!enabled)
+ return E_POINTER;
+ *enabled = boolValueForKey(WebKitMenuItemElementEnabledPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setMenuItemElementEnabled(BOOL enabled)
+{
+ setBoolValue(WebKitMenuItemElementEnabledPreferenceKey, enabled);
+ return S_OK;
+}
+
HRESULT WebPreferences::setModernMediaControlsEnabled(BOOL enabled)
{
setBoolValue(WebKitModernMediaControlsEnabledPreferenceKey, enabled);
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.h (229577 => 229578)
--- trunk/Source/WebKitLegacy/win/WebPreferences.h 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.h 2018-03-13 17:16:28 UTC (rev 229578)
@@ -273,6 +273,8 @@
virtual HRESULT STDMETHODCALLTYPE setFetchAPIKeepAliveEnabled(BOOL);
virtual HRESULT STDMETHODCALLTYPE spatialNavigationEnabled(_Out_ BOOL*);
virtual HRESULT STDMETHODCALLTYPE setSpatialNavigationEnabled(BOOL);
+ virtual HRESULT STDMETHODCALLTYPE menuItemElementEnabled(_Out_ BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setMenuItemElementEnabled(BOOL);
// WebPreferences
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (229577 => 229578)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2018-03-13 17:16:28 UTC (rev 229578)
@@ -5207,6 +5207,11 @@
return hr;
RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(!!enabled);
+ hr = prefsPrivate->menuItemElementEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ RuntimeEnabledFeatures::sharedFeatures().setMenuItemElementEnabled(!!enabled);
+
hr = prefsPrivate->modernMediaControlsEnabled(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/Tools/ChangeLog (229577 => 229578)
--- trunk/Tools/ChangeLog 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Tools/ChangeLog 2018-03-13 17:16:28 UTC (rev 229578)
@@ -1,3 +1,14 @@
+2018-03-13 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [Win] Layout Test fast/html/menuitem-element.html is failing.
+ https://bugs.webkit.org/show_bug.cgi?id=179299
+
+ Reviewed by Per Arne Vollan.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (setWebPreferencesForTestOptions):
+ Recognize test option "enableMenuItemElement".
+
2018-03-12 Tim Horton <timothy_hor...@apple.com>
Stop using SDK conditionals to control feature definitions
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (229577 => 229578)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2018-03-13 16:12:40 UTC (rev 229577)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2018-03-13 17:16:28 UTC (rev 229578)
@@ -893,6 +893,7 @@
{
COMPtr<IWebPreferencesPrivate6> prefsPrivate { Query, preferences };
+ prefsPrivate->setMenuItemElementEnabled(options.enableMenuItemElement);
prefsPrivate->setModernMediaControlsEnabled(options.enableModernMediaControls);
prefsPrivate->setIsSecureContextAttributeEnabled(options.enableIsSecureContextAttribute);
prefsPrivate->setInspectorAdditionsEnabled(options.enableInspectorAdditions);
