Split V8Proxy::retrieveActiveFrame() into two methods.

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 323 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromePrintContext);
 };
 
 // WebFrameImpl ----------------------------------------------------------------
 
 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
     return NULL;
 }
 
 WebFrameImpl::WebFrameImpl()
 // Don't complain about using "this" in initializer list.
 MSVC_PUSH_DISABLE_WARNING(4355)
   : frame_loader_client_(this),
     scope_matches_factory_(this),
 MSVC_POP_WARNING()
     currently_loading_request_(NULL),
@@ skipping 1558 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }