Changeset 223418 in webkit


Ignore:
Timestamp:
Oct 16, 2017 11:05:59 AM (6 years ago)
Author:
Brent Fulgham
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.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r223415 r223418  
     12017-10-16  Brent Fulgham  <bfulgham@apple.com>
     2
     3        REGRESSION(223307): ASSERTION in WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution
     4        https://bugs.webkit.org/show_bug.cgi?id=178342
     5        <rdar://problem/35008505>
     6
     7        Reviewed by Chris Dumez.
     8
     9        In r223307 I mistakenly used 'topDocument->topDocument()' because of a copy/paste error. I should have just used
     10        'topDocument'.
     11
     12        Tests: CommandBackForwardTestWKWebView in TestWebKitAPI.
     13
     14        * loader/ResourceLoadObserver.cpp:
     15        (WebCore::ResourceLoadObserver::logUserInteractionWithReducedTimeResolution): We might enter this routine at a time
     16        where there is no page. If so, we should return early and not log credit.
     17        * page/EventHandler.cpp:
     18        (WebCore::EventHandler::keyEvent): Correct the argument passed to the log function.
     19
    1202017-10-15  Filip Pizlo  <fpizlo@apple.com>
    221
  • trunk/Source/WebCore/loader/ResourceLoadObserver.cpp

    r223253 r223418  
    275275void ResourceLoadObserver::logUserInteractionWithReducedTimeResolution(const Document& document)
    276276{
     277    if (!shouldLog(document.page()))
     278        return;
     279
    277280    ASSERT(document.page());
    278 
    279     if (!shouldLog(document.page()))
    280         return;
    281281
    282282    auto& url = document.url();
  • trunk/Source/WebCore/page/EventHandler.cpp

    r223307 r223418  
    31313131            topDocument->setUserDidInteractWithPage(savedUserDidInteractWithPage);
    31323132        else
    3133             ResourceLoadObserver::shared().logUserInteractionWithReducedTimeResolution(topDocument->topDocument());
     3133            ResourceLoadObserver::shared().logUserInteractionWithReducedTimeResolution(*topDocument);
    31343134    }
    31353135
Note: See TracChangeset for help on using the changeset viewer.