Title: [213916] trunk
- Revision
- 213916
- Author
- beid...@apple.com
- Date
- 2017-03-14 10:58:09 -0700 (Tue, 14 Mar 2017)
Log Message
REGRESSION (r213877): WebKit2.CookieManager fails.
https://bugs.webkit.org/show_bug.cgi?id=169581
Reviewed by Tim Horton.
Source/WebKit2:
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::processPoolDestroyed): Invalidate the new sets of callbacks.
(WebKit::WebCookieManagerProxy::processDidClose): Ditto.
Tools:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Reenable the test.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213915 => 213916)
--- trunk/Source/WebKit2/ChangeLog 2017-03-14 17:39:27 UTC (rev 213915)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 17:58:09 UTC (rev 213916)
@@ -1,3 +1,14 @@
+2017-03-14 Brady Eidson <beid...@apple.com>
+
+ REGRESSION (r213877): WebKit2.CookieManager fails.
+ https://bugs.webkit.org/show_bug.cgi?id=169581
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::processPoolDestroyed): Invalidate the new sets of callbacks.
+ (WebKit::WebCookieManagerProxy::processDidClose): Ditto.
+
2017-03-14 Tomas Popela <tpop...@redhat.com>
Fix uninitialized public members in NetworkProcess
Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (213915 => 213916)
--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2017-03-14 17:39:27 UTC (rev 213915)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2017-03-14 17:58:09 UTC (rev 213916)
@@ -73,6 +73,8 @@
{
invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::OwnerWasInvalidated);
invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::OwnerWasInvalidated);
+ invalidateCallbackMap(m_voidCallbacks, CallbackBase::Error::OwnerWasInvalidated);
+ invalidateCallbackMap(m_getCookiesCallbacks, CallbackBase::Error::OwnerWasInvalidated);
}
void WebCookieManagerProxy::processDidClose(WebProcessProxy*)
@@ -79,6 +81,8 @@
{
invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::ProcessExited);
+ invalidateCallbackMap(m_voidCallbacks, CallbackBase::Error::ProcessExited);
+ invalidateCallbackMap(m_getCookiesCallbacks, CallbackBase::Error::ProcessExited);
}
void WebCookieManagerProxy::processDidClose(NetworkProcessProxy*)
@@ -85,6 +89,8 @@
{
invalidateCallbackMap(m_arrayCallbacks, CallbackBase::Error::ProcessExited);
invalidateCallbackMap(m_httpCookieAcceptPolicyCallbacks, CallbackBase::Error::ProcessExited);
+ invalidateCallbackMap(m_voidCallbacks, CallbackBase::Error::ProcessExited);
+ invalidateCallbackMap(m_getCookiesCallbacks, CallbackBase::Error::ProcessExited);
}
void WebCookieManagerProxy::refWebContextSupplement()
Modified: trunk/Tools/ChangeLog (213915 => 213916)
--- trunk/Tools/ChangeLog 2017-03-14 17:39:27 UTC (rev 213915)
+++ trunk/Tools/ChangeLog 2017-03-14 17:58:09 UTC (rev 213916)
@@ -1,3 +1,12 @@
+2017-03-14 Brady Eidson <beid...@apple.com>
+
+ REGRESSION (r213877): WebKit2.CookieManager fails.
+ https://bugs.webkit.org/show_bug.cgi?id=169581
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Reenable the test.
+
2017-03-14 Wenson Hsieh <wenson_hs...@apple.com>
[WK2] Data interaction tests occasionally hit assertions in debug builds
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (213915 => 213916)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-03-14 17:39:27 UTC (rev 213915)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-03-14 17:58:09 UTC (rev 213916)
@@ -153,6 +153,7 @@
51CD1C6C1B38CE4300142CA5 /* ModalAlerts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51CD1C6A1B38CE3600142CA5 /* ModalAlerts.mm */; };
51CD1C721B38D48400142CA5 /* modal-alerts-in-new-about-blank-window.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51CD1C711B38D48400142CA5 /* modal-alerts-in-new-about-blank-window.html */; };
51D124981E763B02002B2820 /* WKHTTPCookieStorage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D124971E763AF8002B2820 /* WKHTTPCookieStorage.mm */; };
+ 51D1249B1E785425002B2820 /* CookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */; };
51E5C7021919C3B200D8B3E1 /* simple2.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51E780361919AFF8001829A2 /* simple2.html */; };
51E5C7031919C3B200D8B3E1 /* simple3.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51E780371919AFF8001829A2 /* simple3.html */; };
51E6A8941D2F1C0A00C004B6 /* LocalStorageClear.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E6A8921D2F1BEC00C004B6 /* LocalStorageClear.mm */; };
@@ -2659,6 +2660,7 @@
374B7A601DF36EEE00ACCB6C /* BundleEditingDelegate.mm in Sources */,
5C0BF8951DD599CD00B00328 /* NavigatorLanguage.mm in Sources */,
A1DF74321C41B65800A2F4D0 /* AlwaysRevalidatedURLSchemes.mm in Sources */,
+ 51D1249B1E785425002B2820 /* CookieManager.cpp in Sources */,
2DE71AFE1D49C0BD00904094 /* AnimatedResize.mm in Sources */,
7CCE7EB41A411A7E00447C4C /* AttributedString.mm in Sources */,
CDC8E48D1BC5CB4500594FEC /* AudioSessionCategoryIOS.mm in Sources */,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
