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

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

 /*
  * 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 70 matching lines @@
 
   // Translate given platform monotonic time in seconds into a high resolution
   // DOMHighResTimeStamp in milliseconds. The result timestamp is relative to
   // document's time origin and has a time resolution that is safe for
   // exposing to web.
   DOMHighResTimeStamp monotonicTimeToDOMHighResTimeStamp(double) const;
   DOMHighResTimeStamp now() const;
 
   double timeOrigin() const { return m_timeOrigin; }
 
-  PerformanceEntryVector getEntries() const;
+  PerformanceEntryVector getEntries();
   PerformanceEntryVector getEntriesByType(const String& entryType);
   PerformanceEntryVector getEntriesByName(const String& name,
                                           const String& entryType);
 
   void clearResourceTimings();
   void setResourceTimingBufferSize(unsigned);
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(resourcetimingbufferfull);
 
   void clearFrameTimings();
   void setFrameTimingBufferSize(unsigned);
 
   DEFINE_ATTRIBUTE_EVENT_LISTENER(frametimingbufferfull);
 
   void addLongTaskTiming(double startTime,
                          double endTime,
                          const String& name,
                          const String& culpritFrameSrc,
                          const String& culpritFrameId,
                          const String& culpritFrameName);
 
   void addResourceTiming(const ResourceTimingInfo&);
 
-  void addNavigationTiming(LocalFrame*);
+  void notifyNavigationTimingToObserver();
 
   void addFirstPaintTiming(double startTime);
 
   void addFirstContentfulPaintTiming(double startTime);
 
   void mark(const String& markName, ExceptionState&);
   void clearMarks(const String& markName);
 
   void measure(const String& measureName,
                const String& startMark,
                const String& endMark,
                ExceptionState&);
   void clearMeasures(const String& measureName);
 
   void unregisterPerformanceObserver(PerformanceObserver&);
   void registerPerformanceObserver(PerformanceObserver&);
   void updatePerformanceObserverFilterOptions();
   void activateObserver(PerformanceObserver&);
   void resumeSuspendedObservers();
 
-  DECLARE_VIRTUAL_TRACE();
-
- private:
-  static PerformanceNavigationTiming::NavigationType getNavigationType(
-      NavigationType,
-      const Document*);
-
   static bool allowsTimingRedirect(const Vector<ResourceResponse>&,
                                    const ResourceResponse&,
                                    const SecurityOrigin&,
                                    ExecutionContext*);
 
+  static SecurityOrigin* getSecurityOrigin(ExecutionContext*);

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

Is this for calling from NT? If so, not worth making a public member, just add a
helper there.

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

Made it inline in PerformanceNavigationTiming and kept it as how it was (a
private-scoped method) in PerformanceBase. Don't want to introduce any new
change that's not directly related to this patch.

+
+  DECLARE_VIRTUAL_TRACE();
+
+ private:
   static bool passesTimingAllowCheck(const ResourceResponse&,
                                      const SecurityOrigin&,
                                      const AtomicString&,
                                      ExecutionContext*);
 
   void addPaintTiming(PerformancePaintTiming::PaintType, double startTime);
 
  protected:
   explicit PerformanceBase(double timeOrigin, RefPtr<WebTaskRunner>);
 
+  // Expect Performance to override this method,
+  // WorkerPerformance doesn't have to override this.
+  virtual PerformanceNavigationTiming* getNavigationTimingInstance() {
+    return nullptr;
+  }
+
   bool isResourceTimingBufferFull();
   void addResourceTimingBuffer(PerformanceEntry&);
 
   bool isFrameTimingBufferFull();
   void addFrameTimingBuffer(PerformanceEntry&);
 
   void notifyObserversOfEntry(PerformanceEntry&);
   bool hasObserverFor(PerformanceEntry::EntryType) const;
 
   void deliverObservationsTimerFired(TimerBase*);
@@ skipping 10 matching lines @@
   PerformanceEntryTypeMask m_observerFilterOptions;
   PerformanceObservers m_observers;
   PerformanceObservers m_activeObservers;
   PerformanceObservers m_suspendedObservers;
   TaskRunnerTimer<PerformanceBase> m_deliverObservationsTimer;
 };
 
 }  // namespace blink
 
 #endif  // PerformanceBase_h