diff options
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r-- | webkit/glue/webframe_impl.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 466fe5f..db177aa 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -341,8 +341,19 @@ class ChromePrintContext : public WebCore::PrintContext { int WebFrameImpl::live_object_count_ = 0; // static -WebFrame* WebFrame::RetrieveActiveFrame() { - WebCore::Frame* frame = WebCore::ScriptController::retrieveActiveFrame(); +WebFrame* WebFrame::RetrieveFrameForEnteredContext() { + WebCore::Frame* frame = + WebCore::ScriptController::retrieveFrameForEnteredContext(); + if (frame) + return WebFrameImpl::FromFrame(frame); + else + return NULL; +} + +// static +WebFrame* WebFrame::RetrieveFrameForCurrentContext() { + WebCore::Frame* frame = + WebCore::ScriptController::retrieveFrameForCurrentContext(); if (frame) return WebFrameImpl::FromFrame(frame); else |