Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / fetch / RawResource.cpp

diff --git a/src/third_party/WebKit/Source/core/fetch/RawResource.cpp b/src/third_party/WebKit/Source/core/fetch/RawResource.cpp
index c3affde..5bd97e1 100644 (file)
--- a/src/third_party/WebKit/Source/core/fetch/RawResource.cpp
+++ b/src/third_party/WebKit/Source/core/fetch/RawResource.cpp
@@ -38,7 +38,7 @@ RawResource::RawResource(const ResourceRequest& resourceRequest, Type type)
 {
 }
 
-void RawResource::appendData(const char* data, int length)
+void RawResource::appendData(const char* data, unsigned length)
 {
     Resource::appendData(data, length);
 
@@ -57,18 +57,15 @@ void RawResource::didAddClient(ResourceClient* c)
     // so a protector is necessary.
     ResourcePtr<RawResource> protect(this);
     RawResourceClient* client = static_cast<RawResourceClient*>(c);
-    size_t redirectCount = redirectChain().size();
-    for (size_t i = 0; i < redirectCount; i++) {
-        RedirectPair redirect = redirectChain()[i];
+    for (const auto& redirect : redirectChain()) {
         ResourceRequest request(redirect.m_request);
         client->redirectReceived(this, request, redirect.m_redirectResponse);
         if (!hasClient(c))
             return;
     }
-    ASSERT(redirectCount == redirectChain().size());
 
     if (!m_response.isNull())
-        client->responseReceived(this, m_response);
+        client->responseReceived(this, m_response, nullptr);
     if (!hasClient(c))
         return;
     if (m_data)
@@ -78,15 +75,15 @@ void RawResource::didAddClient(ResourceClient* c)
     Resource::didAddClient(client);
 }
 
-void RawResource::willSendRequest(ResourceRequest& request, const ResourceResponse& response)
+void RawResource::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
     ResourcePtr<RawResource> protect(this);
-    if (!response.isNull()) {
+    if (!redirectResponse.isNull()) {
         ResourceClientWalker<RawResourceClient> w(m_clients);
         while (RawResourceClient* c = w.next())
-            c->redirectReceived(this, request, response);
+            c->redirectReceived(this, newRequest, redirectResponse);
     }
-    Resource::willSendRequest(request, response);
+    Resource::willFollowRedirect(newRequest, redirectResponse);
 }
 
 void RawResource::updateRequest(const ResourceRequest& request)
@@ -97,13 +94,17 @@ void RawResource::updateRequest(const ResourceRequest& request)
         c->updateRequest(this, request);
 }
 
-void RawResource::responseReceived(const ResourceResponse& response)
+void RawResource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     InternalResourcePtr protect(this);
-    Resource::responseReceived(response);
+    Resource::responseReceived(response, nullptr);
     ResourceClientWalker<RawResourceClient> w(m_clients);
-    while (RawResourceClient* c = w.next())
-        c->responseReceived(this, m_response);
+    ASSERT(count() <= 1 || !handle);
+    while (RawResourceClient* c = w.next()) {
+        // |handle| is cleared when passed, but it's not a problem because
+        // |handle| is null when there are two or more clients, as asserted.
+        c->responseReceived(this, m_response, handle);
+    }
 }
 
 void RawResource::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
@@ -173,17 +174,15 @@ bool RawResource::canReuse(const ResourceRequest& newRequest) const
     const HTTPHeaderMap& newHeaders = newRequest.httpHeaderFields();
     const HTTPHeaderMap& oldHeaders = m_resourceRequest.httpHeaderFields();
 
-    HTTPHeaderMap::const_iterator end = newHeaders.end();
-    for (HTTPHeaderMap::const_iterator i = newHeaders.begin(); i != end; ++i) {
-        AtomicString headerName = i->key;
-        if (!shouldIgnoreHeaderForCacheReuse(headerName) && i->value != oldHeaders.get(headerName))
+    for (const auto& header : newHeaders) {
+        AtomicString headerName = header.key;
+        if (!shouldIgnoreHeaderForCacheReuse(headerName) && header.value != oldHeaders.get(headerName))
             return false;
     }
 
-    end = oldHeaders.end();
-    for (HTTPHeaderMap::const_iterator i = oldHeaders.begin(); i != end; ++i) {
-        AtomicString headerName = i->key;
-        if (!shouldIgnoreHeaderForCacheReuse(headerName) && i->value != newHeaders.get(headerName))
+    for (const auto& header : oldHeaders) {
+        AtomicString headerName = header.key;
+        if (!shouldIgnoreHeaderForCacheReuse(headerName) && header.value != newHeaders.get(headerName))
             return false;
     }