Title: [210993] trunk
- Revision
- 210993
- Author
- [email protected]
- Date
- 2017-01-20 15:33:23 -0800 (Fri, 20 Jan 2017)
Log Message
Build Fix for Windows DumpRenderTree after r210976
https://bugs.webkit.org/show_bug.cgi?id=167115
Source/WebKit/win:
* WebPreferences.h:
Remove extra space.
* IWebPreferencesPrivate.idl:
Add new interface functions.
* WebView.cpp:
We use new functions that are only in IWebPreferencesPrivate4,
so instantiate that COM object instead of version 3.
Tools:
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (210992 => 210993)
--- trunk/Source/WebKit/win/ChangeLog 2017-01-20 23:23:56 UTC (rev 210992)
+++ trunk/Source/WebKit/win/ChangeLog 2017-01-20 23:33:23 UTC (rev 210993)
@@ -1,3 +1,16 @@
+2017-01-20 Alex Christensen <[email protected]>
+
+ Build Fix for Windows DumpRenderTree after r210976
+ https://bugs.webkit.org/show_bug.cgi?id=167115
+
+ * WebPreferences.h:
+ Remove extra space.
+ * IWebPreferencesPrivate.idl:
+ Add new interface functions.
+ * WebView.cpp:
+ We use new functions that are only in IWebPreferencesPrivate4,
+ so instantiate that COM object instead of version 3.
+
2017-01-20 Joseph Pecoraro <[email protected]>
Build Fix for Windows DumpRenderTree after r210976
Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (210992 => 210993)
--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2017-01-20 23:23:56 UTC (rev 210992)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2017-01-20 23:33:23 UTC (rev 210993)
@@ -189,4 +189,6 @@
interface IWebPreferencesPrivate4 : IWebPreferencesPrivate3
{
HRESULT setApplicationId([in] BSTR applicationId);
+ HRESULT webAnimationsEnabled([out, retval] BOOL*);
+ HRESULT setWebAnimationsEnabled([in] BOOL enabled);
}
Modified: trunk/Source/WebKit/win/WebPreferences.h (210992 => 210993)
--- trunk/Source/WebKit/win/WebPreferences.h 2017-01-20 23:23:56 UTC (rev 210992)
+++ trunk/Source/WebKit/win/WebPreferences.h 2017-01-20 23:33:23 UTC (rev 210993)
@@ -243,7 +243,6 @@
// IWebPreferencesPrivate4
virtual HRESULT STDMETHODCALLTYPE setApplicationId(BSTR);
-
virtual HRESULT STDMETHODCALLTYPE webAnimationsEnabled(_Out_ BOOL*);
virtual HRESULT STDMETHODCALLTYPE setWebAnimationsEnabled(BOOL);
Modified: trunk/Source/WebKit/win/WebView.cpp (210992 => 210993)
--- trunk/Source/WebKit/win/WebView.cpp 2017-01-20 23:23:56 UTC (rev 210992)
+++ trunk/Source/WebKit/win/WebView.cpp 2017-01-20 23:33:23 UTC (rev 210993)
@@ -5181,7 +5181,7 @@
settings.setShouldDisplayTextDescriptions(enabled);
#endif
- COMPtr<IWebPreferencesPrivate3> prefsPrivate(Query, preferences);
+ COMPtr<IWebPreferencesPrivate4> prefsPrivate(Query, preferences);
if (prefsPrivate) {
hr = prefsPrivate->localStorageDatabasePath(&str);
if (FAILED(hr))
Modified: trunk/Tools/ChangeLog (210992 => 210993)
--- trunk/Tools/ChangeLog 2017-01-20 23:23:56 UTC (rev 210992)
+++ trunk/Tools/ChangeLog 2017-01-20 23:33:23 UTC (rev 210993)
@@ -1,3 +1,11 @@
+2017-01-20 Alex Christensen <[email protected]>
+
+ Build Fix for Windows DumpRenderTree after r210976
+ https://bugs.webkit.org/show_bug.cgi?id=167115
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+
2017-01-20 Joseph Pecoraro <[email protected]>
Remove outdated ENABLE(CSP_NEXT) build flag
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (210992 => 210993)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-01-20 23:23:56 UTC (rev 210992)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-01-20 23:33:23 UTC (rev 210993)
@@ -855,15 +855,14 @@
preferences->setFontSmoothing(FontSmoothingTypeStandard);
- COMPtr<IWebPreferencesPrivate3> prefsPrivate3(Query, preferences);
- ASSERT(prefsPrivate3);
- prefsPrivate3->setFetchAPIEnabled(TRUE);
- prefsPrivate3->setShadowDOMEnabled(TRUE);
- prefsPrivate3->setCustomElementsEnabled(TRUE);
- prefsPrivate3->setModernMediaControlsEnabled(FALSE);
+ COMPtr<IWebPreferencesPrivate4> prefsPrivate4(Query, preferences);
+ ASSERT(prefsPrivate4);
+ prefsPrivate4->setFetchAPIEnabled(TRUE);
+ prefsPrivate4->setShadowDOMEnabled(TRUE);
+ prefsPrivate4->setCustomElementsEnabled(TRUE);
+ prefsPrivate4->setModernMediaControlsEnabled(FALSE);
+ prefsPrivate4->setWebAnimationsEnabled(TRUE);
- preferences->setWebAnimationsEnabled(TRUE);
-
setAlwaysAcceptCookies(false);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
