Split V8Proxy::retrieveActiveFrame() into two methods.

webkit/port/bindings/v8/ScriptController.cpp

 // Copyright (c) 2008, Google 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:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 62 matching lines @@
 };
 
 
 namespace WebCore {
 
 void ScriptController::setFlags(const char* str, int length)
 {
     v8::V8::SetFlagsFromString(str, length);
 }
 
-Frame* ScriptController::retrieveActiveFrame()
+Frame* ScriptController::retrieveFrameForEnteredContext()
 {
-    return V8Proxy::retrieveActiveFrame();
+    return V8Proxy::retrieveFrameForEnteredContext();
+}
+
+Frame* ScriptController::retrieveFrameForCurrentContext()
+{
+    return V8Proxy::retrieveFrameForCurrentContext();
 }
 
 bool ScriptController::isSafeScript(Frame* target)
 {
     return V8Proxy::CanAccessFrame(target, true);
 }
 
 void ScriptController::gcProtectJSWrapper(void* dom_object)
 {
     V8Proxy::GCProtect(dom_object);
@@ skipping 52 matching lines @@
 }
 
 // Disconnect the proxy from its owner frame;
 void ScriptController::disconnectFrame()
 {
     m_proxy->disconnectFrame();
 }
 
 bool ScriptController::processingUserGesture() const
 {
-    Frame* active_frame = V8Proxy::retrieveActiveFrame();
+    Frame* active_frame = V8Proxy::retrieveFrameForEnteredContext();
     // No script is running, must be run by users.
     if (!active_frame)
         return true;
 
     V8Proxy* active_proxy = active_frame->script()->proxy();
 
     v8::HandleScope handle_scope;
     v8::Handle<v8::Context> context = V8Proxy::GetContext(active_frame);
     // TODO(fqian): find all cases context can be empty:
     //  1) JS is disabled;
@@ skipping 250 matching lines @@
 {
     notImplemented();
 }
 
 void ScriptController::updateDocument()
 {
     m_proxy->updateDocument();
 }
 
 }  // namespace WebCpre