Split V8Proxy::retrieveActiveFrame() into two methods.

webkit/port/bindings/v8/JSXPathNSResolver.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 40 matching lines @@
 
   // Check if the resolver has a function property named lookupNamespaceURI.
   if (m_resolver->Has(lookupNamespaceURIName)) {
     v8::Handle<v8::Value> lookupNamespaceURI = m_resolver->Get(lookupNamespaceURIName);
     if (lookupNamespaceURI->IsFunction()) {
       lookupNamespaceURIFunc = v8::Handle<v8::Function>::Cast(lookupNamespaceURI);
     }
   }
 
   if (lookupNamespaceURIFunc.IsEmpty() && !m_resolver->IsFunction()) {
-    Frame* frame = V8Proxy::retrieveActiveFrame();
+    Frame* frame = V8Proxy::retrieveFrameForEnteredContext();
     log_info(frame, "XPathNSResolver does not have a lookupNamespaceURI method.", String());
     return String();
   }
 
   // Catch exceptions from calling the namespace resolver.
   v8::TryCatch try_catch;
   try_catch.SetVerbose(true);  // Print exceptions to console.
 
   const int argc = 1;
   v8::Handle<v8::Value> argv[argc] = { v8String(prefix) };
   v8::Handle<v8::Function> function = lookupNamespaceURIFunc.IsEmpty()
       ? v8::Handle<v8::Function>::Cast(m_resolver)
       : lookupNamespaceURIFunc;
 
   V8Proxy* proxy = V8Proxy::retrieve();
   v8::Handle<v8::Value> retval = proxy->CallFunction(function, m_resolver, argc, argv);
 
   // Eat exceptions from namespace resolver and return an empty string. This
   // will most likely cause NAMESPACE_ERR.
   if (try_catch.HasCaught()) {
     return String();
   }
 
   return ToWebCoreString(retval);
 }
 
 }
 
 #endif // ENABLE(XPATH)