Report nav timing 2 instance as soon as it's requested.

third_party/WebKit/Source/core/timing/PerformanceBase.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 33 matching lines @@
 #include "core/timing/PerformanceUserTiming.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/CurrentTime.h"
 #include <algorithm>
 
 namespace blink {
 
-namespace {
-
-SecurityOrigin* getSecurityOrigin(ExecutionContext* context) {
-  if (context)
-    return context->getSecurityOrigin();
-  return nullptr;
-}
-
-}  // namespace
-
 using PerformanceObserverVector = HeapVector<Member<PerformanceObserver>>;
 
 static const size_t defaultResourceTimingBufferSize = 150;
 static const size_t defaultFrameTimingBufferSize = 150;
 
 PerformanceBase::PerformanceBase(double timeOrigin,
                                  RefPtr<WebTaskRunner> taskRunner)
     : m_frameTimingBufferSize(defaultFrameTimingBufferSize),
       m_resourceTimingBufferSize(defaultResourceTimingBufferSize),
       m_userTiming(nullptr),
       m_timeOrigin(timeOrigin),
       m_observerFilterOptions(PerformanceEntry::Invalid),
       m_deliverObservationsTimer(
           std::move(taskRunner),
           this,
           &PerformanceBase::deliverObservationsTimerFired) {}
 
 PerformanceBase::~PerformanceBase() {}
 
-PerformanceNavigationTiming::NavigationType PerformanceBase::getNavigationType(
-    NavigationType type,

[panicker, 2017/02/03 23:53:52]

could you move this to a separate CL?

[sunjian, 2017/02/10 18:32:46]

It's actually easier to keep this change. getNavigationType is not even being
used as you can see. It would be pretty awkward to keep it.

-    const Document* document) {
-  if (document &&
-      document->pageVisibilityState() == PageVisibilityStatePrerender) {
-    return PerformanceNavigationTiming::NavigationType::Prerender;
-  }
-  switch (type) {
-    case NavigationTypeReload:
-      return PerformanceNavigationTiming::NavigationType::Reload;
-    case NavigationTypeBackForward:
-      return PerformanceNavigationTiming::NavigationType::BackForward;
-    case NavigationTypeLinkClicked:
-    case NavigationTypeFormSubmitted:
-    case NavigationTypeFormResubmitted:
-    case NavigationTypeOther:
-      return PerformanceNavigationTiming::NavigationType::Navigate;
-  }
-  NOTREACHED();
-  return PerformanceNavigationTiming::NavigationType::Navigate;
+const AtomicString& PerformanceBase::interfaceName() const {
+  return EventTargetNames::Performance;
 }
 
-const AtomicString& PerformanceBase::interfaceName() const {
-  return EventTargetNames::Performance;
+SecurityOrigin* PerformanceBase::getSecurityOrigin(ExecutionContext* context) {
+  if (context)
+    return context->getSecurityOrigin();
+  return nullptr;
 }
 
 PerformanceTiming* PerformanceBase::timing() const {
   return nullptr;
 }
 
-PerformanceEntryVector PerformanceBase::getEntries() const {
+PerformanceEntryVector PerformanceBase::getEntries() {
   PerformanceEntryVector entries;
 
   entries.appendVector(m_resourceTimingBuffer);
+  if (!m_navigationTiming)
+    m_navigationTiming = getNavigationTimingInstance();
+  // This extra checking is needed when WorkerPerformance
+  // calls this method.
   if (m_navigationTiming)
     entries.push_back(m_navigationTiming);
   entries.appendVector(m_frameTimingBuffer);
 
   if (m_userTiming) {
     entries.appendVector(m_userTiming->getMarks());
     entries.appendVector(m_userTiming->getMeasures());
   }
 
   std::sort(entries.begin(), entries.end(),
             PerformanceEntry::startTimeCompareLessThan);
   return entries;
 }
 
 PerformanceEntryVector PerformanceBase::getEntriesByType(
     const String& entryType) {
   PerformanceEntryVector entries;
   PerformanceEntry::EntryType type =
       PerformanceEntry::toEntryTypeEnum(entryType);
 
   switch (type) {
     case PerformanceEntry::Resource:
       for (const auto& resource : m_resourceTimingBuffer)
         entries.push_back(resource);
       break;
     case PerformanceEntry::Navigation:
+      if (!m_navigationTiming)
+        m_navigationTiming = getNavigationTimingInstance();
       if (m_navigationTiming)
         entries.push_back(m_navigationTiming);
       break;
     case PerformanceEntry::Composite:
     case PerformanceEntry::Render:
       for (const auto& frame : m_frameTimingBuffer) {
         if (type == frame->entryTypeEnum()) {
           entries.push_back(frame);
         }
       }
@@ skipping 35 matching lines @@
     return entries;
 
   if (entryType.isNull() || type == PerformanceEntry::Resource) {
     for (const auto& resource : m_resourceTimingBuffer) {
       if (resource->name() == name)
         entries.push_back(resource);
     }
   }
 
   if (entryType.isNull() || type == PerformanceEntry::Navigation) {
+    if (!m_navigationTiming)
+      m_navigationTiming = getNavigationTimingInstance();
     if (m_navigationTiming && m_navigationTiming->name() == name)
       entries.push_back(m_navigationTiming);
   }
 
   if (entryType.isNull() || type == PerformanceEntry::Composite ||
       type == PerformanceEntry::Render) {
     for (const auto& frame : m_frameTimingBuffer) {
       if (frame->name() == name &&
           (entryType.isNull() || entryType == frame->entryType()))
         entries.push_back(frame);
@@ skipping 129 matching lines @@
   double lastRedirectEndTime = lastRedirectTiming->receiveHeadersEnd();
 
   PerformanceEntry* entry = PerformanceResourceTiming::create(
       info, timeOrigin(), startTime, lastRedirectEndTime, allowTimingDetails,
       allowRedirectDetails);
   notifyObserversOfEntry(*entry);
   if (!isResourceTimingBufferFull())
     addResourceTimingBuffer(*entry);
 }
 
-void PerformanceBase::addNavigationTiming(LocalFrame* frame) {
-  if (!RuntimeEnabledFeatures::performanceNavigationTiming2Enabled())
-    return;
-  DCHECK(frame);
-  const DocumentLoader* documentLoader = frame->loader().documentLoader();
-  DCHECK(documentLoader);
-
-  const DocumentLoadTiming& documentLoadTiming = documentLoader->timing();
-
-  const DocumentTiming* documentTiming =
-      frame->document() ? &(frame->document()->timing()) : nullptr;
-
-  ResourceTimingInfo* navigationTimingInfo =
-      documentLoader->getNavigationTimingInfo();
-  if (!navigationTimingInfo)
-    return;
-
-  const ResourceResponse& finalResponse = navigationTimingInfo->finalResponse();
-
-  ResourceLoadTiming* resourceLoadTiming = finalResponse.resourceLoadTiming();
-  // Don't create a navigation timing instance when
-  // resourceLoadTiming is null, which could happen when visiting non-http sites
-  // such as about:blank or in some error cases.
-  if (!resourceLoadTiming)
-    return;
-  double lastRedirectEndTime = documentLoadTiming.redirectEnd();
-  double finishTime = documentLoadTiming.loadEventEnd();
-
-  ExecutionContext* context = getExecutionContext();
-  SecurityOrigin* securityOrigin = getSecurityOrigin(context);
-  if (!securityOrigin)
-    return;
-
-  bool allowRedirectDetails =
-      allowsTimingRedirect(navigationTimingInfo->redirectChain(), finalResponse,
-                           *securityOrigin, context);
-
-  unsigned long long transferSize = navigationTimingInfo->transferSize();
-  unsigned long long encodedBodyLength = finalResponse.encodedBodyLength();
-  unsigned long long decodedBodyLength = finalResponse.decodedBodyLength();
-  bool didReuseConnection = finalResponse.connectionReused();
-  PerformanceNavigationTiming::NavigationType type =
-      getNavigationType(documentLoader->getNavigationType(), frame->document());
-
-  m_navigationTiming = new PerformanceNavigationTiming(
-      timeOrigin(), documentLoadTiming.unloadEventStart(),
-      documentLoadTiming.unloadEventEnd(), documentLoadTiming.loadEventStart(),
-      documentLoadTiming.loadEventEnd(), documentLoadTiming.redirectCount(),
-      documentTiming ? documentTiming->domInteractive() : 0,
-      documentTiming ? documentTiming->domContentLoadedEventStart() : 0,
-      documentTiming ? documentTiming->domContentLoadedEventEnd() : 0,
-      documentTiming ? documentTiming->domComplete() : 0, type,
-      documentLoadTiming.redirectStart(), documentLoadTiming.redirectEnd(),
-      documentLoadTiming.fetchStart(), documentLoadTiming.responseEnd(),
-      allowRedirectDetails,
-      documentLoadTiming.hasSameOriginAsPreviousDocument(), resourceLoadTiming,
-      lastRedirectEndTime, finishTime, transferSize, encodedBodyLength,
-      decodedBodyLength, didReuseConnection);
-  notifyObserversOfEntry(*m_navigationTiming);
+// Called after loadEventEnd happens.
+void PerformanceBase::notifyNavigationTimingToObserver() {

[panicker, 2017/02/03 23:53:52]

s/ToObserver/ToObservers/

[sunjian, 2017/02/10 18:32:46]

Done.

+  if (!m_navigationTiming)
+    m_navigationTiming = getNavigationTimingInstance();
+  if (m_navigationTiming)
+    notifyObserversOfEntry(*m_navigationTiming);
 }
 
 void PerformanceBase::addFirstPaintTiming(double startTime) {
   addPaintTiming(PerformancePaintTiming::PaintType::FirstPaint, startTime);
 }
 
 void PerformanceBase::addFirstContentfulPaintTiming(double startTime) {
   addPaintTiming(PerformancePaintTiming::PaintType::FirstContentfulPaint,
                  startTime);
 }
@@ skipping 184 matching lines @@
   visitor->trace(m_resourceTimingBuffer);
   visitor->trace(m_navigationTiming);
   visitor->trace(m_userTiming);
   visitor->trace(m_observers);
   visitor->trace(m_activeObservers);
   visitor->trace(m_suspendedObservers);
   EventTargetWithInlineData::trace(visitor);
 }
 
 }  // namespace blink