webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 5 deletions

diff --git a/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp b/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp
index 1002c2141..be8507a31 100644
--- a/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp
+++ b/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp
@@ -28,10 +28,10 @@
 
 #include "StorageAreaMap.h"
 #include <WebCore/Document.h>
-#include <WebCore/ExceptionCode.h>
 #include <WebCore/Frame.h>
 #include <WebCore/Page.h>
 #include <WebCore/SchemeRegistry.h>
+#include <WebCore/SecurityOriginData.h>
 #include <WebCore/Settings.h>
 
 using namespace WebCore;
@@ -44,14 +44,14 @@ static uint64_t generateStorageAreaID()
     return ++storageAreaID;
 }
 
-PassRefPtr<StorageAreaImpl> StorageAreaImpl::create(PassRefPtr<StorageAreaMap> storageAreaMap)
+Ref<StorageAreaImpl> StorageAreaImpl::create(Ref<StorageAreaMap>&& storageAreaMap)
 {
-    return adoptRef(new StorageAreaImpl(storageAreaMap));
+    return adoptRef(*new StorageAreaImpl(WTFMove(storageAreaMap)));
 }
 
-StorageAreaImpl::StorageAreaImpl(PassRefPtr<StorageAreaMap> storageAreaMap)
+StorageAreaImpl::StorageAreaImpl(Ref<StorageAreaMap>&& storageAreaMap)
     : m_storageAreaID(generateStorageAreaID())
-    , m_storageAreaMap(storageAreaMap)
+    , m_storageAreaMap(WTFMove(storageAreaMap))
 {
 }
 
@@ -127,4 +127,9 @@ void StorageAreaImpl::closeDatabaseIfIdle()
     ASSERT_NOT_REACHED();
 }
 
+WebCore::SecurityOriginData StorageAreaImpl::securityOrigin() const
+{
+    return WebCore::SecurityOriginData::fromSecurityOrigin(m_storageAreaMap->securityOrigin());
+}
+
 } // namespace WebKit