Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1958)

Unified Diff: Source/modules/webdatabase/DatabaseSync.cpp

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/webdatabase/DatabaseManager.cpp ('k') | Source/modules/webdatabase/SQLResultSet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webdatabase/DatabaseSync.cpp
diff --git a/Source/modules/webdatabase/DatabaseSync.cpp b/Source/modules/webdatabase/DatabaseSync.cpp
index d01b4ff328eeb760f8f1fbfc983e07a0b446a07e..f1219b871885d9c0ea55610250a6bf502a1fb8a2 100644
--- a/Source/modules/webdatabase/DatabaseSync.cpp
+++ b/Source/modules/webdatabase/DatabaseSync.cpp
@@ -74,20 +74,20 @@ PassRefPtr<DatabaseBackendSync> DatabaseSync::backend()
return this;
}
-void DatabaseSync::changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionSyncCallback> changeVersionCallback, ExceptionState& es)
+void DatabaseSync::changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionSyncCallback> changeVersionCallback, ExceptionState& exceptionState)
{
ASSERT(m_executionContext->isContextThread());
if (sqliteDatabase().transactionInProgress()) {
reportChangeVersionResult(1, SQLError::DATABASE_ERR, 0);
setLastErrorMessage("unable to changeVersion from within a transaction");
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
return;
}
RefPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, changeVersionCallback, false);
- transaction->begin(es);
- if (es.hadException()) {
+ transaction->begin(exceptionState);
+ if (exceptionState.hadException()) {
ASSERT(!lastErrorMessage().isEmpty());
return;
}
@@ -96,20 +96,20 @@ void DatabaseSync::changeVersion(const String& oldVersion, const String& newVers
if (!getVersionFromDatabase(actualVersion)) {
reportChangeVersionResult(2, SQLError::UNKNOWN_ERR, sqliteDatabase().lastError());
setLastErrorMessage("unable to read the current version", sqliteDatabase().lastError(), sqliteDatabase().lastErrorMsg());
- es.throwDOMException(UnknownError, SQLError::unknownErrorMessage);
+ exceptionState.throwDOMException(UnknownError, SQLError::unknownErrorMessage);
return;
}
if (actualVersion != oldVersion) {
reportChangeVersionResult(3, SQLError::VERSION_ERR, 0);
setLastErrorMessage("current version of the database and `oldVersion` argument do not match");
- es.throwDOMException(VersionError, SQLError::versionErrorMessage);
+ exceptionState.throwDOMException(VersionError, SQLError::versionErrorMessage);
return;
}
- transaction->execute(es);
- if (es.hadException()) {
+ transaction->execute(exceptionState);
+ if (exceptionState.hadException()) {
ASSERT(!lastErrorMessage().isEmpty());
return;
}
@@ -117,12 +117,12 @@ void DatabaseSync::changeVersion(const String& oldVersion, const String& newVers
if (!setVersionInDatabase(newVersion)) {
reportChangeVersionResult(4, SQLError::UNKNOWN_ERR, sqliteDatabase().lastError());
setLastErrorMessage("unable to set the new version", sqliteDatabase().lastError(), sqliteDatabase().lastErrorMsg());
- es.throwDOMException(UnknownError, SQLError::unknownErrorMessage);
+ exceptionState.throwDOMException(UnknownError, SQLError::unknownErrorMessage);
return;
}
- transaction->commit(es);
- if (es.hadException()) {
+ transaction->commit(exceptionState);
+ if (exceptionState.hadException()) {
ASSERT(!lastErrorMessage().isEmpty());
setCachedVersion(oldVersion);
return;
@@ -134,14 +134,14 @@ void DatabaseSync::changeVersion(const String& oldVersion, const String& newVers
setLastErrorMessage("");
}
-void DatabaseSync::transaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionState& es)
+void DatabaseSync::transaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionState& exceptionState)
{
- runTransaction(callback, false, es);
+ runTransaction(callback, false, exceptionState);
}
-void DatabaseSync::readTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionState& es)
+void DatabaseSync::readTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionState& exceptionState)
{
- runTransaction(callback, true, es);
+ runTransaction(callback, true, exceptionState);
}
void DatabaseSync::rollbackTransaction(PassRefPtr<SQLTransactionSync> transaction)
@@ -152,31 +152,31 @@ void DatabaseSync::rollbackTransaction(PassRefPtr<SQLTransactionSync> transactio
return;
}
-void DatabaseSync::runTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionState& es)
+void DatabaseSync::runTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionState& exceptionState)
{
ASSERT(m_executionContext->isContextThread());
if (sqliteDatabase().transactionInProgress()) {
setLastErrorMessage("unable to start a transaction from within a transaction");
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
return;
}
RefPtr<SQLTransactionSync> transaction = SQLTransactionSync::create(this, callback, readOnly);
- transaction->begin(es);
- if (es.hadException()) {
+ transaction->begin(exceptionState);
+ if (exceptionState.hadException()) {
rollbackTransaction(transaction);
return;
}
- transaction->execute(es);
- if (es.hadException()) {
+ transaction->execute(exceptionState);
+ if (exceptionState.hadException()) {
rollbackTransaction(transaction);
return;
}
- transaction->commit(es);
- if (es.hadException()) {
+ transaction->commit(exceptionState);
+ if (exceptionState.hadException()) {
rollbackTransaction(transaction);
return;
}
« no previous file with comments | « Source/modules/webdatabase/DatabaseManager.cpp ('k') | Source/modules/webdatabase/SQLResultSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698