Title: [197597] trunk/Source/WebKit/mac
- Revision
- 197597
- Author
- [email protected]
- Date
- 2016-03-04 16:36:48 -0800 (Fri, 04 Mar 2016)
Log Message
Unreviewed test fix for null global WebResourceLoadStatisticsStore.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
(+[WebView _applicationWillTerminate]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (197596 => 197597)
--- trunk/Source/WebKit/mac/ChangeLog 2016-03-04 23:55:55 UTC (rev 197596)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-05 00:36:48 UTC (rev 197597)
@@ -1,5 +1,13 @@
2016-03-04 Brent Fulgham <[email protected]>
+ Unreviewed test fix for null global WebResourceLoadStatisticsStore.
+
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+ (+[WebView _applicationWillTerminate]):
+
+2016-03-04 Brent Fulgham <[email protected]>
+
[WK2] Gather resource load statistics
https://bugs.webkit.org/show_bug.cgi?id=154278
<rdar://problem/24702892>
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (197596 => 197597)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-04 23:55:55 UTC (rev 197596)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-05 00:36:48 UTC (rev 197597)
@@ -2477,7 +2477,8 @@
settings.setHiddenPageCSSAnimationSuspensionEnabled([preferences hiddenPageCSSAnimationSuspensionEnabled]);
settings.setResourceLoadStatisticsEnabled([preferences resourceLoadStatisticsEnabled]);
- resourceLoadStatisticsStore->readDataFromDiskIfNeeded();
+ if (resourceLoadStatisticsStore)
+ resourceLoadStatisticsStore->readDataFromDiskIfNeeded();
#if ENABLE(GAMEPAD)
RuntimeEnabledFeatures::sharedFeatures().setGamepadsEnabled([preferences gamepadsEnabled]);
@@ -4847,7 +4848,8 @@
{
applicationIsTerminating = YES;
- resourceLoadStatisticsStore->writeDataToDisk();
+ if (resourceLoadStatisticsStore)
+ resourceLoadStatisticsStore->writeDataToDisk();
if (fastDocumentTeardownEnabled())
[self closeAllWebViews];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
