| Index: webkit/glue/webframe_impl.cc
|
| diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
|
| index 466fe5f656e7ead97c7a18494da787c770b169d1..db177aa3e2649ed9c065a08d6f1940d7070f83f9 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
|
|
|