Make ScriptController inherit LocalWindowProxyManager

third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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 834 matching lines @@
   if (scriptState->contextIsValid()) {
     ASSERT(toFrameIfNotDetached(context) == frame);
     return scriptState->context();
   }
   return v8::Local<v8::Context>();
 }
 
 v8::Local<v8::Context> toV8ContextEvenIfDetached(Frame* frame,
                                                  DOMWrapperWorld& world) {
   ASSERT(frame);
-  return frame->windowProxy(world)->contextIfInitialized();
+  // Note: despite the name of this function, it's not actually safe to call
+  // this on a detached frame.
+  return frame->getWindowProxyManager()->context(world);
 }
 
 void crashIfIsolateIsDead(v8::Isolate* isolate) {
   if (isolate->IsDead()) {
     // FIXME: We temporarily deal with V8 internal error situations
     // such as out-of-memory by crashing the renderer.
     CRASH();
   }
 }
 
@@ skipping 147 matching lines @@
   if (!v8Call(v8::JSON::Parse(isolate, v8String(isolate, stringifiedJSON)),
               parsed, tryCatch)) {
     if (tryCatch.HasCaught())
       exceptionState.rethrowV8Exception(tryCatch.Exception());
   }
 
   return parsed;
 }
 
 }  // namespace blink