Title: [231657] branches/safari-606.1.17-branch/Source/WebKitLegacy/win
- Revision
- 231657
- Author
- [email protected]
- Date
- 2018-05-10 13:43:14 -0700 (Thu, 10 May 2018)
Log Message
Cherry-pick r231635. rdar://problem/39664620
REGRESSION(r231622) [Win] Crashes for null dereference of prefsPrivate in WebView::notifyPreferencesChanged
https://bugs.webkit.org/show_bug.cgi?id=185505
Unreviewed serious crash fix
Windows port crashes soon since Bug 184996.
* WebPreferences.cpp:
(WebPreferences::QueryInterface): Added IID_IWebPreferencesPrivate7.
* WebPreferences.h: Inherit IWebPreferencesPrivate7 instead of IWebPreferencesPrivate6.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606.1.17-branch/Source/WebKitLegacy/win/ChangeLog (231656 => 231657)
--- branches/safari-606.1.17-branch/Source/WebKitLegacy/win/ChangeLog 2018-05-10 20:43:12 UTC (rev 231656)
+++ branches/safari-606.1.17-branch/Source/WebKitLegacy/win/ChangeLog 2018-05-10 20:43:14 UTC (rev 231657)
@@ -1,3 +1,33 @@
+2018-05-10 Jason Marcell <[email protected]>
+
+ Cherry-pick r231635. rdar://problem/39664620
+
+ REGRESSION(r231622) [Win] Crashes for null dereference of prefsPrivate in WebView::notifyPreferencesChanged
+ https://bugs.webkit.org/show_bug.cgi?id=185505
+
+ Unreviewed serious crash fix
+
+ Windows port crashes soon since Bug 184996.
+
+ * WebPreferences.cpp:
+ (WebPreferences::QueryInterface): Added IID_IWebPreferencesPrivate7.
+ * WebPreferences.h: Inherit IWebPreferencesPrivate7 instead of IWebPreferencesPrivate6.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-05-10 Fujii Hironori <[email protected]>
+
+ REGRESSION(r231622) [Win] Crashes for null dereference of prefsPrivate in WebView::notifyPreferencesChanged
+ https://bugs.webkit.org/show_bug.cgi?id=185505
+
+ Unreviewed serious crash fix
+
+ Windows port crashes soon since Bug 184996.
+
+ * WebPreferences.cpp:
+ (WebPreferences::QueryInterface): Added IID_IWebPreferencesPrivate7.
+ * WebPreferences.h: Inherit IWebPreferencesPrivate7 instead of IWebPreferencesPrivate6.
+
2018-05-07 Daniel Bates <[email protected]>
Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
Modified: branches/safari-606.1.17-branch/Source/WebKitLegacy/win/WebPreferences.cpp (231656 => 231657)
--- branches/safari-606.1.17-branch/Source/WebKitLegacy/win/WebPreferences.cpp 2018-05-10 20:43:12 UTC (rev 231656)
+++ branches/safari-606.1.17-branch/Source/WebKitLegacy/win/WebPreferences.cpp 2018-05-10 20:43:14 UTC (rev 231657)
@@ -576,6 +576,8 @@
*ppvObject = static_cast<IWebPreferencesPrivate5*>(this);
else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate6))
*ppvObject = static_cast<IWebPreferencesPrivate6*>(this);
+ else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate7))
+ *ppvObject = static_cast<IWebPreferencesPrivate7*>(this);
else if (IsEqualGUID(riid, CLSID_WebPreferences))
*ppvObject = this;
else
Modified: branches/safari-606.1.17-branch/Source/WebKitLegacy/win/WebPreferences.h (231656 => 231657)
--- branches/safari-606.1.17-branch/Source/WebKitLegacy/win/WebPreferences.h 2018-05-10 20:43:12 UTC (rev 231656)
+++ branches/safari-606.1.17-branch/Source/WebKitLegacy/win/WebPreferences.h 2018-05-10 20:43:14 UTC (rev 231657)
@@ -30,7 +30,7 @@
#include <WebCore/BString.h>
#include <wtf/RetainPtr.h>
-class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate6 {
+class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate7 {
public:
static WebPreferences* createInstance();
protected:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
