Update To 11.40.268.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 4f64ca6..7437e46 100644 (file)
--- a/src/third_party/WebKit/Source/core/fetch/FetchContext.cpp
+++ b/src/third_party/WebKit/Source/core/fetch/FetchContext.cpp
@@ -32,12 +32,12 @@
 #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, int)
@@ -85,7 +85,7 @@ void FetchContext::dispatchDidFinishLoading(DocumentLoader*, unsigned long, doub
 {
 }
 
-void FetchContext::dispatchDidFail(DocumentLoader*, unsigned long, const ResourceError&)
+void FetchContext::dispatchDidFail(DocumentLoader*, unsigned long, const ResourceError&, bool)
 {
 }
 
@@ -93,4 +93,4 @@ void FetchContext::sendRemainingDelegateMessages(DocumentLoader*, unsigned long,
 {
 }
 
-} // namespace WebCore
+} // namespace blink