Title: [217455] trunk/Source/WebKit2
- Revision
- 217455
- Author
- [email protected]
- Date
- 2017-05-25 15:33:28 -0700 (Thu, 25 May 2017)
Log Message
ASSERT(m_websiteDataStore->websiteDataStore().sessionID() == m_sessionID) in PageConfiguration::sessionID()
https://bugs.webkit.org/show_bug.cgi?id=172615
<rdar://problem/32277488>
Reviewed by Brady Eidson.
Fix assertion added in r215923 to take into account the fact that the PageConfiguration's sessionID
is SessionID::legacyPrivateSessionID() when private browsing is enabled, instead of being the
WebsiteDataStore's sessionID.
See code in WebProcessPool::createWebPage():
"""
pageConfiguration->setSessionID(pageConfiguration->preferences()->privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : m_websiteDataStore->websiteDataStore().sessionID());
"""
* UIProcess/API/APIPageConfiguration.cpp:
(API::PageConfiguration::sessionID):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (217454 => 217455)
--- trunk/Source/WebKit2/ChangeLog 2017-05-25 22:29:43 UTC (rev 217454)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-25 22:33:28 UTC (rev 217455)
@@ -1,3 +1,23 @@
+2017-05-25 Chris Dumez <[email protected]>
+
+ ASSERT(m_websiteDataStore->websiteDataStore().sessionID() == m_sessionID) in PageConfiguration::sessionID()
+ https://bugs.webkit.org/show_bug.cgi?id=172615
+ <rdar://problem/32277488>
+
+ Reviewed by Brady Eidson.
+
+ Fix assertion added in r215923 to take into account the fact that the PageConfiguration's sessionID
+ is SessionID::legacyPrivateSessionID() when private browsing is enabled, instead of being the
+ WebsiteDataStore's sessionID.
+
+ See code in WebProcessPool::createWebPage():
+ """
+ pageConfiguration->setSessionID(pageConfiguration->preferences()->privateBrowsingEnabled() ? SessionID::legacyPrivateSessionID() : m_websiteDataStore->websiteDataStore().sessionID());
+ """
+
+ * UIProcess/API/APIPageConfiguration.cpp:
+ (API::PageConfiguration::sessionID):
+
2017-05-25 Brent Fulgham <[email protected]>
[WK2][iOS] Add a mach-lookup exception for 'com.apple.lsd.mapdb' to Network sandbox
Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp (217454 => 217455)
--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2017-05-25 22:29:43 UTC (rev 217454)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.cpp 2017-05-25 22:33:28 UTC (rev 217455)
@@ -33,6 +33,7 @@
#include "WebProcessPool.h"
#include "WebUserContentControllerProxy.h"
+using namespace WebCore;
using namespace WebKit;
namespace API {
@@ -154,10 +155,7 @@
WebCore::SessionID PageConfiguration::sessionID()
{
-#if !ASSERT_DISABLED
- if (m_websiteDataStore)
- ASSERT(m_websiteDataStore->websiteDataStore().sessionID() == m_sessionID);
-#endif
+ ASSERT(!m_websiteDataStore || m_websiteDataStore->websiteDataStore().sessionID() == m_sessionID || m_sessionID == SessionID::legacyPrivateSessionID());
return m_sessionID;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
