Add Prerender type to NavigationType for nav timing 2

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/PerformanceResourceTiming.h"
 #include "core/timing/PerformanceUserTiming.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/CurrentTime.h"
 #include <algorithm>
 
 namespace blink {
 
+namespace {

[panicker, 2016/11/18 21:01:05]

nit: add blank line 

[sunjian, 2016/11/18 21:17:58]

Done.

+PerformanceNavigationTiming::PerformanceNavigationType getNavigationType(NavigationType type,
+                                            Document* document) {
+  if (document &&
+      document->pageVisibilityState() == PageVisibilityStatePrerender) {
+    return PerformanceNavigationTiming::KTypePrerender;
+  }
+  switch (type) {
+    case NavigationTypeReload:
+      return PerformanceNavigationTiming::KTypeReload;
+    case NavigationTypeBackForward:
+      return PerformanceNavigationTiming::KTypeBackForward;
+    default:
+      return PerformanceNavigationTiming::KTypeNavigate;
+  }
+}
+}
+
 using PerformanceObserverVector = HeapVector<Member<PerformanceObserver>>;
 
 static const size_t defaultResourceTimingBufferSize = 150;
 static const size_t defaultFrameTimingBufferSize = 150;
 
 PerformanceBase::PerformanceBase(double timeOrigin)
     : m_frameTimingBufferSize(defaultFrameTimingBufferSize),
       m_resourceTimingBufferSize(defaultResourceTimingBufferSize),
       m_userTiming(nullptr),
       m_timeOrigin(timeOrigin),
@@ skipping 264 matching lines @@
   if (!resourceLoadTiming)
     return;
   double lastRedirectEndTime = documentLoadTiming.redirectEnd();
   double finishTime = documentLoadTiming.loadEventEnd();
 
   // TODO(sunjian) Implement transfer size. crbug/663187
   unsigned long long transferSize = 0;
   unsigned long long encodedBodyLength = finalResponse.encodedBodyLength();
   unsigned long long decodedBodyLength = finalResponse.decodedBodyLength();
   bool didReuseConnection = finalResponse.connectionReused();
+  PerformanceNavigationTiming::PerformanceNavigationType 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,
-      documentLoader->getNavigationType(), documentLoadTiming.redirectStart(),
-      documentLoadTiming.redirectEnd(), documentLoadTiming.fetchStart(),
-      documentLoadTiming.responseEnd(),
+      documentTiming ? documentTiming->domComplete() : 0, type,
+      documentLoadTiming.redirectStart(), documentLoadTiming.redirectEnd(),
+      documentLoadTiming.fetchStart(), documentLoadTiming.responseEnd(),
       documentLoadTiming.hasCrossOriginRedirect(),
       documentLoadTiming.hasSameOriginAsPreviousDocument(), resourceLoadTiming,
       lastRedirectEndTime, finishTime, transferSize, encodedBodyLength,
       decodedBodyLength, didReuseConnection);
   notifyObserversOfEntry(*m_navigationTiming);
 }
 
 void PerformanceBase::addResourceTimingBuffer(PerformanceEntry& entry) {
   m_resourceTimingBuffer.append(&entry);
 
@@ skipping 168 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