Skip to content
Permalink
Browse files
Remove build warning for unused function parameters in indexeddb.
https://bugs.webkit.org/show_bug.cgi?id=113043

Reviewed by Tony Chang.

No new tests, just remove build warning.

* Modules/indexeddb/IDBCallbacks.h:
(WebCore::IDBCallbacks::onBlocked):
(WebCore::IDBCallbacks::onUpgradeNeeded):
* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::stringToDirection):
* Modules/indexeddb/IDBCursor.h:
(IDBCursor):
* Modules/indexeddb/IDBCursorBackendImpl.cpp:
(WebCore::IDBCursorBackendImpl::prefetchReset):
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::transaction):
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::setIndexesReady):
* Modules/indexeddb/IDBIndex.cpp:
(WebCore::IDBIndex::openCursor):
(WebCore::IDBIndex::openKeyCursor):
* Modules/indexeddb/IDBLevelDBCoding.cpp:
(IDBLevelDBCoding):
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore):
(WebCore::IDBObjectStore::openCursor):
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::stringToMode):
* Modules/indexeddb/IDBTransaction.h:
(IDBTransaction):
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore):


Canonical link: https://commits.webkit.org/131770@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147029 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cswei committed Mar 28, 2013
1 parent ead4624 commit 35d4a5ab27d6204c36c42cc6a8e0c1a75ecd6e24
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 17 deletions.
@@ -1,3 +1,40 @@
2013-03-27 Charles Wei <charles.wei@torchmobile.com.cn>

Remove build warning for unused function parameters in indexeddb.
https://bugs.webkit.org/show_bug.cgi?id=113043

Reviewed by Tony Chang.

No new tests, just remove build warning.

* Modules/indexeddb/IDBCallbacks.h:
(WebCore::IDBCallbacks::onBlocked):
(WebCore::IDBCallbacks::onUpgradeNeeded):
* Modules/indexeddb/IDBCursor.cpp:
(WebCore::IDBCursor::stringToDirection):
* Modules/indexeddb/IDBCursor.h:
(IDBCursor):
* Modules/indexeddb/IDBCursorBackendImpl.cpp:
(WebCore::IDBCursorBackendImpl::prefetchReset):
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::transaction):
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::setIndexesReady):
* Modules/indexeddb/IDBIndex.cpp:
(WebCore::IDBIndex::openCursor):
(WebCore::IDBIndex::openKeyCursor):
* Modules/indexeddb/IDBLevelDBCoding.cpp:
(IDBLevelDBCoding):
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore):
(WebCore::IDBObjectStore::openCursor):
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::stringToMode):
* Modules/indexeddb/IDBTransaction.h:
(IDBTransaction):
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore):

2013-03-27 Sergey Ryazanov <serya@chromium.org>

REGRESSION (r146588): Cannot correctly display Chinese SNS Renren
@@ -68,9 +68,9 @@ class IDBCallbacks : public RefCounted<IDBCallbacks> {
// From IDBCursor.advance()/continue()
virtual void onSuccessWithPrefetch(const Vector<RefPtr<IDBKey> >& keys, const Vector<RefPtr<IDBKey> >& primaryKeys, const Vector<RefPtr<SharedBuffer> >& values) = 0;
// From IDBFactory.open()/deleteDatabase()
virtual void onBlocked(int64_t existingVersion) { ASSERT_NOT_REACHED(); }
virtual void onBlocked(int64_t /* existingVersion */) { ASSERT_NOT_REACHED(); }
// From IDBFactory.open()
virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
virtual void onUpgradeNeeded(int64_t /* oldVersion */, PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
virtual void onSuccess(PassRefPtr<IDBDatabaseBackendInterface>, const IDBDatabaseMetadata&) { ASSERT_NOT_REACHED(); }
};

@@ -297,7 +297,7 @@ PassRefPtr<IDBObjectStore> IDBCursor::effectiveObjectStore()
return index->objectStore();
}

