diff options
Diffstat (limited to 'WebKit/wx/WebFrame.cpp')
| -rw-r--r-- | WebKit/wx/WebFrame.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp index f205152..9018d37 100644 --- a/WebKit/wx/WebFrame.cpp +++ b/WebKit/wx/WebFrame.cpp @@ -188,9 +188,9 @@ wxString wxWebFrame::RunScript(const wxString& javascript) { wxString returnValue = wxEmptyString; if (m_impl->frame) { - JSC::JSValue result = m_impl->frame->loader()->executeScript(javascript, true).jsValue(); + JSC::JSValue result = m_impl->frame->script()->executeScript(javascript, true).jsValue(); if (result) - returnValue = wxString(result.toString(m_impl->frame->script()->globalObject()->globalExec()).UTF8String().c_str(), wxConvUTF8); + returnValue = wxString(result.toString(m_impl->frame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec()).UTF8String().c_str(), wxConvUTF8); } return returnValue; } |