Title: [210991] trunk
- Revision
- 210991
- Author
- joep...@webkit.org
- Date
- 2017-01-20 14:54:49 -0800 (Fri, 20 Jan 2017)
Log Message
Build Fix for Windows DumpRenderTree after r210976
Source/WebKit/win:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::setWebAnimationsEnabled):
(WebPreferences::webAnimationsEnabled):
* WebPreferences.h:
* WebView.cpp:
Add toggle APIs for WebAnimations.
Tools:
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (210990 => 210991)
--- trunk/Source/WebKit/win/ChangeLog 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/ChangeLog 2017-01-20 22:54:49 UTC (rev 210991)
@@ -1,3 +1,16 @@
+2017-01-20 Joseph Pecoraro <pecor...@apple.com>
+
+ Build Fix for Windows DumpRenderTree after r210976
+
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::setWebAnimationsEnabled):
+ (WebPreferences::webAnimationsEnabled):
+ * WebPreferences.h:
+ * WebView.cpp:
+ Add toggle APIs for WebAnimations.
+
2017-01-19 Chris Dumez <cdu...@apple.com>
iterable<> should be enabled on WK1
Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (210990 => 210991)
--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2017-01-20 22:54:49 UTC (rev 210991)
@@ -175,3 +175,5 @@
#define WebKitCustomElementsEnabledPreferenceKey "WebKitCustomElementsEnabled"
#define WebKitModernMediaControlsEnabledPreferenceKey "WebKitModernMediaControlsEnabled"
+
+#define WebKitWebAnimationsEnabledPreferenceKey "WebKitWebAnimationsEnabled"
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (210990 => 210991)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2017-01-20 22:54:49 UTC (rev 210991)
@@ -304,6 +304,8 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitCustomElementsEnabledPreferenceKey), kCFBooleanFalse);
+ CFDictionaryAddValue(defaults, CFSTR(WebKitWebAnimationsEnabledPreferenceKey), kCFBooleanFalse);
+
defaultSettings = defaults;
}
@@ -1994,3 +1996,17 @@
m_applicationId = String(applicationId).createCFString();
return S_OK;
}
+
+HRESULT WebPreferences::setWebAnimationsEnabled(BOOL enabled)
+{
+ setBoolValue(WebKitWebAnimationsEnabledPreferenceKey, enabled);
+ return S_OK;
+}
+
+HRESULT WebPreferences::webAnimationsEnabled(_Out_ BOOL* enabled)
+{
+ if (!enabled)
+ return E_POINTER;
+ *enabled = boolValueForKey(WebKitWebAnimationsEnabledPreferenceKey);
+ return S_OK;
+}
Modified: trunk/Source/WebKit/win/WebPreferences.h (210990 => 210991)
--- trunk/Source/WebKit/win/WebPreferences.h 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebPreferences.h 2017-01-20 22:54:49 UTC (rev 210991)
@@ -244,6 +244,9 @@
// IWebPreferencesPrivate4
virtual HRESULT STDMETHODCALLTYPE setApplicationId(BSTR);
+ virtual HRESULT STDMETHODCALLTYPE webAnimationsEnabled(_Out_ BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setWebAnimationsEnabled(BOOL);
+
// WebPreferences
// This method accesses a different preference key than developerExtrasEnabled.
Modified: trunk/Source/WebKit/win/WebView.cpp (210990 => 210991)
--- trunk/Source/WebKit/win/WebView.cpp 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Source/WebKit/win/WebView.cpp 2017-01-20 22:54:49 UTC (rev 210991)
@@ -5254,6 +5254,13 @@
return hr;
RuntimeEnabledFeatures::sharedFeatures().setModernMediaControlsEnabled(!!enabled);
+#if ENABLE(WEB_ANIMATIONS)
+ hr = prefsPrivate->webAnimationsEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ RuntimeEnabledFeatures::sharedFeatures().setWebAnimationsEnabled(!!enabled);
+#endif
+
hr = preferences->privateBrowsingEnabled(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/Tools/ChangeLog (210990 => 210991)
--- trunk/Tools/ChangeLog 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Tools/ChangeLog 2017-01-20 22:54:49 UTC (rev 210991)
@@ -1,3 +1,10 @@
+2017-01-20 Joseph Pecoraro <pecor...@apple.com>
+
+ Build Fix for Windows DumpRenderTree after r210976
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+
2017-01-20 Antoine Quint <grao...@apple.com>
Web Animations should be off by default and enabled as an experimental feature
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (210990 => 210991)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-01-20 22:53:19 UTC (rev 210990)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-01-20 22:54:49 UTC (rev 210991)
@@ -860,10 +860,10 @@
prefsPrivate3->setFetchAPIEnabled(TRUE);
prefsPrivate3->setShadowDOMEnabled(TRUE);
prefsPrivate3->setCustomElementsEnabled(TRUE);
-
prefsPrivate3->setModernMediaControlsEnabled(FALSE);
- prefsPrivate3->setWebAnimationsEnabled(TRUE);
+ preferences->setWebAnimationsEnabled(TRUE);
+
setAlwaysAcceptCookies(false);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
