Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / storage / StorageNamespace.cpp

diff --git a/src/third_party/WebKit/Source/core/storage/StorageNamespace.cpp b/src/third_party/WebKit/Source/core/storage/StorageNamespace.cpp
index 84f6074..fabce9f 100644 (file)
--- a/src/third_party/WebKit/Source/core/storage/StorageNamespace.cpp
+++ b/src/third_party/WebKit/Source/core/storage/StorageNamespace.cpp
@@ -33,9 +33,9 @@
 #include "public/platform/WebStorageNamespace.h"
 #include "wtf/MainThread.h"
 
-namespace WebCore {
+namespace blink {
 
-StorageNamespace::StorageNamespace(PassOwnPtr<blink::WebStorageNamespace> webStorageNamespace)
+StorageNamespace::StorageNamespace(PassOwnPtr<WebStorageNamespace> webStorageNamespace)
     : m_webStorageNamespace(webStorageNamespace)
 {
 }
@@ -47,20 +47,20 @@ StorageNamespace::~StorageNamespace()
 PassOwnPtrWillBeRawPtr<StorageArea> StorageNamespace::localStorageArea(SecurityOrigin* origin)
 {
     ASSERT(isMainThread());
-    static blink::WebStorageNamespace* localStorageNamespace = 0;
+    static WebStorageNamespace* localStorageNamespace = 0;
     if (!localStorageNamespace)
-        localStorageNamespace = blink::Platform::current()->createLocalStorageNamespace();
-    return adoptPtrWillBeNoop(new StorageArea(adoptPtr(localStorageNamespace->createStorageArea(origin->toString())), LocalStorage));
+        localStorageNamespace = Platform::current()->createLocalStorageNamespace();
+    return StorageArea::create(adoptPtr(localStorageNamespace->createStorageArea(origin->toString())), LocalStorage);
 }
 
 PassOwnPtrWillBeRawPtr<StorageArea> StorageNamespace::storageArea(SecurityOrigin* origin)
 {
-    return adoptPtrWillBeNoop(new StorageArea(adoptPtr(m_webStorageNamespace->createStorageArea(origin->toString())), SessionStorage));
+    return StorageArea::create(adoptPtr(m_webStorageNamespace->createStorageArea(origin->toString())), SessionStorage);
 }
 
-bool StorageNamespace::isSameNamespace(const blink::WebStorageNamespace& sessionNamespace) const
+bool StorageNamespace::isSameNamespace(const WebStorageNamespace& sessionNamespace) const
 {
     return m_webStorageNamespace && m_webStorageNamespace->isSameNamespace(sessionNamespace);
 }
 
-} // namespace WebCore
+} // namespace blink