Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / network / ResourceResponse.cpp

diff --git a/src/third_party/WebKit/Source/platform/network/ResourceResponse.cpp b/src/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
index 65c53e5..7aed805 100644 (file)
--- a/src/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
+++ b/src/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
@@ -30,7 +30,7 @@
 #include "wtf/CurrentTime.h"
 #include "wtf/StdLibExtras.h"
 
-namespace WebCore {
+namespace blink {
 
 ResourceResponse::ResourceResponse()
     : m_expectedContentLength(0)
@@ -55,6 +55,7 @@ ResourceResponse::ResourceResponse()
     , m_wasNpnNegotiated(false)
     , m_wasAlternateProtocolAvailable(false)
     , m_wasFetchedViaProxy(false)
+    , m_wasFetchedViaServiceWorker(false)
     , m_responseTime(0)
     , m_remotePort(0)
 {
@@ -87,6 +88,7 @@ ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType
     , m_wasNpnNegotiated(false)
     , m_wasAlternateProtocolAvailable(false)
     , m_wasFetchedViaProxy(false)
+    , m_wasFetchedViaServiceWorker(false)
     , m_responseTime(0)
     , m_remotePort(0)
 {
@@ -116,6 +118,7 @@ PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou
     response->m_wasNpnNegotiated = data->m_wasNpnNegotiated;
     response->m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable;
     response->m_wasFetchedViaProxy = data->m_wasFetchedViaProxy;
+    response->m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker;
     response->m_responseTime = data->m_responseTime;
     response->m_remoteIPAddress = AtomicString(data->m_remoteIPAddress);
     response->m_remotePort = data->m_remotePort;
@@ -151,6 +154,7 @@ PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const
     data->m_wasNpnNegotiated = m_wasNpnNegotiated;
     data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable;
     data->m_wasFetchedViaProxy = m_wasFetchedViaProxy;
+    data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker;
     data->m_responseTime = m_responseTime;
     data->m_remoteIPAddress = m_remoteIPAddress.string().isolatedCopy();
     data->m_remotePort = m_remotePort;