Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoadTiming.cpp

Issue 1427243003: Revert of Let RenderFrameImpl set navigationStart based on CommonNavigationParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation_start_common_params
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/DocumentLoadTiming.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoadTiming.cpp b/third_party/WebKit/Source/core/loader/DocumentLoadTiming.cpp
index 011335672676f1c5a996ed6d478b87ddee0759fd..33f85356cf1b5a720608c174489791809809e6ee 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoadTiming.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoadTiming.cpp
@@ -87,12 +87,6 @@
void DocumentLoadTiming::markNavigationStart()
{
- // Allow the embedder to override navigationStart before we record it if
- // they have a more accurate timestamp.
- if (m_navigationStart) {
- ASSERT(m_referenceMonotonicTime && m_referenceWallTime);
- return;
- }
TRACE_EVENT_MARK("blink.user_timing", "navigationStart");
ASSERT(!m_navigationStart && !m_referenceMonotonicTime && !m_referenceWallTime);
@@ -104,16 +98,14 @@
void DocumentLoadTiming::setNavigationStart(double navigationStart)
{
TRACE_EVENT_MARK_WITH_TIMESTAMP("blink.user_timing", "navigationStart", navigationStart);
+ ASSERT(m_referenceMonotonicTime && m_referenceWallTime);
m_navigationStart = navigationStart;
// |m_referenceMonotonicTime| and |m_referenceWallTime| represent
// navigationStart. When the embedder sets navigationStart (because the
// navigation started earlied on the browser side), we need to adjust these
// as well.
- if (!m_referenceWallTime)
- m_referenceWallTime = currentTime();
- else
- m_referenceWallTime = monotonicTimeToPseudoWallTime(navigationStart);
+ m_referenceWallTime = monotonicTimeToPseudoWallTime(navigationStart);
m_referenceMonotonicTime = navigationStart;
notifyDocumentTimingChanged();
}
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698