diff options
author | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 10:54:57 +0000 |
---|---|---|
committer | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-03 10:54:57 +0000 |
commit | beea9c0efe410ae4579b9a194efad9387dbdbce9 (patch) | |
tree | 3f8d65c67ec3d0c9b258da53de1d3f0a58f9fd1b /webkit | |
parent | d732c98af766e644dc5df9edfe8ac1e8bd5c4696 (diff) | |
download | chromium_src-beea9c0efe410ae4579b9a194efad9387dbdbce9.zip chromium_src-beea9c0efe410ae4579b9a194efad9387dbdbce9.tar.gz chromium_src-beea9c0efe410ae4579b9a194efad9387dbdbce9.tar.bz2 |
DevTools: do console evaluations in the global context of the inspected window. That context is exposed as contentWindow global variable to inject.js by ResetUtilityContext method.
Review URL: http://codereview.chromium.org/149174
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/devtools/js/inject.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/devtools/js/inject.js b/webkit/glue/devtools/js/inject.js index 7a88f30..f72e424 100644 --- a/webkit/glue/devtools/js/inject.js +++ b/webkit/glue/devtools/js/inject.js @@ -544,7 +544,8 @@ devtools.Injected.prototype.wrapConsoleObject = function(obj) { */ devtools.Injected.prototype.evaluate = function(expression) { try { - return [ this.wrapConsoleObject(window.eval(expression)), false ]; + // Evaluate the expression in the global context of the inspected window. + return [ this.wrapConsoleObject(contentWindow.eval(expression)), false ]; } catch (e) { return [ e.toString(), true ]; } |