Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82

1 files changed, 10 insertions, 0 deletions

diff --git a/WebCore/platform/network/chromium/ResourceResponse.h b/WebCore/platform/network/chromium/ResourceResponse.h
index 0c2b5d9..1b9de04 100644
--- a/WebCore/platform/network/chromium/ResourceResponse.h
+++ b/WebCore/platform/network/chromium/ResourceResponse.h
@@ -38,6 +38,7 @@ namespace WebCore {
         ResourceResponse()
             : m_isContentFiltered(false)
             , m_appCacheID(0)
+            , m_wasFetchedViaSPDY(false)
         {
         }
 
@@ -45,6 +46,7 @@ namespace WebCore {
             : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
             , m_isContentFiltered(false)
             , m_appCacheID(0)
+            , m_wasFetchedViaSPDY(false)
         {
         }
 
@@ -72,6 +74,12 @@ namespace WebCore {
             m_appCacheManifestURL = url;
         }
 
+        bool wasFetchedViaSPDY() const { return m_wasFetchedViaSPDY; }
+        void setWasFetchedViaSPDY(bool value)
+        {
+            m_wasFetchedViaSPDY = value;
+        }
+
     private:
         friend class ResourceResponseBase;
 
@@ -96,6 +104,8 @@ namespace WebCore {
         // The manifest url of the appcache this response was retrieved from, if any.
         // Note: only valid for main resource responses.
         KURL m_appCacheManifestURL;
+
+        bool m_wasFetchedViaSPDY;
     };
 
 } // namespace WebCore