Changeset 281147 in webkit

Timestamp:

Aug 17, 2021, 10:30:54 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Document load events should update timing in PerformanceNavigationTiming even after its instantiation
​https://bugs.webkit.org/show_bug.cgi?id=229181

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-08-17
Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

• web-platform-tests/navigation-timing/nav2_test_attributes_values-expected.txt:

Source/WebCore:

When we make a PerformanceNavigationTiming object, we copy the DocumentLoadTiming and DocumentEventTiming values.
If PerformanceNavigationTiming is accessed before the document has finished loading, we still need to update the timing values.

Covered by a newly passing WPT test, which Chrome and Firefox already pass.

• dom/Document.cpp:

(WebCore::Document::documentEventTimingFromNavigationTiming):
(WebCore::Document::setReadyState):
(WebCore::Document::finishedParsing):

• dom/Document.h:
• loader/DocumentLoadTiming.h:

(WebCore::DocumentLoadTiming::setLoadEventStart):
(WebCore::DocumentLoadTiming::setLoadEventEnd):
(WebCore::DocumentLoadTiming::markLoadEventStart): Deleted.
(WebCore::DocumentLoadTiming::markLoadEventEnd): Deleted.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::dispatchLoadEvent):

• page/Performance.h:
• page/PerformanceNavigationTiming.h:

LayoutTests:

• TestExpectations:
• platform/mac-wk1/TestExpectations:

This test now always passes in WK2.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (5 diffs)
• Source/WebCore/dom/Document.h (modified) (1 diff)
• Source/WebCore/loader/DocumentLoadTiming.h (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (2 diffs)
• Source/WebCore/page/Performance.h (modified) (1 diff)
• Source/WebCore/page/PerformanceNavigationTiming.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Document load events should update timing in PerformanceNavigationTiming even after its instantiation
+        https://bugs.webkit.org/show_bug.cgi?id=229181
+
+        Reviewed by Chris Dumez.
+
+        * TestExpectations:
+        * platform/mac-wk1/TestExpectations:
+        This test now always passes in WK2.
+
 2021-08-17  Eric Hutchison  <ehutchison@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1133 +1133 @@
 imported/w3c/web-platform-tests/resource-timing/crossorigin-sandwich-partial-TAO.sub.html [ Pass Failure ]
 imported/w3c/web-platform-tests/navigation-timing/secure_connection_start_non_zero.https.html [ Pass Failure ]
-imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values.html [ Pass Failure ]
 imported/w3c/web-platform-tests/resource-timing/TAO-match.html [ Pass Failure ]
 imported/w3c/web-platform-tests/resource-timing/iframe-failed-commit.html [ Pass Failure ]

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Document load events should update timing in PerformanceNavigationTiming even after its instantiation
+        https://bugs.webkit.org/show_bug.cgi?id=229181
+
+        Reviewed by Chris Dumez.
+
+        * web-platform-tests/navigation-timing/nav2_test_attributes_values-expected.txt:
+
 2021-08-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values-expected.txt

@@ -4 +4 @@
 
 
-FAIL Performance navigation timing instance's value is reasonable. assert_greater_than: Expected domInteractive to be greater than 0 expected a number greater than 0 but got 0
+PASS Performance navigation timing instance's value is reasonable.
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -582 +582 @@
 # NSURLConnection doesn't have an API to give us good timing for redirects. We do what we can with MonotonicTime::now() but this still fails sometimes.
 imported/w3c/web-platform-tests/navigation-timing/nav2_test_redirect_server.html [ Pass Failure ]
+imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values.html [ Pass Failure ]
 
 webkit.org/b/160101 userscripts/window-onerror-for-isolated-world-3.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-17  Alex Christensen  <achristensen@webkit.org>
+
+        Document load events should update timing in PerformanceNavigationTiming even after its instantiation
+        https://bugs.webkit.org/show_bug.cgi?id=229181
+
+        Reviewed by Chris Dumez.
+
+        When we make a PerformanceNavigationTiming object, we copy the DocumentLoadTiming and DocumentEventTiming values.
+        If PerformanceNavigationTiming is accessed before the document has finished loading, we still need to update the timing values.
+
+        Covered by a newly passing WPT test, which Chrome and Firefox already pass.
+
+        * dom/Document.cpp:
+        (WebCore::Document::documentEventTimingFromNavigationTiming):
+        (WebCore::Document::setReadyState):
+        (WebCore::Document::finishedParsing):
+        * dom/Document.h:
+        * loader/DocumentLoadTiming.h:
+        (WebCore::DocumentLoadTiming::setLoadEventStart):
+        (WebCore::DocumentLoadTiming::setLoadEventEnd):
+        (WebCore::DocumentLoadTiming::markLoadEventStart): Deleted.
+        (WebCore::DocumentLoadTiming::markLoadEventEnd): Deleted.
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::dispatchLoadEvent):
+        * page/Performance.h:
+        * page/PerformanceNavigationTiming.h:
+
 2021-08-17  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -162 +162 @@
 #include "PaintWorkletGlobalScope.h"
 #include "Performance.h"
