From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- .../WebCore/inspector/InspectorDatabaseAgent.cpp | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'Source/WebCore/inspector/InspectorDatabaseAgent.cpp') diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp index 45ec42a..7f6e379 100644 --- a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp +++ b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp @@ -70,9 +70,9 @@ private: namespace { -long lastTransactionId = 0; +int lastTransactionId = 0; -void reportTransactionFailed(InspectorFrontend::Database* frontend, long transactionId, SQLError* error) +void reportTransactionFailed(InspectorFrontend::Database* frontend, int transactionId, SQLError* error) { if (!frontend) return; @@ -84,7 +84,7 @@ void reportTransactionFailed(InspectorFrontend::Database* frontend, long transac class StatementCallback : public SQLStatementCallback { public: - static PassRefPtr create(long transactionId, PassRefPtr frontendProvider) + static PassRefPtr create(int transactionId, PassRefPtr frontendProvider) { return adoptRef(new StatementCallback(transactionId, frontendProvider)); } @@ -118,16 +118,16 @@ public: } private: - StatementCallback(long transactionId, PassRefPtr frontendProvider) + StatementCallback(int transactionId, PassRefPtr frontendProvider) : m_transactionId(transactionId) , m_frontendProvider(frontendProvider) { } - long m_transactionId; + int m_transactionId; RefPtr m_frontendProvider; }; class StatementErrorCallback : public SQLStatementErrorCallback { public: - static PassRefPtr create(long transactionId, PassRefPtr frontendProvider) + static PassRefPtr create(int transactionId, PassRefPtr frontendProvider) { return adoptRef(new StatementErrorCallback(transactionId, frontendProvider)); } @@ -141,16 +141,16 @@ public: } private: - StatementErrorCallback(long transactionId, PassRefPtr frontendProvider) + StatementErrorCallback(int transactionId, PassRefPtr frontendProvider) : m_transactionId(transactionId) , m_frontendProvider(frontendProvider) { } - long m_transactionId; + int m_transactionId; RefPtr m_frontendProvider; }; class TransactionCallback : public SQLTransactionCallback { public: - static PassRefPtr create(const String& sqlStatement, long transactionId, PassRefPtr frontendProvider) + static PassRefPtr create(const String& sqlStatement, int transactionId, PassRefPtr frontendProvider) { return adoptRef(new TransactionCallback(sqlStatement, transactionId, frontendProvider)); } @@ -170,18 +170,18 @@ public: return true; } private: - TransactionCallback(const String& sqlStatement, long transactionId, PassRefPtr frontendProvider) + TransactionCallback(const String& sqlStatement, int transactionId, PassRefPtr frontendProvider) : m_sqlStatement(sqlStatement) , m_transactionId(transactionId) , m_frontendProvider(frontendProvider) { } String m_sqlStatement; - long m_transactionId; + int m_transactionId; RefPtr m_frontendProvider; }; class TransactionErrorCallback : public SQLTransactionErrorCallback { public: - static PassRefPtr create(long transactionId, PassRefPtr frontendProvider) + static PassRefPtr create(int transactionId, PassRefPtr frontendProvider) { return adoptRef(new TransactionErrorCallback(transactionId, frontendProvider)); } @@ -194,10 +194,10 @@ public: return true; } private: - TransactionErrorCallback(long transactionId, PassRefPtr frontendProvider) + TransactionErrorCallback(int transactionId, PassRefPtr frontendProvider) : m_transactionId(transactionId) , m_frontendProvider(frontendProvider) { } - long m_transactionId; + int m_transactionId; RefPtr m_frontendProvider; }; @@ -257,7 +257,7 @@ void InspectorDatabaseAgent::clearFrontend() m_frontendProvider.clear(); } -void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, long databaseId, RefPtr* names) +void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, int databaseId, RefPtr* names) { Database* database = databaseForId(databaseId); if (database) { @@ -268,7 +268,7 @@ void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString*, long databaseId } } -void InspectorDatabaseAgent::executeSQL(ErrorString*, long databaseId, const String& query, bool* success, long* transactionId) +void InspectorDatabaseAgent::executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId) { Database* database = databaseForId(databaseId); if (!database) { @@ -284,7 +284,7 @@ void InspectorDatabaseAgent::executeSQL(ErrorString*, long databaseId, const Str *success = true; } -long InspectorDatabaseAgent::databaseId(Database* database) +int InspectorDatabaseAgent::databaseId(Database* database) { for (DatabaseResourcesMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) { if (it->second->database() == database) @@ -293,7 +293,7 @@ long InspectorDatabaseAgent::databaseId(Database* database) return 0; } -Database* InspectorDatabaseAgent::databaseForId(long databaseId) +Database* InspectorDatabaseAgent::databaseForId(int databaseId) { DatabaseResourcesMap::iterator it = m_resources.find(databaseId); if (it == m_resources.end()) -- cgit v1.1