Title: [254611] branches/safari-609-branch/Source/WebKit
- Revision
- 254611
- Author
- alanc...@apple.com
- Date
- 2020-01-15 11:15:47 -0800 (Wed, 15 Jan 2020)
Log Message
Cherry-pick r254310. rdar://problem/58552856
Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
https://bugs.webkit.org/show_bug.cgi?id=206035
<rdar://problem/58455306>
Reviewed by Brent Fulgham.
No new tests.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setResourceLoadStatisticsEnabled):
Added a check that m_sessionID exists.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (254610 => 254611)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:15:44 UTC (rev 254610)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-01-15 19:15:47 UTC (rev 254611)
@@ -1,5 +1,38 @@
2020-01-14 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254310. rdar://problem/58552856
+
+ Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=206035
+ <rdar://problem/58455306>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::setResourceLoadStatisticsEnabled):
+ Added a check that m_sessionID exists.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-09 John Wilander <wilan...@apple.com>
+
+ Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=206035
+ <rdar://problem/58455306>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::setResourceLoadStatisticsEnabled):
+ Added a check that m_sessionID exists.
+
+2020-01-14 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254293. rdar://problem/58549084
Resource Load Statistics: Flip experimental website data removal setting from an enable to a disable
Modified: branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp (254610 => 254611)
--- branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-15 19:15:44 UTC (rev 254610)
+++ branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-15 19:15:47 UTC (rev 254611)
@@ -1634,7 +1634,7 @@
void WebProcess::setResourceLoadStatisticsEnabled(bool enabled)
{
- if (WebCore::DeprecatedGlobalSettings::resourceLoadStatisticsEnabled() == enabled || m_sessionID->isEphemeral())
+ if (WebCore::DeprecatedGlobalSettings::resourceLoadStatisticsEnabled() == enabled || (m_sessionID && m_sessionID->isEphemeral()))
return;
WebCore::DeprecatedGlobalSettings::setResourceLoadStatisticsEnabled(enabled);
#if ENABLE(RESOURCE_LOAD_STATISTICS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
