bindings: Introduces ScriptWrappable::associateWithWrapper in addition to wrap.

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 5758 matching lines @@
         v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapperNonTemplate(this, isolate);
         if (!wrapper.IsEmpty())
             return wrapper;
     }
 
     v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, wrapperType, toScriptWrappableBase(), isolate);
     if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 
     wrapperType->installConditionallyEnabledProperties(wrapper, isolate);
+    return associateWithWrapper(wrapperType, wrapper, isolate);
+}
+
+v8::Handle<v8::Object> Document::associateWithWrapper(const WrapperTypeInfo* wrapperType, v8::Handle<v8::Object> wrapper, v8::Isolate* isolate)
+{
     wrapperType->refObject(toScriptWrappableBase());
     V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType, wrapper, isolate);
-
     DOMWrapperWorld& world = DOMWrapperWorld::current(isolate);
     if (world.isMainWorld() && frame())
         frame()->script().windowProxy(world)->updateDocumentWrapper(wrapper);

[haraken, 2014/09/05 16:41:39]

The line 5876 - 5788 should be put in Document::wrap (after the
Document::associateWithWrapper call).

T::associateWithWrapper should not call anything but refObject and
associateObjectWithWrapperNonTemplate.

BTW, if T::associateWithWrapper always calls refObject and
associateObjectWithWrapperNonTemplate, can we remove all
T::associateWithWrapper's from all subclasses of ScriptWrappable?

[Yuki, 2014/09/08 07:56:05]

As we talked offline, we need two entry points for the case a) we create a new
wrapper from the impl, and case b) JS already created a wrapper object and we'd
like to re-use that wrapper in callback constructors.  The method
T::associateWithWrapper is the entry point for the case b).

I believe that line 5786 - 5788 are (potentially) necessary for the case b),
too, although Document doesn't have a callback constructor.

-
     return wrapper;
 }
 
 void Document::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_importsController);
     visitor->trace(m_docType);
     visitor->trace(m_implementation);
     visitor->trace(m_autofocusElement);
@@ skipping 55 matching lines @@
 using namespace blink;
 void showLiveDocumentInstances()
 {
     WeakDocumentSet& set = liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it) {
         fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().utf8().data());
     }
 }
 #endif