Split V8Proxy::retrieveActiveFrame() into two methods.

webkit/port/bindings/v8/v8_proxy.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 604 matching lines @@
 {
     // If we have a delayed vector it cannot be empty.
     if (!m_delayed)
         return;
     ASSERT(!m_delayed->isEmpty());
 
     // Add the delayed messages to the page of the active
     // context. If that for some bizarre reason does not
     // exist, we clear the list of delayed messages to avoid
     // posting messages. We still deallocate the vector.
-    Frame* frame = V8Proxy::retrieveActiveFrame();
+    Frame* frame = V8Proxy::retrieveFrameForEnteredContext();
     Page* page = NULL;
     if (frame)
         page = frame->page();
     if (!page)
         m_delayed->clear();
 
     // Iterate through all the delayed messages and add them
     // to the console.
     const int size = m_delayed->size();
     for (int i = 0; i < size; i++) {
@@ skipping 20 matching lines @@
     if (!page)
         return;
     JavaScriptConsoleMessage message(msg, url, 0);
     ConsoleMessageManager::AddMessage(page, message);
 }
 
 static void HandleConsoleMessage(v8::Handle<v8::Message> message,
                                  v8::Handle<v8::Value> data)
 {
   // Use the frame where JavaScript is called from.
-  Frame* frame = V8Proxy::retrieveActiveFrame();
+  Frame* frame = V8Proxy::retrieveFrameForEnteredContext();
   if (!frame)
       return;
 
   Page* page = frame->page();
   if (!page)
       return;
 
   v8::Handle<v8::String> errorMessageString = message->Get();
   ASSERT(!errorMessageString.IsEmpty());
   String errorMessage = ToWebCoreString(errorMessageString);
@@ skipping 16 matching lines @@
 };
 
 
 static void ReportUnsafeAccessTo(Frame* target, DelayReporting delay)
 {
   ASSERT(target);
   Document* targetDocument = target->document();
   if (!targetDocument)
       return;
 
-  Frame* source = V8Proxy::retrieveActiveFrame();
+  Frame* source = V8Proxy::retrieveFrameForEnteredContext();
   if (!source || !source->document())
       return;  // Ignore error if the source document is gone.
 
   Document* sourceDocument = source->document();
 
   // FIXME: This error message should contain more specifics of why the same
   // origin check has failed.
   String str = String::format("Unsafe JavaScript attempt to access frame "
       "with URL %s from frame with URL %s. "
       "Domains, protocols and ports must match.\n",
@@ skipping 911 matching lines @@
     return ToNativeObject<DOMWindow>(V8ClassIndex::DOMWINDOW, global);
 }
 
 
 Frame* V8Proxy::retrieveFrame(v8::Handle<v8::Context> context)
 {
     return retrieveWindow(context)->frame();
 }
 
 
-Frame* V8Proxy::retrieveActiveFrame()
+Frame* V8Proxy::retrieveFrameForEnteredContext()
 {
     v8::Handle<v8::Context> context = v8::Context::GetEntered();
     if (context.IsEmpty())
         return 0;
     return retrieveFrame(context);
 }
 
 
+Frame* V8Proxy::retrieveFrameForCurrentContext()
+{
+    v8::Handle<v8::Context> context = v8::Context::GetCurrent();
+    if (context.IsEmpty())
+        return 0;
+    return retrieveFrame(context);
+}
+
+
 Frame* V8Proxy::retrieveFrame()
 {
     DOMWindow* window = retrieveWindow();
     return window ? window->frame() : 0;
 }
 
 
 V8Proxy* V8Proxy::retrieve()
 {
     DOMWindow* window = retrieveWindow();
@@ skipping 1653 matching lines @@
 }
 
 void V8Proxy::RegisterExtension(v8::Extension* extension,
                                 const String& schemeRestriction) {
     v8::RegisterExtension(extension);
     V8ExtensionInfo info = {schemeRestriction, extension};
     m_extensions.push_back(info);
 }
 
 }  // namespace WebCore