Commit 02e94c42 authored by dglazkov@chromium.org's avatar dglazkov@chromium.org

2009-09-17 Dimitri Glazkov <dglazkov@chromium.org>

        Unreviewed, build fix.

        [V8] Partial roll out of http://trac.webkit.org/changeset/48455 to
        fix crashes that started happening in V8Proxy::getEnteredContext().

        * bindings/v8/ScheduledAction.cpp:
        (WebCore::ScheduledAction::execute):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48483 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3b920269
2009-09-17 Dimitri Glazkov <dglazkov@chromium.org>
Unreviewed, build fix.
[V8] Partial roll out of http://trac.webkit.org/changeset/48455 to
fix crashes that started happening in V8Proxy::getEnteredContext().
* bindings/v8/ScheduledAction.cpp:
(WebCore::ScheduledAction::execute):
2009-09-17 Chris Fleizach <cfleizach@apple.com>
Reviewed by Beth Dakin.
......@@ -107,7 +107,8 @@ void ScheduledAction::execute(V8Proxy* proxy)
ASSERT(proxy);
v8::HandleScope handleScope;
v8::Handle<v8::Context> v8Context = m_context.get();
// FIXME: Figure out why using m_context instead of proxy->context() here causes crashes in V8Proxy::getEnteredContext();
v8::Handle<v8::Context> v8Context = proxy->context();
if (v8Context.IsEmpty())
return; // JS may not be enabled.
......@@ -135,7 +136,8 @@ void ScheduledAction::execute(WorkerContext* workerContext)
if (!m_function.IsEmpty() && m_function->IsFunction()) {
v8::HandleScope handleScope;
v8::Handle<v8::Context> v8Context = m_context.get();
// FIXME: Figure out why using m_context instead of proxy->context() here causes crashes in V8Proxy::getEnteredContext();
v8::Handle<v8::Context> v8Context = scriptController->proxy()->context();
ASSERT(!v8Context.IsEmpty());
v8::Context::Scope scope(v8Context);
m_function->Call(v8Context->Global(), m_argc, m_argv);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment