Diff
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (221732 => 221733)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2017-09-07 15:55:19 UTC (rev 221733)
@@ -1,3 +1,22 @@
+2017-09-07 Per Arne Vollan <[email protected]>
+
+ [Win] Enable DatatransferItems in DRT.
+ https://bugs.webkit.org/show_bug.cgi?id=176424
+
+ Reviewed by Brent Fulgham.
+
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::QueryInterface):
+ (WebPreferences::isSecureContextAttributeEnabled):
+ (WebPreferences::dataTransferItemsEnabled):
+ (WebPreferences::setDataTransferItemsEnabled):
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2017-08-28 Brent Fulgham <[email protected]>
Unreviewed build fix #2 after r221275.
Modified: trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl (221732 => 221733)
--- trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Source/WebKitLegacy/win/Interfaces/IWebPreferencesPrivate.idl 2017-09-07 15:55:19 UTC (rev 221733)
@@ -209,3 +209,10 @@
HRESULT isSecureContextAttributeEnabled([out, retval] BOOL*);
HRESULT setIsSecureContextAttributeEnabled([in] BOOL enabled);
}
+
+[uuid(B8BC62C9-1CA9-4FD1-B328-CB0BD171249F)]
+interface IWebPreferencesPrivate6 : IWebPreferencesPrivate5
+{
+ HRESULT dataTransferItemsEnabled([out, retval] BOOL*);
+ HRESULT setDataTransferItemsEnabled([in] BOOL enabled);
+}
Modified: trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h (221732 => 221733)
--- trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h 2017-09-07 15:55:19 UTC (rev 221733)
@@ -187,3 +187,5 @@
#define WebKitMediaPreloadingEnabledPreferenceKey "WebKitMediaPreloadingEnabled"
#define WebKitIsSecureContextAttributeEnabledPreferenceKey "WebKitIsSecureContextAttributeEnabled"
+
+#define WebKitDataTransferItemsEnabledPreferenceKey "WebKitDataTransferItemsEnabled"
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (221732 => 221733)
--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp 2017-09-07 15:55:19 UTC (rev 221733)
@@ -318,6 +318,8 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitIsSecureContextAttributeEnabledPreferenceKey), kCFBooleanFalse);
+ CFDictionaryAddValue(defaults, CFSTR(WebKitDataTransferItemsEnabledPreferenceKey), kCFBooleanFalse);
+
defaultSettings = defaults;
}
@@ -565,6 +567,8 @@
*ppvObject = static_cast<IWebPreferencesPrivate4*>(this);
else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate5))
*ppvObject = static_cast<IWebPreferencesPrivate5*>(this);
+ else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate6))
+ *ppvObject = static_cast<IWebPreferencesPrivate6*>(this);
else if (IsEqualGUID(riid, CLSID_WebPreferences))
*ppvObject = this;
else
@@ -2059,6 +2063,20 @@
return S_OK;
}
+HRESULT WebPreferences::dataTransferItemsEnabled(_Out_ BOOL* enabled)
+{
+ if (!enabled)
+ return E_POINTER;
+ *enabled = boolValueForKey(WebKitDataTransferItemsEnabledPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setDataTransferItemsEnabled(BOOL enabled)
+{
+ setBoolValue(WebKitDataTransferItemsEnabledPreferenceKey, enabled);
+ return S_OK;
+}
+
HRESULT WebPreferences::setApplicationId(BSTR applicationId)
{
m_applicationId = String(applicationId).createCFString();
Modified: trunk/Source/WebKitLegacy/win/WebPreferences.h (221732 => 221733)
--- trunk/Source/WebKitLegacy/win/WebPreferences.h 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.h 2017-09-07 15:55:19 UTC (rev 221733)
@@ -30,7 +30,7 @@
#include <WebCore/BString.h>
#include <wtf/RetainPtr.h>
-class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate5 {
+class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate6 {
public:
static WebPreferences* createInstance();
protected:
@@ -260,6 +260,10 @@
virtual HRESULT STDMETHODCALLTYPE isSecureContextAttributeEnabled(_Out_ BOOL*);
virtual HRESULT STDMETHODCALLTYPE setIsSecureContextAttributeEnabled(BOOL);
+ // IWebPreferencesPrivate6
+ virtual HRESULT STDMETHODCALLTYPE dataTransferItemsEnabled(_Out_ BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setDataTransferItemsEnabled(BOOL);
+
// WebPreferences
// This method accesses a different preference key than developerExtrasEnabled.
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (221732 => 221733)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2017-09-07 15:55:19 UTC (rev 221733)
@@ -5135,7 +5135,7 @@
settings.setShouldDisplayTextDescriptions(enabled);
#endif
- COMPtr<IWebPreferencesPrivate5> prefsPrivate { Query, preferences };
+ COMPtr<IWebPreferencesPrivate6> prefsPrivate { Query, preferences };
if (prefsPrivate) {
hr = prefsPrivate->localStorageDatabasePath(&str);
if (FAILED(hr))
@@ -5236,6 +5236,11 @@
return hr;
RuntimeEnabledFeatures::sharedFeatures().setIsSecureContextAttributeEnabled(!!enabled);
+ hr = prefsPrivate->dataTransferItemsEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ RuntimeEnabledFeatures::sharedFeatures().setDataTransferItemsEnabled(!!enabled);
+
hr = preferences->privateBrowsingEnabled(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/Tools/ChangeLog (221732 => 221733)
--- trunk/Tools/ChangeLog 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Tools/ChangeLog 2017-09-07 15:55:19 UTC (rev 221733)
@@ -1,3 +1,13 @@
+2017-09-07 Per Arne Vollan <[email protected]>
+
+ [Win] Enable DatatransferItems in DRT.
+ https://bugs.webkit.org/show_bug.cgi?id=176424
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+
2017-09-07 Carlos Garcia Campos <[email protected]>
[GTK] Bump libxml2 version to 1.9.5
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (221732 => 221733)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-09-07 15:42:46 UTC (rev 221732)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2017-09-07 15:55:19 UTC (rev 221733)
@@ -792,7 +792,7 @@
preferences->setAutosaves(FALSE);
- COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
+ COMPtr<IWebPreferencesPrivate6> prefsPrivate(Query, preferences);
ASSERT(prefsPrivate);
prefsPrivate->setFullScreenEnabled(TRUE);
@@ -845,9 +845,7 @@
prefsPrivate->setJavaScriptCanAccessClipboard(TRUE);
prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
prefsPrivate->setDeveloperExtrasEnabled(FALSE);
- COMPtr<IWebPreferencesPrivate2> prefsPrivate2(Query, preferences);
- if (prefsPrivate2)
- prefsPrivate2->setJavaScriptRuntimeFlags(WebKitJavaScriptRuntimeFlagsAllEnabled);
+ prefsPrivate->setJavaScriptRuntimeFlags(WebKitJavaScriptRuntimeFlagsAllEnabled);
// Set JS experiments enabled: YES
preferences->setLoadsImagesAutomatically(TRUE);
prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
@@ -874,15 +872,14 @@
preferences->setFontSmoothing(FontSmoothingTypeStandard);
- COMPtr<IWebPreferencesPrivate4> prefsPrivate4(Query, preferences);
- ASSERT(prefsPrivate4);
- prefsPrivate4->setFetchAPIEnabled(TRUE);
- prefsPrivate4->setShadowDOMEnabled(TRUE);
- prefsPrivate4->setCustomElementsEnabled(TRUE);
- prefsPrivate4->setModernMediaControlsEnabled(FALSE);
- prefsPrivate4->setResourceTimingEnabled(TRUE);
- prefsPrivate4->setUserTimingEnabled(TRUE);
- prefsPrivate4->clearNetworkLoaderSession();
+ prefsPrivate->setFetchAPIEnabled(TRUE);
+ prefsPrivate->setShadowDOMEnabled(TRUE);
+ prefsPrivate->setCustomElementsEnabled(TRUE);
+ prefsPrivate->setModernMediaControlsEnabled(FALSE);
+ prefsPrivate->setResourceTimingEnabled(TRUE);
+ prefsPrivate->setUserTimingEnabled(TRUE);
+ prefsPrivate->setDataTransferItemsEnabled(TRUE);
+ prefsPrivate->clearNetworkLoaderSession();
setAlwaysAcceptCookies(false);
}
