diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-27 00:50:16 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-27 00:50:16 +0000 |
| commit | f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd (patch) | |
| tree | 7d8eafaff84f2dc9a32072c9b5de115d7f535500 /chrome/renderer | |
| parent | 3adb24ec4914ccb68cb9db958eadba2f54b58fe0 (diff) | |
| download | chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.zip chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.gz chromium_src-f8ca6e9ed1768aaf216c4ffa4eb572bbef0dc9fd.tar.bz2 | |
src/webkit side of webKit merge 38653:38729
Review URL: http://codereview.chromium.org/12708
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/greasemonkey_slave.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/greasemonkey_slave.cc b/chrome/renderer/greasemonkey_slave.cc index f2de9fb..4cf9439 100644 --- a/chrome/renderer/greasemonkey_slave.cc +++ b/chrome/renderer/greasemonkey_slave.cc @@ -162,7 +162,7 @@ bool GreasemonkeySlave::InjectScripts(WebFrame* frame) { script != scripts_.end(); ++script) { if (script->MatchesUrl(frame->GetURL())) { frame->ExecuteJavaScript(script->GetBody().as_string(), - script->GetURL().as_string()); + GURL(script->GetURL().as_string())); } } diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 835e73f..2cedc6d 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2373,7 +2373,7 @@ void RenderView::EvaluateScript(const std::wstring& frame_xpath, if (!web_frame) return; - web_frame->ExecuteJavaScript(WideToUTF8(script), ""); + web_frame->ExecuteJavaScript(WideToUTF8(script), GURL()); } void RenderView::OnScriptEvalRequest(const std::wstring& frame_xpath, |