Changeset 63878 in webkit

Timestamp:

Jul 22, 2010 12:40:52 AM (14 years ago)

Author:

tonyg@chromium.org

Message:

2010-07-22 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by Darin Fisher.

webkitPerformance.timing.responseEnd should not include document parse time
​https://bugs.webkit.org/show_bug.cgi?id=42797

No new tests because timing based test would be flaky.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::finishedLoading): finishedLoading() is called by the platform at the right time, but didReceiveData() synchronously invokes parsing without returning to the event loop prior to this. So by the time the didFinishLoading() method is executed, parsing is finished. The solution is to move this time to didReceiveData() prior to parsing.
• loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::didReceiveData): Update the time each time didReceiveData() is called. (WebCore::MainResourceLoader::didFinishLoading): When finished, and after parsing, set responseEnd appropriately.
• loader/MainResourceLoader.h:
• page/Timing.cpp: (WebCore::Timing::resourceLoadTimeRelativeToAbsolute): Now that responseEnd is set correctly, it can be much shorter for very fast loads (like local files). This exposed the fact that this skew check was not tight enough. We need to make sure that the whole range of values from the ResourceLoadTiming API fit within fetchStart-responseEnd, not just that requestTime fits in this range.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• loader/MainResourceLoader.cpp (modified) (2 diffs)
• loader/MainResourceLoader.h (modified) (1 diff)
• page/Timing.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-22  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        webkitPerformance.timing.responseEnd should not include document parse time
+        https://bugs.webkit.org/show_bug.cgi?id=42797
+
+        No new tests because timing based test would be flaky.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::finishedLoading): finishedLoading() is called by the platform at the right time, but didReceiveData() synchronously invokes parsing without returning to the event loop prior to this. So by the time the didFinishLoading() method is executed, parsing is finished. The solution is to move this time to didReceiveData() prior to parsing.
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didReceiveData): Update the time each time didReceiveData() is called.
+        (WebCore::MainResourceLoader::didFinishLoading): When finished, and after parsing, set responseEnd appropriately.
+        * loader/MainResourceLoader.h:
+        * page/Timing.cpp:
+        (WebCore::Timing::resourceLoadTimeRelativeToAbsolute): Now that responseEnd is set correctly, it can be much shorter for very fast loads (like local files). This exposed the fact that this skew check was not tight enough. We need to make sure that the whole range of values from the ResourceLoadTiming API fit within fetchStart-responseEnd, not just that requestTime fits in this range.
+
 2010-07-21  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2222 +2222 @@
 
     RefPtr<DocumentLoader> dl = activeDocumentLoader();
-    ASSERT(!dl->timing()->responseEnd);
-    dl->timing()->responseEnd = currentTime();
     dl->finishedLoading();
     if (!dl->mainDocumentError().isNull() || !dl->frameLoader())

trunk/WebCore/loader/MainResourceLoader.cpp

@@ -414 +414 @@
     RefPtr<MainResourceLoader> protect(this);
 
+    m_timeOfLastDataReceived = currentTime();
+
     ResourceLoader::didReceiveData(data, length, lengthReceived, allAtOnce);
 }
@@ -433 +435 @@
 #endif
 
+    ASSERT(!documentLoader()->timing()->responseEnd);
+    documentLoader()->timing()->responseEnd = m_timeOfLastDataReceived;
     frameLoader()->finishedLoading();
     ResourceLoader::didFinishLoading();

trunk/WebCore/loader/MainResourceLoader.h

@@ -108 +108 @@
         bool m_loadingMultipartContent;
         bool m_waitingForContentPolicy;
+        double m_timeOfLastDataReceived;
     };
 

trunk/WebCore/page/Timing.cpp

@@ -291 +291 @@
     // Since ResourceLoadTimings came from the network platform layer, we must
     // check them for skew because they may be from another thread/process.
-    double baseTime = getPossiblySkewedTimeInKnownRange(resourceTiming->requestTime, documentTiming->fetchStart, documentTiming->responseEnd);
+    double baseTime = getPossiblySkewedTimeInKnownRange(resourceTiming->requestTime, documentTiming->fetchStart, documentTiming->responseEnd - (resourceTiming->receiveHeadersEnd / 1000.0));
     return toIntegerMilliseconds(baseTime) + relativeSeconds;
 }