diff options
Diffstat (limited to 'WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp b/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp index d30b95a..df0cc53 100644 --- a/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp +++ b/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp @@ -35,6 +35,7 @@ #include "V8CustomSQLStatementCallback.h" #include "Frame.h" +#include "ScriptExecutionContext.h" #include "V8CustomVoidCallback.h" #include "V8SQLResultSet.h" #include "V8SQLTransaction.h" @@ -44,6 +45,7 @@ namespace WebCore { V8CustomSQLStatementCallback::V8CustomSQLStatementCallback(v8::Local<v8::Object> callback, Frame* frame) : m_callback(v8::Persistent<v8::Object>::New(callback)) , m_frame(frame) + , m_worldContext(UseCurrentWorld) { } @@ -52,15 +54,15 @@ V8CustomSQLStatementCallback::~V8CustomSQLStatementCallback() m_callback.Dispose(); } -void V8CustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLResultSet* resultSet, bool& raisedException) +void V8CustomSQLStatementCallback::handleEvent(ScriptExecutionContext* context, SQLTransaction* transaction, SQLResultSet* resultSet, bool& raisedException) { v8::HandleScope handleScope; - v8::Handle<v8::Context> context = V8Proxy::context(m_frame.get()); - if (context.IsEmpty()) + v8::Handle<v8::Context> v8Context = toV8Context(context, m_worldContext); + if (v8Context.IsEmpty()) return; - v8::Context::Scope scope(context); + v8::Context::Scope scope(v8Context); v8::Handle<v8::Value> argv[] = { toV8(transaction), @@ -77,4 +79,3 @@ void V8CustomSQLStatementCallback::handleEvent(SQLTransaction* transaction, SQLR } // namespace WebCore #endif - |