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

Unified Diff: Source/modules/webdatabase/SQLStatementSync.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/SQLResultSet.cpp ('k') | Source/modules/webdatabase/SQLTransaction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webdatabase/SQLStatementSync.cpp
diff --git a/Source/modules/webdatabase/SQLStatementSync.cpp b/Source/modules/webdatabase/SQLStatementSync.cpp
index a85d8b0895832f590456c950349cd80be4d326fa..f231bfb5aa366d2886a594ad33dd5c6feb244fc4 100644
--- a/Source/modules/webdatabase/SQLStatementSync.cpp
+++ b/Source/modules/webdatabase/SQLStatementSync.cpp
@@ -50,7 +50,7 @@ SQLStatementSync::SQLStatementSync(const String& statement, const Vector<SQLValu
ASSERT(!m_statement.isEmpty());
}
-PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionState& es)
+PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionState& exceptionState)
{
db->setAuthorizerPermissions(m_permissions);
@@ -60,18 +60,18 @@ PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionSt
int result = statement.prepare();
if (result != SQLResultOk) {
if (result == SQLResultInterrupt)
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
else
- es.throwDOMException(SyntaxError, SQLError::syntaxErrorMessage);
+ exceptionState.throwDOMException(SyntaxError, SQLError::syntaxErrorMessage);
db->setLastErrorMessage("could not prepare statement", result, database->lastErrorMsg());
return 0;
}
if (statement.bindParameterCount() != m_arguments.size()) {
if (db->isInterrupted())
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
else
- es.throwDOMException(SyntaxError, SQLError::syntaxErrorMessage);
+ exceptionState.throwDOMException(SyntaxError, SQLError::syntaxErrorMessage);
db->setLastErrorMessage("number of '?'s in statement string does not match argument count");
return 0;
}
@@ -79,13 +79,13 @@ PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionSt
for (unsigned i = 0; i < m_arguments.size(); ++i) {
result = statement.bindValue(i + 1, m_arguments[i]);
if (result == SQLResultFull) {
- es.throwDOMException(QuotaExceededError, SQLError::quotaExceededErrorMessage);
+ exceptionState.throwDOMException(QuotaExceededError, SQLError::quotaExceededErrorMessage);
db->setLastErrorMessage("there was not enough remaining storage space");
return 0;
}
if (result != SQLResultOk) {
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
db->setLastErrorMessage("could not bind value", result, database->lastErrorMsg());
return 0;
}
@@ -110,7 +110,7 @@ PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionSt
} while (result == SQLResultRow);
if (result != SQLResultDone) {
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
db->setLastErrorMessage("could not iterate results", result, database->lastErrorMsg());
return 0;
}
@@ -120,15 +120,15 @@ PassRefPtr<SQLResultSet> SQLStatementSync::execute(DatabaseSync* db, ExceptionSt
resultSet->setInsertId(database->lastInsertRowID());
} else if (result == SQLResultFull) {
// Quota error, the delegate will be asked for more space and this statement might be re-run.
- es.throwDOMException(QuotaExceededError, SQLError::quotaExceededErrorMessage);
+ exceptionState.throwDOMException(QuotaExceededError, SQLError::quotaExceededErrorMessage);
db->setLastErrorMessage("there was not enough remaining storage space");
return 0;
} else if (result == SQLResultConstraint) {
- es.throwDOMException(ConstraintError, "A constraint was violated.");
+ exceptionState.throwDOMException(ConstraintError, "A constraint was violated.");
db->setLastErrorMessage("statement failed due to a constraint failure");
return 0;
} else {
- es.throwUninformativeAndGenericDOMException(SQLDatabaseError);
+ exceptionState.throwUninformativeAndGenericDOMException(SQLDatabaseError);
db->setLastErrorMessage("could not execute statement", result, database->lastErrorMsg());
return 0;
}
« no previous file with comments | « Source/modules/webdatabase/SQLResultSet.cpp ('k') | Source/modules/webdatabase/SQLTransaction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698