Title: [240697] trunk/Source/WebCore
- Revision
- 240697
- Author
- bfulg...@apple.com
- Date
- 2019-01-29 17:42:44 -0800 (Tue, 29 Jan 2019)
Log Message
Make sure we have a frame before trying to access its loader
https://bugs.webkit.org/show_bug.cgi?id=193985
<rdar://problem/47618239>
Reviewed by Ryosuke Niwa.
* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240696 => 240697)
--- trunk/Source/WebCore/ChangeLog 2019-01-30 01:42:43 UTC (rev 240696)
+++ trunk/Source/WebCore/ChangeLog 2019-01-30 01:42:44 UTC (rev 240697)
@@ -1,3 +1,14 @@
+2019-01-29 Brent Fulgham <bfulg...@apple.com>
+
+ Make sure we have a frame before trying to access its loader
+ https://bugs.webkit.org/show_bug.cgi?id=193985
+ <rdar://problem/47618239>
+
+ Reviewed by Ryosuke Niwa.
+
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
+
2019-01-29 Andy Estes <aes...@apple.com>
Try to fix the watchOS build.
Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (240696 => 240697)
--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2019-01-30 01:42:43 UTC (rev 240696)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2019-01-30 01:42:44 UTC (rev 240697)
@@ -214,11 +214,12 @@
statistics.mostRecentUserInteractionTime = newTime;
#if ENABLE(RESOURCE_LOAD_STATISTICS)
- if (auto* opener = document.frame()->loader().opener()) {
- if (auto* openerDocument = opener->document()) {
- if (auto* openerFrame = openerDocument->frame()) {
- if (auto openerPageID = openerFrame->loader().client().pageID()) {
- requestStorageAccessUnderOpener(domain, openerPageID.value(), *openerDocument);
+ if (auto* frame = document.frame()) {
+ if (auto* opener = frame->loader().opener()) {
+ if (auto* openerDocument = opener->document()) {
+ if (auto* openerFrame = openerDocument->frame()) {
+ if (auto openerPageID = openerFrame->loader().client().pageID())
+ requestStorageAccessUnderOpener(domain, openerPageID.value(), *openerDocument);
}
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
