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

Unified Diff: third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp

Issue 2746333002: DevTools: move recurring flag into AsyncTask, control cancelation from embedder only. (Closed)
Patch Set: using _END now Created 3 years, 9 months 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 | « third_party/WebKit/Source/modules/indexeddb/WebIDBCallbacksImpl.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
diff --git a/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp b/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
index 6efdaece8ed7d58c43e909131cf3d417c2e916c4..a7776fde01cfd3c536cddf984417a443b18d1b38 100644
--- a/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp
@@ -72,8 +72,7 @@ SQLTransaction::SQLTransaction(Database* db,
m_readOnly(readOnly) {
DCHECK(isMainThread());
ASSERT(m_database);
- probe::asyncTaskScheduled(db->getExecutionContext(), "SQLTransaction", this,
- true);
+ probe::asyncTaskScheduled(db->getExecutionContext(), "SQLTransaction", this);
}
SQLTransaction::~SQLTransaction() {}
@@ -153,7 +152,8 @@ SQLTransactionState SQLTransaction::nextStateForTransactionError() {
SQLTransactionState SQLTransaction::deliverTransactionCallback() {
bool shouldDeliverErrorCallback = false;
- probe::AsyncTask asyncTask(m_database->getExecutionContext(), this);
+ probe::AsyncTask asyncTask(m_database->getExecutionContext(), this,
+ "transaction");
// Spec 4.3.2 4: Invoke the transaction callback with the new SQLTransaction
// object.
@@ -179,7 +179,6 @@ SQLTransactionState SQLTransaction::deliverTransactionCallback() {
SQLTransactionState SQLTransaction::deliverTransactionErrorCallback() {
probe::AsyncTask asyncTask(m_database->getExecutionContext(), this);
- probe::asyncTaskCanceled(m_database->getExecutionContext(), this);
// Spec 4.3.2.10: If exists, invoke error callback with the last
// error to have occurred in this transaction.
@@ -243,7 +242,6 @@ SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback() {
SQLTransactionState SQLTransaction::deliverSuccessCallback() {
DCHECK(isMainThread());
probe::AsyncTask asyncTask(m_database->getExecutionContext(), this);
- probe::asyncTaskCanceled(m_database->getExecutionContext(), this);
// Spec 4.3.2.8: Deliver success callback.
if (VoidCallback* successCallback = m_successCallback.release())
« no previous file with comments | « third_party/WebKit/Source/modules/indexeddb/WebIDBCallbacksImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698