nav timing 2 redirect allow opt-in

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 327 matching lines @@
   DCHECK(documentLoader);
 
   const DocumentLoadTiming& documentLoadTiming = documentLoader->timing();
 
   const DocumentTiming* documentTiming =
       frame->document() ? &(frame->document()->timing()) : nullptr;
 
   const ResourceResponse& finalResponse = documentLoader->response();
   ResourceTimingInfo* resourceTimingInfo =
       documentLoader->getMainResourceTimingInfo();
+
   // Don't create navigation timing instance when resourceTimingInfo
   // is null, which could happen when it is an iframe navigation restored
   // from history, since its location may have been changed after initial
   // navigation.
   if (!resourceTimingInfo)
     return;
 
   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();
 
+  SecurityOrigin* securityOrigin = nullptr;
+  ExecutionContext* context = getExecutionContext();
+  if (context)
+    securityOrigin = context->getSecurityOrigin();
+  if (!securityOrigin)
+    return;

[panicker, 2016/12/05 19:11:52]

Factor code above into a helper method getSecurityOrigin(..), to avoid DRY
issue: same lines repeated for ResourceTiming.

[sunjian, 2016/12/06 19:46:44]

Done.

+
+  const Vector<ResourceResponse>& redirectChain =

[panicker, 2016/12/05 19:11:52]

no need for temp variable?

[sunjian, 2016/12/06 19:46:44]

Done.

+      resourceTimingInfo->redirectChain();
+  bool allowRedirectDetails = allowsTimingRedirect(redirectChain, finalResponse,

[panicker, 2016/12/05 19:11:52]

let's add a unittest for allowTimingRedirect(..)

[sunjian, 2016/12/06 19:46:44]

Done.

+                                                   *securityOrigin, context);
+
   unsigned long long transferSize = resourceTimingInfo->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(),
-      documentLoadTiming.hasCrossOriginRedirect(),
+      allowRedirectDetails,
       documentLoadTiming.hasSameOriginAsPreviousDocument(), resourceLoadTiming,
       lastRedirectEndTime, finishTime, transferSize, encodedBodyLength,
       decodedBodyLength, didReuseConnection);
   notifyObserversOfEntry(*m_navigationTiming);
 }
 
 void PerformanceBase::addResourceTimingBuffer(PerformanceEntry& entry) {
   m_resourceTimingBuffer.append(&entry);
 
   if (isResourceTimingBufferFull()) {
@@ skipping 170 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