IndexedDB::CursorDirection IDBCursor::stringToDirection(const String& directionString, ScriptExecutionContext* context, ExceptionCode& ec)
IndexedDB::CursorDirection IDBCursor::stringToDirection(const String& directionString, ExceptionCode& ec)
{
if (directionString == IDBCursor::directionNext())
return IndexedDB::CursorNext;
@@ -55,7 +55,7 @@ class IDBCursor : public ScriptWrappable, public RefCounted<IDBCursor> {
static const AtomicString& directionPrev();
static const AtomicString& directionPrevUnique();

static IndexedDB::CursorDirection stringToDirection(const String& modeString, ScriptExecutionContext*, ExceptionCode&);
static IndexedDB::CursorDirection stringToDirection(const String& modeString, ExceptionCode&);
static const AtomicString& directionToString(unsigned short mode);

static PassRefPtr<IDBCursor> create(PassRefPtr<IDBCursorBackendInterface>, IndexedDB::CursorDirection, IDBRequest*, IDBAny* source, IDBTransaction*);
@@ -220,7 +220,7 @@ void IDBCursorBackendImpl::CursorPrefetchIterationOperation::perform(IDBTransact
m_callbacks->onSuccessWithPrefetch(foundKeys, foundPrimaryKeys, foundValues);
}

void IDBCursorBackendImpl::prefetchReset(int usedPrefetches, int unusedPrefetches)
void IDBCursorBackendImpl::prefetchReset(int usedPrefetches, int)
{
IDB_TRACE("IDBCursorBackendImpl::prefetchReset");
m_cursor = m_savedCursor;
@@ -230,7 +230,7 @@ PassRefPtr<IDBTransaction> IDBDatabase::transaction(ScriptExecutionContext* cont
return 0;
}

IndexedDB::TransactionMode mode = IDBTransaction::stringToMode(modeString, context, ec);
IndexedDB::TransactionMode mode = IDBTransaction::stringToMode(modeString, ec);
if (ec)
return 0;

@@ -915,7 +915,7 @@ void IDBDatabaseBackendImpl::setIndexKeys(int64_t transactionId, int64_t objectS
}
}

void IDBDatabaseBackendImpl::setIndexesReady(int64_t transactionId, int64_t objectStoreId, const Vector<int64_t>& indexIds)
void IDBDatabaseBackendImpl::setIndexesReady(int64_t transactionId, int64_t, const Vector<int64_t>& indexIds)
{
IDB_TRACE("IDBObjectStoreBackendImpl::setIndexesReady");

@@ -67,7 +67,7 @@ PassRefPtr<IDBRequest> IDBIndex::openCursor(ScriptExecutionContext* context, Pas
ec = IDBDatabaseException::TransactionInactiveError;
return 0;
}
IndexedDB::CursorDirection direction = IDBCursor::stringToDirection(directionString, context, ec);
IndexedDB::CursorDirection direction = IDBCursor::stringToDirection(directionString, ec);
if (ec)
return 0;

@@ -122,7 +122,7 @@ PassRefPtr<IDBRequest> IDBIndex::openKeyCursor(ScriptExecutionContext* context,
ec = IDBDatabaseException::TransactionInactiveError;
return 0;
}
IndexedDB::CursorDirection direction = IDBCursor::stringToDirection(directionString, context, ec);
IndexedDB::CursorDirection direction = IDBCursor::stringToDirection(directionString, ec);
if (ec)
return 0;

@@ -726,7 +726,7 @@ IDBKeyPath decodeIDBKeyPath(const char* p, const char* limit)
namespace {

template<typename KeyType>
int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool ignoreDuplicates, bool& ok)
int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool, bool& ok)
{
KeyType keyA;
KeyType keyB;
@@ -749,7 +749,7 @@ int compare(const LevelDBSlice& a, const LevelDBSlice& b, bool ignoreDuplicates,
}

template<>
int compare<ExistsEntryKey>(const LevelDBSlice& a, const LevelDBSlice& b, bool ignoreDuplicates, bool& ok)
int compare<ExistsEntryKey>(const LevelDBSlice& a, const LevelDBSlice& b, bool, bool& ok)
{
KeyPrefix prefixA;
KeyPrefix prefixB;
@@ -772,7 +772,7 @@ int compare<ExistsEntryKey>(const LevelDBSlice& a, const LevelDBSlice& b, bool i
}

template<>
int compare<ObjectStoreDataKey>(const LevelDBSlice& a, const LevelDBSlice& b, bool ignoreDuplicates, bool& ok)
int compare<ObjectStoreDataKey>(const LevelDBSlice& a, const LevelDBSlice& b, bool, bool& ok)
{
KeyPrefix prefixA;
KeyPrefix prefixB;
@@ -320,7 +320,7 @@ class IndexPopulator : public EventListener {
{
}

virtual void handleEvent(ScriptExecutionContext* context, Event* event)
virtual void handleEvent(ScriptExecutionContext*, Event* event)
{
ASSERT(event->type() == eventNames().successEvent);
EventTarget* target = event->target();
@@ -504,7 +504,7 @@ PassRefPtr<IDBRequest> IDBObjectStore::openCursor(ScriptExecutionContext* contex
ec = IDBDatabaseException::TransactionInactiveError;
return 0;
}
IndexedDB::CursorDirection direction = IDBCursor::stringToDirection(directionString, context, ec);
IndexedDB::CursorDirection direction = IDBCursor::stringToDirection(directionString, ec);
if (ec)
return 0;

@@ -336,7 +336,7 @@ bool IDBTransaction::hasPendingActivity() const
return m_hasPendingActivity && !m_contextStopped;
}

IndexedDB::TransactionMode IDBTransaction::stringToMode(const String& modeString, ScriptExecutionContext* context, ExceptionCode& ec)
IndexedDB::TransactionMode IDBTransaction::stringToMode(const String& modeString, ExceptionCode& ec)
{
if (modeString.isNull()
|| modeString == IDBTransaction::modeReadOnly())
@@ -62,7 +62,7 @@ class IDBTransaction : public ScriptWrappable, public RefCounted<IDBTransaction>
static const AtomicString& modeReadOnlyLegacy();
static const AtomicString& modeReadWriteLegacy();

static IndexedDB::TransactionMode stringToMode(const String&, ScriptExecutionContext*, ExceptionCode&);
static IndexedDB::TransactionMode stringToMode(const String&, ExceptionCode&);
static const AtomicString& modeToString(IndexedDB::TransactionMode);

IDBDatabaseBackendInterface* backendDB() const;
@@ -202,7 +202,7 @@ class OpenDatabaseCallback : public EventListener {
RefPtr<ExecutableWithDatabase> m_executableWithDatabase;
};

void ExecutableWithDatabase::start(IDBFactory* idbFactory, SecurityOrigin* securityOrigin, const String& databaseName)
void ExecutableWithDatabase::start(IDBFactory* idbFactory, SecurityOrigin*, const String& databaseName)
{
RefPtr<OpenDatabaseCallback> callback = OpenDatabaseCallback::create(this);
ExceptionCode ec = 0;

0 comments on commit 35d4a5a

Please sign in to comment.