Title: [223418] trunk/Source/WebCore
- Revision
- 223418
- Author
- [email protected]
- Date
- 2017-10-16 11:05:59 -0700 (Mon, 16 Oct 2017)
Log Message
REGRESSION(223307): ASSERTION in WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution
https://bugs.webkit.org/show_bug.cgi?id=178342
<rdar://problem/35008505>
Reviewed by Chris Dumez.
In r223307 I mistakenly used 'topDocument->topDocument()' because of a copy/paste error. I should have just used
'topDocument'.
Tests: CommandBackForwardTestWKWebView in TestWebKitAPI.
* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution): We might enter this routine at a time
where there is no page. If so, we should return early and not log credit.
* page/EventHandler.cpp:
(WebCore::EventHandler::keyEvent): Correct the argument passed to the log function.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223417 => 223418)
--- trunk/Source/WebCore/ChangeLog 2017-10-16 18:00:34 UTC (rev 223417)
+++ trunk/Source/WebCore/ChangeLog 2017-10-16 18:05:59 UTC (rev 223418)
@@ -1,3 +1,22 @@
+2017-10-16 Brent Fulgham <[email protected]>
+
+ REGRESSION(223307): ASSERTION in WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution
+ https://bugs.webkit.org/show_bug.cgi?id=178342
+ <rdar://problem/35008505>
+
+ Reviewed by Chris Dumez.
+
+ In r223307 I mistakenly used 'topDocument->topDocument()' because of a copy/paste error. I should have just used
+ 'topDocument'.
+
+ Tests: CommandBackForwardTestWKWebView in TestWebKitAPI.
+
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution): We might enter this routine at a time
+ where there is no page. If so, we should return early and not log credit.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::keyEvent): Correct the argument passed to the log function.
+
2017-10-15 Filip Pizlo <[email protected]>
Make some asserts into release asserts
Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (223417 => 223418)
--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2017-10-16 18:00:34 UTC (rev 223417)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2017-10-16 18:05:59 UTC (rev 223418)
@@ -274,11 +274,11 @@
void ResourceLoadObserver::logUserInteractionWithReducedTimeResolution(const Document& document)
{
- ASSERT(document.page());
-
if (!shouldLog(document.page()))
return;
+ ASSERT(document.page());
+
auto& url = ""
if (url.isBlankURL() || url.isEmpty())
return;
Modified: trunk/Source/WebCore/page/EventHandler.cpp (223417 => 223418)
--- trunk/Source/WebCore/page/EventHandler.cpp 2017-10-16 18:00:34 UTC (rev 223417)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2017-10-16 18:05:59 UTC (rev 223418)
@@ -3130,7 +3130,7 @@
if (!wasHandled)
topDocument->setUserDidInteractWithPage(savedUserDidInteractWithPage);
else
- ResourceLoadObserver::shared().logUserInteractionWithReducedTimeResolution(topDocument->topDocument());
+ ResourceLoadObserver::shared().logUserInteractionWithReducedTimeResolution(*topDocument);
}
return wasHandled;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
