diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 20:29:46 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 20:29:46 +0000 |
| commit | 62d7cbac7b74a8617dee21b21851cd2bc230852c (patch) | |
| tree | ed7ff22a2f2dee245e8a8a69a29d6e5e80d9c1f3 /webkit | |
| parent | 90e559d55f55616faef31590ef99ed7f1054da26 (diff) | |
| download | chromium_src-62d7cbac7b74a8617dee21b21851cd2bc230852c.zip chromium_src-62d7cbac7b74a8617dee21b21851cd2bc230852c.tar.gz chromium_src-62d7cbac7b74a8617dee21b21851cd2bc230852c.tar.bz2 | |
Roll WebKit ro r49372
And fixes the compilation errors.
Review URL: http://codereview.chromium.org/273008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/api/src/WebPluginContainerImpl.cpp | 2 | ||||
| -rw-r--r-- | webkit/glue/webframe_impl.cc | 4 |
2 files changed, 3 insertions, 3 deletions
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)) |