Kill [SetWrapperReferenceFromReference] IDL extended attribute

Source/bindings/scripts/code_generator_v8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 495 matching lines @@
         my $idlFilename = Cwd::abs_path(IDLFileForInterface($interfaceName)) or die("Could NOT find IDL file for interface \"$interfaceName\" $!\n");
         my $idlRelPath = File::Spec->abs2rel($idlFilename, $sourceRoot);
         push(@includes, dirname($idlRelPath) . "/" . $implClassName . ".h");
     }
     return @includes;
 }
 
 sub NeedsVisitDOMWrapper
 {
     my $interface = shift;
-    return ExtendedAttributeContains($interface->extendedAttributes->{"Custom"}, "VisitDOMWrapper") || $interface->extendedAttributes->{"SetWrapperReferenceFrom"} || $interface->extendedAttributes->{"SetWrapperReferenceFromReference"} || $interface->extendedAttributes->{"SetWrapperReferenceTo"} || SVGTypeNeedsToHoldContextElement($interface->name);
+    return ExtendedAttributeContains($interface->extendedAttributes->{"Custom"}, "VisitDOMWrapper") || $interface->extendedAttributes->{"SetWrapperReferenceFrom"} || $interface->extendedAttributes->{"SetWrapperReferenceTo"} || SVGTypeNeedsToHoldContextElement($interface->name);
 }
 
 sub GenerateVisitDOMWrapper
 {
     my $interface = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
     if (ExtendedAttributeContains($interface->extendedAttributes->{"Custom"}, "VisitDOMWrapper")) {
         return;
@@ skipping 28 matching lines @@
         $code .= <<END;
     ${setReferenceImplType}* ${setReferenceName} = impl->${setReferenceName}();
     if (${setReferenceName}) {
         if (!DOMDataStore::containsWrapper<${setReferenceV8Type}>(${setReferenceName}, isolate))
             wrap(${setReferenceName}, creationContext, isolate);
         DOMDataStore::setWrapperReference<${setReferenceV8Type}>(wrapper, ${setReferenceName}, isolate);
     }
 END
     }
 
-    my $isReachableMethod = $interface->extendedAttributes->{"SetWrapperReferenceFrom"};
-    my $isReachableReferenceMethod = $interface->extendedAttributes->{"SetWrapperReferenceFromReference"};
-
-    if ($isReachableMethod || $isReachableReferenceMethod) {
+    my $setWrapperReferenceMethod = $interface->extendedAttributes->{"SetWrapperReferenceFrom"};
+    if ($setWrapperReferenceMethod) {
         AddToImplIncludes("bindings/v8/V8GCController.h");
         AddToImplIncludes("core/dom/Element.h");
-        if ($isReachableMethod) {
-            $code .= <<END;
-    if (Node* owner = impl->${isReachableMethod}()) {
-        Node* root = V8GCController::opaqueRootForGC(owner, isolate);
+        $code .= <<END;
+    // The ${setWrapperReferenceMethod}() method may return a reference or a pointer but
+    // RefPtr can be constructed from either.
+    if (RefPtr<Node> owner = PassRefPtr<Node>(impl->${setWrapperReferenceMethod}())) {

[adamk, 2014/02/26 17:55:38]

Why make a RefPTr here when we didn't make one before? Is this just to take
advantage of the reference constructor for PassRefPtr? If so, I wonder if you
could instead augment WTF::getPtr
(https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...)
to handle references...

[Inactive, 2014/02/26 18:01:56]

Yes, this is the trick, we construct a RefPtr because it can be constructed from
either a pointer or a reference and the implementation may return either (we
don't know).

Augmenting the WTF::getPtr() to take a reference in is a much better idea
though. I'll do this instead, thanks :)

+        Node* root = V8GCController::opaqueRootForGC(owner.get(), isolate);
         isolate->SetReferenceFromGroup(v8::UniqueId(reinterpret_cast<intptr_t>(root)), wrapper);
         return;
     }
 END
-        } else {
-            $code .= <<END;
-    Node* root = V8GCController::opaqueRootForGC(&impl->${isReachableReferenceMethod}(), isolate);
-    isolate->SetReferenceFromGroup(v8::UniqueId(reinterpret_cast<intptr_t>(root)), wrapper);
-}
-
-END
-        }
     }
 
-    if (!$isReachableReferenceMethod) {
-        $code .= <<END;
+    $code .= <<END;
     setObjectGroup(object, wrapper, isolate);
 }
 
 END
-    }
 
     $implementation{nameSpaceWebCore}->add($code);
 }
 
 sub GetSVGPropertyTypes
 {
     my $implType = shift;
 
     my $svgPropertyType;
     my $svgListPropertyType;
@@ skipping 5862 matching lines @@
         if ($parameter->type eq "SerializedScriptValue") {
             return 1;
         } elsif (IsIntegerType($parameter->type)) {
             return 1;
         }
     }
     return 0;
 }
 
 1;