diff options
author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebKit/chromium/src/WebIDBDatabaseImpl.cpp | |
parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebKit/chromium/src/WebIDBDatabaseImpl.cpp')
-rw-r--r-- | WebKit/chromium/src/WebIDBDatabaseImpl.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/WebKit/chromium/src/WebIDBDatabaseImpl.cpp b/WebKit/chromium/src/WebIDBDatabaseImpl.cpp index e2f771a..8c8e30a 100644 --- a/WebKit/chromium/src/WebIDBDatabaseImpl.cpp +++ b/WebKit/chromium/src/WebIDBDatabaseImpl.cpp @@ -28,7 +28,7 @@ #include "DOMStringList.h" #include "IDBCallbacksProxy.h" -#include "IDBDatabase.h" +#include "IDBDatabaseBackendInterface.h" #include "WebIDBCallbacks.h" #include "WebIDBObjectStoreImpl.h" @@ -38,8 +38,8 @@ using namespace WebCore; namespace WebKit { -WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabase> database) - : m_database(database) +WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend) + : m_databaseBackend(databaseBackend) { } @@ -49,32 +49,32 @@ WebIDBDatabaseImpl::~WebIDBDatabaseImpl() WebString WebIDBDatabaseImpl::name() const { - return m_database->name(); + return m_databaseBackend->name(); } WebString WebIDBDatabaseImpl::description() const { - return m_database->description(); + return m_databaseBackend->description(); } WebString WebIDBDatabaseImpl::version() const { - return m_database->version(); + return m_databaseBackend->version(); } WebDOMStringList WebIDBDatabaseImpl::objectStores() const { - return m_database->objectStores(); + return m_databaseBackend->objectStores(); } void WebIDBDatabaseImpl::createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, WebIDBCallbacks* callbacks) { - m_database->createObjectStore(name, keyPath, autoIncrement, IDBCallbacksProxy::create(callbacks)); + m_databaseBackend->createObjectStore(name, keyPath, autoIncrement, IDBCallbacksProxy::create(callbacks)); } WebIDBObjectStore* WebIDBDatabaseImpl::objectStore(const WebString& name, unsigned short mode) { - RefPtr<IDBObjectStore> objectStore = m_database->objectStore(name, mode); + RefPtr<IDBObjectStoreBackendInterface> objectStore = m_databaseBackend->objectStore(name, mode); if (!objectStore) return 0; return new WebIDBObjectStoreImpl(objectStore); @@ -82,7 +82,7 @@ WebIDBObjectStore* WebIDBDatabaseImpl::objectStore(const WebString& name, unsign void WebIDBDatabaseImpl::removeObjectStore(const WebString& name, WebIDBCallbacks* callbacks) { - m_database->removeObjectStore(name, IDBCallbacksProxy::create(callbacks)); + m_databaseBackend->removeObjectStore(name, IDBCallbacksProxy::create(callbacks)); } } // namespace WebCore |