Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/core/fetch/FetchContext.cpp b/src/third_party/WebKit/Source/core/fetch/FetchContext.cpp
index 037e629..e95ce8e 100644 (file)
--- a/src/third_party/WebKit/Source/core/fetch/FetchContext.cpp
+++ b/src/third_party/WebKit/Source/core/fetch/FetchContext.cpp
@@ -32,15 +32,15 @@
 #include "core/fetch/FetchContext.h"
 
 
-namespace WebCore {
+namespace blink {
 
 FetchContext& FetchContext::nullInstance()
 {
-    DEFINE_STATIC_LOCAL(FetchContext, instance, ());
-    return instance;
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<FetchContext>, instance, (adoptPtrWillBeNoop(new FetchContext())));
+    return *instance;
 }
 
-void FetchContext::dispatchDidChangeResourcePriority(unsigned long, ResourceLoadPriority)
+void FetchContext::dispatchDidChangeResourcePriority(unsigned long, ResourceLoadPriority, int)
 {
 }
 
@@ -48,11 +48,15 @@ void FetchContext::reportLocalLoadFailed(const KURL&)
 {
 }
 
-void FetchContext::addAdditionalRequestHeaders(Document&, ResourceRequest&, Resource::Type)
+void FetchContext::addAdditionalRequestHeaders(Document*, ResourceRequest&, FetchResourceType)
 {
 }
 
-CachePolicy FetchContext::cachePolicy(Resource::Type) const
+void FetchContext::setFirstPartyForCookies(ResourceRequest&)
+{
+}
+
+CachePolicy FetchContext::cachePolicy(Document*) const
 {
     return CachePolicyVerify;
 }
@@ -73,7 +77,11 @@ void FetchContext::dispatchDidReceiveData(DocumentLoader*, unsigned long, const
 {
 }
 
-void FetchContext::dispatchDidFinishLoading(DocumentLoader*, unsigned long, double)
+void FetchContext::dispatchDidDownloadData(DocumentLoader*, unsigned long, int, int)
+{
+}
+
+void FetchContext::dispatchDidFinishLoading(DocumentLoader*, unsigned long, double, int64_t)
 {
 }
 
@@ -81,8 +89,8 @@ void FetchContext::dispatchDidFail(DocumentLoader*, unsigned long, const Resourc
 {
 }
 
-void FetchContext::sendRemainingDelegateMessages(DocumentLoader*, unsigned long, const ResourceResponse&, const char*, int, int, const ResourceError&)
+void FetchContext::sendRemainingDelegateMessages(DocumentLoader*, unsigned long, const ResourceResponse&, int)
 {
 }
 
-} // namespace WebCore
+} // namespace blink