summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/external_extension.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-12 00:48:58 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-12 00:48:58 +0000
commit9a7b22e6fb1d115a694616fd5a12bfe6e491664b (patch)
tree505bc1a11530c975bf45588b19aa6c3cfbc36c13 /chrome/renderer/external_extension.cc
parent08da43b40e557c42b93fe490e91ab44a73d7e0dd (diff)
downloadchromium_src-9a7b22e6fb1d115a694616fd5a12bfe6e491664b.zip
chromium_src-9a7b22e6fb1d115a694616fd5a12bfe6e491664b.tar.gz
chromium_src-9a7b22e6fb1d115a694616fd5a12bfe6e491664b.tar.bz2
Split V8Proxy::retrieveActiveFrame() into two methods.
We now have RetrieveFrameForCurrentContext() and RetrieveFrameForEnteredContext(). These terms means the same thing they do in V8::Context -- 'current' is the top of the js stack and 'entered' is the bottom. I needed 'entered' to fix a bug in extensions where if you call an extension API through the web inspector we get confused and think the web inspector's view is the one who called. Review URL: http://codereview.chromium.org/113085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/external_extension.cc')
-rw-r--r--chrome/renderer/external_extension.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc
index 378e78e..100f311 100644
--- a/chrome/renderer/external_extension.cc
+++ b/chrome/renderer/external_extension.cc
@@ -35,7 +35,7 @@ class ExternalExtensionWrapper : public v8::Extension {
if (!args.Length())
return v8::Undefined();
- WebFrame* webframe = WebFrame::RetrieveActiveFrame();
+ WebFrame* webframe = WebFrame::RetrieveFrameForEnteredContext();
DCHECK(webframe) << "There should be an active frame since we just got "
"a native function called.";
if (!webframe) return v8::Undefined();