Revert 152077 "[Resource Timing] Expose redirect timing information"

trunk/Source/core/page/PerformanceResourceTiming.cpp

Index: trunk/Source/core/page/PerformanceResourceTiming.cpp
===================================================================
--- trunk/Source/core/page/PerformanceResourceTiming.cpp	(revision 152082)
+++ trunk/Source/core/page/PerformanceResourceTiming.cpp	(working copy)
@@ -36,9 +36,9 @@
 #include "core/dom/Document.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
-#include "core/page/ResourceTimingInfo.h"
 #include "core/platform/network/ResourceRequest.h"
 #include "core/platform/network/ResourceResponse.h"
+#include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
@@ -48,18 +48,40 @@
     return document->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(seconds) * 1000.0;
 }
 
-PerformanceResourceTiming::PerformanceResourceTiming(const ResourceTimingInfo& info, Document* requestingDocument, double startTime, double lastRedirectEndTime, bool allowTimingDetails, bool allowRedirectDetails)
-    : PerformanceEntry(info.initialRequest().url().string(), "resource", monotonicTimeToDocumentMilliseconds(requestingDocument, startTime), monotonicTimeToDocumentMilliseconds(requestingDocument, info.loadFinishTime()))
-    , m_initiatorType(info.initiatorType())
-    , m_timing(info.finalResponse().resourceLoadTiming())
-    , m_lastRedirectEndTime(lastRedirectEndTime)
-    , m_finishTime(info.loadFinishTime())
-    , m_didReuseConnection(info.finalResponse().connectionReused())
-    , m_allowTimingDetails(allowTimingDetails)
-    , m_allowRedirectDetails(allowRedirectDetails)
+static bool passesTimingAllowCheck(const ResourceResponse& response, Document* requestingDocument)
+{
+    AtomicallyInitializedStatic(AtomicString&, timingAllowOrigin = *new AtomicString("timing-allow-origin"));
+
+    RefPtr<SecurityOrigin> resourceOrigin = SecurityOrigin::create(response.url());
+    if (resourceOrigin->isSameSchemeHostPort(requestingDocument->securityOrigin()))
+        return true;
+
+    const String& timingAllowOriginString = response.httpHeaderField(timingAllowOrigin);
+    if (timingAllowOriginString.isEmpty() || equalIgnoringCase(timingAllowOriginString, "null"))
+        return false;
+
+    if (timingAllowOriginString == "*")
+        return true;
+
+    const String& securityOrigin = requestingDocument->securityOrigin()->toString();
+    Vector<String> timingAllowOrigins;
+    timingAllowOriginString.split(" ", timingAllowOrigins);
+    for (size_t i = 0; i < timingAllowOrigins.size(); ++i)
+        if (timingAllowOrigins[i] == securityOrigin)
+            return true;
+
+    return false;
+}
+
+PerformanceResourceTiming::PerformanceResourceTiming(const AtomicString& initiatorType, const ResourceRequest& request, const ResourceResponse& response, double initiationTime, double finishTime, Document* requestingDocument)
+    : PerformanceEntry(request.url().string(), "resource", monotonicTimeToDocumentMilliseconds(requestingDocument, initiationTime), monotonicTimeToDocumentMilliseconds(requestingDocument, finishTime))
+    , m_initiatorType(initiatorType)
+    , m_timing(response.resourceLoadTiming())
+    , m_finishTime(finishTime)
+    , m_didReuseConnection(response.connectionReused())
+    , m_shouldReportDetails(passesTimingAllowCheck(response, requestingDocument))
     , m_requestingDocument(requestingDocument)
 {
-    ASSERT(m_timing);
     ScriptWrappable::init(this);
 }
 
@@ -74,31 +96,28 @@
 
 double PerformanceResourceTiming::redirectStart() const
 {
-    if (!m_lastRedirectEndTime || !m_allowRedirectDetails)
+    // FIXME: Need to track and report redirects for resources.
+    if (!m_shouldReportDetails)
         return 0.0;
-
-    return PerformanceEntry::startTime();
+    return 0;
 }
 
 double PerformanceResourceTiming::redirectEnd() const
 {
-    if (!m_lastRedirectEndTime || !m_allowRedirectDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
-
-    return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_lastRedirectEndTime);
+    return 0;
 }
 
 double PerformanceResourceTiming::fetchStart() const
 {
-    if (m_lastRedirectEndTime)
-        return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->requestTime);
-
-    return PerformanceEntry::startTime();
+    // FIXME: This should be different depending on redirects.
+    return (startTime());
 }
 
 double PerformanceResourceTiming::domainLookupStart() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     if (!m_timing || m_timing->dnsStart == 0.0)
@@ -109,7 +128,7 @@
 
 double PerformanceResourceTiming::domainLookupEnd() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     if (!m_timing || m_timing->dnsEnd == 0.0)
@@ -120,7 +139,7 @@
 
 double PerformanceResourceTiming::connectStart() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     // connectStart will be zero when a network request is not made.
@@ -137,7 +156,7 @@
 
 double PerformanceResourceTiming::connectEnd() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     // connectStart will be zero when a network request is not made.
@@ -149,7 +168,7 @@
 
 double PerformanceResourceTiming::secureConnectionStart() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     if (!m_timing || m_timing->sslStart == 0.0) // Secure connection not negotiated.
@@ -160,7 +179,7 @@
 
 double PerformanceResourceTiming::requestStart() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     if (!m_timing)
@@ -171,7 +190,7 @@
 
 double PerformanceResourceTiming::responseStart() const
 {
-    if (!m_allowTimingDetails)
+    if (!m_shouldReportDetails)
         return 0.0;
 
     if (!m_timing)