v8binding: Initializes WindowProxy iff it's uninitialized.

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

 /*
  * Copyright (C) 2008, 2009, 2011 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 43 matching lines @@
     return;
 
   if (behavior == DetachGlobal && !m_globalProxy.isEmpty()) {
     m_globalProxy.get().SetWrapperClassId(0);
     V8DOMWrapper::clearNativeInfo(isolate(), m_globalProxy.newLocal(isolate()));
 #if DCHECK_IS_ON()
     didDetachGlobalObject();
 #endif
   }
 
-  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
-  m_lifecycle = Lifecycle::ContextDetached;
+  DCHECK_EQ(m_lifecycle, Lifecycle::ContextInitialized);
+  m_lifecycle = behavior == DetachGlobal ? Lifecycle::GlobalObjectDetached
+                                         : Lifecycle::ContextDetachedFromFrame;
 }
 
 void RemoteWindowProxy::initialize() {
   TRACE_EVENT1("v8", "RemoteWindowProxy::initialize", "isMainWindow",
                frame()->isMainFrame());
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER(
       frame()->isMainFrame()
           ? "Blink.Binding.InitializeMainRemoteWindowProxy"
           : "Blink.Binding.InitializeNonMainRemoteWindowProxy");
 
@@ skipping 18 matching lines @@
   if (m_globalProxy.isEmpty())
     m_globalProxy.set(isolate(), globalProxy);
   else
     DCHECK(m_globalProxy.get() == globalProxy);
   CHECK(!m_globalProxy.isEmpty());
 
 #if DCHECK_IS_ON()
   didAttachGlobalObject();
 #endif
 
-  // TODO(haraken): Currently we cannot enable the following DCHECK because
-  // an already detached window proxy can be re-initialized. This is wrong.
-  // DCHECK(m_lifecycle == Lifecycle::ContextUninitialized);
+  DCHECK(m_lifecycle == Lifecycle::ContextUninitialized ||
+         m_lifecycle == Lifecycle::GlobalObjectDetached);
   m_lifecycle = Lifecycle::ContextInitialized;
 }
 
 void RemoteWindowProxy::setupWindowPrototypeChain() {
   // Associate the window wrapper object and its prototype chain with the
   // corresponding native DOMWindow object.
   DOMWindow* window = frame()->domWindow();
   const WrapperTypeInfo* wrapperTypeInfo = window->wrapperTypeInfo();
 
   // The global proxy object.  Note this is not the global object.
   v8::Local<v8::Object> globalProxy = m_globalProxy.newLocal(isolate());
   CHECK(m_globalProxy == globalProxy);
   V8DOMWrapper::setNativeInfo(isolate(), globalProxy, wrapperTypeInfo, window);
   // Mark the handle to be traced by Oilpan, since the global proxy has a
   // reference to the DOMWindow.
   m_globalProxy.get().SetWrapperClassId(wrapperTypeInfo->wrapperClassId);
 
   // The global object, aka window wrapper object.
   v8::Local<v8::Object> windowWrapper =
       globalProxy->GetPrototype().As<v8::Object>();
   v8::Local<v8::Object> associatedWrapper =
       associateWithWrapper(window, wrapperTypeInfo, windowWrapper);
   DCHECK(associatedWrapper == windowWrapper);
 }
 
 }  // namespace blink