[Win] Layout Test fast/html/menuitem-element.html is failing.
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Mar 2018 17:16:28 +0000 (17:16 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Mar 2018 17:16:28 +0000 (17:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179299

Reviewed by Per Arne Vollan.

Source/WebKitLegacy/win:

* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::menuItemElementEnabled):
(WebPreferences::setMenuItemElementEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):
Add private web preference "menuItemElementEnabled".

Tools:

* DumpRenderTree/win/DumpRenderTree.cpp:
(setWebPreferencesForTestOptions):
Recognize test option "enableMenuItemElement".

LayoutTests:

* platform/win/TestExpectations:
Remove "failure" line.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/win/TestExpectations
Source/WebKitLegacy/win/ChangeLog
Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl
Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h
Source/WebKitLegacy/win/WebPreferences.cpp
Source/WebKitLegacy/win/WebPreferences.h
Source/WebKitLegacy/win/WebView.cpp
Tools/ChangeLog
Tools/DumpRenderTree/win/DumpRenderTree.cpp

index 7b49242..60dfe31 100644 (file)
@@ -1,3 +1,13 @@
+2018-03-13  Ross Kirsling  <ross.kirsling@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  <danyao@chromium.org>
 
         LayoutTests/http/tests/navigation/page-cache-iframe-provisional-load.html fails with async policy delegate
index 862ee94..b675a22 100644 (file)
@@ -3834,8 +3834,6 @@ webkit.org/b/179297 fast/loader/empty-embed-src-attribute.html [ Pass Crash ]
 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 ]
index c9f279d..a82293a 100644 (file)
@@ -1,3 +1,20 @@
+2018-03-13  Ross Kirsling  <ross.kirsling@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  <graouts@apple.com>
 
         [Web Animations] Implement CSS Animations and CSS Transitions as Web Animations
index ed41ee1..891a7d0 100644 (file)
@@ -225,4 +225,6 @@ interface IWebPreferencesPrivate6 : IWebPreferencesPrivate5
     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);
 }
index e50da8c..37d73e6 100644 (file)
 
 #define WebKitCustomElementsEnabledPreferenceKey "WebKitCustomElementsEnabled"
 
+#define WebKitMenuItemElementEnabledPreferenceKey "WebKitMenuItemElementEnabled"
+
 #define WebKitModernMediaControlsEnabledPreferenceKey "WebKitModernMediaControlsEnabled"
 
 #define WebKitWebAnimationsEnabledPreferenceKey "WebKitWebAnimationsEnabled"
index 8725269..e460d13 100644 (file)
@@ -2015,6 +2015,20 @@ HRESULT WebPreferences::setCustomElementsEnabled(BOOL enabled)
     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);
index d468137..ddd8dcc 100644 (file)
@@ -273,6 +273,8 @@ public:
     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
 
index 39808a0..3da0e15 100644 (file)
@@ -5207,6 +5207,11 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         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;
index 87c8cd0..402f0ce 100644 (file)
@@ -1,3 +1,14 @@
+2018-03-13  Ross Kirsling  <ross.kirsling@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_horton@apple.com>
 
         Stop using SDK conditionals to control feature definitions
index 9168c42..ac6519f 100644 (file)
@@ -893,6 +893,7 @@ static void setWebPreferencesForTestOptions(IWebPreferences* preferences, const
 {
     COMPtr<IWebPreferencesPrivate6> prefsPrivate { Query, preferences };
 
+    prefsPrivate->setMenuItemElementEnabled(options.enableMenuItemElement);
     prefsPrivate->setModernMediaControlsEnabled(options.enableModernMediaControls);
     prefsPrivate->setIsSecureContextAttributeEnabled(options.enableIsSecureContextAttribute);
     prefsPrivate->setInspectorAdditionsEnabled(options.enableInspectorAdditions);