| Index: Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
|
| diff --git a/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp b/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
|
| index 4812ca5cf2b8d48b15be04b2b21b16447a643b6d..08d810f0f219e594228dc98f770211788b9b6bc2 100644
|
| --- a/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
|
| +++ b/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
|
| @@ -154,7 +154,7 @@ private:
|
| WebWorkerBase* m_webWorkerBase;
|
| };
|
|
|
| -bool IDBFactoryBackendProxy::allowIndexedDB(ScriptExecutionContext* context, const String& name, const WebSecurityOrigin& origin, PassRefPtr<IDBCallbacks> callbacks)
|
| +bool IDBFactoryBackendProxy::allowIndexedDB(ScriptExecutionContext* context, const String& name, const WebSecurityOrigin& origin, IDBCallbacks* callbacks)
|
| {
|
| bool allowed;
|
| ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerContext());
|
| @@ -187,9 +187,8 @@ bool IDBFactoryBackendProxy::allowIndexedDB(ScriptExecutionContext* context, con
|
| return allowed;
|
| }
|
|
|
| -void IDBFactoryBackendProxy::getDatabaseNames(PassRefPtr<IDBCallbacks> prpCallbacks, const String& databaseIdentifier, ScriptExecutionContext* context, const String& dataDir)
|
| +void IDBFactoryBackendProxy::getDatabaseNames(IDBCallbacks* callbacks, const String& databaseIdentifier, ScriptExecutionContext* context, const String& dataDir)
|
| {
|
| - RefPtr<IDBCallbacks> callbacks(prpCallbacks);
|
| WebSecurityOrigin origin(context->securityOrigin());
|
| if (!allowIndexedDB(context, "Database Listing", origin, callbacks))
|
| return;
|
| @@ -197,10 +196,8 @@ void IDBFactoryBackendProxy::getDatabaseNames(PassRefPtr<IDBCallbacks> prpCallba
|
| m_webIDBFactory->getDatabaseNames(new WebIDBCallbacksImpl(callbacks), databaseIdentifier, dataDir);
|
| }
|
|
|
| -void IDBFactoryBackendProxy::open(const String& name, int64_t version, int64_t transactionId, PassRefPtr<IDBCallbacks> prpCallbacks, PassRefPtr<IDBDatabaseCallbacks> prpDatabaseCallbacks, const String& databaseIdentifier, ScriptExecutionContext* context, const String& dataDir)
|
| +void IDBFactoryBackendProxy::open(const String& name, int64_t version, int64_t transactionId, IDBCallbacks* callbacks, IDBDatabaseCallbacks* databaseCallbacks, const String& databaseIdentifier, ScriptExecutionContext* context, const String& dataDir)
|
| {
|
| - RefPtr<IDBCallbacks> callbacks(prpCallbacks);
|
| - RefPtr<IDBDatabaseCallbacks> databaseCallbacks(prpDatabaseCallbacks);
|
| WebSecurityOrigin origin(context->securityOrigin());
|
| if (!allowIndexedDB(context, name, origin, callbacks))
|
| return;
|
| @@ -208,9 +205,8 @@ void IDBFactoryBackendProxy::open(const String& name, int64_t version, int64_t t
|
| m_webIDBFactory->open(name, version, transactionId, new WebIDBCallbacksImpl(callbacks), new WebIDBDatabaseCallbacksImpl(databaseCallbacks), databaseIdentifier, dataDir);
|
| }
|
|
|
| -void IDBFactoryBackendProxy::deleteDatabase(const String& name, PassRefPtr<IDBCallbacks> prpCallbacks, const String& databaseIdentifier, ScriptExecutionContext* context, const String& dataDir)
|
| +void IDBFactoryBackendProxy::deleteDatabase(const String& name, IDBCallbacks* callbacks, const String& databaseIdentifier, ScriptExecutionContext* context, const String& dataDir)
|
| {
|
| - RefPtr<IDBCallbacks> callbacks(prpCallbacks);
|
| WebSecurityOrigin origin(context->securityOrigin());
|
| if (!allowIndexedDB(context, name, origin, callbacks))
|
| return;
|
|
|