Kill [SetWrapperReferenceFromReference] IDL extended attribute

Source/bindings/templates/interface.cpp

 {% extends 'interface_base.cpp' %}
 
 
 {##############################################################################}
 {% macro attribute_configuration(attribute) %}
 {% set getter_callback =
        '%sV8Internal::%sAttributeGetterCallback' %
             (cpp_class, attribute.name)
        if not attribute.constructor_type else
        '{0}V8Internal::{0}ConstructorGetter'.format(cpp_class) %}
@@ skipping 660 matching lines @@
     V8DOMWrapper::associateObjectWithWrapper<{{v8_class}}>(event.release(), &{{v8_class}}::wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dependent);
     v8SetReturnValue(info, wrapper);
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block visit_dom_wrapper %}
-{% if reachable_node_function or reachable_node_reference_function or
+{% if reachable_node_function or
       set_wrapper_reference_to_list %}
 void {{v8_class}}::visitDOMWrapper(void* object, const v8::Persistent<v8::Object>& wrapper, v8::Isolate* isolate)
 {
     {{cpp_class}}* impl = fromInternalPointer(object);
     {% if set_wrapper_reference_to_list %}
     v8::Local<v8::Object> creationContext = v8::Local<v8::Object>::New(isolate, wrapper);
     V8WrapperInstantiationScope scope(creationContext, isolate);
     {% for set_wrapper_reference_to in set_wrapper_reference_to_list %}
     {{set_wrapper_reference_to.cpp_type}} {{set_wrapper_reference_to.name}} = impl->{{set_wrapper_reference_to.name}}();
     if ({{set_wrapper_reference_to.name}}) {
         if (!DOMDataStore::containsWrapper<{{set_wrapper_reference_to.v8_type}}>({{set_wrapper_reference_to.name}}, isolate))
             wrap({{set_wrapper_reference_to.name}}, creationContext, isolate);
         DOMDataStore::setWrapperReference<{{set_wrapper_reference_to.v8_type}}>(wrapper, {{set_wrapper_reference_to.name}}, isolate);
     }
     {% endfor %}
     {% endif %}
     {% if reachable_node_function %}
-    if (Node* owner = impl->{{reachable_node_function}}()) {
+    // The {{reachable_node_function}}() method may return a reference or a pointer.
+    if (Node* owner = WTF::getPtr(impl->{{reachable_node_function}}())) {
         Node* root = V8GCController::opaqueRootForGC(owner, isolate);
         isolate->SetReferenceFromGroup(v8::UniqueId(reinterpret_cast<intptr_t>(root)), wrapper);
         return;
     }
-    {% elif reachable_node_reference_function %}
-    Node* root = V8GCController::opaqueRootForGC(&impl->{{reachable_node_reference_function}}(), isolate);
-    isolate->SetReferenceFromGroup(v8::UniqueId(reinterpret_cast<intptr_t>(root)), wrapper);
     {% endif %}
     {% if reachable_node_function or set_wrapper_reference_to_list %}

[Nils Barth (inactive), 2014/02/28 02:18:16]

This conditional is no longer necessary; I'll fix in a followup.

[Nils Barth (inactive), 2014/03/03 01:58:30]

Fixed in:
Cleanup [SetWrapperReferenceFromReference] cruft
https://codereview.chromium.org/176993007/

     setObjectGroup(object, wrapper, isolate);
     {% endif %}
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block shadow_attributes %}
@@ skipping 603 matching lines @@
 {% endfilter %}
 }
 
 template<>
 v8::Handle<v8::Value> toV8NoInline({{cpp_class}}* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     return toV8(impl, creationContext, isolate);
 }
 
 {% endblock %}