Revert of Prepare WindowProxy for using v8::Context::NewRemoteContext().

third_party/WebKit/Source/bindings/core/v8/ScriptState.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ScriptState_h
 #define ScriptState_h
 
 #include <memory>
 
 #include "bindings/core/v8/ScopedPersistent.h"
@@ skipping 138 matching lines @@
 
   // This can return an empty handle if the v8::Context is gone.
   v8::Local<v8::Context> context() const {
     return m_context.newLocal(m_isolate);
   }
   bool contextIsValid() const {
     return !m_context.isEmpty() && m_perContextData;
   }
   void detachGlobalObject();
   void clearContext() { return m_context.clear(); }
+#if DCHECK_IS_ON()
+  bool isGlobalObjectDetached() const { return m_globalObjectDetached; }
+#endif
 
   V8PerContextData* perContextData() const { return m_perContextData.get(); }
   void disposePerContextData();
 
   ScriptValue getFromExtrasExports(const char* name);
 
  protected:
   ScriptState(v8::Local<v8::Context>, PassRefPtr<DOMWrapperWorld>);
 
  private:
   v8::Isolate* m_isolate;
   // This persistent handle is weak.
   ScopedPersistent<v8::Context> m_context;
 
   // This RefPtr doesn't cause a cycle because all persistent handles that
   // DOMWrapperWorld holds are weak.
   RefPtr<DOMWrapperWorld> m_world;
 
   // This std::unique_ptr causes a cycle:
   // V8PerContextData --(Persistent)--> v8::Context --(RefPtr)--> ScriptState
   //     --(std::unique_ptr)--> V8PerContextData
   // So you must explicitly clear the std::unique_ptr by calling
   // disposePerContextData() once you no longer need V8PerContextData.
   // Otherwise, the v8::Context will leak.
   std::unique_ptr<V8PerContextData> m_perContextData;
+
+#if DCHECK_IS_ON()
+  bool m_globalObjectDetached = false;
+#endif
 };
 
 // ScriptStateProtectingContext keeps the context associated with the
 // ScriptState alive.  You need to call clear() once you no longer need the
 // context. Otherwise, the context will leak.
 class ScriptStateProtectingContext {
   WTF_MAKE_NONCOPYABLE(ScriptStateProtectingContext);
   USING_FAST_MALLOC(ScriptStateProtectingContext);
 
  public:
@@ skipping 11 matching lines @@
   }
 
  private:
   RefPtr<ScriptState> m_scriptState;
   ScopedPersistent<v8::Context> m_context;
 };
 
 }  // namespace blink
 
 #endif  // ScriptState_h