summaryrefslogtreecommitdiffstats
path: root/WebCore/storage
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/storage')
-rw-r--r--WebCore/storage/DatabaseSync.cpp3
-rw-r--r--WebCore/storage/IndexedDatabase.h3
-rw-r--r--WebCore/storage/IndexedDatabaseImpl.cpp3
-rw-r--r--WebCore/storage/IndexedDatabaseImpl.h2
-rw-r--r--WebCore/storage/IndexedDatabaseRequest.cpp3
5 files changed, 9 insertions, 5 deletions
diff --git a/WebCore/storage/DatabaseSync.cpp b/WebCore/storage/DatabaseSync.cpp
index fd1376a..224a75d 100644
--- a/WebCore/storage/DatabaseSync.cpp
+++ b/WebCore/storage/DatabaseSync.cpp
@@ -107,6 +107,7 @@ ScriptExecutionContext* DatabaseSync::scriptExecutionContext() const
return m_scriptExecutionContext.get();
}
+} // namespace WebCore
+
#endif // ENABLE(DATABASE)
-} // namespace WebCore
diff --git a/WebCore/storage/IndexedDatabase.h b/WebCore/storage/IndexedDatabase.h
index 1e43781..6bc9b6e 100644
--- a/WebCore/storage/IndexedDatabase.h
+++ b/WebCore/storage/IndexedDatabase.h
@@ -39,6 +39,7 @@ namespace WebCore {
class Frame;
class IDBDatabase;
+class SecurityOrigin;
// This class is shared by IndexedDatabaseRequest (async) and IndexedDatabaseSync (sync).
// This is implemented by IndexedDatabaseImpl and optionally others (in order to proxy
@@ -49,7 +50,7 @@ public:
static PassRefPtr<IndexedDatabase> create();
virtual ~IndexedDatabase() { }
- virtual void open(const String& name, const String& description, bool modifyDatabase, PassRefPtr<IDBCallbacks>, Frame*, ExceptionCode&) = 0;
+ virtual void open(const String& name, const String& description, bool modifyDatabase, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, Frame*, ExceptionCode&) = 0;
};
} // namespace WebCore
diff --git a/WebCore/storage/IndexedDatabaseImpl.cpp b/WebCore/storage/IndexedDatabaseImpl.cpp
index b3051c9..ae4fd1e 100644
--- a/WebCore/storage/IndexedDatabaseImpl.cpp
+++ b/WebCore/storage/IndexedDatabaseImpl.cpp
@@ -30,6 +30,7 @@
#include "IDBDatabase.h"
#include "IDBDatabaseError.h"
+#include "SecurityOrigin.h"
#include <wtf/Threading.h>
#include <wtf/UnusedParam.h>
@@ -50,7 +51,7 @@ IndexedDatabaseImpl::~IndexedDatabaseImpl()
{
}
-void IndexedDatabaseImpl::open(const String& name, const String& description, bool modifyDatabase, PassRefPtr<IDBCallbacks> callbacks, Frame*, ExceptionCode&)
+void IndexedDatabaseImpl::open(const String& name, const String& description, bool modifyDatabase, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin>, Frame*, ExceptionCode&)
{
// FIXME: Write for realz.
UNUSED_PARAM(name);
diff --git a/WebCore/storage/IndexedDatabaseImpl.h b/WebCore/storage/IndexedDatabaseImpl.h
index 73edf6b..8d73694 100644
--- a/WebCore/storage/IndexedDatabaseImpl.h
+++ b/WebCore/storage/IndexedDatabaseImpl.h
@@ -39,7 +39,7 @@ public:
static PassRefPtr<IndexedDatabaseImpl> create();
virtual ~IndexedDatabaseImpl();
- virtual void open(const String& name, const String& description, bool modifyDatabase, PassRefPtr<IDBCallbacks>, Frame*, ExceptionCode&);
+ virtual void open(const String& name, const String& description, bool modifyDatabase, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, Frame*, ExceptionCode&);
private:
IndexedDatabaseImpl();
diff --git a/WebCore/storage/IndexedDatabaseRequest.cpp b/WebCore/storage/IndexedDatabaseRequest.cpp
index 2210a8d..b549bd6 100644
--- a/WebCore/storage/IndexedDatabaseRequest.cpp
+++ b/WebCore/storage/IndexedDatabaseRequest.cpp
@@ -29,6 +29,7 @@
#include "config.h"
#include "IndexedDatabaseRequest.h"
+#include "Document.h"
#include "ExceptionCode.h"
#include "Frame.h"
#include "IDBDatabase.h"
@@ -54,7 +55,7 @@ IndexedDatabaseRequest::~IndexedDatabaseRequest()
PassRefPtr<IDBRequest> IndexedDatabaseRequest::open(const String& name, const String& description, bool modifyDatabase, ExceptionCode& exception)
{
RefPtr<IDBRequest> request = IDBRequest::create(m_frame->document(), m_this);
- m_indexedDatabase->open(name, description, modifyDatabase, request, m_frame, exception);
+ m_indexedDatabase->open(name, description, modifyDatabase, request, m_frame->document()->securityOrigin(), m_frame, exception);
return request;
}