summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp')
-rw-r--r--WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp b/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp
index 68002d7..efe415c 100644
--- a/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp
+++ b/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp
@@ -35,6 +35,7 @@
#include "V8CustomSQLTransactionCallback.h"
#include "Frame.h"
+#include "ScriptExecutionContext.h"
#include "V8CustomVoidCallback.h"
#include "V8SQLTransaction.h"
@@ -43,6 +44,7 @@ namespace WebCore {
V8CustomSQLTransactionCallback::V8CustomSQLTransactionCallback(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 @@ V8CustomSQLTransactionCallback::~V8CustomSQLTransactionCallback()
}
-void V8CustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bool& raisedException)
+void V8CustomSQLTransactionCallback::handleEvent(ScriptExecutionContext* context, SQLTransaction* transaction, 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)
@@ -79,4 +81,3 @@ void V8CustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo
} // namespace WebCore
#endif
-