Title: [241064] branches/safari-607-branch/Source/WebCore
- Revision
- 241064
- Author
- alanc...@apple.com
- Date
- 2019-02-06 14:16:39 -0800 (Wed, 06 Feb 2019)
Log Message
Cherry-pick r240697. rdar://problem/47774541
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240697 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (241063 => 241064)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-06 22:16:37 UTC (rev 241063)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-06 22:16:39 UTC (rev 241064)
@@ -1,5 +1,32 @@
2019-02-05 Alan Coon <alanc...@apple.com>
+ Cherry-pick r240697. rdar://problem/47774541
+
+ 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240697 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-02-05 Alan Coon <alanc...@apple.com>
+
Cherry-pick r240643. rdar://problem/47774515
webkitcurrentplaybacktargetiswirelesschanged and webkitCurrentPlaybackIsWireless are non-deterministic.
Modified: branches/safari-607-branch/Source/WebCore/loader/ResourceLoadObserver.cpp (241063 => 241064)
--- branches/safari-607-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2019-02-06 22:16:37 UTC (rev 241063)
+++ branches/safari-607-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2019-02-06 22:16:39 UTC (rev 241064)
@@ -181,11 +181,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
