Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

1 files changed, 36 insertions, 36 deletions

diff --git a/WebCore/platform/network/chromium/ResourceResponse.h b/WebCore/platform/network/chromium/ResourceResponse.h
index b453896..8400ce5 100644
--- a/WebCore/platform/network/chromium/ResourceResponse.h
+++ b/WebCore/platform/network/chromium/ResourceResponse.h
@@ -36,57 +36,49 @@ namespace WebCore {
     class ResourceResponse : public ResourceResponseBase {
     public:
         ResourceResponse()
-            : m_isContentFiltered(false)
-            , m_appCacheID(0)
-            , m_wasFetchedViaSPDY(false)
+            : m_appCacheID(0)
+            , m_isContentFiltered(false)
             , m_isMultipartPayload(false)
+            , m_wasFetchedViaSPDY(false)
+            , m_wasNpnNegotiated(false)
+            , m_responseTime(0)
         {
         }
 
         ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
             : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
-            , m_isContentFiltered(false)
             , m_appCacheID(0)
-            , m_wasFetchedViaSPDY(false)
+            , m_isContentFiltered(false)
             , m_isMultipartPayload(false)
+            , m_wasFetchedViaSPDY(false)
+            , m_wasNpnNegotiated(false)
+            , m_responseTime(0)
         {
         }
 
         const CString& getSecurityInfo() const { return m_securityInfo; }
-        void setSecurityInfo(const CString& securityInfo)
-        {
-            m_securityInfo = securityInfo;
-        }
-
-        bool isContentFiltered() const { return m_isContentFiltered; }
-        void setIsContentFiltered(bool isContentFiltered)
-        {
-            m_isContentFiltered = isContentFiltered;
-        }
+        void setSecurityInfo(const CString& securityInfo) { m_securityInfo = securityInfo; }
 
         long long appCacheID() const { return m_appCacheID; }
-        void setAppCacheID(long long id)
-        {
-            m_appCacheID = id;
-        }
+        void setAppCacheID(long long id) { m_appCacheID = id; }
 
         const KURL& appCacheManifestURL() const { return m_appCacheManifestURL; }
-        void setAppCacheManifestURL(const KURL& url)
-        {
-            m_appCacheManifestURL = url;
-        }
+        void setAppCacheManifestURL(const KURL& url) { m_appCacheManifestURL = url; }
+
+        bool isContentFiltered() const { return m_isContentFiltered; }
+        void setIsContentFiltered(bool value) { m_isContentFiltered = value; }
 
         bool wasFetchedViaSPDY() const { return m_wasFetchedViaSPDY; }
-        void setWasFetchedViaSPDY(bool value)
-        {
-            m_wasFetchedViaSPDY = value;
-        }
+        void setWasFetchedViaSPDY(bool value) { m_wasFetchedViaSPDY = value; }
+
+        bool wasNpnNegotiated() const { return m_wasNpnNegotiated; }
+        void setWasNpnNegotiated(bool value) { m_wasNpnNegotiated = value; }
 
         bool isMultipartPayload() const { return m_isMultipartPayload; }
-        void setIsMultipartPayload(bool value)
-        {
-            m_isMultipartPayload = value;
-        }
+        void setIsMultipartPayload(bool value) { m_isMultipartPayload = value; }
+
+        double responseTime() const { return m_responseTime; }
+        void setResponseTime(double responseTime) { m_responseTime = responseTime; }
 
     private:
         friend class ResourceResponseBase;
@@ -101,10 +93,6 @@ namespace WebCore {
             notImplemented();
         }
 
-        // Whether the contents for this response has been altered/blocked (usually
-        // for security reasons.
-        bool m_isContentFiltered;
-
         // The id of the appcache this response was retrieved from, or zero if
         // the response was not retrieved from an appcache.
         long long m_appCacheID;
@@ -113,10 +101,22 @@ namespace WebCore {
         // Note: only valid for main resource responses.
         KURL m_appCacheManifestURL;
 
-        bool m_wasFetchedViaSPDY;
+        // Whether the contents for this response has been altered/blocked (usually
+        // for security reasons.
+        bool m_isContentFiltered;
 
         // Set to true if this is part of a multipart response.
         bool m_isMultipartPayload;
+
+        // Was the resource fetched over SPDY.  See http://dev.chromium.org/spdy
+        bool m_wasFetchedViaSPDY;
+
+        // Was the resource fetched over a channel which used TLS/Next-Protocol-Negotiation (also SPDY related).
+        bool m_wasNpnNegotiated;
+
+        // The time at which the response headers were received.  For cached
+        // responses, this time could be "far" in the past.
+        double m_responseTime;
     };
 
 } // namespace WebCore