Changeset 82738 in webkit
- Timestamp:
- Apr 1, 2011 4:12:07 PM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 1 added
- 1 deleted
- 38 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r82666 r82738 1 2011-03-30 Jeremy Orlow <jorlow@chromium.org> 2 3 Reviewed by Nate Chapin. 4 5 Clean up IndexedDB WebKit API 6 https://bugs.webkit.org/show_bug.cgi?id=57507 7 8 Rename the backend proxy files that didn't have Backend in their name. 9 Everything in WebKit should be in the WebKit namespace. 10 Put everything behind the feature flag so we're consistient. 11 Put the feature flag #if above includes. 12 13 * WebKit.gyp: 14 * src/IDBCallbacksProxy.cpp: 15 (WebKit::IDBCallbacksProxy::create): 16 (WebKit::IDBCallbacksProxy::IDBCallbacksProxy): 17 (WebKit::IDBCallbacksProxy::onError): 18 (WebKit::IDBCallbacksProxy::onSuccess): 19 * src/IDBCallbacksProxy.h: 20 * src/IDBCursorBackendProxy.cpp: 21 (WebKit::IDBCursorBackendProxy::create): 22 (WebKit::IDBCursorBackendProxy::IDBCursorBackendProxy): 23 * src/IDBCursorBackendProxy.h: 24 * src/IDBDatabaseBackendProxy.cpp: 25 (WebKit::IDBDatabaseBackendProxy::create): 26 (WebKit::IDBDatabaseBackendProxy::IDBDatabaseBackendProxy): 27 (WebKit::IDBDatabaseBackendProxy::~IDBDatabaseBackendProxy): 28 (WebKit::IDBDatabaseBackendProxy::name): 29 (WebKit::IDBDatabaseBackendProxy::version): 30 (WebKit::IDBDatabaseBackendProxy::objectStoreNames): 31 (WebKit::IDBDatabaseBackendProxy::createObjectStore): 32 (WebKit::IDBDatabaseBackendProxy::deleteObjectStore): 33 (WebKit::IDBDatabaseBackendProxy::setVersion): 34 (WebKit::IDBDatabaseBackendProxy::transaction): 35 (WebKit::IDBDatabaseBackendProxy::close): 36 (WebKit::IDBDatabaseBackendProxy::open): 37 * src/IDBDatabaseCallbacksProxy.cpp: 38 (WebKit::IDBDatabaseCallbacksProxy::create): 39 (WebKit::IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy): 40 * src/IDBDatabaseCallbacksProxy.h: 41 * src/IDBFactoryBackendProxy.cpp: 42 (WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy): 43 (WebKit::IDBFactoryBackendProxy::open): 44 * src/IDBFactoryBackendProxy.h: 45 * src/IDBIndexBackendProxy.cpp: 46 (WebKit::IDBIndexBackendProxy::create): 47 (WebKit::IDBIndexBackendProxy::IDBIndexBackendProxy): 48 * src/IDBIndexBackendProxy.h: 49 * src/IDBObjectStoreBackendProxy.cpp: 50 (WebKit::IDBObjectStoreBackendProxy::create): 51 (WebKit::IDBObjectStoreBackendProxy::IDBObjectStoreBackendProxy): 52 (WebKit::IDBObjectStoreBackendProxy::~IDBObjectStoreBackendProxy): 53 (WebKit::IDBObjectStoreBackendProxy::name): 54 (WebKit::IDBObjectStoreBackendProxy::keyPath): 55 (WebKit::IDBObjectStoreBackendProxy::indexNames): 56 (WebKit::IDBObjectStoreBackendProxy::get): 57 (WebKit::IDBObjectStoreBackendProxy::put): 58 (WebKit::IDBObjectStoreBackendProxy::deleteFunction): 59 (WebKit::IDBObjectStoreBackendProxy::clear): 60 (WebKit::IDBObjectStoreBackendProxy::createIndex): 61 (WebKit::IDBObjectStoreBackendProxy::index): 62 (WebKit::IDBObjectStoreBackendProxy::deleteIndex): 63 (WebKit::IDBObjectStoreBackendProxy::openCursor): 64 * src/IDBObjectStoreBackendProxy.h: Added. 65 * src/IDBObjectStoreProxy.h: Removed. 66 * src/IDBTransactionBackendProxy.cpp: 67 (WebKit::IDBTransactionBackendProxy::create): 68 (WebKit::IDBTransactionBackendProxy::IDBTransactionBackendProxy): 69 (WebKit::IDBTransactionBackendProxy::objectStore): 70 * src/IDBTransactionBackendProxy.h: 71 (WebKit::IDBTransactionBackendProxy::getWebIDBTransaction): 72 * src/IDBTransactionCallbacksProxy.cpp: 73 (WebKit::IDBTransactionCallbacksProxy::create): 74 (WebKit::IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy): 75 * src/IDBTransactionCallbacksProxy.h: 76 * src/WebIDBCallbacksImpl.cpp: 77 (WebKit::WebIDBCallbacksImpl::onError): 78 (WebKit::WebIDBCallbacksImpl::onSuccess): 79 * src/WebIDBCallbacksImpl.h: 80 * src/WebIDBCursorImpl.cpp: 81 * src/WebIDBCursorImpl.h: 82 * src/WebIDBDatabaseCallbacksImpl.cpp: 83 (WebKit::WebIDBDatabaseCallbacksImpl::onVersionChange): 84 * src/WebIDBDatabaseCallbacksImpl.h: 85 * src/WebIDBDatabaseError.cpp: 86 * src/WebIDBDatabaseImpl.cpp: 87 * src/WebIDBDatabaseImpl.h: 88 * src/WebIDBFactoryImpl.cpp: 89 (WebKit::WebIDBFactoryImpl::WebIDBFactoryImpl): 90 * src/WebIDBFactoryImpl.h: 91 * src/WebIDBIndexImpl.cpp: 92 * src/WebIDBIndexImpl.h: 93 * src/WebIDBKey.cpp: 94 (WebKit::WebIDBKey::createFromValueAndKeyPath): 95 (WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue): 96 * src/WebIDBKeyPath.cpp: 97 (WebKit::WebIDBKeyPath::operator const WTF::Vector<IDBKeyPathElement, 0>&): 98 * src/WebIDBKeyRange.cpp: 99 * src/WebIDBObjectStoreImpl.cpp: 100 * src/WebIDBObjectStoreImpl.h: 101 * src/WebIDBTransactionCallbacksImpl.cpp: 102 * src/WebIDBTransactionCallbacksImpl.h: 103 * src/WebIDBTransactionImpl.cpp: 104 * src/WebIDBTransactionImpl.h: 105 1 106 2011-03-30 Pavel Podivilov <podivilov@chromium.org> 2 107 -
trunk/Source/WebKit/chromium/WebKit.gyp
r82666 r82738 360 360 'src/IDBDatabaseCallbacksProxy.cpp', 361 361 'src/IDBDatabaseCallbacksProxy.h', 362 'src/IDBDatabase Proxy.cpp',363 'src/IDBDatabase Proxy.h',362 'src/IDBDatabaseBackendProxy.cpp', 363 'src/IDBDatabaseBackendProxy.h', 364 364 'src/IDBFactoryBackendProxy.cpp', 365 365 'src/IDBFactoryBackendProxy.h', 366 366 'src/IDBIndexBackendProxy.cpp', 367 367 'src/IDBIndexBackendProxy.h', 368 'src/IDBObjectStore Proxy.cpp',369 'src/IDBObjectStore Proxy.h',368 'src/IDBObjectStoreBackendProxy.cpp', 369 'src/IDBObjectStoreBackendProxy.h', 370 370 'src/IDBTransactionBackendProxy.cpp', 371 371 'src/IDBTransactionBackendProxy.h', -
trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp
r80564 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #include "IDBCallbacksProxy.h" 31 31 32 #if ENABLE(INDEXED_DATABASE) 33 34 #include "IDBDatabaseBackendProxy.h" 32 35 #include "IDBDatabaseError.h" 33 #include "IDBDatabaseProxy.h"34 36 #include "WebIDBCallbacks.h" 35 37 #include "WebIDBCursorImpl.h" … … 40 42 #include "WebSerializedScriptValue.h" 41 43 42 #if ENABLE(INDEXED_DATABASE) 44 using namespace WebCore; 43 45 44 namespace Web Core{46 namespace WebKit { 45 47 46 PassRefPtr<IDBCallbacksProxy> IDBCallbacksProxy::create(PassOwnPtr<Web Kit::WebIDBCallbacks> callbacks)48 PassRefPtr<IDBCallbacksProxy> IDBCallbacksProxy::create(PassOwnPtr<WebIDBCallbacks> callbacks) 47 49 { 48 50 return adoptRef(new IDBCallbacksProxy(callbacks)); 49 51 } 50 52 51 IDBCallbacksProxy::IDBCallbacksProxy(PassOwnPtr<Web Kit::WebIDBCallbacks> callbacks)53 IDBCallbacksProxy::IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks> callbacks) 52 54 : m_callbacks(callbacks) 53 55 { … … 60 62 void IDBCallbacksProxy::onError(PassRefPtr<IDBDatabaseError> idbDatabaseError) 61 63 { 62 m_callbacks->onError(Web Kit::WebIDBDatabaseError(idbDatabaseError));64 m_callbacks->onError(WebIDBDatabaseError(idbDatabaseError)); 63 65 } 64 66 65 67 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBCursorBackendInterface> idbCursorBackend) 66 68 { 67 m_callbacks->onSuccess(new Web Kit::WebIDBCursorImpl(idbCursorBackend));69 m_callbacks->onSuccess(new WebIDBCursorImpl(idbCursorBackend)); 68 70 } 69 71 70 72 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend) 71 73 { 72 m_callbacks->onSuccess(new Web Kit::WebIDBDatabaseImpl(backend));74 m_callbacks->onSuccess(new WebIDBDatabaseImpl(backend)); 73 75 } 74 76 75 77 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBKey> idbKey) 76 78 { 77 m_callbacks->onSuccess(Web Kit::WebIDBKey(idbKey));79 m_callbacks->onSuccess(WebIDBKey(idbKey)); 78 80 } 79 81 80 82 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBTransactionBackendInterface> backend) 81 83 { 82 m_callbacks->onSuccess(new Web Kit::WebIDBTransactionImpl(backend));84 m_callbacks->onSuccess(new WebIDBTransactionImpl(backend)); 83 85 } 84 86 85 87 void IDBCallbacksProxy::onSuccess(PassRefPtr<SerializedScriptValue> serializedScriptValue) 86 88 { 87 m_callbacks->onSuccess(Web Kit::WebSerializedScriptValue(serializedScriptValue));89 m_callbacks->onSuccess(WebSerializedScriptValue(serializedScriptValue)); 88 90 } 89 91 … … 93 95 } 94 96 95 } // namespace Web Core97 } // namespace WebKit 96 98 97 99 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h
r80564 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #define IDBCallbacksProxy_h 31 31 32 #if ENABLE(INDEXED_DATABASE) 33 32 34 #include "IDBCallbacks.h" 33 35 #include <wtf/PassOwnPtr.h> … … 35 37 #include <wtf/RefPtr.h> 36 38 37 #if ENABLE(INDEXED_DATABASE) 39 namespace WebKit { 38 40 39 namespace WebKit {40 41 class WebIDBCallbacks; 41 }42 42 43 namespace WebCore { 44 45 class IDBCallbacksProxy : public IDBCallbacks { 43 class IDBCallbacksProxy : public WebCore::IDBCallbacks { 46 44 public: 47 static PassRefPtr<IDBCallbacksProxy> create(PassOwnPtr<Web Kit::WebIDBCallbacks>);45 static PassRefPtr<IDBCallbacksProxy> create(PassOwnPtr<WebIDBCallbacks>); 48 46 virtual ~IDBCallbacksProxy(); 49 47 50 virtual void onError(PassRefPtr< IDBDatabaseError>);51 virtual void onSuccess(PassRefPtr< IDBCursorBackendInterface>);52 virtual void onSuccess(PassRefPtr< IDBDatabaseBackendInterface>);53 virtual void onSuccess(PassRefPtr< IDBKey>);54 virtual void onSuccess(PassRefPtr< IDBTransactionBackendInterface>);55 virtual void onSuccess(PassRefPtr< SerializedScriptValue>);48 virtual void onError(PassRefPtr<WebCore::IDBDatabaseError>); 49 virtual void onSuccess(PassRefPtr<WebCore::IDBCursorBackendInterface>); 50 virtual void onSuccess(PassRefPtr<WebCore::IDBDatabaseBackendInterface>); 51 virtual void onSuccess(PassRefPtr<WebCore::IDBKey>); 52 virtual void onSuccess(PassRefPtr<WebCore::IDBTransactionBackendInterface>); 53 virtual void onSuccess(PassRefPtr<WebCore::SerializedScriptValue>); 56 54 virtual void onBlocked(); 57 55 58 56 private: 59 IDBCallbacksProxy(PassOwnPtr<Web Kit::WebIDBCallbacks>);57 IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks>); 60 58 61 OwnPtr<Web Kit::WebIDBCallbacks> m_callbacks;59 OwnPtr<WebIDBCallbacks> m_callbacks; 62 60 }; 63 61 64 65 } // namespace WebCore 62 } // namespace WebKit 66 63 67 64 #endif -
trunk/Source/WebKit/chromium/src/IDBCursorBackendProxy.cpp
r80171 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 37 37 #include "WebSerializedScriptValue.h" 38 38 39 namespace WebCore { 39 using namespace WebCore; 40 40 41 PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebKit::WebIDBCursor> idbCursor) 41 namespace WebKit { 42 43 PassRefPtr<IDBCursorBackendInterface> IDBCursorBackendProxy::create(PassOwnPtr<WebIDBCursor> idbCursor) 42 44 { 43 45 return adoptRef(new IDBCursorBackendProxy(idbCursor)); 44 46 } 45 47 46 IDBCursorBackendProxy::IDBCursorBackendProxy(PassOwnPtr<Web Kit::WebIDBCursor> idbCursor)48 IDBCursorBackendProxy::IDBCursorBackendProxy(PassOwnPtr<WebIDBCursor> idbCursor) 47 49 : m_idbCursor(idbCursor) 48 50 { … … 88 90 } 89 91 90 } // namespace Web Core92 } // namespace WebKit 91 93 92 94 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBCursorBackendProxy.h
r80171 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 36 36 #include <wtf/RefPtr.h> 37 37 38 namespace Web Core{38 namespace WebKit { 39 39 40 class IDBCursorBackendProxy : public IDBCursorBackendInterface {40 class IDBCursorBackendProxy : public WebCore::IDBCursorBackendInterface { 41 41 public: 42 static PassRefPtr< IDBCursorBackendInterface> create(PassOwnPtr<WebKit::WebIDBCursor>);42 static PassRefPtr<WebCore::IDBCursorBackendInterface> create(PassOwnPtr<WebIDBCursor>); 43 43 virtual ~IDBCursorBackendProxy(); 44 44 45 45 virtual unsigned short direction() const; 46 virtual PassRefPtr< IDBKey> key() const;47 virtual PassRefPtr< IDBKey> primaryKey() const;48 virtual PassRefPtr< SerializedScriptValue> value() const;49 virtual void update(PassRefPtr< SerializedScriptValue>, PassRefPtr<IDBCallbacks>,ExceptionCode&);50 virtual void continueFunction(PassRefPtr< IDBKey>, PassRefPtr<IDBCallbacks>,ExceptionCode&);51 virtual void deleteFunction(PassRefPtr< IDBCallbacks>,ExceptionCode&);46 virtual PassRefPtr<WebCore::IDBKey> key() const; 47 virtual PassRefPtr<WebCore::IDBKey> primaryKey() const; 48 virtual PassRefPtr<WebCore::SerializedScriptValue> value() const; 49 virtual void update(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::ExceptionCode&); 50 virtual void continueFunction(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::ExceptionCode&); 51 virtual void deleteFunction(PassRefPtr<WebCore::IDBCallbacks>, WebCore::ExceptionCode&); 52 52 53 53 private: 54 IDBCursorBackendProxy(PassOwnPtr<Web Kit::WebIDBCursor>);54 IDBCursorBackendProxy(PassOwnPtr<WebIDBCursor>); 55 55 56 OwnPtr<Web Kit::WebIDBCursor> m_idbCursor;56 OwnPtr<WebIDBCursor> m_idbCursor; 57 57 }; 58 58 59 } // namespace Web Core59 } // namespace WebKit 60 60 61 61 #endif -
trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp
-
Property
svn:eol-style
set to
LF
r82737 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 25 25 26 26 #include "config.h" 27 #include "IDBDatabaseProxy.h" 27 #include "IDBDatabaseBackendProxy.h" 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "DOMStringList.h" 30 32 #include "IDBCallbacks.h" 31 33 #include "IDBDatabaseCallbacks.h" 32 #include "IDBObjectStore Proxy.h"34 #include "IDBObjectStoreBackendProxy.h" 33 35 #include "IDBTransactionBackendProxy.h" 34 36 #include "WebDOMStringList.h" … … 41 43 #include "WebIDBTransaction.h" 42 44 43 #if ENABLE(INDEXED_DATABASE) 45 using namespace WebCore; 44 46 45 namespace Web Core{47 namespace WebKit { 46 48 47 PassRefPtr<IDBDatabaseBackendInterface> IDBDatabase Proxy::create(PassOwnPtr<WebKit::WebIDBDatabase> database)49 PassRefPtr<IDBDatabaseBackendInterface> IDBDatabaseBackendProxy::create(PassOwnPtr<WebIDBDatabase> database) 48 50 { 49 return adoptRef(new IDBDatabase Proxy(database));51 return adoptRef(new IDBDatabaseBackendProxy(database)); 50 52 } 51 53 52 IDBDatabase Proxy::IDBDatabaseProxy(PassOwnPtr<WebKit::WebIDBDatabase> database)54 IDBDatabaseBackendProxy::IDBDatabaseBackendProxy(PassOwnPtr<WebIDBDatabase> database) 53 55 : m_webIDBDatabase(database) 54 56 { 55 57 } 56 58 57 IDBDatabase Proxy::~IDBDatabaseProxy()59 IDBDatabaseBackendProxy::~IDBDatabaseBackendProxy() 58 60 { 59 61 } 60 62 61 String IDBDatabase Proxy::name() const63 String IDBDatabaseBackendProxy::name() const 62 64 { 63 65 return m_webIDBDatabase->name(); 64 66 } 65 67 66 String IDBDatabase Proxy::version() const68 String IDBDatabaseBackendProxy::version() const 67 69 { 68 70 return m_webIDBDatabase->version(); 69 71 } 70 72 71 PassRefPtr<DOMStringList> IDBDatabase Proxy::objectStoreNames() const73 PassRefPtr<DOMStringList> IDBDatabaseBackendProxy::objectStoreNames() const 72 74 { 73 75 return m_webIDBDatabase->objectStoreNames(); 74 76 } 75 77 76 PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabase Proxy::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)78 PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseBackendProxy::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 77 79 { 78 80 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, 79 81 // all implementations of IDB interfaces are proxy objects. 80 82 IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction); 81 Web Kit::WebIDBObjectStore* objectStore = m_webIDBDatabase->createObjectStore(name, keyPath, autoIncrement, *transactionProxy->getWebIDBTransaction(), ec);83 WebIDBObjectStore* objectStore = m_webIDBDatabase->createObjectStore(name, keyPath, autoIncrement, *transactionProxy->getWebIDBTransaction(), ec); 82 84 if (!objectStore) 83 85 return 0; 84 return IDBObjectStore Proxy::create(objectStore);86 return IDBObjectStoreBackendProxy::create(objectStore); 85 87 } 86 88 87 void IDBDatabase Proxy::deleteObjectStore(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)89 void IDBDatabaseBackendProxy::deleteObjectStore(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 88 90 { 89 91 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, … … 93 95 } 94 96 95 void IDBDatabase Proxy::setVersion(const String& version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, ExceptionCode& ec)97 void IDBDatabaseBackendProxy::setVersion(const String& version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, ExceptionCode& ec) 96 98 { 97 99 m_webIDBDatabase->setVersion(version, new WebIDBCallbacksImpl(callbacks), ec); 98 100 } 99 101 100 PassRefPtr<IDBTransactionBackendInterface> IDBDatabase Proxy::transaction(DOMStringList* storeNames, unsigned short mode, ExceptionCode& ec)102 PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendProxy::transaction(DOMStringList* storeNames, unsigned short mode, ExceptionCode& ec) 101 103 { 102 Web Kit::WebDOMStringList names(storeNames);103 Web Kit::WebIDBTransaction* transaction = m_webIDBDatabase->transaction(names, mode, ec);104 WebDOMStringList names(storeNames); 105 WebIDBTransaction* transaction = m_webIDBDatabase->transaction(names, mode, ec); 104 106 if (!transaction) { 105 107 ASSERT(ec); … … 109 111 } 110 112 111 void IDBDatabase Proxy::close(PassRefPtr<IDBDatabaseCallbacks>)113 void IDBDatabaseBackendProxy::close(PassRefPtr<IDBDatabaseCallbacks>) 112 114 { 113 115 m_webIDBDatabase->close(); 114 116 } 115 117 116 void IDBDatabase Proxy::open(PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks)118 void IDBDatabaseBackendProxy::open(PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks) 117 119 { 118 120 m_webIDBDatabase->open(new WebIDBDatabaseCallbacksImpl(databaseCallbacks)); 119 121 } 120 122 121 } // namespace Web Core123 } // namespace WebKit 122 124 123 125 #endif // ENABLE(INDEXED_DATABASE) -
Property
svn:eol-style
set to
-
trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.h
r82737 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #ifndef IDBDatabaseProxy_h 27 #define IDBDatabaseProxy_h 26 #ifndef IDBDatabaseBackendProxy_h 27 #define IDBDatabaseBackendProxy_h 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "IDBDatabaseBackendInterface.h" … … 32 34 #include <wtf/PassRefPtr.h> 33 35 34 #if ENABLE(INDEXED_DATABASE) 36 namespace WebKit { 35 37 36 namespace WebKit { class WebIDBDatabase; } 38 class WebIDBDatabase; 37 39 38 namespace WebCore { 39 40 class IDBDatabaseProxy : public IDBDatabaseBackendInterface { 40 class IDBDatabaseBackendProxy : public WebCore::IDBDatabaseBackendInterface { 41 41 public: 42 static PassRefPtr< IDBDatabaseBackendInterface> create(PassOwnPtr<WebKit::WebIDBDatabase>);43 virtual ~IDBDatabase Proxy();42 static PassRefPtr<WebCore::IDBDatabaseBackendInterface> create(PassOwnPtr<WebIDBDatabase>); 43 virtual ~IDBDatabaseBackendProxy(); 44 44 45 45 virtual String name() const; 46 46 virtual String version() const; 47 virtual PassRefPtr< DOMStringList> objectStoreNames() const;47 virtual PassRefPtr<WebCore::DOMStringList> objectStoreNames() const; 48 48 49 virtual PassRefPtr< IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface*,ExceptionCode&);50 virtual void deleteObjectStore(const String& name, IDBTransactionBackendInterface*,ExceptionCode&);51 virtual void setVersion(const String& version, PassRefPtr< IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>,ExceptionCode&);52 virtual PassRefPtr< IDBTransactionBackendInterface> transaction(DOMStringList* storeNames, unsigned short mode,ExceptionCode&);53 virtual void close(PassRefPtr< IDBDatabaseCallbacks>);49 virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&); 50 virtual void deleteObjectStore(const String& name, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&); 51 virtual void setVersion(const String& version, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::IDBDatabaseCallbacks>, WebCore::ExceptionCode&); 52 virtual PassRefPtr<WebCore::IDBTransactionBackendInterface> transaction(WebCore::DOMStringList* storeNames, unsigned short mode, WebCore::ExceptionCode&); 53 virtual void close(PassRefPtr<WebCore::IDBDatabaseCallbacks>); 54 54 55 virtual void open(PassRefPtr< IDBDatabaseCallbacks>);55 virtual void open(PassRefPtr<WebCore::IDBDatabaseCallbacks>); 56 56 57 57 private: 58 IDBDatabase Proxy(PassOwnPtr<WebKit::WebIDBDatabase>);58 IDBDatabaseBackendProxy(PassOwnPtr<WebIDBDatabase>); 59 59 60 OwnPtr<Web Kit::WebIDBDatabase> m_webIDBDatabase;60 OwnPtr<WebIDBDatabase> m_webIDBDatabase; 61 61 }; 62 62 63 } // namespace Web Core63 } // namespace WebKit 64 64 65 65 #endif 66 66 67 #endif // IDBDatabase Proxy_h67 #endif // IDBDatabaseBackendProxy_h -
trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.cpp
r80183 r82738 31 31 #include "WebIDBDatabaseCallbacks.h" 32 32 33 namespace WebCore { 33 using namespace WebCore; 34 34 35 PassRefPtr<IDBDatabaseCallbacksProxy> IDBDatabaseCallbacksProxy::create(PassOwnPtr<WebKit::WebIDBDatabaseCallbacks> callbacks) 35 namespace WebKit { 36 37 PassRefPtr<IDBDatabaseCallbacksProxy> IDBDatabaseCallbacksProxy::create(PassOwnPtr<WebIDBDatabaseCallbacks> callbacks) 36 38 { 37 39 return adoptRef(new IDBDatabaseCallbacksProxy(callbacks)); 38 40 } 39 41 40 IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy(PassOwnPtr<Web Kit::WebIDBDatabaseCallbacks> callbacks)42 IDBDatabaseCallbacksProxy::IDBDatabaseCallbacksProxy(PassOwnPtr<WebIDBDatabaseCallbacks> callbacks) 41 43 : m_callbacks(callbacks) 42 44 { … … 52 54 } 53 55 54 } // namespace Web Core56 } // namespace WebKit 55 57 56 58 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBDatabaseCallbacksProxy.h
r80183 r82738 27 27 #define IDBDatabaseCallbacksProxy_h 28 28 29 #include "IDBDatabaseCallbacks.h"30 31 29 #if ENABLE(INDEXED_DATABASE) 32 30 31 #include "IDBDatabaseCallbacks.h" 33 32 #include <wtf/PassOwnPtr.h> 34 33 35 namespace WebKit { class WebIDBDatabaseCallbacks; }34 namespace WebKit { 36 35 37 namespace WebCore { 36 class WebIDBDatabaseCallbacks; 38 37 39 class IDBDatabaseCallbacksProxy : public IDBDatabaseCallbacks {38 class IDBDatabaseCallbacksProxy : public WebCore::IDBDatabaseCallbacks { 40 39 public: 41 static PassRefPtr<IDBDatabaseCallbacksProxy> create(PassOwnPtr<Web Kit::WebIDBDatabaseCallbacks>);40 static PassRefPtr<IDBDatabaseCallbacksProxy> create(PassOwnPtr<WebIDBDatabaseCallbacks>); 42 41 virtual ~IDBDatabaseCallbacksProxy(); 43 42 … … 45 44 46 45 private: 47 IDBDatabaseCallbacksProxy(PassOwnPtr<Web Kit::WebIDBDatabaseCallbacks>);46 IDBDatabaseCallbacksProxy(PassOwnPtr<WebIDBDatabaseCallbacks>); 48 47 49 OwnPtr<Web Kit::WebIDBDatabaseCallbacks> m_callbacks;48 OwnPtr<WebIDBDatabaseCallbacks> m_callbacks; 50 49 }; 51 50 52 } // namespace Web Core51 } // namespace WebKit 53 52 54 53 #endif -
trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
r80635 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #include "IDBFactoryBackendProxy.h" 31 31 32 #if ENABLE(INDEXED_DATABASE) 33 32 34 #include "DOMStringList.h" 35 #include "IDBDatabaseBackendProxy.h" 33 36 #include "IDBDatabaseError.h" 34 #include "IDBDatabaseProxy.h"35 37 #include "WebFrameImpl.h" 36 38 #include "WebIDBCallbacksImpl.h" … … 42 44 #include "WebVector.h" 43 45 44 #if ENABLE(INDEXED_DATABASE) 46 using namespace WebCore; 45 47 46 namespace Web Core{48 namespace WebKit { 47 49 48 50 PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendProxy::create() … … 52 54 53 55 IDBFactoryBackendProxy::IDBFactoryBackendProxy() 54 : m_webIDBFactory( WebKit::webKitClient()->idbFactory())56 : m_webIDBFactory(webKitClient()->idbFactory()) 55 57 { 56 58 } … … 62 64 void IDBFactoryBackendProxy::open(const String& name, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin> origin, Frame* frame, const String& dataDir, int64_t maximumSize, BackingStoreType backingStoreType) 63 65 { 64 Web Kit::WebFrame* webFrame = WebKit::WebFrameImpl::fromFrame(frame);65 m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir, maximumSize, static_cast<Web Kit::WebIDBFactory::BackingStoreType>(backingStoreType));66 WebFrame* webFrame = WebFrameImpl::fromFrame(frame); 67 m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir, maximumSize, static_cast<WebIDBFactory::BackingStoreType>(backingStoreType)); 66 68 } 67 69 68 } // namespace Web Core70 } // namespace WebKit 69 71 70 72 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.h
r80635 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #define IDBFactoryBackendProxy_h 31 31 32 #if ENABLE(INDEXED_DATABASE) 33 32 34 #include "IDBFactoryBackendInterface.h" 33 35 34 #if ENABLE(INDEXED_DATABASE) 36 namespace WebCore { class DOMStringList; } 35 37 36 namespace WebKit { class WebIDBFactory; }38 namespace WebKit { 37 39 38 namespace WebCore { 40 class WebIDBFactory; 39 41 40 class DOMStringList; 41 42 class IDBFactoryBackendProxy : public IDBFactoryBackendInterface { 42 class IDBFactoryBackendProxy : public WebCore::IDBFactoryBackendInterface { 43 43 public: 44 static PassRefPtr< IDBFactoryBackendInterface> create();44 static PassRefPtr<WebCore::IDBFactoryBackendInterface> create(); 45 45 virtual ~IDBFactoryBackendProxy(); 46 46 47 PassRefPtr< DOMStringList> databases(void) const;48 virtual void open(const String& name, PassRefPtr< IDBCallbacks>, PassRefPtr<SecurityOrigin>,Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType);47 PassRefPtr<WebCore::DOMStringList> databases(void) const; 48 virtual void open(const String& name, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::SecurityOrigin>, WebCore::Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType); 49 49 50 50 private: … … 52 52 53 53 // We don't own this pointer (unlike all the other proxy classes which do). 54 Web Kit::WebIDBFactory* m_webIDBFactory;54 WebIDBFactory* m_webIDBFactory; 55 55 }; 56 56 57 } // namespace Web Core57 } // namespace WebKit 58 58 59 59 #endif -
trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.cpp
r69721 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 38 38 #include "WebIDBKeyRange.h" 39 39 40 namespace WebCore { 40 using namespace WebCore; 41 41 42 PassRefPtr<IDBIndexBackendInterface> IDBIndexBackendProxy::create(PassOwnPtr<WebKit::WebIDBIndex> index) 42 namespace WebKit { 43 44 PassRefPtr<IDBIndexBackendInterface> IDBIndexBackendProxy::create(PassOwnPtr<WebIDBIndex> index) 43 45 { 44 46 return adoptRef(new IDBIndexBackendProxy(index)); 45 47 } 46 48 47 IDBIndexBackendProxy::IDBIndexBackendProxy(PassOwnPtr<Web Kit::WebIDBIndex> index)49 IDBIndexBackendProxy::IDBIndexBackendProxy(PassOwnPtr<WebIDBIndex> index) 48 50 : m_webIDBIndex(index) 49 51 { … … 106 108 } 107 109 108 } // namespace Web Core110 } // namespace WebKit 109 111 110 112 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBIndexBackendProxy.h
r69721 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #define IDBIndexBackendProxy_h 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "IDBIndexBackendInterface.h" 30 32 #include <wtf/OwnPtr.h> 31 33 #include <wtf/PassOwnPtr.h> 32 34 33 #if ENABLE(INDEXED_DATABASE) 35 namespace WebKit { 34 36 35 namespace WebKit { class WebIDBIndex; } 37 class WebIDBIndex; 36 38 37 namespace WebCore { 38 39 class IDBIndexBackendProxy : public IDBIndexBackendInterface { 39 class IDBIndexBackendProxy : public WebCore::IDBIndexBackendInterface { 40 40 public: 41 static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<Web Kit::WebIDBIndex>);41 static PassRefPtr<IDBIndexBackendInterface> create(PassOwnPtr<WebIDBIndex>); 42 42 virtual ~IDBIndexBackendProxy(); 43 43 … … 47 47 virtual bool unique(); 48 48 49 virtual void openCursor(PassRefPtr< IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*,ExceptionCode&);50 virtual void openKeyCursor(PassRefPtr< IDBKeyRange>, unsigned short direction, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*,ExceptionCode&);51 virtual void get(PassRefPtr< IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*,ExceptionCode&);52 virtual void getKey(PassRefPtr< IDBKey>, PassRefPtr<IDBCallbacks>, IDBTransactionBackendInterface*,ExceptionCode&);49 virtual void openCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&); 50 virtual void openKeyCursor(PassRefPtr<WebCore::IDBKeyRange>, unsigned short direction, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&); 51 virtual void get(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&); 52 virtual void getKey(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBCallbacks>, WebCore::IDBTransactionBackendInterface*, WebCore::ExceptionCode&); 53 53 54 54 private: 55 IDBIndexBackendProxy(PassOwnPtr<Web Kit::WebIDBIndex>);55 IDBIndexBackendProxy(PassOwnPtr<WebIDBIndex>); 56 56 57 OwnPtr<Web Kit::WebIDBIndex> m_webIDBIndex;57 OwnPtr<WebIDBIndex> m_webIDBIndex; 58 58 }; 59 59 60 } // namespace Web Core60 } // namespace WebKit 61 61 62 62 #endif -
trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp
r82737 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 25 25 26 26 #include "config.h" 27 #include "IDBObjectStoreProxy.h" 27 #include "IDBObjectStoreBackendProxy.h" 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "DOMStringList.h" … … 40 42 #include "WebSerializedScriptValue.h" 41 43 42 #if ENABLE(INDEXED_DATABASE) 44 using namespace WebCore; 43 45 44 namespace Web Core{46 namespace WebKit { 45 47 46 PassRefPtr<IDBObjectStoreBackendInterface> IDBObjectStore Proxy::create(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)48 PassRefPtr<IDBObjectStoreBackendInterface> IDBObjectStoreBackendProxy::create(PassOwnPtr<WebIDBObjectStore> objectStore) 47 49 { 48 return adoptRef(new IDBObjectStore Proxy(objectStore));50 return adoptRef(new IDBObjectStoreBackendProxy(objectStore)); 49 51 } 50 52 51 IDBObjectStore Proxy::IDBObjectStoreProxy(PassOwnPtr<WebKit::WebIDBObjectStore> objectStore)53 IDBObjectStoreBackendProxy::IDBObjectStoreBackendProxy(PassOwnPtr<WebIDBObjectStore> objectStore) 52 54 : m_webIDBObjectStore(objectStore) 53 55 { 54 56 } 55 57 56 IDBObjectStore Proxy::~IDBObjectStoreProxy()58 IDBObjectStoreBackendProxy::~IDBObjectStoreBackendProxy() 57 59 { 58 60 } 59 61 60 String IDBObjectStore Proxy::name() const62 String IDBObjectStoreBackendProxy::name() const 61 63 { 62 64 return m_webIDBObjectStore->name(); 63 65 } 64 66 65 String IDBObjectStore Proxy::keyPath() const67 String IDBObjectStoreBackendProxy::keyPath() const 66 68 { 67 69 return m_webIDBObjectStore->keyPath(); 68 70 } 69 71 70 PassRefPtr<DOMStringList> IDBObjectStore Proxy::indexNames() const72 PassRefPtr<DOMStringList> IDBObjectStoreBackendProxy::indexNames() const 71 73 { 72 74 return m_webIDBObjectStore->indexNames(); 73 75 } 74 76 75 void IDBObjectStore Proxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)77 void IDBObjectStoreBackendProxy::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 76 78 { 77 79 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, … … 81 83 } 82 84 83 void IDBObjectStore Proxy::put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key, PutMode putMode, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)85 void IDBObjectStoreBackendProxy::put(PassRefPtr<SerializedScriptValue> value, PassRefPtr<IDBKey> key, PutMode putMode, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 84 86 { 85 87 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, 86 88 // all implementations of IDB interfaces are proxy objects. 87 89 IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction); 88 m_webIDBObjectStore->put(value, key, static_cast<Web Kit::WebIDBObjectStore::PutMode>(putMode), new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec);90 m_webIDBObjectStore->put(value, key, static_cast<WebIDBObjectStore::PutMode>(putMode), new WebIDBCallbacksImpl(callbacks), *transactionProxy->getWebIDBTransaction(), ec); 89 91 } 90 92 91 void IDBObjectStore Proxy::deleteFunction(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)93 void IDBObjectStoreBackendProxy::deleteFunction(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 92 94 { 93 95 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, … … 97 99 } 98 100 99 void IDBObjectStore Proxy::clear(PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)101 void IDBObjectStoreBackendProxy::clear(PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 100 102 { 101 103 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, … … 105 107 } 106 108 107 PassRefPtr<IDBIndexBackendInterface> IDBObjectStore Proxy::createIndex(const String& name, const String& keyPath, bool unique, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)109 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendProxy::createIndex(const String& name, const String& keyPath, bool unique, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 108 110 { 109 111 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, 110 112 // all implementations of IDB interfaces are proxy objects. 111 113 IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction); 112 Web Kit::WebIDBIndex* index = m_webIDBObjectStore->createIndex(name, keyPath, unique, *transactionProxy->getWebIDBTransaction(), ec);114 WebIDBIndex* index = m_webIDBObjectStore->createIndex(name, keyPath, unique, *transactionProxy->getWebIDBTransaction(), ec); 113 115 if (!index) 114 116 return 0; … … 116 118 } 117 119 118 PassRefPtr<IDBIndexBackendInterface> IDBObjectStore Proxy::index(const String& name, ExceptionCode& ec)120 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendProxy::index(const String& name, ExceptionCode& ec) 119 121 { 120 Web Kit::WebIDBIndex* index = m_webIDBObjectStore->index(name, ec);122 WebIDBIndex* index = m_webIDBObjectStore->index(name, ec); 121 123 if (!index) 122 124 return 0; … … 124 126 } 125 127 126 void IDBObjectStore Proxy::deleteIndex(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)128 void IDBObjectStoreBackendProxy::deleteIndex(const String& name, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 127 129 { 128 130 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, … … 132 134 } 133 135 134 void IDBObjectStore Proxy::openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)136 void IDBObjectStoreBackendProxy::openCursor(PassRefPtr<IDBKeyRange> range, unsigned short direction, PassRefPtr<IDBCallbacks> callbacks, IDBTransactionBackendInterface* transaction, ExceptionCode& ec) 135 137 { 136 138 // The transaction pointer is guaranteed to be a pointer to a proxy object as, in the renderer, … … 140 142 } 141 143 142 } // namespace Web Core144 } // namespace WebKit 143 145 144 146 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp
r72765 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 29 29 #if ENABLE(INDEXED_DATABASE) 30 30 31 #include "IDBObjectStore Proxy.h"31 #include "IDBObjectStoreBackendProxy.h" 32 32 #include "IDBTransactionCallbacks.h" 33 33 #include "WebIDBDatabaseError.h" … … 36 36 #include "WebIDBTransactionCallbacksImpl.h" 37 37 38 namespace WebCore { 38 using namespace WebCore; 39 39 40 PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(PassOwnPtr<WebKit::WebIDBTransaction> transaction) 40 namespace WebKit { 41 42 PassRefPtr<IDBTransactionBackendInterface> IDBTransactionBackendProxy::create(PassOwnPtr<WebIDBTransaction> transaction) 41 43 { 42 44 return adoptRef(new IDBTransactionBackendProxy(transaction)); 43 45 } 44 46 45 IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<Web Kit::WebIDBTransaction> transaction)47 IDBTransactionBackendProxy::IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction> transaction) 46 48 : m_webIDBTransaction(transaction) 47 49 { … … 55 57 PassRefPtr<IDBObjectStoreBackendInterface> IDBTransactionBackendProxy::objectStore(const String& name, ExceptionCode& ec) 56 58 { 57 Web Kit::WebIDBObjectStore* objectStore = m_webIDBTransaction->objectStore(name, ec);59 WebIDBObjectStore* objectStore = m_webIDBTransaction->objectStore(name, ec); 58 60 if (!objectStore) 59 61 return 0; 60 return IDBObjectStore Proxy::create(objectStore);62 return IDBObjectStoreBackendProxy::create(objectStore); 61 63 } 62 64 … … 89 91 } 90 92 91 } // namespace Web Core93 } // namespace WebKit 92 94 93 95 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.h
r72765 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #define IDBTransactionBackendProxy_h 28 28 29 #include "IDBTransactionBackendInterface.h"30 31 29 #if ENABLE(INDEXED_DATABASE) 32 30 31 #include "IDBTransactionBackendInterface.h" 33 32 #include <wtf/OwnPtr.h> 34 33 #include <wtf/PassOwnPtr.h> 35 34 36 namespace WebKit { class WebIDBTransaction; }35 namespace WebKit { 37 36 38 namespace WebCore { 37 class WebIDBTransaction; 39 38 40 class IDBTransactionBackendProxy : public IDBTransactionBackendInterface {39 class IDBTransactionBackendProxy : public WebCore::IDBTransactionBackendInterface { 41 40 public: 42 static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<Web Kit::WebIDBTransaction>);41 static PassRefPtr<IDBTransactionBackendInterface> create(PassOwnPtr<WebIDBTransaction>); 43 42 virtual ~IDBTransactionBackendProxy(); 44 43 45 virtual PassRefPtr< IDBObjectStoreBackendInterface> objectStore(const String& name,ExceptionCode&);44 virtual PassRefPtr<WebCore::IDBObjectStoreBackendInterface> objectStore(const String& name, WebCore::ExceptionCode&); 46 45 virtual unsigned short mode() const; 47 46 virtual void abort(); 48 virtual bool scheduleTask(PassOwnPtr< ScriptExecutionContext::Task>, PassOwnPtr<ScriptExecutionContext::Task>);47 virtual bool scheduleTask(PassOwnPtr<WebCore::ScriptExecutionContext::Task>, PassOwnPtr<WebCore::ScriptExecutionContext::Task>); 49 48 virtual void didCompleteTaskEvents(); 50 virtual void setCallbacks( IDBTransactionCallbacks*);49 virtual void setCallbacks(WebCore::IDBTransactionCallbacks*); 51 50 52 Web Kit::WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); }51 WebIDBTransaction* getWebIDBTransaction() const { return m_webIDBTransaction.get(); } 53 52 54 53 private: 55 IDBTransactionBackendProxy(PassOwnPtr<Web Kit::WebIDBTransaction>);54 IDBTransactionBackendProxy(PassOwnPtr<WebIDBTransaction>); 56 55 57 OwnPtr<Web Kit::WebIDBTransaction> m_webIDBTransaction;56 OwnPtr<WebIDBTransaction> m_webIDBTransaction; 58 57 }; 59 58 60 } // namespace Web Core59 } // namespace WebKit 61 60 62 61 #endif -
trunk/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.cpp
r77647 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #include "IDBTransactionCallbacksProxy.h" 31 31 32 #if ENABLE(INDEXED_DATABASE) 33 32 34 #include "WebIDBTransactionCallbacks.h" 33 35 34 #if ENABLE(INDEXED_DATABASE) 36 using namespace WebCore; 35 37 36 namespace Web Core{38 namespace WebKit { 37 39 38 PassRefPtr<IDBTransactionCallbacksProxy> IDBTransactionCallbacksProxy::create(PassOwnPtr<Web Kit::WebIDBTransactionCallbacks> callbacks)40 PassRefPtr<IDBTransactionCallbacksProxy> IDBTransactionCallbacksProxy::create(PassOwnPtr<WebIDBTransactionCallbacks> callbacks) 39 41 { 40 42 return adoptRef(new IDBTransactionCallbacksProxy(callbacks)); 41 43 } 42 44 43 IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy(PassOwnPtr<Web Kit::WebIDBTransactionCallbacks> callbacks)45 IDBTransactionCallbacksProxy::IDBTransactionCallbacksProxy(PassOwnPtr<WebIDBTransactionCallbacks> callbacks) 44 46 : m_callbacks(callbacks) 45 47 { … … 60 62 } 61 63 62 } // namespace Web Core64 } // namespace WebKit 63 65 64 66 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.h
r77647 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #define IDBTransactionCallbacksProxy_h 31 31 32 #include "IDBTransactionCallbacks.h"33 34 32 #if ENABLE(INDEXED_DATABASE) 35 33 34 #include "IDBTransactionCallbacks.h" 36 35 #include <wtf/PassOwnPtr.h> 37 36 #include <wtf/PassRefPtr.h> 38 37 39 namespace WebKit { class WebIDBTransactionCallbacks; }38 namespace WebKit { 40 39 41 namespace WebCore { 40 class WebIDBTransactionCallbacks; 42 41 43 class IDBTransactionCallbacksProxy : public IDBTransactionCallbacks {42 class IDBTransactionCallbacksProxy : public WebCore::IDBTransactionCallbacks { 44 43 public: 45 static PassRefPtr<IDBTransactionCallbacksProxy> create(PassOwnPtr<Web Kit::WebIDBTransactionCallbacks>);44 static PassRefPtr<IDBTransactionCallbacksProxy> create(PassOwnPtr<WebIDBTransactionCallbacks>); 46 45 virtual ~IDBTransactionCallbacksProxy(); 47 46 … … 50 49 51 50 private: 52 IDBTransactionCallbacksProxy(PassOwnPtr<Web Kit::WebIDBTransactionCallbacks>);51 IDBTransactionCallbacksProxy(PassOwnPtr<WebIDBTransactionCallbacks>); 53 52 54 OwnPtr<Web Kit::WebIDBTransactionCallbacks> m_callbacks;53 OwnPtr<WebIDBTransactionCallbacks> m_callbacks; 55 54 }; 56 55 57 56 58 } // namespace Web Core57 } // namespace WebKit 59 58 60 59 #endif -
trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp
r80564 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #include "WebIDBCallbacksImpl.h" 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "IDBCallbacks.h" 30 32 #include "IDBCursorBackendProxy.h" 33 #include "IDBDatabaseBackendProxy.h" 31 34 #include "IDBDatabaseError.h" 32 #include "IDBDatabaseProxy.h"33 35 #include "IDBKey.h" 34 36 #include "IDBTransactionBackendProxy.h" … … 40 42 #include "WebSerializedScriptValue.h" 41 43 42 #if ENABLE(INDEXED_DATABASE) 44 using namespace WebCore; 43 45 44 namespace Web Core{46 namespace WebKit { 45 47 46 48 WebIDBCallbacksImpl::WebIDBCallbacksImpl(PassRefPtr<IDBCallbacks> callbacks) … … 53 55 } 54 56 55 void WebIDBCallbacksImpl::onError(const Web Kit::WebIDBDatabaseError& error)57 void WebIDBCallbacksImpl::onError(const WebIDBDatabaseError& error) 56 58 { 57 59 m_callbacks->onError(error); 58 60 } 59 61 60 void WebIDBCallbacksImpl::onSuccess(Web Kit::WebIDBCursor* cursor)62 void WebIDBCallbacksImpl::onSuccess(WebIDBCursor* cursor) 61 63 { 62 64 m_callbacks->onSuccess(IDBCursorBackendProxy::create(cursor)); 63 65 } 64 66 65 void WebIDBCallbacksImpl::onSuccess(Web Kit::WebIDBDatabase* webKitInstance)67 void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance) 66 68 { 67 m_callbacks->onSuccess(IDBDatabase Proxy::create(webKitInstance));69 m_callbacks->onSuccess(IDBDatabaseBackendProxy::create(webKitInstance)); 68 70 } 69 71 70 void WebIDBCallbacksImpl::onSuccess(const Web Kit::WebIDBKey& key)72 void WebIDBCallbacksImpl::onSuccess(const WebIDBKey& key) 71 73 { 72 74 m_callbacks->onSuccess(key); 73 75 } 74 76 75 void WebIDBCallbacksImpl::onSuccess(Web Kit::WebIDBTransaction* webKitInstance)77 void WebIDBCallbacksImpl::onSuccess(WebIDBTransaction* webKitInstance) 76 78 { 77 79 m_callbacks->onSuccess(IDBTransactionBackendProxy::create(webKitInstance)); 78 80 } 79 81 80 void WebIDBCallbacksImpl::onSuccess(const Web Kit::WebSerializedScriptValue& serializedScriptValue)82 void WebIDBCallbacksImpl::onSuccess(const WebSerializedScriptValue& serializedScriptValue) 81 83 { 82 84 m_callbacks->onSuccess(serializedScriptValue); … … 88 90 } 89 91 90 } // namespace Web Core92 } // namespace WebKit 91 93 92 94 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h
r80564 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #define WebIDBCallbacksImpl_h 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "WebIDBCallbacks.h" 30 32 #include <wtf/PassRefPtr.h> 31 33 #include <wtf/RefPtr.h> 32 34 33 #if ENABLE(INDEXED_DATABASE) 35 namespace WebCore { class IDBCallbacks; } 34 36 35 namespace Web Core{37 namespace WebKit { 36 38 37 class IDBCallbacks; 38 39 class WebIDBCallbacksImpl : public WebKit::WebIDBCallbacks { 39 class WebIDBCallbacksImpl : public WebIDBCallbacks { 40 40 public: 41 WebIDBCallbacksImpl(PassRefPtr< IDBCallbacks>);41 WebIDBCallbacksImpl(PassRefPtr<WebCore::IDBCallbacks>); 42 42 virtual ~WebIDBCallbacksImpl(); 43 43 44 virtual void onError(const Web Kit::WebIDBDatabaseError&);45 virtual void onSuccess(Web Kit::WebIDBCursor*);46 virtual void onSuccess(Web Kit::WebIDBDatabase*);47 virtual void onSuccess(const Web Kit::WebIDBKey&);48 virtual void onSuccess(Web Kit::WebIDBTransaction*);49 virtual void onSuccess(const Web Kit::WebSerializedScriptValue&);44 virtual void onError(const WebIDBDatabaseError&); 45 virtual void onSuccess(WebIDBCursor*); 46 virtual void onSuccess(WebIDBDatabase*); 47 virtual void onSuccess(const WebIDBKey&); 48 virtual void onSuccess(WebIDBTransaction*); 49 virtual void onSuccess(const WebSerializedScriptValue&); 50 50 virtual void onBlocked(); 51 51 52 52 private: 53 RefPtr< IDBCallbacks> m_callbacks;53 RefPtr<WebCore::IDBCallbacks> m_callbacks; 54 54 }; 55 55 56 } // namespace Web Core56 } // namespace WebKit 57 57 58 #endif 58 #endif // ENABLE(INDEXED_DATABASE) 59 59 60 60 #endif // WebIDBCallbacksImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp
r80171 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 26 26 #include "config.h" 27 27 #include "WebIDBCursorImpl.h" 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "IDBAny.h" … … 81 83 } 82 84 83 } // namespace WebCore 85 } // namespace WebKit 86 87 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.h
r80171 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 26 26 #ifndef WebIDBCursorImpl_h 27 27 #define WebIDBCursorImpl_h 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "WebCommon.h" … … 57 59 } // namespace WebKit 58 60 61 #endif // ENABLE(INDEXED_DATABASE) 62 59 63 #endif // WebIDBCursorImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.cpp
r80183 r82738 32 32 #include "WebString.h" 33 33 34 namespace WebCore { 34 using namespace WebCore; 35 36 namespace WebKit { 35 37 36 38 WebIDBDatabaseCallbacksImpl::WebIDBDatabaseCallbacksImpl(PassRefPtr<IDBDatabaseCallbacks> callbacks) … … 43 45 } 44 46 45 void WebIDBDatabaseCallbacksImpl::onVersionChange(const Web Kit::WebString& version)47 void WebIDBDatabaseCallbacksImpl::onVersionChange(const WebString& version) 46 48 { 47 49 m_callbacks->onVersionChange(version); 48 50 } 49 51 50 } // namespace Web Core52 } // namespace WebKit 51 53 52 54 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBDatabaseCallbacksImpl.h
r80183 r82738 35 35 #include <wtf/RefPtr.h> 36 36 37 namespace WebCore { 37 namespace WebCore { class IDBDatabaseCallbacks; } 38 38 39 class IDBDatabaseCallbacks; 39 namespace WebKit { 40 40 41 class WebIDBDatabaseCallbacksImpl : public Web Kit::WebIDBDatabaseCallbacks {41 class WebIDBDatabaseCallbacksImpl : public WebIDBDatabaseCallbacks { 42 42 public: 43 WebIDBDatabaseCallbacksImpl(PassRefPtr< IDBDatabaseCallbacks>);43 WebIDBDatabaseCallbacksImpl(PassRefPtr<WebCore::IDBDatabaseCallbacks>); 44 44 virtual ~WebIDBDatabaseCallbacksImpl(); 45 45 46 virtual void onVersionChange(const Web Kit::WebString& version);46 virtual void onVersionChange(const WebString& version); 47 47 48 48 private: 49 RefPtr< IDBDatabaseCallbacks> m_callbacks;49 RefPtr<WebCore::IDBDatabaseCallbacks> m_callbacks; 50 50 }; 51 51 52 } // namespace Web Core52 } // namespace WebKit 53 53 54 #endif 54 #endif // ENABLE(INDEXED_DATABASE) 55 55 56 56 #endif // WebIDBDatabaseCallbacksImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBDatabaseError.cpp
r74188 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 32 32 #include "WebIDBDatabaseError.h" 33 33 34 #if ENABLE(INDEXED_DATABASE) 35 34 36 #include "IDBDatabaseError.h" 35 37 #include "WebString.h" 36 37 #if ENABLE(INDEXED_DATABASE)38 38 39 39 using namespace WebCore; -
trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
r80183 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #include "WebIDBDatabaseImpl.h" 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "DOMStringList.h" 30 32 #include "IDBCallbacksProxy.h" … … 36 38 #include "WebIDBObjectStoreImpl.h" 37 39 #include "WebIDBTransactionImpl.h" 38 39 #if ENABLE(INDEXED_DATABASE)40 40 41 41 using namespace WebCore; … … 113 113 } 114 114 115 } // namespace Web Core115 } // namespace WebKit 116 116 117 117 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.h
r80183 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #define WebIDBDatabaseImpl_h 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "WebCommon.h" 30 32 #include "WebExceptionCode.h" … … 33 35 #include <wtf/RefPtr.h> 34 36 35 namespace WebCore { 36 class IDBDatabaseBackendInterface; 37 class IDBDatabaseCallbacksProxy; 38 } 37 namespace WebCore { class IDBDatabaseBackendInterface; } 39 38 40 39 namespace WebKit { 41 40 41 class IDBDatabaseCallbacksProxy; 42 42 class WebIDBDatabaseCallbacks; 43 43 class WebIDBObjectStore; … … 64 64 private: 65 65 WTF::RefPtr<WebCore::IDBDatabaseBackendInterface> m_databaseBackend; 66 WTF::RefPtr< WebCore::IDBDatabaseCallbacksProxy> m_databaseCallbacks;66 WTF::RefPtr<IDBDatabaseCallbacksProxy> m_databaseCallbacks; 67 67 }; 68 68 … … 70 70 71 71 #endif // WebIDBDatabaseImpl_h 72 73 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp
r80635 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 32 32 #include "WebIDBFactoryImpl.h" 33 33 34 #if ENABLE(INDEXED_DATABASE) 35 34 36 #include "DOMStringList.h" 35 37 #include "IDBCallbacksProxy.h" … … 38 40 #include "WebIDBDatabaseError.h" 39 41 #include <wtf/OwnPtr.h> 40 41 #if ENABLE(INDEXED_DATABASE)42 42 43 43 using namespace WebCore; … … 51 51 52 52 WebIDBFactoryImpl::WebIDBFactoryImpl() 53 : m_idbFactoryBackend( WebCore::IDBFactoryBackendImpl::create())53 : m_idbFactoryBackend(IDBFactoryBackendImpl::create()) 54 54 { 55 55 } -
trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.h
r80635 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 30 30 #define WebIDBFactoryImpl_h 31 31 32 #if ENABLE(INDEXED_DATABASE) 33 32 34 #include "WebDOMStringList.h" 33 35 #include "WebIDBFactory.h" … … 51 53 } // namespace WebKit 52 54 55 #endif // ENABLE(INDEXED_DATABASE) 56 53 57 #endif // WebIDBFactoryImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp
r69721 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #include "WebIDBIndexImpl.h" 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "IDBCallbacksProxy.h" 30 32 #include "IDBIndex.h" … … 33 35 #include "WebIDBKey.h" 34 36 #include "WebIDBKeyRange.h" 35 36 #if ENABLE(INDEXED_DATABASE)37 37 38 38 using namespace WebCore; … … 89 89 } 90 90 91 } // namespace Web Core91 } // namespace WebKit 92 92 93 93 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.h
r69721 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 26 26 #ifndef WebIDBIndexImpl_h 27 27 #define WebIDBIndexImpl_h 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "WebCommon.h" … … 58 60 } // namespace WebKit 59 61 62 #endif // ENABLE(INDEXED_DATABASE) 63 60 64 #endif // WebIDBIndexImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBKey.cpp
r78721 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 81 81 if (serializedScriptValue.isNull()) 82 82 return WebIDBKey::createInvalid(); 83 return WebCore::createIDBKeyFromSerializedValueAndKeyPath(serializedScriptValue, idbKeyPath);83 return createIDBKeyFromSerializedValueAndKeyPath(serializedScriptValue, idbKeyPath); 84 84 } 85 85 86 86 WebSerializedScriptValue WebIDBKey::injectIDBKeyIntoSerializedValue(const WebIDBKey& key, const WebSerializedScriptValue& value, const WebIDBKeyPath& path) 87 87 { 88 return WebCore::injectIDBKeyIntoSerializedValue(key, value, path);88 return injectIDBKeyIntoSerializedValue(key, value, path); 89 89 } 90 90 -
trunk/Source/WebKit/chromium/src/WebIDBKeyPath.cpp
r65439 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 68 68 } 69 69 70 WebIDBKeyPath::operator const WTF::Vector< WebCore::IDBKeyPathElement, 0>&() const70 WebIDBKeyPath::operator const WTF::Vector<IDBKeyPathElement, 0>&() const 71 71 { 72 72 return *m_private.get(); -
trunk/Source/WebKit/chromium/src/WebIDBKeyRange.cpp
r73264 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #include "WebIDBKeyRange.h" 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "IDBKey.h" 30 32 #include "IDBKeyRange.h" 31 33 #include "WebIDBKey.h" 32 34 33 using WebCore::IDBKeyRange;35 using namespace WebCore; 34 36 35 37 namespace WebKit { … … 94 96 95 97 } // namespace WebKit 98 99 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp
r80564 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 27 27 #include "WebIDBObjectStoreImpl.h" 28 28 29 #if ENABLE(INDEXED_DATABASE) 30 29 31 #include "DOMStringList.h" 30 32 #include "IDBCallbacksProxy.h" … … 37 39 #include "WebIDBTransaction.h" 38 40 #include "WebSerializedScriptValue.h" 39 40 #if ENABLE(INDEXED_DATABASE)41 41 42 42 using namespace WebCore; … … 114 114 } 115 115 116 } // namespace Web Core116 } // namespace WebKit 117 117 118 118 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.h
r78416 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 26 26 #ifndef WebIDBObjectStoreImpl_h 27 27 #define WebIDBObjectStoreImpl_h 28 29 #if ENABLE(INDEXED_DATABASE) 28 30 29 31 #include "WebCommon.h" … … 65 67 } // namespace WebKit 66 68 69 #endif // ENABLE(INDEXED_DATABASE) 70 67 71 #endif // WebIDBObjectStoreImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBTransactionCallbacksImpl.cpp
r77647 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 31 31 #include "IDBTransactionCallbacks.h" 32 32 33 namespace WebCore { 33 using namespace WebCore; 34 35 namespace WebKit { 34 36 35 37 WebIDBTransactionCallbacksImpl::WebIDBTransactionCallbacksImpl(PassRefPtr<IDBTransactionCallbacks> callbacks) … … 52 54 } 53 55 54 } // namespace Web Core56 } // namespace WebKit 55 57 56 58 #endif // ENABLE(INDEXED_DATABASE) -
trunk/Source/WebKit/chromium/src/WebIDBTransactionCallbacksImpl.h
r77647 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 33 33 #include <wtf/RefPtr.h> 34 34 35 namespace WebCore { 35 namespace WebCore { class IDBTransactionCallbacks; } 36 36 37 class IDBTransactionCallbacks; 37 namespace WebKit { 38 38 39 class WebIDBTransactionCallbacksImpl : public Web Kit::WebIDBTransactionCallbacks {39 class WebIDBTransactionCallbacksImpl : public WebIDBTransactionCallbacks { 40 40 public: 41 WebIDBTransactionCallbacksImpl(PassRefPtr< IDBTransactionCallbacks>);41 WebIDBTransactionCallbacksImpl(PassRefPtr<WebCore::IDBTransactionCallbacks>); 42 42 virtual ~WebIDBTransactionCallbacksImpl(); 43 43 … … 46 46 47 47 private: 48 RefPtr< IDBTransactionCallbacks> m_callbacks;48 RefPtr<WebCore::IDBTransactionCallbacks> m_callbacks; 49 49 }; 50 50 51 } // namespace Web Core51 } // namespace WebKit 52 52 53 #endif 53 #endif // ENABLE(INDEXED_DATABASE) 54 54 55 55 #endif // WebIDBTransactionCallbacksImpl_h -
trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp
r72765 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without -
trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.h
r72765 r82738 1 1 /* 2 * Copyright (C) 201 0Google Inc. All rights reserved.2 * Copyright (C) 2011 Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without
Note: See TracChangeset
for help on using the changeset viewer.