Commit 8109d31c authored by ossy@webkit.org's avatar ossy@webkit.org

Build fix for Qt port after API changes of http://trac.webkit.org/changeset/79904.

Patch by Alexis Menard <alexis.menard@openbossa.org> on 2011-02-28
Reviewed by Oliver Hunt.

Source/WebCore: 

* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtConnectionObject::execute):

Source/WebKit/qt: 

* Api/qwebelement.cpp:
(QWebElement::evaluateJavaScript):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 72338517
2011-02-28 Alexis Menard <alexis.menard@openbossa.org>
Reviewed by Oliver Hunt.
Build fix for Qt port after API changes of http://trac.webkit.org/changeset/79904.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtConnectionObject::execute):
2011-02-25 David Levin <levin@chromium.org>
Reviewed by Darin Adler.
......
......@@ -1836,7 +1836,7 @@ void QtConnectionObject::execute(void **argv)
PutPropertySlot slot;
wrapper->put(exec, Identifier(exec, "__qt_sender__"), qt_sender, slot);
oldsc = fimp->scope();
fimp->setScope(oldsc->push(wrapper));
fimp->setScope(exec->globalData(), oldsc->push(wrapper));
}
CallData callData;
......@@ -1844,7 +1844,7 @@ void QtConnectionObject::execute(void **argv)
call(exec, m_funcObject.get(), callType, callData, m_thisObject.get(), l);
if (fimp)
fimp->setScope(oldsc);
fimp->setScope(exec->globalData(), oldsc);
}
}
}
......
......@@ -786,7 +786,7 @@ QVariant QWebElement::evaluateJavaScript(const QString& scriptSource)
if (!setupScriptContext(m_element, thisValue, state, scriptController))
return QVariant();
#if USE(JSC)
JSC::ScopeChain& scopeChain = state->dynamicGlobalObject()->globalScopeChain();
JSC::ScopeChainNode* scopeChain = state->dynamicGlobalObject()->globalScopeChain();
JSC::UString script(reinterpret_cast_ptr<const UChar*>(scriptSource.data()), scriptSource.length());
JSC::Completion completion = JSC::evaluate(state, scopeChain, JSC::makeSource(script), thisValue);
if ((completion.complType() != JSC::ReturnValue) && (completion.complType() != JSC::Normal))
......
2011-02-28 Alexis Menard <alexis.menard@openbossa.org>
Reviewed by Oliver Hunt.
Build fix for Qt port after API changes of http://trac.webkit.org/changeset/79904.
* Api/qwebelement.cpp:
(QWebElement::evaluateJavaScript):
2011-02-28 Alexis Menard <alexis.menard@openbossa.org>
Reviewed by Andreas Kling.
......
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