Diff
Modified: trunk/Source/WebCore/ChangeLog (190249 => 190250)
--- trunk/Source/WebCore/ChangeLog 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/ChangeLog 2015-09-25 19:46:51 UTC (rev 190250)
@@ -1,3 +1,104 @@
+2015-09-25 Brady Eidson <beid...@apple.com>
+
+ PassRefPtr<> to RefPtr<> conversion in legacy IndexedDB code.
+ https://bugs.webkit.org/show_bug.cgi?id=149558
+
+ Reviewed by Beth Dakin.
+
+ No new tests (No behavior change.)
+
+ This patch does not attempt to completely remove all PassRefPtr usage inside legacy IDB.
+
+ It just switches over all PassRefPtr usage at the top level IDB interfaces that
+ modern IDB is implementing.
+
+ The rest of the usage inside the legacy implementation can be dealt with later via `git rm`.
+
+ * Modules/indexeddb/IDBAny.h:
+ * Modules/indexeddb/IDBCursor.h:
+ * Modules/indexeddb/IDBDatabase.h:
+ * Modules/indexeddb/IDBDatabaseError.h:
+ * Modules/indexeddb/IDBFactory.h:
+ * Modules/indexeddb/IDBIndex.h:
+ * Modules/indexeddb/IDBObjectStore.h:
+ * Modules/indexeddb/IDBRequest.h:
+ * Modules/indexeddb/IDBTransaction.h:
+ * Modules/indexeddb/client/IDBFactoryImpl.cpp:
+ (WebCore::IDBClient::IDBFactory::getDatabaseNames):
+ (WebCore::IDBClient::IDBFactory::open):
+ (WebCore::IDBClient::IDBFactory::deleteDatabase):
+ * Modules/indexeddb/client/IDBFactoryImpl.h:
+ * Modules/indexeddb/client/IDBRequestImpl.cpp:
+ (WebCore::IDBClient::IDBRequest::result):
+ (WebCore::IDBClient::IDBRequest::error):
+ (WebCore::IDBClient::IDBRequest::source):
+ (WebCore::IDBClient::IDBRequest::transaction):
+ * Modules/indexeddb/client/IDBRequestImpl.h:
+ * Modules/indexeddb/legacy/LegacyAny.cpp:
+ (WebCore::LegacyAny::createInvalid):
+ (WebCore::LegacyAny::createNull):
+ (WebCore::LegacyAny::createString):
+ (WebCore::LegacyAny::domStringList):
+ (WebCore::LegacyAny::idbCursor):
+ (WebCore::LegacyAny::idbCursorWithValue):
+ (WebCore::LegacyAny::idbDatabase):
+ (WebCore::LegacyAny::idbFactory):
+ (WebCore::LegacyAny::idbIndex):
+ (WebCore::LegacyAny::idbObjectStore):
+ (WebCore::LegacyAny::idbTransaction):
+ (WebCore::LegacyAny::LegacyAny):
+ * Modules/indexeddb/legacy/LegacyAny.h:
+ (WebCore::LegacyAny::create):
+ * Modules/indexeddb/legacy/LegacyCursor.cpp:
+ (WebCore::LegacyCursor::update):
+ (WebCore::LegacyCursor::deleteFunction):
+ * Modules/indexeddb/legacy/LegacyCursor.h:
+ * Modules/indexeddb/legacy/LegacyDatabase.cpp:
+ (WebCore::LegacyDatabase::objectStoreNames):
+ (WebCore::LegacyDatabase::createObjectStore):
+ (WebCore::LegacyDatabase::transaction):
+ * Modules/indexeddb/legacy/LegacyDatabase.h:
+ * Modules/indexeddb/legacy/LegacyFactory.cpp:
+ (WebCore::LegacyFactory::getDatabaseNames):
+ (WebCore::LegacyFactory::open):
+ (WebCore::LegacyFactory::deleteDatabase):
+ * Modules/indexeddb/legacy/LegacyFactory.h:
+ * Modules/indexeddb/legacy/LegacyIndex.cpp:
+ (WebCore::LegacyIndex::openCursor):
+ (WebCore::LegacyIndex::count):
+ (WebCore::LegacyIndex::openKeyCursor):
+ (WebCore::LegacyIndex::get):
+ (WebCore::LegacyIndex::getKey):
+ * Modules/indexeddb/legacy/LegacyIndex.h:
+ (WebCore::LegacyIndex::legacyObjectStore):
+ * Modules/indexeddb/legacy/LegacyObjectStore.cpp:
+ (WebCore::LegacyObjectStore::indexNames):
+ (WebCore::LegacyObjectStore::get):
+ (WebCore::LegacyObjectStore::add):
+ (WebCore::LegacyObjectStore::put):
+ (WebCore::LegacyObjectStore::deleteFunction):
+ (WebCore::LegacyObjectStore::clear):
+ (WebCore::LegacyObjectStore::createIndex):
+ (WebCore::LegacyObjectStore::index):
+ (WebCore::LegacyObjectStore::openCursor):
+ (WebCore::LegacyObjectStore::count):
+ * Modules/indexeddb/legacy/LegacyObjectStore.h:
+ (WebCore::LegacyObjectStore::keyPathAny):
+ (WebCore::LegacyObjectStore::transaction):
+ (WebCore::LegacyObjectStore::createIndex):
+ (WebCore::LegacyObjectStore::count):
+ * Modules/indexeddb/legacy/LegacyRequest.cpp:
+ (WebCore::LegacyRequest::result):
+ (WebCore::LegacyRequest::error):
+ (WebCore::LegacyRequest::source):
+ (WebCore::LegacyRequest::transaction):
+ (WebCore::LegacyRequest::onSuccess):
+ * Modules/indexeddb/legacy/LegacyRequest.h:
+ * Modules/indexeddb/legacy/LegacyTransaction.cpp:
+ (WebCore::LegacyTransaction::objectStore):
+ * Modules/indexeddb/legacy/LegacyTransaction.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+
2015-09-25 Per Arne Vollan <pe...@outlook.com>
[WinCairo] Incorrect position for windowless plugins.
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBAny.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBAny.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBAny.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -31,7 +31,6 @@
#include "IDBKeyPath.h"
#include "ScriptWrappable.h"
#include <bindings/ScriptValue.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
@@ -70,14 +69,14 @@
};
virtual Type type() const = 0;
- virtual PassRefPtr<DOMStringList> domStringList() = 0;
- virtual PassRefPtr<IDBCursor> idbCursor() = 0;
- virtual PassRefPtr<IDBCursorWithValue> idbCursorWithValue() = 0;
- virtual PassRefPtr<IDBDatabase> idbDatabase() = 0;
- virtual PassRefPtr<IDBFactory> idbFactory() = 0;
- virtual PassRefPtr<IDBIndex> idbIndex() = 0;
- virtual PassRefPtr<IDBObjectStore> idbObjectStore() = 0;
- virtual PassRefPtr<IDBTransaction> idbTransaction() = 0;
+ virtual RefPtr<DOMStringList> domStringList() = 0;
+ virtual RefPtr<IDBCursor> idbCursor() = 0;
+ virtual RefPtr<IDBCursorWithValue> idbCursorWithValue() = 0;
+ virtual RefPtr<IDBDatabase> idbDatabase() = 0;
+ virtual RefPtr<IDBFactory> idbFactory() = 0;
+ virtual RefPtr<IDBIndex> idbIndex() = 0;
+ virtual RefPtr<IDBObjectStore> idbObjectStore() = 0;
+ virtual RefPtr<IDBTransaction> idbTransaction() = 0;
virtual const Deprecated::ScriptValue& scriptValue() = 0;
virtual int64_t integer() = 0;
virtual const String& string() = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -33,7 +33,6 @@
#include "IndexedDB.h"
#include "ScriptWrappable.h"
#include <bindings/ScriptValue.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
@@ -66,12 +65,12 @@
virtual const Deprecated::ScriptValue& value() const = 0;
virtual IDBAny* source() const = 0;
- virtual PassRefPtr<IDBRequest> update(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> update(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&) = 0;
virtual void advance(unsigned long, ExceptionCode&) = 0;
// FIXME: Try to modify the code generator so this overload is unneeded.
virtual void continueFunction(ScriptExecutionContext*, ExceptionCode&) = 0;
virtual void continueFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCode&) = 0;
protected:
IDBCursor();
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -36,7 +36,6 @@
#include "IDBTransaction.h"
#include "IndexedDB.h"
#include "ScriptWrappable.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
@@ -55,12 +54,12 @@
// Implement the IDL
virtual const String name() const = 0;
virtual uint64_t version() const = 0;
- virtual PassRefPtr<DOMStringList> objectStoreNames() const = 0;
+ virtual RefPtr<DOMStringList> objectStoreNames() const = 0;
- virtual PassRefPtr<IDBObjectStore> createObjectStore(const String& name, const Dictionary&, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBObjectStore> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const Vector<String>&, const String& mode, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const String&, const String& mode, ExceptionCode&) = 0;
+ virtual RefPtr<IDBObjectStore> createObjectStore(const String& name, const Dictionary&, ExceptionCode&) = 0;
+ virtual RefPtr<IDBObjectStore> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionCode&) = 0;
+ virtual RefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const Vector<String>&, const String& mode, ExceptionCode&) = 0;
+ virtual RefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const String&, const String& mode, ExceptionCode&) = 0;
virtual void deleteObjectStore(const String& name, ExceptionCode&) = 0;
virtual void close() = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseError.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseError.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseError.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -27,8 +27,8 @@
#define IDBDatabaseError_h
#include "IDBDatabaseException.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
#if ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -28,7 +28,6 @@
#include "IDBOpenDBRequest.h"
#include "ScriptWrappable.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
@@ -51,11 +50,11 @@
// FIXME: getDatabaseNames is no longer a web-facing API, and should be removed from IDBFactory.
// The Web Inspector currently uses this to enumerate the list of databases, but is more complicated as a result.
// We should provide a simpler API to the Web Inspector then remove getDatabaseNames.
- virtual PassRefPtr<IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) = 0;
+ virtual RefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) = 0;
+ virtual RefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) = 0;
+ virtual RefPtr<IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) = 0;
virtual short cmp(ScriptExecutionContext*, const Deprecated::ScriptValue& first, const Deprecated::ScriptValue& second, ExceptionCode&) = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -49,34 +49,34 @@
// Implement the IDL
virtual const String name() const = 0;
- virtual PassRefPtr<IDBObjectStore> objectStore() const = 0;
- virtual PassRefPtr<IDBAny> keyPathAny() const = 0;
+ virtual RefPtr<IDBObjectStore> objectStore() const = 0;
+ virtual RefPtr<IDBAny> keyPathAny() const = 0;
virtual const IDBKeyPath keyPath() const = 0;
virtual bool unique() const = 0;
virtual bool multiEntry() const = 0;
virtual int64_t id() const = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> getKey(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> getKey(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> getKey(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> getKey(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
protected:
IDBIndex();
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -29,7 +29,6 @@
#include "Dictionary.h"
#include "ExceptionCode.h"
#include "ScriptWrappable.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
@@ -62,36 +61,36 @@
// Implement the IDBObjectStore IDL
virtual int64_t id() const = 0;
virtual const String name() const = 0;
- virtual PassRefPtr<IDBAny> keyPathAny() const = 0;
+ virtual RefPtr<IDBAny> keyPathAny() const = 0;
virtual const IDBKeyPath keyPath() const = 0;
- virtual PassRefPtr<DOMStringList> indexNames() const = 0;
- virtual PassRefPtr<IDBTransaction> transaction() const = 0;
+ virtual RefPtr<DOMStringList> indexNames() const = 0;
+ virtual RefPtr<IDBTransaction> transaction() const = 0;
virtual bool autoIncrement() const = 0;
- virtual PassRefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> clear(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> clear(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCode&) = 0;
+ virtual RefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBIndex> index(const String& name, ExceptionCode&) = 0;
+ virtual RefPtr<IDBIndex> index(const String& name, ExceptionCode&) = 0;
virtual void deleteIndex(const String& name, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) = 0;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) = 0;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) = 0;
protected:
IDBObjectStore();
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -49,11 +49,11 @@
public:
virtual ~IDBRequest() { }
- virtual PassRefPtr<IDBAny> result(ExceptionCode&) const = 0;
+ virtual RefPtr<IDBAny> result(ExceptionCode&) const = 0;
virtual unsigned short errorCode(ExceptionCode&) const = 0;
- virtual PassRefPtr<DOMError> error(ExceptionCode&) const = 0;
- virtual PassRefPtr<IDBAny> source() const = 0;
- virtual PassRefPtr<IDBTransaction> transaction() const = 0;
+ virtual RefPtr<DOMError> error(ExceptionCode&) const = 0;
+ virtual RefPtr<IDBAny> source() const = 0;
+ virtual RefPtr<IDBTransaction> transaction() const = 0;
// Defined in the IDL
enum ReadyState {
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -62,8 +62,8 @@
// Implement the IDBTransaction IDL
virtual const String& mode() const = 0;
virtual IDBDatabase* db() const = 0;
- virtual PassRefPtr<DOMError> error() const = 0;
- virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, ExceptionCode&) = 0;
+ virtual RefPtr<DOMError> error() const = 0;
+ virtual RefPtr<IDBObjectStore> objectStore(const String& name, ExceptionCode&) = 0;
virtual void abort(ExceptionCode&) = 0;
using RefCounted<IDBTransaction>::ref;
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -68,19 +68,19 @@
}
-PassRefPtr<WebCore::IDBRequest> IDBFactory::getDatabaseNames(ScriptExecutionContext*, ExceptionCode&)
+RefPtr<WebCore::IDBRequest> IDBFactory::getDatabaseNames(ScriptExecutionContext*, ExceptionCode&)
{
return nullptr;
}
-PassRefPtr<WebCore::IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
+RefPtr<WebCore::IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
{
LOG(IndexedDB, "IDBFactory::open");
return openInternal(context, name, 0, ec).release();
}
-PassRefPtr<WebCore::IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, unsigned long long version, ExceptionCode& ec)
+RefPtr<WebCore::IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, const String& name, unsigned long long version, ExceptionCode& ec)
{
LOG(IndexedDB, "IDBFactory::open");
@@ -116,7 +116,7 @@
return adoptRef(&request.leakRef());
}
-PassRefPtr<WebCore::IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
+RefPtr<WebCore::IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
{
LOG(IndexedDB, "IDBFactory::deleteDatabase");
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -39,11 +39,11 @@
public:
static Ref<IDBFactory> create();
- virtual PassRefPtr<WebCore::IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) override final;
+ virtual RefPtr<WebCore::IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) override final;
- virtual PassRefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) override final;
- virtual PassRefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) override final;
- virtual PassRefPtr<WebCore::IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) override final;
+ virtual RefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) override final;
+ virtual RefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) override final;
+ virtual RefPtr<WebCore::IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) override final;
virtual short cmp(ScriptExecutionContext*, const Deprecated::ScriptValue& first, const Deprecated::ScriptValue& second, ExceptionCode&) override final;
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -38,7 +38,7 @@
{
}
-PassRefPtr<IDBAny> IDBRequest::result(ExceptionCode&) const
+RefPtr<IDBAny> IDBRequest::result(ExceptionCode&) const
{
return nullptr;
}
@@ -48,17 +48,17 @@
return 0;
}
-PassRefPtr<DOMError> IDBRequest::error(ExceptionCode&) const
+RefPtr<DOMError> IDBRequest::error(ExceptionCode&) const
{
return nullptr;
}
-PassRefPtr<IDBAny> IDBRequest::source() const
+RefPtr<IDBAny> IDBRequest::source() const
{
return nullptr;
}
-PassRefPtr<IDBTransaction> IDBRequest::transaction() const
+RefPtr<IDBTransaction> IDBRequest::transaction() const
{
return nullptr;
}
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -36,11 +36,11 @@
class IDBRequest : public WebCore::IDBOpenDBRequest, public RefCounted<IDBRequest> {
public:
- virtual PassRefPtr<IDBAny> result(ExceptionCode&) const override;
+ virtual RefPtr<IDBAny> result(ExceptionCode&) const override;
virtual unsigned short errorCode(ExceptionCode&) const override;
- virtual PassRefPtr<DOMError> error(ExceptionCode&) const override;
- virtual PassRefPtr<IDBAny> source() const override;
- virtual PassRefPtr<IDBTransaction> transaction() const override;
+ virtual RefPtr<DOMError> error(ExceptionCode&) const override;
+ virtual RefPtr<IDBAny> source() const override;
+ virtual RefPtr<IDBTransaction> transaction() const override;
virtual const String& readyState() const override;
// EventTarget
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -38,17 +38,17 @@
namespace WebCore {
-PassRefPtr<LegacyAny> LegacyAny::createInvalid()
+RefPtr<LegacyAny> LegacyAny::createInvalid()
{
return adoptRef(new LegacyAny(Type::Undefined));
}
-PassRefPtr<LegacyAny> LegacyAny::createNull()
+RefPtr<LegacyAny> LegacyAny::createNull()
{
return adoptRef(new LegacyAny(Type::Null));
}
-PassRefPtr<LegacyAny> LegacyAny::createString(const String& value)
+RefPtr<LegacyAny> LegacyAny::createString(const String& value)
{
return adoptRef(new LegacyAny(value));
}
@@ -64,49 +64,49 @@
{
}
-PassRefPtr<DOMStringList> LegacyAny::domStringList()
+RefPtr<DOMStringList> LegacyAny::domStringList()
{
ASSERT(m_type == Type::DOMStringList);
return m_domStringList;
}
-PassRefPtr<IDBCursor> LegacyAny::idbCursor()
+RefPtr<IDBCursor> LegacyAny::idbCursor()
{
ASSERT(m_type == Type::IDBCursor);
return m_idbCursor;
}
-PassRefPtr<IDBCursorWithValue> LegacyAny::idbCursorWithValue()
+RefPtr<IDBCursorWithValue> LegacyAny::idbCursorWithValue()
{
ASSERT(m_type == Type::IDBCursorWithValue);
return m_idbCursorWithValue;
}
-PassRefPtr<IDBDatabase> LegacyAny::idbDatabase()
+RefPtr<IDBDatabase> LegacyAny::idbDatabase()
{
ASSERT(m_type == Type::IDBDatabase);
return m_idbDatabase;
}
-PassRefPtr<IDBFactory> LegacyAny::idbFactory()
+RefPtr<IDBFactory> LegacyAny::idbFactory()
{
ASSERT(m_type == Type::IDBFactory);
return m_idbFactory;
}
-PassRefPtr<IDBIndex> LegacyAny::idbIndex()
+RefPtr<IDBIndex> LegacyAny::idbIndex()
{
ASSERT(m_type == Type::IDBIndex);
return m_idbIndex;
}
-PassRefPtr<IDBObjectStore> LegacyAny::idbObjectStore()
+RefPtr<IDBObjectStore> LegacyAny::idbObjectStore()
{
ASSERT(m_type == Type::IDBObjectStore);
return m_idbObjectStore;
}
-PassRefPtr<IDBTransaction> LegacyAny::idbTransaction()
+RefPtr<IDBTransaction> LegacyAny::idbTransaction()
{
ASSERT(m_type == Type::IDBTransaction);
return m_idbTransaction;
@@ -130,56 +130,56 @@
return m_integer;
}
-LegacyAny::LegacyAny(PassRefPtr<DOMStringList> value)
+LegacyAny::LegacyAny(RefPtr<DOMStringList> value)
: m_type(Type::DOMStringList)
, m_domStringList(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyCursorWithValue> value)
+LegacyAny::LegacyAny(RefPtr<LegacyCursorWithValue> value)
: m_type(Type::IDBCursorWithValue)
, m_idbCursorWithValue(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyCursor> value)
+LegacyAny::LegacyAny(RefPtr<LegacyCursor> value)
: m_type(Type::IDBCursor)
, m_idbCursor(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyDatabase> value)
+LegacyAny::LegacyAny(RefPtr<LegacyDatabase> value)
: m_type(Type::IDBDatabase)
, m_idbDatabase(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyFactory> value)
+LegacyAny::LegacyAny(RefPtr<LegacyFactory> value)
: m_type(Type::IDBFactory)
, m_idbFactory(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyIndex> value)
+LegacyAny::LegacyAny(RefPtr<LegacyIndex> value)
: m_type(Type::IDBIndex)
, m_idbIndex(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyTransaction> value)
+LegacyAny::LegacyAny(RefPtr<LegacyTransaction> value)
: m_type(Type::IDBTransaction)
, m_idbTransaction(value)
, m_integer(0)
{
}
-LegacyAny::LegacyAny(PassRefPtr<LegacyObjectStore> value)
+LegacyAny::LegacyAny(RefPtr<LegacyObjectStore> value)
: m_type(Type::IDBObjectStore)
, m_idbObjectStore(value)
, m_integer(0)
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyAny.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -59,25 +59,26 @@
class LegacyAny : public IDBAny {
public:
- static PassRefPtr<LegacyAny> createInvalid();
- static PassRefPtr<LegacyAny> createNull();
- static PassRefPtr<LegacyAny> createString(const String&);
+ static RefPtr<LegacyAny> createInvalid();
+ static RefPtr<LegacyAny> createNull();
+ static RefPtr<LegacyAny> createString(const String&);
template<typename T>
- static PassRefPtr<LegacyAny> create(T* idbObject)
+ static RefPtr<LegacyAny> create(T* idbObject)
{
return adoptRef(new LegacyAny(idbObject));
}
template<typename T>
- static PassRefPtr<LegacyAny> create(const T& idbObject)
+ static RefPtr<LegacyAny> create(const T& idbObject)
{
return adoptRef(new LegacyAny(idbObject));
}
template<typename T>
- static PassRefPtr<LegacyAny> create(PassRefPtr<T> idbObject)
+ static RefPtr<LegacyAny> create(PassRefPtr<T> idbObject)
{
- return adoptRef(new LegacyAny(idbObject));
+ RefPtr<T> refObject = idbObject;
+ return adoptRef(new LegacyAny(WTF::move(refObject)));
}
- static PassRefPtr<LegacyAny> create(int64_t value)
+ static RefPtr<LegacyAny> create(int64_t value)
{
return adoptRef(new LegacyAny(value));
}
@@ -85,14 +86,14 @@
virtual Type type() const override final { return m_type; }
// Use type() to figure out which one of these you're allowed to call.
- virtual PassRefPtr<DOMStringList> domStringList() override final;
- virtual PassRefPtr<IDBCursor> idbCursor() override final;
- virtual PassRefPtr<IDBCursorWithValue> idbCursorWithValue() override final;
- virtual PassRefPtr<IDBDatabase> idbDatabase() override final;
- virtual PassRefPtr<IDBFactory> idbFactory() override final;
- virtual PassRefPtr<IDBIndex> idbIndex() override final;
- virtual PassRefPtr<IDBObjectStore> idbObjectStore() override final;
- virtual PassRefPtr<IDBTransaction> idbTransaction() override final;
+ virtual RefPtr<DOMStringList> domStringList() override final;
+ virtual RefPtr<IDBCursor> idbCursor() override final;
+ virtual RefPtr<IDBCursorWithValue> idbCursorWithValue() override final;
+ virtual RefPtr<IDBDatabase> idbDatabase() override final;
+ virtual RefPtr<IDBFactory> idbFactory() override final;
+ virtual RefPtr<IDBIndex> idbIndex() override final;
+ virtual RefPtr<IDBObjectStore> idbObjectStore() override final;
+ virtual RefPtr<IDBTransaction> idbTransaction() override final;
virtual const Deprecated::ScriptValue& scriptValue() override final;
virtual int64_t integer() override final;
virtual const String& string() override final;
@@ -108,14 +109,14 @@
private:
explicit LegacyAny(Type);
- explicit LegacyAny(PassRefPtr<DOMStringList>);
- explicit LegacyAny(PassRefPtr<LegacyCursor>);
- explicit LegacyAny(PassRefPtr<LegacyCursorWithValue>);
- explicit LegacyAny(PassRefPtr<LegacyDatabase>);
- explicit LegacyAny(PassRefPtr<LegacyFactory>);
- explicit LegacyAny(PassRefPtr<LegacyIndex>);
- explicit LegacyAny(PassRefPtr<LegacyObjectStore>);
- explicit LegacyAny(PassRefPtr<LegacyTransaction>);
+ explicit LegacyAny(RefPtr<DOMStringList>);
+ explicit LegacyAny(RefPtr<LegacyCursor>);
+ explicit LegacyAny(RefPtr<LegacyCursorWithValue>);
+ explicit LegacyAny(RefPtr<LegacyDatabase>);
+ explicit LegacyAny(RefPtr<LegacyFactory>);
+ explicit LegacyAny(RefPtr<LegacyIndex>);
+ explicit LegacyAny(RefPtr<LegacyObjectStore>);
+ explicit LegacyAny(RefPtr<LegacyTransaction>);
explicit LegacyAny(const IDBKeyPath&);
explicit LegacyAny(const String&);
explicit LegacyAny(const Deprecated::ScriptValue&);
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -96,7 +96,7 @@
return m_source.get();
}
-PassRefPtr<IDBRequest> LegacyCursor::update(JSC::ExecState& state, Deprecated::ScriptValue& value, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyCursor::update(JSC::ExecState& state, Deprecated::ScriptValue& value, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyCursor::update");
@@ -201,7 +201,7 @@
ASSERT(!ec);
}
-PassRefPtr<IDBRequest> LegacyCursor::deleteFunction(ScriptExecutionContext* context, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyCursor::deleteFunction(ScriptExecutionContext* context, ExceptionCode& ec)
{
ec = 0;
LOG(StorageAPI, "LegacyCursor::delete");
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyCursor.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -35,7 +35,6 @@
#include "LegacyTransaction.h"
#include "ScriptWrappable.h"
#include <bindings/ScriptValue.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
@@ -62,12 +61,12 @@
const Deprecated::ScriptValue& value() const;
IDBAny* source() const;
- PassRefPtr<IDBRequest> update(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&);
+ RefPtr<IDBRequest> update(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&);
void advance(unsigned long, ExceptionCode&);
// FIXME: Try to modify the code generator so this overload is unneeded.
void continueFunction(ScriptExecutionContext*, ExceptionCode& ec) { continueFunction(static_cast<IDBKey*>(nullptr), ec); }
void continueFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCode&);
+ RefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCode&);
void continueFunction(PassRefPtr<IDBKey>, ExceptionCode&);
void postSuccessHandlerCallback();
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -145,7 +145,7 @@
m_transactions.get(transactionId)->onComplete();
}
-PassRefPtr<DOMStringList> LegacyDatabase::objectStoreNames() const
+RefPtr<DOMStringList> LegacyDatabase::objectStoreNames() const
{
RefPtr<DOMStringList> objectStoreNames = DOMStringList::create();
for (auto& objectStore : m_metadata.objectStores.values())
@@ -161,7 +161,7 @@
return m_metadata.version != IDBDatabaseMetadata::NoIntVersion ? m_metadata.version : static_cast<uint64_t>(IDBDatabaseMetadata::DefaultIntVersion);
}
-PassRefPtr<IDBObjectStore> LegacyDatabase::createObjectStore(const String& name, const Dictionary& options, ExceptionCode& ec)
+RefPtr<IDBObjectStore> LegacyDatabase::createObjectStore(const String& name, const Dictionary& options, ExceptionCode& ec)
{
IDBKeyPath keyPath;
bool autoIncrement = false;
@@ -179,7 +179,7 @@
return createObjectStore(name, keyPath, autoIncrement, ec);
}
-PassRefPtr<IDBObjectStore> LegacyDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, ExceptionCode& ec)
+RefPtr<IDBObjectStore> LegacyDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyDatabase::createObjectStore");
if (!m_versionChangeTransaction) {
@@ -241,7 +241,7 @@
m_metadata.objectStores.remove(objectStoreId);
}
-PassRefPtr<IDBTransaction> LegacyDatabase::transaction(ScriptExecutionContext* context, const Vector<String>& scope, const String& modeString, ExceptionCode& ec)
+RefPtr<IDBTransaction> LegacyDatabase::transaction(ScriptExecutionContext* context, const Vector<String>& scope, const String& modeString, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyDatabase::transaction");
if (!scope.size()) {
@@ -275,7 +275,7 @@
return transaction.release();
}
-PassRefPtr<IDBTransaction> LegacyDatabase::transaction(ScriptExecutionContext* context, const String& storeName, const String& mode, ExceptionCode& ec)
+RefPtr<IDBTransaction> LegacyDatabase::transaction(ScriptExecutionContext* context, const String& storeName, const String& mode, ExceptionCode& ec)
{
RefPtr<DOMStringList> storeNames = DOMStringList::create();
storeNames->append(storeName);
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyDatabase.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -63,12 +63,12 @@
// Implement the IDL
virtual const String name() const override final { return m_metadata.name; }
virtual uint64_t version() const override final;
- virtual PassRefPtr<DOMStringList> objectStoreNames() const override final;
+ virtual RefPtr<DOMStringList> objectStoreNames() const override final;
- virtual PassRefPtr<IDBObjectStore> createObjectStore(const String& name, const Dictionary&, ExceptionCode&) override final;
- virtual PassRefPtr<IDBObjectStore> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionCode&) override final;
- virtual PassRefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const Vector<String>&, const String& mode, ExceptionCode&) override final;
- virtual PassRefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const String&, const String& mode, ExceptionCode&) override final;
+ virtual RefPtr<IDBObjectStore> createObjectStore(const String& name, const Dictionary&, ExceptionCode&) override final;
+ virtual RefPtr<IDBObjectStore> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionCode&) override final;
+ virtual RefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const Vector<String>&, const String& mode, ExceptionCode&) override final;
+ virtual RefPtr<IDBTransaction> transaction(ScriptExecutionContext*, const String&, const String& mode, ExceptionCode&) override final;
virtual void deleteObjectStore(const String& name, ExceptionCode&) override final;
virtual void close() override final;
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyFactory.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyFactory.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyFactory.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -75,7 +75,7 @@
return true;
}
-PassRefPtr<IDBRequest> LegacyFactory::getDatabaseNames(ScriptExecutionContext* context, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyFactory::getDatabaseNames(ScriptExecutionContext* context, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyFactory::getDatabaseNames");
if (!isContextValid(context))
@@ -90,13 +90,13 @@
return request;
}
-PassRefPtr<IDBOpenDBRequest> LegacyFactory::open(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
+RefPtr<IDBOpenDBRequest> LegacyFactory::open(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyFactory::open");
return openInternal(context, name, 0, IndexedDB::VersionNullness::Null, ec);
}
-PassRefPtr<IDBOpenDBRequest> LegacyFactory::open(ScriptExecutionContext* context, const String& name, unsigned long long version, ExceptionCode& ec)
+RefPtr<IDBOpenDBRequest> LegacyFactory::open(ScriptExecutionContext* context, const String& name, unsigned long long version, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyFactory::open");
if (!version) {
@@ -127,7 +127,7 @@
return request;
}
-PassRefPtr<IDBOpenDBRequest> LegacyFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
+RefPtr<IDBOpenDBRequest> LegacyFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyFactory::deleteDatabase");
if (name.isNull()) {
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyFactory.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyFactory.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyFactory.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -61,13 +61,13 @@
// FIXME: getDatabaseNames is no longer a web-facing API, and should be removed from LegacyFactory.
// The Web Inspector currently uses this to enumerate the list of databases, but is more complicated as a result.
// We should provide a simpler API to the Web Inspector then remove getDatabaseNames.
- PassRefPtr<IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&);
+ virtual RefPtr<IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) override;
- PassRefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&);
- PassRefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&);
- PassRefPtr<IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&);
+ virtual RefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) override;
+ virtual RefPtr<IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) override;
+ virtual RefPtr<IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) override;
- short cmp(ScriptExecutionContext*, const Deprecated::ScriptValue& first, const Deprecated::ScriptValue& second, ExceptionCode&);
+ short cmp(ScriptExecutionContext*, const Deprecated::ScriptValue& first, const Deprecated::ScriptValue& second, ExceptionCode&) override;
private:
LegacyFactory(IDBFactoryBackendInterface*);
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyIndex.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyIndex.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyIndex.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -54,7 +54,7 @@
{
}
-PassRefPtr<IDBRequest> LegacyIndex::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, const String& directionString, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::openCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, const String& directionString, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::openCursor");
if (m_deleted) {
@@ -75,16 +75,16 @@
return request;
}
-PassRefPtr<IDBRequest> LegacyIndex::openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::openCursor");
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return openCursor(context, keyRange.release(), direction, ec);
+ return openCursor(context, keyRange.get(), direction, ec);
}
-PassRefPtr<IDBRequest> LegacyIndex::count(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::count(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::count");
if (m_deleted) {
@@ -100,16 +100,16 @@
return request;
}
-PassRefPtr<IDBRequest> LegacyIndex::count(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::count(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::count");
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return count(context, keyRange.release(), ec);
+ return count(context, keyRange.get(), ec);
}
-PassRefPtr<IDBRequest> LegacyIndex::openKeyCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, const String& directionString, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::openKeyCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, const String& directionString, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::openKeyCursor");
if (m_deleted) {
@@ -130,25 +130,25 @@
return request;
}
-PassRefPtr<IDBRequest> LegacyIndex::openKeyCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::openKeyCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::openKeyCursor");
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return openKeyCursor(context, keyRange.release(), direction, ec);
+ return openKeyCursor(context, keyRange.get(), direction, ec);
}
-PassRefPtr<IDBRequest> LegacyIndex::get(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::get(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::get");
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return get(context, keyRange.release(), ec);
+ return get(context, keyRange.get(), ec);
}
-PassRefPtr<IDBRequest> LegacyIndex::get(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::get(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::get");
if (m_deleted) {
@@ -169,17 +169,17 @@
return request;
}
-PassRefPtr<IDBRequest> LegacyIndex::getKey(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::getKey(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::getKey");
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return getKey(context, keyRange.release(), ec);
+ return getKey(context, keyRange.get(), ec);
}
-PassRefPtr<IDBRequest> LegacyIndex::getKey(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyIndex::getKey(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyIndex::getKey");
if (m_deleted) {
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyIndex.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyIndex.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyIndex.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -56,34 +56,34 @@
// Implement the IDL
virtual const String name() const override final { return m_metadata.name; }
- virtual PassRefPtr<IDBObjectStore> objectStore() const override final { return m_objectStore; }
- PassRefPtr<LegacyObjectStore> legacyObjectStore() const { return m_objectStore; }
- virtual PassRefPtr<IDBAny> keyPathAny() const override final { return LegacyAny::create(m_metadata.keyPath); }
+ virtual RefPtr<IDBObjectStore> objectStore() const override final { return m_objectStore; }
+ LegacyObjectStore* legacyObjectStore() const { return m_objectStore.get(); }
+ virtual RefPtr<IDBAny> keyPathAny() const override final { return LegacyAny::create(m_metadata.keyPath); }
virtual const IDBKeyPath keyPath() const override final { return m_metadata.keyPath; }
virtual bool unique() const override final { return m_metadata.unique; }
virtual bool multiEntry() const override final { return m_metadata.multiEntry; }
virtual int64_t id() const override final { return m_metadata.id; }
// FIXME: Try to modify the code generator so this is unneeded.
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, ExceptionCode& ec) override final { return openCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); }
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) override final { return openCursor(context, keyRange, IDBCursor::directionNext(), ec); }
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec) override final { return openCursor(context, key, IDBCursor::directionNext(), ec); }
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext* context, ExceptionCode& ec) override final { return count(context, static_cast<IDBKeyRange*>(nullptr), ec); }
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, ExceptionCode& ec) override final { return openCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); }
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec) override final { return openCursor(context, keyRange, IDBCursor::directionNext(), ec); }
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec) override final { return openCursor(context, key, IDBCursor::directionNext(), ec); }
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext* context, ExceptionCode& ec) override final { return count(context, static_cast<IDBKeyRange*>(nullptr), ec); }
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext* context, ExceptionCode& ec) override final { return openKeyCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); }
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec) override final { return openKeyCursor(context, keyRange, IDBCursor::directionNext(), ec); }
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec) override final { return openKeyCursor(context, key, IDBCursor::directionNext(), ec); }
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext* context, ExceptionCode& ec) override final { return openKeyCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); }
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec) override final { return openKeyCursor(context, keyRange, IDBCursor::directionNext(), ec); }
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec) override final { return openKeyCursor(context, key, IDBCursor::directionNext(), ec); }
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> getKey(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&) override final;
- virtual PassRefPtr<IDBRequest> getKey(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> getKey(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&) override final;
+ virtual RefPtr<IDBRequest> getKey(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&) override final;
void markDeleted() { m_deleted = true; }
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -58,7 +58,7 @@
relaxAdoptionRequirement();
}
-PassRefPtr<DOMStringList> LegacyObjectStore::indexNames() const
+RefPtr<DOMStringList> LegacyObjectStore::indexNames() const
{
LOG(StorageAPI, "LegacyObjectStore::indexNames");
RefPtr<DOMStringList> indexNames = DOMStringList::create();
@@ -68,7 +68,7 @@
return indexNames.release();
}
-PassRefPtr<IDBRequest> LegacyObjectStore::get(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::get(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::get");
if (m_deleted) {
@@ -88,39 +88,39 @@
return request.release();
}
-PassRefPtr<IDBRequest> LegacyObjectStore::get(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::get(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return get(context, keyRange.release(), ec);
+ return get(context, keyRange.get(), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::add(JSC::ExecState& state, Deprecated::ScriptValue& value, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::add(JSC::ExecState& state, Deprecated::ScriptValue& value, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::add");
return put(IDBDatabaseBackend::AddOnly, LegacyAny::create(this), state, value, key, ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::add(JSC::ExecState& state, Deprecated::ScriptValue& value, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::add(JSC::ExecState& state, Deprecated::ScriptValue& value, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::add");
return put(IDBDatabaseBackend::AddOnly, LegacyAny::create(this), state, value, static_cast<IDBKey*>(nullptr), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::put(JSC::ExecState& state, Deprecated::ScriptValue& value, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::put(JSC::ExecState& state, Deprecated::ScriptValue& value, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::put");
return put(IDBDatabaseBackend::AddOrUpdate, LegacyAny::create(this), state, value, key, ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::put(JSC::ExecState& state, Deprecated::ScriptValue& value, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::put(JSC::ExecState& state, Deprecated::ScriptValue& value, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::put");
return put(IDBDatabaseBackend::AddOrUpdate, LegacyAny::create(this), state, value, static_cast<IDBKey*>(nullptr), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::put(IDBDatabaseBackend::PutMode putMode, PassRefPtr<LegacyAny> source, JSC::ExecState& state, Deprecated::ScriptValue& value, const Deprecated::ScriptValue& keyValue, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::put(IDBDatabaseBackend::PutMode putMode, RefPtr<LegacyAny> source, JSC::ExecState& state, Deprecated::ScriptValue& value, const Deprecated::ScriptValue& keyValue, ExceptionCode& ec)
{
ScriptExecutionContext* context = scriptExecutionContextFromExecState(&state);
DOMRequestState requestState(context);
@@ -128,7 +128,7 @@
return put(putMode, source, state, value, key.release(), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::put(IDBDatabaseBackend::PutMode putMode, PassRefPtr<LegacyAny> source, JSC::ExecState& state, Deprecated::ScriptValue& value, PassRefPtr<IDBKey> prpKey, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::put(IDBDatabaseBackend::PutMode putMode, RefPtr<LegacyAny> source, JSC::ExecState& state, Deprecated::ScriptValue& value, RefPtr<IDBKey> prpKey, ExceptionCode& ec)
{
RefPtr<IDBKey> key = prpKey;
if (m_deleted) {
@@ -220,7 +220,7 @@
return request.release();
}
-PassRefPtr<IDBRequest> LegacyObjectStore::deleteFunction(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::deleteFunction(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::delete");
if (m_deleted) {
@@ -245,15 +245,15 @@
return request.release();
}
-PassRefPtr<IDBRequest> LegacyObjectStore::deleteFunction(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::deleteFunction(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return deleteFunction(context, keyRange.release(), ec);
+ return deleteFunction(context, keyRange.get(), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::clear(ScriptExecutionContext* context, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::clear(ScriptExecutionContext* context, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::clear");
if (m_deleted) {
@@ -282,7 +282,7 @@
// cursor success handlers are kept alive.
class IndexPopulator : public EventListener {
public:
- static Ref<IndexPopulator> create(PassRefPtr<IDBDatabaseBackend> backend, int64_t transactionId, int64_t objectStoreId, const IDBIndexMetadata& indexMetadata)
+ static Ref<IndexPopulator> create(RefPtr<IDBDatabaseBackend> backend, int64_t transactionId, int64_t objectStoreId, const IDBIndexMetadata& indexMetadata)
{
return adoptRef(*new IndexPopulator(backend, transactionId, objectStoreId, indexMetadata));
}
@@ -293,7 +293,7 @@
}
private:
- IndexPopulator(PassRefPtr<IDBDatabaseBackend> backend, int64_t transactionId, int64_t objectStoreId, const IDBIndexMetadata& indexMetadata)
+ IndexPopulator(RefPtr<IDBDatabaseBackend> backend, int64_t transactionId, int64_t objectStoreId, const IDBIndexMetadata& indexMetadata)
: EventListener(CPPEventListenerType)
, m_databaseBackend(backend)
, m_transactionId(transactionId)
@@ -350,7 +350,7 @@
};
}
-PassRefPtr<IDBIndex> LegacyObjectStore::createIndex(ScriptExecutionContext* context, const String& name, const IDBKeyPath& keyPath, const Dictionary& options, ExceptionCode& ec)
+RefPtr<IDBIndex> LegacyObjectStore::createIndex(ScriptExecutionContext* context, const String& name, const IDBKeyPath& keyPath, const Dictionary& options, ExceptionCode& ec)
{
bool unique = false;
options.get("unique", unique);
@@ -361,7 +361,7 @@
return createIndex(context, name, keyPath, unique, multiEntry, ec);
}
-PassRefPtr<IDBIndex> LegacyObjectStore::createIndex(ScriptExecutionContext* context, const String& name, const IDBKeyPath& keyPath, bool unique, bool multiEntry, ExceptionCode& ec)
+RefPtr<IDBIndex> LegacyObjectStore::createIndex(ScriptExecutionContext* context, const String& name, const IDBKeyPath& keyPath, bool unique, bool multiEntry, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::createIndex");
if (!m_transaction->isVersionChange() || m_deleted) {
@@ -408,7 +408,7 @@
return index.release();
}
-PassRefPtr<IDBIndex> LegacyObjectStore::index(const String& name, ExceptionCode& ec)
+RefPtr<IDBIndex> LegacyObjectStore::index(const String& name, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::index");
if (m_deleted) {
@@ -472,27 +472,27 @@
}
}
-PassRefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, ExceptionCode& ec)
{
return openCursor(context, static_cast<IDBKeyRange*>(nullptr), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> keyRange, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCode& ec)
{
return openCursor(context, keyRange, IDBCursor::directionNext(), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
return openCursor(context, key, IDBCursor::directionNext(), ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& direction, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, IDBKeyRange* range, const String& direction, ExceptionCode& ec)
{
return openCursor(context, range, direction, IDBDatabaseBackend::NormalTask, ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, const String& directionString, IDBDatabaseBackend::TaskType taskType, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, IDBKeyRange* range, const String& directionString, IDBDatabaseBackend::TaskType taskType, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::openCursor");
if (m_deleted) {
@@ -514,15 +514,15 @@
return request.release();
}
-PassRefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode& ec)
{
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return openCursor(context, keyRange.release(), direction, ec);
+ return openCursor(context, keyRange.get(), direction, ec);
}
-PassRefPtr<IDBRequest> LegacyObjectStore::count(ScriptExecutionContext* context, PassRefPtr<IDBKeyRange> range, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::count(ScriptExecutionContext* context, IDBKeyRange* range, ExceptionCode& ec)
{
LOG(StorageAPI, "LegacyObjectStore::count");
if (m_deleted) {
@@ -538,12 +538,12 @@
return request.release();
}
-PassRefPtr<IDBRequest> LegacyObjectStore::count(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
+RefPtr<IDBRequest> LegacyObjectStore::count(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCode& ec)
{
RefPtr<IDBKeyRange> keyRange = IDBKeyRange::only(context, key, ec);
if (ec)
return 0;
- return count(context, keyRange.release(), ec);
+ return count(context, keyRange.get(), ec);
}
void LegacyObjectStore::transactionFinished()
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyObjectStore.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -38,7 +38,6 @@
#include "LegacyTransaction.h"
#include "ScriptWrappable.h"
#include "SerializedScriptValue.h"
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
@@ -62,43 +61,43 @@
// Implement the IDBObjectStore IDL
int64_t id() const { return m_metadata.id; }
const String name() const { return m_metadata.name; }
- PassRefPtr<IDBAny> keyPathAny() const { return LegacyAny::create(m_metadata.keyPath); }
+ RefPtr<IDBAny> keyPathAny() const { return LegacyAny::create(m_metadata.keyPath); }
const IDBKeyPath keyPath() const { return m_metadata.keyPath; }
- PassRefPtr<DOMStringList> indexNames() const;
- PassRefPtr<IDBTransaction> transaction() const { return m_transaction; }
+ RefPtr<DOMStringList> indexNames() const;
+ RefPtr<IDBTransaction> transaction() const { return m_transaction; }
bool autoIncrement() const { return m_metadata.autoIncrement; }
- PassRefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&);
- PassRefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&);
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCode&);
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&);
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, ExceptionCode&);
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, const String& direction, IDBDatabaseBackend::TaskType, ExceptionCode&);
- PassRefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&);
+ RefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&);
+ RefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCode&);
+ RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCode&);
+ RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&);
+ RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCode&);
+ RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, IDBDatabaseBackend::TaskType, ExceptionCode&);
+ RefPtr<IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCode&);
- PassRefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> get(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&);
- PassRefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> put(IDBDatabaseBackend::PutMode, PassRefPtr<LegacyAny>, JSC::ExecState&, Deprecated::ScriptValue&, PassRefPtr<IDBKey>, ExceptionCode&);
- PassRefPtr<IDBRequest> put(IDBDatabaseBackend::PutMode, PassRefPtr<LegacyAny> source, JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&);
+ RefPtr<IDBRequest> add(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> put(JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> put(IDBDatabaseBackend::PutMode, RefPtr<LegacyAny>, JSC::ExecState&, Deprecated::ScriptValue&, RefPtr<IDBKey>, ExceptionCode&);
+ RefPtr<IDBRequest> put(IDBDatabaseBackend::PutMode, RefPtr<LegacyAny> source, JSC::ExecState&, Deprecated::ScriptValue&, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&);
- PassRefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
- PassRefPtr<IDBRequest> clear(ScriptExecutionContext*, ExceptionCode&);
+ RefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&);
+ RefPtr<IDBRequest> deleteFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> clear(ScriptExecutionContext*, ExceptionCode&);
- PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext* context, const String& name, const String& keyPath, const Dictionary& options, ExceptionCode& ec) { return createIndex(context, name, IDBKeyPath(keyPath), options, ec); }
- PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext* context, const String& name, const Vector<String>& keyPath, const Dictionary& options, ExceptionCode& ec) { return createIndex(context, name, IDBKeyPath(keyPath), options, ec); }
- PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, const Dictionary&, ExceptionCode&);
- PassRefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCode&);
+ RefPtr<IDBIndex> createIndex(ScriptExecutionContext* context, const String& name, const String& keyPath, const Dictionary& options, ExceptionCode& ec) { return createIndex(context, name, IDBKeyPath(keyPath), options, ec); }
+ RefPtr<IDBIndex> createIndex(ScriptExecutionContext* context, const String& name, const Vector<String>& keyPath, const Dictionary& options, ExceptionCode& ec) { return createIndex(context, name, IDBKeyPath(keyPath), options, ec); }
+ RefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, const Dictionary&, ExceptionCode&);
+ RefPtr<IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCode&);
- PassRefPtr<IDBIndex> index(const String& name, ExceptionCode&);
+ RefPtr<IDBIndex> index(const String& name, ExceptionCode&);
void deleteIndex(const String& name, ExceptionCode&);
- PassRefPtr<IDBRequest> count(ScriptExecutionContext* context, ExceptionCode& ec) { return count(context, static_cast<IDBKeyRange*>(nullptr), ec); }
- PassRefPtr<IDBRequest> count(ScriptExecutionContext*, PassRefPtr<IDBKeyRange>, ExceptionCode&);
- PassRefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
+ RefPtr<IDBRequest> count(ScriptExecutionContext* context, ExceptionCode& ec) { return count(context, static_cast<IDBKeyRange*>(nullptr), ec); }
+ RefPtr<IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCode&);
+ RefPtr<IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCode&);
void markDeleted() { m_deleted = true; }
void transactionFinished();
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -96,7 +96,7 @@
{
}
-PassRefPtr<IDBAny> LegacyRequest::result(ExceptionCode& ec) const
+RefPtr<IDBAny> LegacyRequest::result(ExceptionCode& ec) const
{
if (m_readyState != DONE) {
ec = IDBDatabaseException::InvalidStateError;
@@ -105,7 +105,7 @@
return m_result;
}
-PassRefPtr<DOMError> LegacyRequest::error(ExceptionCode& ec) const
+RefPtr<DOMError> LegacyRequest::error(ExceptionCode& ec) const
{
if (m_readyState != DONE) {
ec = IDBDatabaseException::InvalidStateError;
@@ -123,12 +123,12 @@
return m_errorCode;
}
-PassRefPtr<IDBAny> LegacyRequest::source() const
+RefPtr<IDBAny> LegacyRequest::source() const
{
return m_source;
}
-PassRefPtr<IDBTransaction> LegacyRequest::transaction() const
+RefPtr<IDBTransaction> LegacyRequest::transaction() const
{
return m_transaction;
}
@@ -296,7 +296,7 @@
RefPtr<LegacyCursor> cursor;
switch (m_cursorType) {
case IndexedDB::CursorType::KeyOnly:
- cursor = LegacyCursor::create(backend.release(), m_cursorDirection, this, m_source.get(), m_transaction.get());
+ cursor = LegacyCursor::create(backend.get(), m_cursorDirection, this, m_source.get(), m_transaction.get());
break;
case IndexedDB::CursorType::KeyAndValue:
cursor = LegacyCursorWithValue::create(backend.release(), m_cursorDirection, this, m_source.get(), m_transaction.get());
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyRequest.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -58,12 +58,12 @@
static Ref<LegacyRequest> create(ScriptExecutionContext*, PassRefPtr<LegacyAny> source, IDBDatabaseBackend::TaskType, LegacyTransaction*);
virtual ~LegacyRequest();
- virtual PassRefPtr<IDBAny> result(ExceptionCode&) const override final;
+ virtual RefPtr<IDBAny> result(ExceptionCode&) const override final;
PassRefPtr<LegacyAny> legacyResult(ExceptionCode&);
virtual unsigned short errorCode(ExceptionCode&) const override final;
- virtual PassRefPtr<DOMError> error(ExceptionCode&) const override final;
- virtual PassRefPtr<IDBAny> source() const override final;
- virtual PassRefPtr<IDBTransaction> transaction() const override final;
+ virtual RefPtr<DOMError> error(ExceptionCode&) const override final;
+ virtual RefPtr<IDBAny> source() const override final;
+ virtual RefPtr<IDBTransaction> transaction() const override final;
virtual const String& readyState() const override final;
void preventPropagation() { m_preventPropagation = true; }
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.cpp (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -113,7 +113,7 @@
}
}
-PassRefPtr<IDBObjectStore> LegacyTransaction::objectStore(const String& name, ExceptionCode& ec)
+RefPtr<IDBObjectStore> LegacyTransaction::objectStore(const String& name, ExceptionCode& ec)
{
if (m_state == Finished) {
ec = IDBDatabaseException::InvalidStateError;
Modified: trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.h (190249 => 190250)
--- trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.h 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/Modules/indexeddb/legacy/LegacyTransaction.h 2015-09-25 19:46:51 UTC (rev 190250)
@@ -67,8 +67,8 @@
virtual const String& mode() const override final;
virtual IDBDatabase* db() const override final;
- virtual PassRefPtr<DOMError> error() const override final { return m_error; }
- virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, ExceptionCode&) override final;
+ virtual RefPtr<DOMError> error() const override final { return m_error; }
+ virtual RefPtr<IDBObjectStore> objectStore(const String& name, ExceptionCode&) override final;
virtual void abort(ExceptionCode&) override final;
class OpenCursorNotifier {
Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (190249 => 190250)
--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-25 19:13:49 UTC (rev 190249)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-25 19:46:51 UTC (rev 190250)
@@ -539,9 +539,9 @@
return;
}
- idbRequest = idbIndex->openCursor(context(), m_idbKeyRange.copyRef(), ec);
+ idbRequest = idbIndex->openCursor(context(), m_idbKeyRange.get(), ec);
} else
- idbRequest = idbObjectStore->openCursor(context(), m_idbKeyRange.copyRef(), ec);
+ idbRequest = idbObjectStore->openCursor(context(), m_idbKeyRange.get(), ec);
idbRequest->addEventListener(eventNames().successEvent, WTF::move(openCursorCallback), false);
}
