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 a0feedbe114d9391b7e3708cefaf54920cadf02c..a1df309b0382c5da9fedf3e81bff7881bcbf8a2e 100644 |
--- a/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp |
+++ b/third_party/WebKit/Source/modules/webdatabase/SQLTransaction.cpp |
@@ -65,7 +65,7 @@ SQLTransaction::SQLTransaction(Database* db, SQLTransactionCallback* callback, |
, m_readOnly(readOnly) |
{ |
ASSERT(m_database); |
- m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(db->executionContext(), "SQLTransaction"); |
+ m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(db->getExecutionContext(), "SQLTransaction"); |
} |
SQLTransaction::~SQLTransaction() |
@@ -154,7 +154,7 @@ SQLTransactionState SQLTransaction::deliverTransactionCallback() |
// Spec 4.3.2 4: Invoke the transaction callback with the new SQLTransaction object |
if (SQLTransactionCallback* callback = m_callback.release()) { |
m_executeSqlAllowed = true; |
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncCallbackStarting(m_database->executionContext(), m_asyncOperationId); |
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncCallbackStarting(m_database->getExecutionContext(), m_asyncOperationId); |
shouldDeliverErrorCallback = !callback->handleEvent(this); |
InspectorInstrumentation::traceAsyncCallbackCompleted(cookie); |
m_executeSqlAllowed = false; |
@@ -173,7 +173,7 @@ SQLTransactionState SQLTransaction::deliverTransactionCallback() |
SQLTransactionState SQLTransaction::deliverTransactionErrorCallback() |
{ |
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(m_database->executionContext(), m_asyncOperationId); |
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(m_database->getExecutionContext(), m_asyncOperationId); |
// Spec 4.3.2.10: If exists, invoke error callback with the last |
// error to have occurred in this transaction. |
@@ -232,7 +232,7 @@ SQLTransactionState SQLTransaction::deliverQuotaIncreaseCallback() |
SQLTransactionState SQLTransaction::deliverSuccessCallback() |
{ |
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(m_database->executionContext(), m_asyncOperationId); |
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(m_database->getExecutionContext(), m_asyncOperationId); |
// Spec 4.3.2.8: Deliver success callback. |
if (VoidCallback* successCallback = m_successCallback.release()) |
@@ -281,7 +281,7 @@ void SQLTransaction::executeSQL(const String& sqlStatement, const Vector<SQLValu |
} |
int permissions = DatabaseAuthorizer::ReadWriteMask; |
- if (!m_database->databaseContext()->allowDatabaseAccess()) |
+ if (!m_database->getDatabaseContext()->allowDatabaseAccess()) |
permissions |= DatabaseAuthorizer::NoAccessMask; |
else if (m_readOnly) |
permissions |= DatabaseAuthorizer::ReadOnlyMask; |