Title: [213155] branches/safari-603.1.30.4-branch/Source/WebKit/win
- Revision
- 213155
- Author
- matthew_han...@apple.com
- Date
- 2017-02-28 11:25:21 -0800 (Tue, 28 Feb 2017)
Log Message
rdar://problem/30687449
Modified Paths
Diff
Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/ChangeLog (213154 => 213155)
--- branches/safari-603.1.30.4-branch/Source/WebKit/win/ChangeLog 2017-02-28 19:25:17 UTC (rev 213154)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/ChangeLog 2017-02-28 19:25:21 UTC (rev 213155)
@@ -1,3 +1,17 @@
+2017-02-28 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] REGRESSION(r211254): IWebPreferencesPrivate binary API broken
+ https://bugs.webkit.org/show_bug.cgi?id=168928
+
+ Reviewed by Brett Fulgham.
+
+ Move new methods to end of last interface.
+
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2017-02-20 Matthew Hanson <matthew_han...@apple.com>
Rollout r212538. rdar://problem/30541748
Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (213154 => 213155)
--- branches/safari-603.1.30.4-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2017-02-28 19:25:17 UTC (rev 213154)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2017-02-28 19:25:21 UTC (rev 213155)
@@ -91,9 +91,6 @@
HRESULT experimentalNotificationsEnabled([out, retval] BOOL *enabled);
HRESULT setExperimentalNotificationsEnabled([in] BOOL enabled);
- HRESULT allowsPageCacheWithWindowOpener([out, retval] BOOL* usesPageCache);
- HRESULT setAllowsPageCacheWithWindowOpener([in] BOOL usesPageCache);
-
HRESULT setShouldUseHighResolutionTimers([in] BOOL useHighResolutionTimers);
HRESULT shouldUseHighResolutionTimers([out, retval] BOOL* useHighResolutionTimers);
@@ -194,4 +191,7 @@
interface IWebPreferencesPrivate4 : IWebPreferencesPrivate3
{
HRESULT setApplicationId([in] BSTR applicationId);
+
+ HRESULT allowsPageCacheWithWindowOpener([out, retval] BOOL* usesPageCache);
+ HRESULT setAllowsPageCacheWithWindowOpener([in] BOOL usesPageCache);
}
Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/WebPreferences.h (213154 => 213155)
--- branches/safari-603.1.30.4-branch/Source/WebKit/win/WebPreferences.h 2017-02-28 19:25:17 UTC (rev 213154)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/WebPreferences.h 2017-02-28 19:25:21 UTC (rev 213155)
@@ -159,8 +159,6 @@
virtual HRESULT STDMETHODCALLTYPE setLocalStorageDatabasePath(_In_ BSTR);
virtual HRESULT STDMETHODCALLTYPE experimentalNotificationsEnabled(_Out_ BOOL*);
virtual HRESULT STDMETHODCALLTYPE setExperimentalNotificationsEnabled(BOOL);
- virtual HRESULT STDMETHODCALLTYPE allowsPageCacheWithWindowOpener(_Out_ BOOL*);
- virtual HRESULT STDMETHODCALLTYPE setAllowsPageCacheWithWindowOpener(BOOL);
// These two methods are no-ops, and only retained to keep
// the Interface consistent. DO NOT USE THEM.
@@ -247,6 +245,8 @@
// IWebPreferencesPrivate4
virtual HRESULT STDMETHODCALLTYPE setApplicationId(BSTR);
+ virtual HRESULT STDMETHODCALLTYPE allowsPageCacheWithWindowOpener(_Out_ BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setAllowsPageCacheWithWindowOpener(BOOL);
// WebPreferences
Modified: branches/safari-603.1.30.4-branch/Source/WebKit/win/WebView.cpp (213154 => 213155)
--- branches/safari-603.1.30.4-branch/Source/WebKit/win/WebView.cpp 2017-02-28 19:25:17 UTC (rev 213154)
+++ branches/safari-603.1.30.4-branch/Source/WebKit/win/WebView.cpp 2017-02-28 19:25:21 UTC (rev 213155)
@@ -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))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes