diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 01:06:38 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 01:06:38 +0000 |
| commit | 79997c83d8091f77bb5f419e05cae0369e4ceb33 (patch) | |
| tree | bc9dc9348e5445d4198ee580b329211be014bcc0 /chrome/renderer | |
| parent | 5b910875d2500ac9d6c2516f15780e036bc6099a (diff) | |
| download | chromium_src-79997c83d8091f77bb5f419e05cae0369e4ceb33.zip chromium_src-79997c83d8091f77bb5f419e05cae0369e4ceb33.tar.gz chromium_src-79997c83d8091f77bb5f419e05cae0369e4ceb33.tar.bz2 | |
Change the javascript context used by the loadtimes extension. It should be
using the CurrentContext, not the EnteredContext so that it grabs the right
object based on the frame being called.
The security of this object is not in question - access to the window itself
is already protected from XSS access.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/593003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/loadtimes_extension_bindings.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index 33d46d7..c43cd95 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -95,7 +95,7 @@ class LoadTimesExtensionWrapper : public v8::Extension { } static v8::Handle<v8::Value> GetLoadTimes(const v8::Arguments& args) { - WebFrame* frame = WebFrame::frameForEnteredContext(); + WebFrame* frame = WebFrame::frameForCurrentContext(); if (frame) { WebDataSource* data_source = frame->dataSource(); if (data_source) { @@ -138,7 +138,7 @@ class LoadTimesExtensionWrapper : public v8::Extension { } static v8::Handle<v8::Value> GetCSI(const v8::Arguments& args) { - WebFrame* frame = WebFrame::frameForEnteredContext(); + WebFrame* frame = WebFrame::frameForCurrentContext(); if (frame) { WebDataSource* data_source = frame->dataSource(); if (data_source) { |