[Resource Timing] Expose redirect timing information

Source/core/page/Performance.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 23 matching lines @@
 
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "MemoryInfo.h"
 #include "PerformanceEntry.h"
 #include "PerformanceNavigation.h"
 #include "PerformanceResourceTiming.h"
 #include "PerformanceTiming.h"
 #include "PerformanceUserTiming.h"
 #include "ResourceResponse.h"
+#include "ResourceTimingInfo.h"
 #include <wtf/CurrentTime.h>
 
 #include "Frame.h"
 
 namespace WebCore {
 
 static const size_t defaultResourceTimingBufferSize = 150;
 
 Performance::Performance(Frame* frame)
     : DOMWindowProperty(frame)
@@ skipping 99 matching lines @@
     m_resourceTimingBuffer.clear();
 }
 
 void Performance::webkitSetResourceTimingBufferSize(unsigned size)
 {
     m_resourceTimingBufferSize = size;
     if (isResourceTimingBufferFull())
         dispatchEvent(Event::create(eventNames().webkitresourcetimingbufferfullEvent, false, false));
 }
 
-void Performance::addResourceTiming(const String& initiatorName, Document* initiatorDocument, const ResourceRequest& request, const ResourceResponse& response, double initiationTime, double finishTime)
+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;
+}
+
+void Performance::addResourceTiming(const ResourceTimingInfo& info, Document* initiatorDocument)
 {
     if (isResourceTimingBufferFull())
         return;
 
-    RefPtr<PerformanceEntry> entry = PerformanceResourceTiming::create(initiatorName, request, response, initiationTime, finishTime, initiatorDocument);
+    bool shouldReportDetails = true;

[James Simonsen, 2013/05/20 23:31:37]

For me, this function would read much easier if there were 2 bools: hadRedirect
and hadCrossOriginRedirect. And then just handle each of the 3 cases.

[Pan, 2013/06/03 10:17:34]

I seperated the non-redirect case and redirect-case, hope it read better.

+    Vector<ResourceResponse> redirectChain = info.redirectChain();

[James Simonsen, 2013/05/20 23:31:37]

const&

[Pan, 2013/06/03 10:17:34]

yep done.

 
+    for (size_t i = 0; i < redirectChain.size(); i++)
+        if (false == (shouldReportDetails = passesTimingAllowCheck(redirectChain[i], initiatorDocument)))

[James Simonsen, 2013/05/20 23:31:37]

Separate lines please.

+            break;
+
+    if (shouldReportDetails)
+        shouldReportDetails = passesTimingAllowCheck(info.finalResponse(), initiatorDocument);
+
+    double lastRedirectEndTime = 0.0;
+    if (redirectChain.size() != 0) {
+        ResourceLoadTiming* loadTiming = redirectChain.last().resourceLoadTiming();

[James Simonsen, 2013/05/20 23:31:37]

loadTiming -> lastRedirectTiming

[Pan, 2013/06/03 10:17:34]

done.

+        ASSERT(loadTiming);
+        if (loadTiming->receiveHeadersEnd > 0)
+            lastRedirectEndTime = loadTiming->convertResourceLoadTimeToMonotonicTime(loadTiming->receiveHeadersEnd);
+        else
+            // Redirect response may be cached in network layer.
+            lastRedirectEndTime = loadTiming->requestTime;

[James Simonsen, 2013/05/20 23:31:37]

Isn't it a bug if receiveHeadersEnd isn't set? We're still supposed to report
how long it took to look things up in the cache. We should file a bug and make
this a FIXME.

[Pan, 2013/06/03 10:17:34]

Not a bug, this should be removed once after mmenke's patch landed.
Now removed.

+    }
+
+    double startTime = info.initialTime();
+    if (!shouldReportDetails && lastRedirectEndTime)
+        startTime = info.finalResponse().resourceLoadTiming()->requestTime;
+
+    RefPtr<PerformanceEntry> entry = PerformanceResourceTiming::create(info, initiatorDocument, startTime, lastRedirectEndTime, shouldReportDetails);
     m_resourceTimingBuffer.append(entry);
 
     if (isResourceTimingBufferFull())
         dispatchEvent(Event::create(eventNames().webkitresourcetimingbufferfullEvent, false, false));
 }
 
 bool Performance::isResourceTimingBufferFull()
 {
     return m_resourceTimingBuffer.size() >= m_resourceTimingBufferSize;
 }
@@ skipping 37 matching lines @@
         m_userTiming = UserTiming::create(this);
     m_userTiming->clearMeasures(measureName);
 }
 
 double Performance::now() const
 {
     return 1000.0 * m_frame->document()->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());
 }
 
 } // namespace WebCore