+#include "PerformanceNavigationTiming.h"
 #include "PlatformLocale.h"
 #include "PlatformMediaSessionManager.h"
@@ -1375 +1376 @@
 }
 
+DocumentEventTiming* Document::documentEventTimingFromNavigationTiming()
+{
+    auto* window = domWindow();
+    if (!window)
+        return nullptr;
+    auto* navigationTiming = window->performance().navigationTiming();
+    if (!navigationTiming)
+        return nullptr;
+    return &navigationTiming->documentEventTiming();
+}
+
 void Document::setReadyState(ReadyState readyState)
 {
@@ -1382 +1394 @@
     switch (readyState) {
     case Loading:
-        if (!m_eventTiming.domLoading)
-            m_eventTiming.domLoading = MonotonicTime::now();
+        if (!m_eventTiming.domLoading) {
+            auto now = MonotonicTime::now();
+            m_eventTiming.domLoading = now;
+            if (auto* eventTiming = documentEventTimingFromNavigationTiming())
+                eventTiming->domLoading = now;
+        }
         break;
     case Complete:
-        if (!m_eventTiming.domComplete)
-            m_eventTiming.domComplete = MonotonicTime::now();
+        if (!m_eventTiming.domComplete) {
+            auto now = MonotonicTime::now();
+            m_eventTiming.domComplete = now;
+            if (auto* eventTiming = documentEventTimingFromNavigationTiming())
+                eventTiming->domComplete = now;
+        }
         FALLTHROUGH;
     case Interactive:
-        if (!m_eventTiming.domInteractive)
-            m_eventTiming.domInteractive = MonotonicTime::now();
+        if (!m_eventTiming.domInteractive) {
+            auto now = MonotonicTime::now();
+            m_eventTiming.domInteractive = now;
+            if (auto* eventTiming = documentEventTimingFromNavigationTiming())
+                eventTiming->domInteractive = now;
+        }
         break;
     }
@@ -6071 +6095 @@
     scriptRunner().documentFinishedParsing();
 
-    if (!m_eventTiming.domContentLoadedEventStart)
-        m_eventTiming.domContentLoadedEventStart = MonotonicTime::now();
+    if (!m_eventTiming.domContentLoadedEventStart) {
+        auto now = MonotonicTime::now();
+        m_eventTiming.domContentLoadedEventStart = now;
+        if (auto* eventTiming = documentEventTimingFromNavigationTiming())
+            eventTiming->domContentLoadedEventStart = now;
+    }
 
     // FIXME: Schedule a task to fire DOMContentLoaded event instead. See webkit.org/b/82931
@@ -6078 +6106 @@
     dispatchEvent(Event::create(eventNames().DOMContentLoadedEvent, Event::CanBubble::Yes, Event::IsCancelable::No));
 
-    if (!m_eventTiming.domContentLoadedEventEnd)
-        m_eventTiming.domContentLoadedEventEnd = MonotonicTime::now();
+    if (!m_eventTiming.domContentLoadedEventEnd) {
+        auto now = MonotonicTime::now();
+        m_eventTiming.domContentLoadedEventEnd = now;
+        if (auto* eventTiming = documentEventTimingFromNavigationTiming())
+            eventTiming->domContentLoadedEventEnd = now;
+    }
 
     if (RefPtr<Frame> frame = this->frame()) {

trunk/Source/WebCore/dom/Document.h

@@ -1660 +1660 @@
     void detachParser();
 
+    DocumentEventTiming* documentEventTimingFromNavigationTiming();
+
     // ScriptExecutionContext
     CSSFontSelector* cssFontSelector() final { return m_fontSelector.ptr(); }

trunk/Source/WebCore/loader/DocumentLoadTiming.h

@@ -38 +38 @@
     void markUnloadEventStart() { m_unloadEventStart = MonotonicTime::now(); }
     void markUnloadEventEnd() { m_unloadEventEnd = MonotonicTime::now(); }
-    void markLoadEventStart() { m_loadEventStart = MonotonicTime::now(); }
-    void markLoadEventEnd() { m_loadEventEnd = MonotonicTime::now(); }
+    void setLoadEventStart(MonotonicTime time) { m_loadEventStart = time; }
+    void setLoadEventEnd(MonotonicTime time) { m_loadEventEnd = time; }
 
     void setHasSameOriginAsPreviousDocument(bool value) { m_hasSameOriginAsPreviousDocument = value; }

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -87 +87 @@
 #include "PageTransitionEvent.h"
 #include "Performance.h"
+#include "PerformanceNavigationTiming.h"
 #include "RequestAnimationFrameCallback.h"
 #include "ResourceLoadInfo.h"
@@ -2260 +2261 @@
     bool shouldMarkLoadEventTimes = protectedLoader && !protectedLoader->timing().loadEventStart();
 
-    if (shouldMarkLoadEventTimes)
-        protectedLoader->timing().markLoadEventStart();
+    if (shouldMarkLoadEventTimes) {
+        auto now = MonotonicTime::now();
+        protectedLoader->timing().setLoadEventStart(now);
+        if (auto* navigationTiming = performance().navigationTiming())
+            navigationTiming->documentLoadTiming().setLoadEventStart(now);
+    }
 
     dispatchEvent(Event::create(eventNames().loadEvent, Event::CanBubble::No, Event::IsCancelable::No), document());
 
-    if (shouldMarkLoadEventTimes)
-        protectedLoader->timing().markLoadEventEnd();
+    if (shouldMarkLoadEventTimes) {
+        auto now = MonotonicTime::now();
+        protectedLoader->timing().setLoadEventEnd(now);
+        if (auto* navigationTiming = performance().navigationTiming())
+            navigationTiming->documentLoadTiming().setLoadEventEnd(now);
+    }
 
     // Send a separate load event to the element that owns this frame.

trunk/Source/WebCore/page/Performance.h

@@ -117 +117 @@
     void scheduleNavigationObservationTaskIfNeeded();
 
+    PerformanceNavigationTiming* navigationTiming() { return m_navigationTiming.get(); }
+
 private:
     Performance(ScriptExecutionContext*, MonotonicTime timeOrigin);

trunk/Source/WebCore/page/PerformanceNavigationTiming.h

@@ -69 +69 @@
     double duration() const final;
 
+    DocumentEventTiming& documentEventTiming() { return m_documentEventTiming; }
+    DocumentLoadTiming& documentLoadTiming() { return m_documentLoadTiming; }
+
 private:
     PerformanceNavigationTiming(MonotonicTime timeOrigin, CachedResource&, const DocumentLoadTiming&, const NetworkLoadMetrics&, const DocumentEventTiming&, const SecurityOrigin&, WebCore::NavigationType);