Title: [221746] trunk
Revision
221746
Author
[email protected]
Date
2017-09-07 12:30:43 -0700 (Thu, 07 Sep 2017)

Log Message

[Win] fast/canvas/2d.getPath.modification.html is failing.
https://bugs.webkit.org/show_bug.cgi?id=176534

Reviewed by Alex Christensen.

We need to enable Inspector additions at runtime in order to expose the getPath function.

Source/WebKitLegacy/win:

* Interfaces/IWebPreferencesPrivate.idl:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::setDataTransferItemsEnabled):
(WebPreferences::inspectorAdditionsEnabled):
(WebPreferences::setInspectorAdditionsEnabled):
* WebPreferences.h:
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Tools:

* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):

Modified Paths

Diff

Modified: trunk/Source/WebKitLegacy/win/ChangeLog (221745 => 221746)


--- trunk/Source/WebKitLegacy/win/ChangeLog	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Source/WebKitLegacy/win/ChangeLog	2017-09-07 19:30:43 UTC (rev 221746)
@@ -1,3 +1,23 @@
+2017-09-07  Per Arne Vollan  <[email protected]>
+
+        [Win] fast/canvas/2d.getPath.modification.html is failing.
+        https://bugs.webkit.org/show_bug.cgi?id=176534
+
+        Reviewed by Alex Christensen.
+
+        We need to enable Inspector additions at runtime in order to expose the getPath function.
+
+        * Interfaces/IWebPreferencesPrivate.idl:
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::setDataTransferItemsEnabled):
+        (WebPreferences::inspectorAdditionsEnabled):
+        (WebPreferences::setInspectorAdditionsEnabled):
+        * WebPreferences.h:
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
 2017-09-07  Alex Christensen  <[email protected]>
 
         Modernize Geolocation code

Modified: trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl (221745 => 221746)


--- trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl	2017-09-07 19:30:43 UTC (rev 221746)
@@ -215,4 +215,6 @@
 {
     HRESULT dataTransferItemsEnabled([out, retval] BOOL*);
     HRESULT setDataTransferItemsEnabled([in] BOOL enabled);
+    HRESULT inspectorAdditionsEnabled([out, retval] BOOL*);
+    HRESULT setInspectorAdditionsEnabled([in] BOOL enabled);
 }

Modified: trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h (221745 => 221746)


--- trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h	2017-09-07 19:30:43 UTC (rev 221746)
@@ -189,3 +189,5 @@
 #define WebKitIsSecureContextAttributeEnabledPreferenceKey "WebKitIsSecureContextAttributeEnabled"
 
 #define WebKitDataTransferItemsEnabledPreferenceKey "WebKitDataTransferItemsEnabled"
+
+#define WebKitInspectorAdditionsEnabledPreferenceKey "WebKitInspectorAdditionsEnabled"

Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (221745 => 221746)


--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp	2017-09-07 19:30:43 UTC (rev 221746)
@@ -320,6 +320,8 @@
 
     CFDictionaryAddValue(defaults, CFSTR(WebKitDataTransferItemsEnabledPreferenceKey), kCFBooleanFalse);
 
+    CFDictionaryAddValue(defaults, CFSTR(WebKitInspectorAdditionsEnabledPreferenceKey), kCFBooleanFalse);
+
     defaultSettings = defaults;
 }
 
@@ -2077,6 +2079,20 @@
     return S_OK;
 }
 
+HRESULT WebPreferences::inspectorAdditionsEnabled(_Out_ BOOL* enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+    *enabled = boolValueForKey(WebKitInspectorAdditionsEnabledPreferenceKey);
+    return S_OK;
+}
+
+HRESULT WebPreferences::setInspectorAdditionsEnabled(BOOL enabled)
+{
+    setBoolValue(WebKitInspectorAdditionsEnabledPreferenceKey, enabled);
+    return S_OK;
+}
+
 HRESULT WebPreferences::setApplicationId(BSTR applicationId)
 {
     m_applicationId = String(applicationId).createCFString();

Modified: trunk/Source/WebKitLegacy/win/WebPreferences.h (221745 => 221746)


--- trunk/Source/WebKitLegacy/win/WebPreferences.h	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.h	2017-09-07 19:30:43 UTC (rev 221746)
@@ -263,6 +263,8 @@
     // IWebPreferencesPrivate6
     virtual HRESULT STDMETHODCALLTYPE dataTransferItemsEnabled(_Out_ BOOL*);
     virtual HRESULT STDMETHODCALLTYPE setDataTransferItemsEnabled(BOOL);
+    virtual HRESULT STDMETHODCALLTYPE inspectorAdditionsEnabled(_Out_ BOOL*);
+    virtual HRESULT STDMETHODCALLTYPE setInspectorAdditionsEnabled(BOOL);
 
     // WebPreferences
 

Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (221745 => 221746)


--- trunk/Source/WebKitLegacy/win/WebView.cpp	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp	2017-09-07 19:30:43 UTC (rev 221746)
@@ -5241,6 +5241,11 @@
         return hr;
     RuntimeEnabledFeatures::sharedFeatures().setDataTransferItemsEnabled(!!enabled);
 
+    hr = prefsPrivate->inspectorAdditionsEnabled(&enabled);
+    if (FAILED(hr))
+        return hr;
+    RuntimeEnabledFeatures::sharedFeatures().setInspectorAdditionsEnabled(!!enabled);
+
     hr = preferences->privateBrowsingEnabled(&enabled);
     if (FAILED(hr))
         return hr;

Modified: trunk/Tools/ChangeLog (221745 => 221746)


--- trunk/Tools/ChangeLog	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Tools/ChangeLog	2017-09-07 19:30:43 UTC (rev 221746)
@@ -1,3 +1,15 @@
+2017-09-07  Per Arne Vollan  <[email protected]>
+
+        [Win] fast/canvas/2d.getPath.modification.html is failing.
+        https://bugs.webkit.org/show_bug.cgi?id=176534
+
+        Reviewed by Alex Christensen.
+
+        We need to enable Inspector additions at runtime in order to expose the getPath function.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetWebPreferencesToConsistentValues):
+
 2017-09-07  Filip Pizlo  <[email protected]>
 
         WSL tests should run in run-_javascript_core-tests

Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (221745 => 221746)


--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp	2017-09-07 19:25:45 UTC (rev 221745)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp	2017-09-07 19:30:43 UTC (rev 221746)
@@ -879,6 +879,7 @@
     prefsPrivate->setResourceTimingEnabled(TRUE);
     prefsPrivate->setUserTimingEnabled(TRUE);
     prefsPrivate->setDataTransferItemsEnabled(TRUE);
+    prefsPrivate->setInspectorAdditionsEnabled(TRUE);
     prefsPrivate->clearNetworkLoaderSession();
 
     setAlwaysAcceptCookies(false);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to