Skip to content
Permalink
Browse files
REGRESSION(223307): ASSERTION in WebCore::ResourceLoadObserver::logUs…
…erInteractionWithReducedTimeResolution

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.


Canonical link: https://commits.webkit.org/194563@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223418 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
brentfulgham committed Oct 16, 2017
1 parent 3601440 commit a28c48e06ef5597b2480fb4c784d1b1530805e1a
Showing with 22 additions and 3 deletions.
  1. +19 −0 Source/WebCore/ChangeLog
  2. +2 −2 Source/WebCore/loader/ResourceLoadObserver.cpp
  3. +1 −1 Source/WebCore/page/EventHandler.cpp
@@ -1,3 +1,22 @@
2017-10-16 Brent Fulgham <bfulgham@apple.com>

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 <fpizlo@apple.com>

Make some asserts into release asserts
@@ -274,11 +274,11 @@ void ResourceLoadObserver::logWebSocketLoading(const Frame* frame, const URL& ta

void ResourceLoadObserver::logUserInteractionWithReducedTimeResolution(const Document& document)
{
ASSERT(document.page());

if (!shouldLog(document.page()))
return;

ASSERT(document.page());

auto& url = document.url();
if (url.isBlankURL() || url.isEmpty())
return;
@@ -3130,7 +3130,7 @@ bool EventHandler::keyEvent(const PlatformKeyboardEvent& keyEvent)
if (!wasHandled)
topDocument->setUserDidInteractWithPage(savedUserDidInteractWithPage);
else
ResourceLoadObserver::shared().logUserInteractionWithReducedTimeResolution(topDocument->topDocument());
ResourceLoadObserver::shared().logUserInteractionWithReducedTimeResolution(*topDocument);
}

return wasHandled;

0 comments on commit a28c48e

Please sign in to comment.