Revert of binding: Removes Document::wrap that must be equivalent to Node::wrap.

third_party/WebKit/Source/bindings/core/v8/WindowProxy.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "bindings/core/v8/WindowProxy.h"
 
 #include "bindings/core/v8/ConditionalFeatures.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptController.h"
-#include "bindings/core/v8/ToV8.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMActivityLogger.h"
 #include "bindings/core/v8/V8Document.h"
 #include "bindings/core/v8/V8GCForContextDispose.h"
 #include "bindings/core/v8/V8HTMLCollection.h"
 #include "bindings/core/v8/V8HTMLDocument.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "bindings/core/v8/V8Initializer.h"
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "bindings/core/v8/V8PagePopupControllerBinding.h"
@@ skipping 20 matching lines @@
 #include "wtf/Assertions.h"
 #include "wtf/StringExtras.h"
 #include "wtf/text/CString.h"
 #include <algorithm>
 #include <utility>
 #include <v8-debug.h>
 #include <v8.h>
 
 namespace blink {
 
+static void checkDocumentWrapper(v8::Local<v8::Object> wrapper,
+                                 Document* document) {
+  ASSERT(V8Document::toImpl(wrapper) == document);
+}
+
 WindowProxy* WindowProxy::create(v8::Isolate* isolate,
                                  Frame* frame,
                                  DOMWrapperWorld& world) {
   return new WindowProxy(frame, &world, isolate);
 }
 
 WindowProxy::WindowProxy(Frame* frame,
                          PassRefPtr<DOMWrapperWorld> world,
                          v8::Isolate* isolate)
     : m_frame(frame), m_isolate(isolate), m_world(world) {}
@@ skipping 319 matching lines @@
   V8DOMWrapper::setNativeInfo(m_isolate, windowProperties, wrapperTypeInfo,
                               window);
 
   // TODO(keishi): Remove installPagePopupController and implement
   // PagePopupController in another way.
   V8PagePopupControllerBinding::installPagePopupController(context,
                                                            windowWrapper);
   return true;
 }
 
+void WindowProxy::updateDocumentWrapper(v8::Local<v8::Object> wrapper) {
+  ASSERT(m_world->isMainWorld());
+  m_document.set(m_isolate, wrapper);
+}
+
 void WindowProxy::updateDocumentProperty() {
-  DCHECK(m_world->isMainWorld());
+  if (!m_world->isMainWorld())
+    return;
 
-  if (m_frame->isRemoteFrame())
+  if (m_frame->isRemoteFrame()) {
     return;
+  }
 
   ScriptState::Scope scope(m_scriptState.get());
   v8::Local<v8::Context> context = m_scriptState->context();
   LocalFrame* frame = toLocalFrame(m_frame);
-  // In the main world, the window.document attribute must be set right after
-  // the initialization of the Window or right after the installation of a new
-  // document, thus this must be the first time of the wrapper instantiation of
-  // the document.
-  CHECK(!frame->document()->containsWrapper());
   v8::Local<v8::Value> documentWrapper =
-      toV8(frame->document(), context->Global(), m_isolate);
-  DCHECK(documentWrapper->IsObject());
-  m_document.set(m_isolate, documentWrapper.As<v8::Object>());
+      toV8(frame->document(), context->Global(), context->GetIsolate());
+  if (documentWrapper.IsEmpty())
+    return;
+  ASSERT(documentWrapper == m_document.newLocal(m_isolate) ||
+         m_document.isEmpty());
+  if (m_document.isEmpty())
+    updateDocumentWrapper(v8::Local<v8::Object>::Cast(documentWrapper));
+  checkDocumentWrapper(m_document.newLocal(m_isolate), frame->document());
+
+  ASSERT(documentWrapper->IsObject());
 
   // Update cached accessor.
   CHECK(V8PrivateProperty::getWindowDocumentCachedAccessor(m_isolate).set(
       context, context->Global(), documentWrapper));
 }
 
 void WindowProxy::updateActivityLogger() {
   m_scriptState->perContextData()->setActivityLogger(
       V8DOMActivityLogger::activityLogger(
           m_world->worldId(),
@@ skipping 47 matching lines @@
     }
     token = frameSecurityToken + token;
   }
 
   // NOTE: V8 does identity comparison in fast path, must use a symbol
   // as the security token.
   context->SetSecurityToken(v8AtomicString(m_isolate, token));
 }
 
 void WindowProxy::updateDocument() {
-  DCHECK(m_world->isMainWorld());
+  ASSERT(m_world->isMainWorld());
   if (!isGlobalInitialized())
     return;
   if (!isContextInitialized())
     return;
   updateActivityLogger();
   updateDocumentProperty();
   updateSecurityOrigin(m_frame->securityContext()->getSecurityOrigin());
 }
 
 static v8::Local<v8::Value> getNamedProperty(
@@ skipping 36 matching lines @@
     return;
   }
   v8::Local<v8::Value> value;
   if (info.Holder()
           ->GetRealNamedPropertyInPrototypeChain(
               info.GetIsolate()->GetCurrentContext(), property.As<v8::String>())
           .ToLocal(&value))
     v8SetReturnValue(info, value);
 }
 
-void WindowProxy::checkDocumentWrapper(v8::Local<v8::Object> wrapper,
-                                       Document* document) const {
-  DCHECK(!wrapper.IsEmpty());
-  DCHECK_EQ(V8Document::toImpl(wrapper), document);
-  DCHECK(wrapper ==
-         toV8(document, m_globalProxy.newLocal(m_isolate), m_isolate));
-}
-
 void WindowProxy::namedItemAdded(HTMLDocument* document,
                                  const AtomicString& name) {
-  DCHECK(m_world->isMainWorld());
+  ASSERT(m_world->isMainWorld());
 
   if (!isContextInitialized() || !m_scriptState->contextIsValid())
     return;
 
   ScriptState::Scope scope(m_scriptState.get());
-  v8::Local<v8::Object> documentWrapper = m_document.newLocal(m_isolate);
-  checkDocumentWrapper(documentWrapper, document);
-  documentWrapper->SetAccessor(m_isolate->GetCurrentContext(),
-                               v8String(m_isolate, name), getter);
+  ASSERT(!m_document.isEmpty());
+  v8::Local<v8::Context> context = m_scriptState->context();
+  v8::Local<v8::Object> documentHandle = m_document.newLocal(m_isolate);
+  checkDocumentWrapper(documentHandle, document);
+  documentHandle->SetAccessor(context, v8String(m_isolate, name), getter);
 }
 
 void WindowProxy::namedItemRemoved(HTMLDocument* document,
                                    const AtomicString& name) {
-  DCHECK(m_world->isMainWorld());
+  ASSERT(m_world->isMainWorld());
 
   if (!isContextInitialized())
     return;
 
   if (document->hasNamedItem(name) || document->hasExtraNamedItem(name))
     return;
 
   ScriptState::Scope scope(m_scriptState.get());
-  v8::Local<v8::Object> documentWrapper = m_document.newLocal(m_isolate);
-  checkDocumentWrapper(documentWrapper, document);
-  documentWrapper->Delete(m_isolate->GetCurrentContext(),
-                          v8String(m_isolate, name));
+  ASSERT(!m_document.isEmpty());
+  v8::Local<v8::Object> documentHandle = m_document.newLocal(m_isolate);
+  checkDocumentWrapper(documentHandle, document);
+  documentHandle->Delete(m_isolate->GetCurrentContext(),
+                         v8String(m_isolate, name));
 }
 
 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
   if (!isContextInitialized())
     return;
   setSecurityToken(origin);
 }
 
 }  // namespace blink