diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/api/src/WebPluginContainerImpl.cpp | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "49321", + "webkit_revision": "49372", "ffmpeg_revision": "28488", } diff --git a/webkit/api/src/WebPluginContainerImpl.cpp b/webkit/api/src/WebPluginContainerImpl.cpp index 0f839a9..5f5fd36 100644 --- a/webkit/api/src/WebPluginContainerImpl.cpp +++ b/webkit/api/src/WebPluginContainerImpl.cpp @@ -246,7 +246,7 @@ WebString WebPluginContainerImpl::executeScriptURL(const WebURL& url, bool popup String script = decodeURLEscapeSequences( kurl.string().substring(strlen("javascript:"))); - ScriptValue result = frame->loader()->executeScript(script, popupsAllowed); + ScriptValue result = frame->script()->executeScript(script, popupsAllowed); // Failure is reported as a null string. String resultStr; diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 511a238..5d05703 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -606,7 +606,7 @@ void WebFrameImpl::bindToWindowObject(const WebString& name, } void WebFrameImpl::executeScript(const WebScriptSource& source) { - frame_->loader()->executeScript( + frame_->script()->executeScript( WebCore::ScriptSourceCode( webkit_glue::WebStringToString(source.code), webkit_glue::WebURLToKURL(source.url), @@ -1896,7 +1896,7 @@ void WebFrameImpl::LoadJavaScriptURL(const KURL& url) { String script = decodeURLEscapeSequences(url.string().substring(strlen("javascript:"))); - ScriptValue result = frame_->loader()->executeScript(script, true); + ScriptValue result = frame_->script()->executeScript(script, true); String script_result; if (!result.getString(script_result)) |