Index: third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
diff --git a/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp b/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
index 4164179e6487c762ffb48a3a4c692269764d1af6..3f46b17c8d77e77dbac6b6ce6ecd1979bf5a6065 100644 |
--- a/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
+++ b/third_party/WebKit/Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.cpp |
@@ -40,13 +40,13 @@ namespace blink { |
bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, |
SQLError* error) { |
- if (!canInvokeCallback()) |
- return true; |
- |
v8::Isolate* isolate = m_scriptState->isolate(); |
+ ExecutionContext* executionContext = m_scriptState->getExecutionContext(); |
+ if (!executionContext || executionContext->isContextSuspended() || |
+ executionContext->isContextDestroyed()) |
+ return true; |
if (!m_scriptState->contextIsValid()) |
return true; |
- |
ScriptState::Scope scope(m_scriptState.get()); |
v8::Local<v8::Value> transactionHandle = |