Make generator function data path more clear.

Source/bindings/scripts/CodeGeneratorV8.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 16 matching lines @@
 
 package CodeGeneratorV8;
 
 use strict;
 
 my $codeGenerator;
 
 
 my @headerContent = ();
 my @implContentHeader = ();
-my @implContent = ();
-my @implContentInternals = ();
+my @implStuff = ();

[haraken, 2013/04/16 09:40:36]

Shall we rename it to @implContent ? Stuff sounds ambiguous.

+my @implInternalStuff = ();

[haraken, 2013/04/16 09:40:36]

@implContentInternals ?

 my %implIncludes = ();
 my %headerIncludes = ();
 
 # Default .h template
 my $headerTemplate = << "EOF";
 /*
     This file is part of the WebKit open source project.
     This file has been generated by generate-bindings.pl. DO NOT MODIFY!
 
     This library is free software; you can redistribute it and/or
@@ skipping 55 matching lines @@
             my %newValue = ();
             $newValue{$conditional} = 1;
             foreach my $condition (split(/\|/, $oldValue)) {
                 $newValue{$condition} = 1;
             }
             $implIncludes{$header} = join("|", sort keys %newValue);
         }
     }
 }
 
+sub AddToHeader
+{
+    my @code = @_;
+    push(@headerContent, @code);
+}
+
+sub AddToImplStuffInternal

[haraken, 2013/04/16 09:40:36]

AddToImplContentInternals ?

+{
+    my $code = shift;
+    push(@implInternalStuff, $code);
+}
+
+sub AddToImplFunctionInternal

[haraken, 2013/04/16 09:40:36]

Maybe this helper method is not needed, because we're not planning to
distinguish functions from others, as discussed offline.

+{
+    my $func = shift;
+    AddToImplStuffInternal($func);
+}
+
+sub AddToImplStuff

[haraken, 2013/04/16 09:40:36]

AddToImplContent ?

+{
+    my $code = shift;
+    push(@implStuff, $code);
+}
+
+sub AddToImplFunction

[haraken, 2013/04/16 09:40:36]

Ditto. We might not need this helper method.

+{
+    my $func = shift;
+    AddToImplStuff($func);
+}
+
+
 sub AddIncludesForType
 {
     my $type = shift;
 
     # When we're finished with the one-file-per-class
     # reorganization, we won't need these special cases.
     if ($codeGenerator->IsTypedArrayType($type)) {
         AddToImplIncludes("wtf/${type}.h");
     }
     if (!$codeGenerator->IsPrimitiveType($type) and !$codeGenerator->IsStringType($type) and !$codeGenerator->SkipIncludeHeader($type) and $type ne "Date") {
@@ skipping 53 matching lines @@
 
 sub GenerateOpaqueRootForGC
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
     if (GetCustomIsReachable($interface)) {
         return;
     }
 
-    push(@implContent, <<END);
+    my $func = <<END;

[haraken, 2013/04/16 09:40:36]

The Blink coding style prefers a full word for a variable name
(http://www.chromium.org/blink/coding-style#TOC-Names).

This should be $function.

 void* V8${interfaceName}::opaqueRootForGC(void* object, v8::Persistent<v8::Object> wrapper, v8::Isolate* isolate)
 {
     ASSERT(!wrapper.IsIndependent(isolate));
     ${interfaceName}* impl = static_cast<${interfaceName}*>(object);
 END
     if (GetGenerateIsReachable($interface) eq  "ImplDocument" ||
         GetGenerateIsReachable($interface) eq  "ImplElementRoot" ||
         GetGenerateIsReachable($interface) eq  "ImplOwnerRoot" ||
         GetGenerateIsReachable($interface) eq  "ImplOwnerNodeRoot") {
 
         $implIncludes{"V8GCController.h"} = 1;
 
         my $methodName;
         $methodName = "document" if (GetGenerateIsReachable($interface) eq "ImplDocument");
         $methodName = "element" if (GetGenerateIsReachable($interface) eq "ImplElementRoot");
         $methodName = "owner" if (GetGenerateIsReachable($interface) eq "ImplOwnerRoot");
         $methodName = "ownerNode" if (GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot");
 
-        push(@implContent, <<END);
+        $func .= <<END;
     if (Node* owner = impl->${methodName}())
         return V8GCController::opaqueRootForGC(owner, isolate);
 END
     }
 
-    push(@implContent, <<END);
+    $func .= <<END;
     return object;
 }
 
 END
+    AddToImplFunction($func);
 }
 
 sub GetSVGPropertyTypes
 {
     my $implType = shift;
 
     my $svgPropertyType;
     my $svgListPropertyType;
     my $svgNativeType;
 
@@ skipping 47 matching lines @@
 
     my $hasDependentLifetime = $interface->extendedAttributes->{"DependentLifetime"} || $codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject") || GetGenerateIsReachable($interface) || $v8InterfaceName =~ /SVG/;
     if (!$hasDependentLifetime) {
         foreach (@{$interface->parents}) {
             my $parent = $_;
             $headerIncludes{"V8${parent}.h"} = 1;
         }
     }
 
     # - Add default header template
-    push(@headerContent, GenerateHeaderContentHeader($interface));
+    AddToHeader(GenerateHeaderContentHeader($interface));
 
     $headerIncludes{"wtf/text/StringHash.h"} = 1;
     $headerIncludes{"WrapperTypeInfo.h"} = 1;
     $headerIncludes{"V8Binding.h"} = 1;
     $headerIncludes{"V8DOMWrapper.h"} = 1;
     $headerIncludes{"wtf/HashMap.h"} = 1;
     $headerIncludes{"v8.h"} = 1;
 
     my $headerClassInclude = GetHeaderClassInclude($interfaceName);
     $headerIncludes{$headerClassInclude} = 1 if $headerClassInclude ne "";
 
     my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
 
     foreach my $headerInclude (sort keys(%headerIncludes)) {
         if ($headerInclude =~ /wtf|v8\.h/) {
-            push(@headerContent, "#include \<${headerInclude}\>\n");
+            AddToHeader("#include \<${headerInclude}\>\n");
         } else {
-            push(@headerContent, "#include \"${headerInclude}\"\n");
+            AddToHeader("#include \"${headerInclude}\"\n");
         }
     }
 
-    push(@headerContent, "\nnamespace WebCore {\n");
-    push(@headerContent, "\ntemplate<typename PropertyType> class SVGPropertyTearOff;\n") if $svgPropertyType;
+    AddToHeader("\nnamespace WebCore {\n");
+    AddToHeader("\ntemplate<typename PropertyType> class SVGPropertyTearOff;\n") if $svgPropertyType;
     if ($svgNativeType) {
         if ($svgNativeType =~ /SVGStaticListPropertyTearOff/) {
-            push(@headerContent, "\ntemplate<typename PropertyType> class SVGStaticListPropertyTearOff;\n");
+            AddToHeader("\ntemplate<typename PropertyType> class SVGStaticListPropertyTearOff;\n");
         } else {
-            push(@headerContent, "\ntemplate<typename PropertyType> class SVGListPropertyTearOff;\n");
+            AddToHeader("\ntemplate<typename PropertyType> class SVGListPropertyTearOff;\n");
         }
     }
 
-    push(@headerContent, "\n");
-    push(@headerContent, "class FloatRect;\n") if $svgPropertyType && $svgPropertyType eq "FloatRect";
-    push(@headerContent, "class Dictionary;\n") if $codeGenerator->IsConstructorTemplate($interface, "Event");
+    AddToHeader("\n");
+    AddToHeader("class FloatRect;\n") if $svgPropertyType && $svgPropertyType eq "FloatRect";
+    AddToHeader("class Dictionary;\n") if $codeGenerator->IsConstructorTemplate($interface, "Event");
 
     my $nativeType = GetNativeTypeForConversions($interface);
     if ($interface->extendedAttributes->{"NamedConstructor"}) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
 class V8${nativeType}Constructor {
 public:
     static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
     static WrapperTypeInfo info;
 };
 
 END
     }
 
-    push(@headerContent, "class $v8InterfaceName {\n");
-    push(@headerContent, "public:\n");
+    AddToHeader("class $v8InterfaceName {\n");
+    AddToHeader("public:\n");
 
-    push(@headerContent, "    static const bool hasDependentLifetime = ");
+    AddToHeader("    static const bool hasDependentLifetime = ");
     if ($hasDependentLifetime) {
-        push(@headerContent, "true;\n");
+        AddToHeader("true;\n");
     } elsif (@{$interface->parents}) {
         # Even if this type doesn't have the [DependentLifetime] attribute its parents may.
         # Let the compiler statically determine this for us.
         my $separator = "";
         foreach (@{$interface->parents}) {
             my $parent = $_;
             $headerIncludes{"V8${parent}.h"} = 1;
-            push(@headerContent, "${separator}V8${parent}::hasDependentLifetime");
+            AddToHeader("${separator}V8${parent}::hasDependentLifetime");
             $separator = " || ";
         }
-        push(@headerContent, ";\n");
+        AddToHeader(";\n");
     } else {
-        push(@headerContent, "false;\n");
+        AddToHeader("false;\n");
     }
 
     my $fromFunctionOpening = "";
     my $fromFunctionClosing = "";
     if ($interface->extendedAttributes->{"WrapAsFunction"}) {
         $fromFunctionOpening = "V8DOMWrapper::fromFunction(";
         $fromFunctionClosing = ")";
     }
 
-    push(@headerContent, <<END);
+    AddToHeader(<<END);
     static bool HasInstance(v8::Handle<v8::Value>, v8::Isolate*, WrapperWorldType);
     static bool HasInstanceInAnyWorld(v8::Handle<v8::Value>, v8::Isolate*);
     static v8::Persistent<v8::FunctionTemplate> GetTemplate(v8::Isolate*, WrapperWorldType);
     static ${nativeType}* toNative(v8::Handle<v8::Object> object)
     {
         return reinterpret_cast<${nativeType}*>(${fromFunctionOpening}object${fromFunctionClosing}->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
     }
     static void derefObject(void*);
     static WrapperTypeInfo info;
 END
 
     if (NeedsCustomOpaqueRootForGC($interface)) {
-        push(@headerContent, "    static void* opaqueRootForGC(void*, v8::Persistent<v8::Object>, v8::Isolate*);\n");
+        AddToHeader("    static void* opaqueRootForGC(void*, v8::Persistent<v8::Object>, v8::Isolate*);\n");
     }
 
     if ($codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject")) {
-        push(@headerContent, "    static ActiveDOMObject* toActiveDOMObject(v8::Handle<v8::Object>);\n");
+        AddToHeader("    static ActiveDOMObject* toActiveDOMObject(v8::Handle<v8::Object>);\n");
     }
 
     if ($codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
-        push(@headerContent, "    static EventTarget* toEventTarget(v8::Handle<v8::Object>);\n");
+        AddToHeader("    static EventTarget* toEventTarget(v8::Handle<v8::Object>);\n");
     }
 
     if ($interfaceName eq "DOMWindow") {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Persistent<v8::ObjectTemplate> GetShadowObjectTemplate(v8::Isolate*, WrapperWorldType);
 END
     }
 
     if ($interfaceName eq "HTMLDocument") {
-      push(@headerContent, <<END);
+      AddToHeader(<<END);
     static v8::Local<v8::Object> wrapInShadowObject(v8::Local<v8::Object> wrapper, Node* impl, v8::Isolate*);
 END
     }
 
     my @enabledPerContextFunctions;
     foreach my $function (@{$interface->functions}) {
         my $name = $function->signature->name;
         my $attrExt = $function->signature->extendedAttributes;
 
         if (HasCustomMethod($attrExt) && !$attrExt->{"ImplementedBy"} && $function->{overloadIndex} == 1) {
             my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
-            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
-            push(@headerContent, <<END);
+            AddToHeader("#if ${conditionalString}\n") if $conditionalString;
+            AddToHeader(<<END);
     static v8::Handle<v8::Value> ${name}MethodCustom(const v8::Arguments&);
 END
-            push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
+            AddToHeader("#endif // ${conditionalString}\n") if $conditionalString;
         }
         if ($attrExt->{"EnabledPerContext"}) {
             push(@enabledPerContextFunctions, $function);
         }
     }
 
     if (IsConstructable($interface)) {
-        push(@headerContent, "    static v8::Handle<v8::Value> constructorCallback(const v8::Arguments&);\n");
+        AddToHeader("    static v8::Handle<v8::Value> constructorCallback(const v8::Arguments&);\n");
 END
     }
     if (HasCustomConstructor($interface)) {
-        push(@headerContent, "    static v8::Handle<v8::Value> constructorCustom(const v8::Arguments&);\n");
+        AddToHeader("    static v8::Handle<v8::Value> constructorCustom(const v8::Arguments&);\n");
     }
 
     my @enabledPerContextAttributes;
     foreach my $attribute (@{$interface->attributes}) {
         my $name = $attribute->signature->name;
         my $attrExt = $attribute->signature->extendedAttributes;
         my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
         if (HasCustomGetter($attrExt) && !$attrExt->{"ImplementedBy"}) {
-            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
-            push(@headerContent, <<END);
+            AddToHeader("#if ${conditionalString}\n") if $conditionalString;
+            AddToHeader(<<END);
     static v8::Handle<v8::Value> ${name}AttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);
 END
-            push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
+            AddToHeader("#endif // ${conditionalString}\n") if $conditionalString;
         }
         if (HasCustomSetter($attrExt) && !$attrExt->{"ImplementedBy"}) {
-            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
-            push(@headerContent, <<END);
+            AddToHeader("#if ${conditionalString}\n") if $conditionalString;
+            AddToHeader(<<END);
     static void ${name}AttrSetterCustom(v8::Local<v8::String> name, v8::Local<v8::Value>, const v8::AccessorInfo&);
 END
-            push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
+            AddToHeader("#endif // ${conditionalString}\n") if $conditionalString;
         }
         if ($attrExt->{"EnabledPerContext"}) {
             push(@enabledPerContextAttributes, $attribute);
         }
     }
 
     GenerateHeaderNamedAndIndexedPropertyAccessors($interface);
     GenerateHeaderCustomCall($interface);
     GenerateHeaderCustomInternalFieldIndices($interface);
 
     if ($interface->name eq "DOMWindow") {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static bool namedSecurityCheckCustom(v8::Local<v8::Object> host, v8::Local<v8::Value> key, v8::AccessType, v8::Local<v8::Value> data);
     static bool indexedSecurityCheckCustom(v8::Local<v8::Object> host, uint32_t index, v8::AccessType, v8::Local<v8::Value> data);
 END
     }
 
     if (@enabledPerContextAttributes) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static void installPerContextProperties(v8::Handle<v8::Object>, ${nativeType}*, v8::Isolate*);
 END
     } else {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static void installPerContextProperties(v8::Handle<v8::Object>, ${nativeType}*, v8::Isolate*) { }
 END
     }
 
     if (@enabledPerContextFunctions) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*);
 END
     } else {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
 END
     }
 
     if ($interfaceName eq "HTMLElement") {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     friend v8::Handle<v8::Object> createV8HTMLWrapper(HTMLElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
     friend v8::Handle<v8::Object> createV8HTMLDirectWrapper(HTMLElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 END
     } elsif ($interfaceName eq "SVGElement") {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     friend v8::Handle<v8::Object> createV8SVGWrapper(SVGElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
     friend v8::Handle<v8::Object> createV8SVGDirectWrapper(SVGElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
     friend v8::Handle<v8::Object> createV8SVGFallbackWrapper(SVGElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 END
     } elsif ($interfaceName eq "HTMLUnknownElement") {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     friend v8::Handle<v8::Object> createV8HTMLFallbackWrapper(HTMLUnknownElement*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 END
     } elsif ($interfaceName eq "Element") {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     // This is a performance optimization hack. See V8Element::wrap.
     friend v8::Handle<v8::Object> wrap(Node*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 END
     }
 
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
 private:
 END
 
     my $noToV8 = $interface->extendedAttributes->{"SuppressToJSObject"};
     my $noWrap = $interface->extendedAttributes->{"NoWrapperCache"} || $noToV8;
     if (!$noWrap) {
         my $createWrapperArgumentType = GetPassRefPtrType($nativeType);
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     friend v8::Handle<v8::Object> wrap(${nativeType}*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
     static v8::Handle<v8::Object> createWrapper(${createWrapperArgumentType}, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 END
     }
 
-    push(@headerContent, <<END);
+    AddToHeader(<<END);
 };
 
 template<>
 class WrapperTypeTraits<${nativeType} > {
 public:
     static WrapperTypeInfo* info() { return &${v8InterfaceName}::info; }
 };
 
 END
 
     my $customWrap = !!($interface->extendedAttributes->{"CustomToJSObject"});
     if ($noToV8) {
         die "Can't suppress toV8 for subclass\n" if @parents;
     } elsif ($noWrap) {
         die "Must have custom toV8\n" if !$customWrap;
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
 class ${nativeType};
 v8::Handle<v8::Value> toV8(${nativeType}*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 v8::Handle<v8::Value> toV8ForMainWorld(${nativeType}*, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 
 template<class HolderContainer, class Wrappable>
 inline v8::Handle<v8::Value> toV8Fast(${nativeType}* impl, const HolderContainer& container, Wrappable*)
 {
     return toV8(impl, container.Holder(), container.GetIsolate());
 }
 
 template<class HolderContainer, class Wrappable>
 inline v8::Handle<v8::Value> toV8FastForMainWorld(${nativeType}* impl, const HolderContainer& container, Wrappable*)
 {
     return toV8ForMainWorld(impl, container.Holder(), container.GetIsolate());
 }
 END
     } else {
 
         my $createWrapperCall = $customWrap ? "${v8InterfaceName}::wrap" : "${v8InterfaceName}::createWrapper";
         my $returningWrapper = $interface->extendedAttributes->{"WrapAsFunction"} ? "V8DOMWrapper::toFunction(wrapper)" : "wrapper";
         my $returningCreatedWrapperOpening = $interface->extendedAttributes->{"WrapAsFunction"} ? "V8DOMWrapper::toFunction(" : "";
         my $returningCreatedWrapperClosing = $interface->extendedAttributes->{"WrapAsFunction"} ? ", \"${interfaceName}\", isolate)" : "";
 
         if ($customWrap) {
-            push(@headerContent, <<END);
+            AddToHeader(<<END);
 
 v8::Handle<v8::Object> wrap(${nativeType}* impl, v8::Handle<v8::Object> creationContext, v8::Isolate*);
 END
         } else {
-            push(@headerContent, <<END);
+            AddToHeader(<<END);
 
 inline v8::Handle<v8::Object> wrap(${nativeType}* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT(impl);
     ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
     return ${returningCreatedWrapperOpening}$createWrapperCall(impl, creationContext, isolate)${returningCreatedWrapperClosing};
 }
 END
         }
 
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
 
 inline v8::Handle<v8::Value> toV8(${nativeType}* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     if (UNLIKELY(!impl))
         return v8NullWithCheck(isolate);
     v8::Handle<v8::Value> wrapper = DOMDataStore::getWrapper(impl, isolate);
     if (!wrapper.IsEmpty())
         return $returningWrapper;
     return wrap(impl, creationContext, isolate);
 }
@@ skipping 34 matching lines @@
 
 template<class HolderContainer, class Wrappable>
 inline v8::Handle<v8::Value> toV8FastForMainWorld(PassRefPtr< ${nativeType} > impl, const HolderContainer& container, Wrappable* wrappable)
 {
     return toV8FastForMainWorld(impl.get(), container, wrappable);
 }
 
 END
     }
 
-    push(@headerContent, <<END);
+    AddToHeader(<<END);
 
 template<class HolderContainer, class Wrappable>
 inline v8::Handle<v8::Value> toV8Fast(PassRefPtr< ${nativeType} > impl, const HolderContainer& container, Wrappable* wrappable)
 {
     return toV8Fast(impl.get(), container, wrappable);
 }
 
 inline v8::Handle<v8::Value> toV8(PassRefPtr< ${nativeType} > impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     return toV8(impl.get(), creationContext, isolate);
 }
 END
 
     if ($codeGenerator->IsConstructorTemplate($interface, "Event")) {
-        push(@headerContent, "\nbool fill${interfaceName}Init(${interfaceName}Init&, const Dictionary&);\n");
+        AddToHeader("\nbool fill${interfaceName}Init(${interfaceName}Init&, const Dictionary&);\n");
     }
 
-    push(@headerContent, "\n}\n\n");
-    push(@headerContent, "#endif // $v8InterfaceName" . "_h\n");
+    AddToHeader("\n}\n\n");
+    AddToHeader("#endif // $v8InterfaceName" . "_h\n");
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
-    push(@headerContent, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    AddToHeader("#endif // ${conditionalString}\n\n") if $conditionalString;
 }
 
 sub GetInternalFields
 {
     my $interface = shift;
 
     my @customInternalFields = ();
     # Event listeners on DOM nodes are explicitly supported in the GC controller.
     if (!$codeGenerator->InheritsInterface($interface, "Node") &&
         $codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
@@ skipping 12 matching lines @@
     return "" if ($codeGenerator->SkipIncludeHeader($v8InterfaceName));
     return "${v8InterfaceName}.h";
 }
 
 sub GenerateHeaderCustomInternalFieldIndices
 {
     my $interface = shift;
     my @customInternalFields = GetInternalFields($interface);
     my $customFieldCounter = 0;
     foreach my $customInternalField (@customInternalFields) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static const int ${customInternalField} = v8DefaultWrapperInternalFieldCount + ${customFieldCounter};
 END
         $customFieldCounter++;
     }
-    push(@headerContent, <<END);
+    AddToHeader(<<END);
     static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + ${customFieldCounter};
 END
 }
 
 my %indexerSpecialCases = (
     "Storage" => 1,
     "HTMLAppletElement" => 1,
     "HTMLEmbedElement" => 1,
     "HTMLObjectElement" => 1
 );
@@ skipping 20 matching lines @@
     if ($interfaceName eq "HTMLAppletElement" || $interfaceName eq "HTMLEmbedElement" || $interfaceName eq "HTMLObjectElement") {
         $hasCustomNamedGetter = 1;
     }
     if ($interfaceName eq "HTMLDocument") {
         $hasCustomNamedGetter = 0;
         $hasCustomIndexedGetter = 0;
     }
     my $isIndexerSpecialCase = exists $indexerSpecialCases{$interfaceName};
 
     if ($hasCustomIndexedGetter || $isIndexerSpecialCase) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Value> indexedPropertyGetter(uint32_t, const v8::AccessorInfo&);
 END
     }
 
     if ($isIndexerSpecialCase || $hasCustomIndexedSetter) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Value> indexedPropertySetter(uint32_t, v8::Local<v8::Value>, const v8::AccessorInfo&);
 END
     }
     if ($hasCustomDeleters) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Boolean> indexedPropertyDeleter(uint32_t, const v8::AccessorInfo&);
 END
     }
     if ($hasCustomNamedGetter) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Value> namedPropertyGetter(v8::Local<v8::String>, const v8::AccessorInfo&);
 END
     }
     if ($hasCustomNamedSetter) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Value> namedPropertySetter(v8::Local<v8::String>, v8::Local<v8::Value>, const v8::AccessorInfo&);
 END
     }
     if ($hasCustomDeleters) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Boolean> namedPropertyDeleter(v8::Local<v8::String>, const v8::AccessorInfo&);
 END
     }
     if ($hasCustomEnumerator) {
-        push(@headerContent, <<END);
+        AddToHeader(<<END);
     static v8::Handle<v8::Array> namedPropertyEnumerator(const v8::AccessorInfo&);
     static v8::Handle<v8::Integer> namedPropertyQuery(v8::Local<v8::String>, const v8::AccessorInfo&);
 END
     }
 }
 
 sub GenerateHeaderCustomCall
 {
     my $interface = shift;
 
     if ($interface->extendedAttributes->{"CustomCall"}) {
-        push(@headerContent, "    static v8::Handle<v8::Value> callAsFunctionCallback(const v8::Arguments&);\n");
+        AddToHeader("    static v8::Handle<v8::Value> callAsFunctionCallback(const v8::Arguments&);\n");
     }
     if ($interface->name eq "Location") {
-        push(@headerContent, "    static v8::Handle<v8::Value> assignAttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);\n");
-        push(@headerContent, "    static v8::Handle<v8::Value> reloadAttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);\n");
-        push(@headerContent, "    static v8::Handle<v8::Value> replaceAttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);\n");
+        AddToHeader("    static v8::Handle<v8::Value> assignAttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);\n");
+        AddToHeader("    static v8::Handle<v8::Value> reloadAttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);\n");
+        AddToHeader("    static v8::Handle<v8::Value> replaceAttrGetterCustom(v8::Local<v8::String> name, const v8::AccessorInfo&);\n");
     }
 }
 
 sub IsConstructable
 {
     my $interface = shift;
 
     return $interface->extendedAttributes->{"CustomConstructor"} || $interface->extendedAttributes->{"Constructor"} || $interface->extendedAttributes->{"ConstructorTemplate"};
 }
 
@@ skipping 38 matching lines @@
     my $funcName = $function->signature->name;
 
     my $signature = "v8::Signature::New(V8PerIsolateData::from(info.GetIsolate())->rawTemplate(&" . $v8InterfaceName . "::info, currentWorldType))";
     if ($function->signature->extendedAttributes->{"DoNotCheckSignature"}) {
         $signature = "v8::Local<v8::Signature>()";
     }
 
     my $newTemplateParams = "${interfaceName}V8Internal::${funcName}MethodCallback, v8Undefined(), $signature";
 
     AddToImplIncludes("Frame.h");
-    push(@implContentInternals, <<END);
+    AddToImplFunctionInternal(<<END);
 static v8::Handle<v8::Value> ${funcName}AttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
 {
     // This is only for getting a unique pointer which we can pass to privateTemplate.
     static const char* privateTemplateUniqueKey = "${funcName}PrivateTemplate";
     WrapperWorldType currentWorldType = worldType(info.GetIsolate());
     V8PerIsolateData* data = V8PerIsolateData::from(info.GetIsolate());
     v8::Persistent<v8::FunctionTemplate> privateTemplate = data->privateTemplate(currentWorldType, &privateTemplateUniqueKey, $newTemplateParams);
 
     v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(${v8InterfaceName}::GetTemplate(info.GetIsolate(), currentWorldType));
     if (holder.IsEmpty()) {
         // can only reach here by 'object.__proto__.func', and it should passed
         // domain security check already
         return privateTemplate->GetFunction();
     }
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(holder);
     if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError)) {
         static const char* sharedTemplateUniqueKey = "${funcName}SharedTemplate";
         v8::Persistent<v8::FunctionTemplate> sharedTemplate = data->privateTemplate(currentWorldType, &sharedTemplateUniqueKey, $newTemplateParams);
         return sharedTemplate->GetFunction();
     }
 
     v8::Local<v8::Value> hiddenValue = info.This()->GetHiddenValue(name);
     if (!hiddenValue.IsEmpty())
         return hiddenValue;
 
     return privateTemplate->GetFunction();
 }
 
+END
+    AddToImplFunctionInternal(<<END);
 static v8::Handle<v8::Value> ${funcName}AttrGetterCallback(v8::Local<v8::String> name, const v8::AccessorInfo& info)
 {
     return ${interfaceName}V8Internal::${funcName}AttrGetter(name, info);
 }
 

[haraken, 2013/04/16 09:40:36]

Nit: You might want to remove the trailing empty lines. You can add empty lines
when you generate the code. You can do it in a follow-up patch.

[kojih, 2013/04/16 11:00:07]

OK. 

 END
 }
 
 sub GenerateDomainSafeFunctionSetter
 {
     my $interfaceName = shift;
     my $v8InterfaceName = "V8" . $interfaceName;
 
-    push(@implContentInternals, <<END);
+    AddToImplFunctionInternal(<<END);
 static void ${interfaceName}DomainSafeFunctionSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
     v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(${v8InterfaceName}::GetTemplate(info.GetIsolate(), worldType(info.GetIsolate())));
     if (holder.IsEmpty())
         return;
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(holder);
     if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame()))
         return;
 
     info.This()->SetHiddenValue(name, value);
 }
 
 END
 }
 
 sub GenerateConstructorGetter
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
-    push(@implContentInternals, <<END);
+    AddToImplFunctionInternal(<<END);
 static v8::Handle<v8::Value> ${interfaceName}ConstructorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
 {
     v8::Handle<v8::Value> data = info.Data();
     ASSERT(data->IsExternal());
     V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->CreationContext());
     if (!perContextData)
         return v8Undefined();
     return perContextData->constructorForType(WrapperTypeInfo::unwrap(data));
 }
 END
@@ skipping 16 matching lines @@
     my $attribute = shift;
     my $interface = shift;
     my $forMainWorldSuffix = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
     my $attrExt = $attribute->signature->extendedAttributes;
     my $attrName = $attribute->signature->name;
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
 
-    push(@implContentInternals, "static v8::Handle<v8::Value> ${attrName}AttrGetterCallback${forMainWorldSuffix}(v8::Local<v8::String> name, const v8::AccessorInfo& info)\n");
-    push(@implContentInternals, "{\n");
-    push(@implContentInternals, GenerateFeatureObservation($attrExt->{"MeasureAs"}));
+    $func .= "static v8::Handle<v8::Value> ${attrName}AttrGetterCallback${forMainWorldSuffix}(v8::Local<v8::String> name, const v8::AccessorInfo& info)\n";
+    $func .= "{\n";
+    $func .= GenerateFeatureObservation($attrExt->{"MeasureAs"});
     if (HasCustomGetter($attrExt)) {
-        push(@implContentInternals, "    return ${v8InterfaceName}::${attrName}AttrGetterCustom(name, info);\n");
+        $func .= "    return ${v8InterfaceName}::${attrName}AttrGetterCustom(name, info);\n";
     } else {
-        push(@implContentInternals, "    return ${interfaceName}V8Internal::${attrName}AttrGetter${forMainWorldSuffix}(name, info);\n");
+        $func .= "    return ${interfaceName}V8Internal::${attrName}AttrGetter${forMainWorldSuffix}(name, info);\n";
     }
-    push(@implContentInternals, "}\n\n");
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "}\n\n";
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateNormalAttrGetter
 {
     my $attribute = shift;
     my $interface = shift;
     my $forMainWorldSuffix = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
     my $attrExt = $attribute->signature->extendedAttributes;
     my $attrName = $attribute->signature->name;
     my $attrType = $attribute->signature->type;
 
     if (HasCustomGetter($attrExt)) {
         return;
     }
 
     $codeGenerator->AssertNotSequenceType($attrType);
     my $getterStringUsesImp = $interfaceName ne "SVGNumber";
     my $nativeType = GetNativeTypeFromSignature($attribute->signature, -1);
     my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($interfaceName);
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
-    push(@implContentInternals, <<END);
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
+    $func .= <<END;
 static v8::Handle<v8::Value> ${attrName}AttrGetter${forMainWorldSuffix}(v8::Local<v8::String> name, const v8::AccessorInfo& info)
 {
 END
     if ($svgNativeType) {
         my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($interfaceName);
         if ($svgWrappedNativeType =~ /List/) {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     $svgNativeType* imp = ${v8InterfaceName}::toNative(info.Holder());
 END
         } else {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     $svgNativeType* wrapper = ${v8InterfaceName}::toNative(info.Holder());
     $svgWrappedNativeType& impInstance = wrapper->propertyReference();
 END
             if ($getterStringUsesImp) {
-                push(@implContentInternals, <<END);
+                $func .= <<END;
     $svgWrappedNativeType* imp = &impInstance;
 END
             }
         }
     } elsif ($attrExt->{"OnProto"} || $attrExt->{"Unforgeable"}) {
         if ($interfaceName eq "DOMWindow") {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     v8::Handle<v8::Object> holder = info.Holder();
 END
         } else {
             # perform lookup first
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     v8::Handle<v8::Object> holder = info.This()->FindInstanceInPrototypeChain(${v8InterfaceName}::GetTemplate(info.GetIsolate(), worldType(info.GetIsolate())));
     if (holder.IsEmpty())
         return v8Undefined();
 END
         }
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(holder);
 END
     } else {
         my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
         my $url = $attribute->signature->extendedAttributes->{"URL"};
         if ($getterStringUsesImp && $reflect && !$url && $codeGenerator->InheritsInterface($interface, "Node") && $codeGenerator->IsStringType($attrType)) {
             # Generate super-compact call for regular attribute getter:
             my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);
-            push(@implContentInternals, "    Element* imp = V8Element::toNative(info.Holder());\n");
-            push(@implContentInternals, "    return v8String(imp->${functionName}(" . join(", ", @arguments) . "), info.GetIsolate(), ReturnUnsafeHandle);\n");
-            push(@implContentInternals, "}\n\n");
-            push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+            $func .= "    Element* imp = V8Element::toNative(info.Holder());\n";
+            $func .= "    return v8String(imp->${functionName}(" . join(", ", @arguments) . "), info.GetIsolate(), ReturnUnsafeHandle);\n";
+            $func .= "}\n\n";
+            $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+            AddToImplFunctionInternal($func);
             return;
             # Skip the rest of the function!
         }
         if ($attribute->signature->type eq "SerializedScriptValue" && $attrExt->{"CachedAttribute"}) {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     v8::Handle<v8::String> propertyName = v8::String::NewSymbol("${attrName}");
     v8::Handle<v8::Value> value = info.Holder()->GetHiddenValue(propertyName);
     if (!value.IsEmpty())
         return value;
 END
         }
         if (!$attribute->isStatic) {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(info.Holder());
 END
         }
     }
 
     # Generate security checks if necessary
     if ($attribute->signature->extendedAttributes->{"CheckSecurityForNode"}) {
-        push(@implContentInternals, "    if (!BindingSecurity::shouldAllowAccessToNode(BindingState::instance(), imp->" . $attribute->signature->name . "()))\n        return v8::Handle<v8::Value>(v8Null(info.GetIsolate()));\n\n");
+        $func .= "    if (!BindingSecurity::shouldAllowAccessToNode(BindingState::instance(), imp->" . $attribute->signature->name . "()))\n        return v8::Handle<v8::Value>(v8Null(info.GetIsolate()));\n\n";
     }
 
     my $useExceptions = 1 if $attribute->signature->extendedAttributes->{"GetterRaisesException"};
     my $isNullable = $attribute->signature->isNullable;
     if ($useExceptions) {
         AddToImplIncludes("ExceptionCode.h");
-        push(@implContentInternals, "    ExceptionCode ec = 0;\n");
+        $func .= "    ExceptionCode ec = 0;\n";
     }
 
     if ($isNullable) {
-        push(@implContentInternals, "    bool isNull = false;\n");
+        $func .= "    bool isNull = false;\n";
     }
 
     my $returnType = $attribute->signature->type;
     my $getterString;
 
     if ($getterStringUsesImp) {
         my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);
         push(@arguments, "isNull") if $isNullable;
         push(@arguments, "ec") if $useExceptions;
         if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
             my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
             AddToImplIncludes("${implementedBy}.h");
             unshift(@arguments, "imp") if !$attribute->isStatic;
             $functionName = "${implementedBy}::${functionName}";
         } elsif ($attribute->isStatic) {
             $functionName = "${interfaceName}::${functionName}";
         } else {
             $functionName = "imp->${functionName}";
         }
-        unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentInternals, "    ", 0));
+        my ($arg, $code) = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, "    ", 0);
+        $func .= $code;
+        unshift(@arguments, @$arg);
         $getterString = "${functionName}(" . join(", ", @arguments) . ")";
     } else {
         $getterString = "impInstance";
     }
 
     my $result;
     if ($attribute->signature->type eq "EventListener" && $interface->name eq "DOMWindow") {
-        push(@implContentInternals, "    if (!imp->document())\n");
-        push(@implContentInternals, "        return v8Undefined();\n");
+        $func .= "    if (!imp->document())\n";
+        $func .= "        return v8Undefined();\n";
     }
 
     if ($useExceptions || $isNullable) {
         if ($nativeType =~ /^V8StringResource/) {
-            push(@implContentInternals, "    " . ConvertToV8StringResource($attribute->signature, $nativeType, "v", $getterString) . ";\n");
+            $func .= "    " . ConvertToV8StringResource($attribute->signature, $nativeType, "v", $getterString) . ";\n";
         } else {
-            push(@implContentInternals, "    $nativeType v = $getterString;\n");
+            $func .= "    $nativeType v = $getterString;\n";
         }
 
         if ($isNullable) {
-            push(@implContentInternals, "    if (isNull)\n");
-            push(@implContentInternals, "        return v8Null(info.GetIsolate());\n");
+            $func .= "    if (isNull)\n";
+            $func .= "        return v8Null(info.GetIsolate());\n";
         }
 
         if ($useExceptions) {
-            push(@implContentInternals, "    if (UNLIKELY(ec))\n");
-            push(@implContentInternals, "        return setDOMException(ec, info.GetIsolate());\n");
+            $func .= "    if (UNLIKELY(ec))\n";
+            $func .= "        return setDOMException(ec, info.GetIsolate());\n";
 
             if ($codeGenerator->ExtendedAttributeContains($attribute->signature->extendedAttributes->{"CallWith"}, "ScriptState")) {
-                push(@implContentInternals, "    if (state.hadException())\n");
-                push(@implContentInternals, "        return throwError(state.exception(), info.GetIsolate());\n");
+                $func .= "    if (state.hadException())\n";
+                $func .= "        return throwError(state.exception(), info.GetIsolate());\n";
             }
         }
 
         $result = "v";
         $result .= ".release()" if ($codeGenerator->IsRefPtrType($returnType));
     } else {
         # Can inline the function call into the return statement to avoid overhead of using a Ref<> temporary
         $result = $getterString;
         # Fix amigious conversion problem, by casting to the base type first ($getterString returns a type that inherits from SVGAnimatedEnumeration, not the base class directly).
         $result = "static_pointer_cast<SVGAnimatedEnumeration>($result)" if $returnType eq "SVGAnimatedEnumeration";
     }
  
     # Special case for readonly or Replaceable attributes (with a few exceptions). This attempts to ensure that JS wrappers don't get
     # garbage-collected prematurely when their lifetime is strongly tied to their owner. We accomplish this by inserting a reference to
     # the newly created wrapper into an internal field of the holder object.
     if ((!$codeGenerator->InheritsInterface($interface, "Node") && $attrName ne "self" && IsWrapperType($returnType) && (IsReadonly($attribute) || $attribute->signature->extendedAttributes->{"Replaceable"} || $attrName eq "location")
          && $returnType ne "EventTarget" && $returnType ne "SerializedScriptValue" && $returnType ne "DOMWindow"
          && $returnType ne "MessagePortArray"
          && $returnType !~ /SVG/ && $returnType !~ /HTML/ && !IsDOMNodeType($returnType))
         || $attribute->signature->extendedAttributes->{"CacheAttributeForGC"}) {
 
         my $arrayType = $codeGenerator->GetArrayType($returnType);
         if ($arrayType) {
             if (!$codeGenerator->SkipIncludeHeader($arrayType)) {
                 AddToImplIncludes("V8$arrayType.h");
                 AddToImplIncludes("$arrayType.h");
             }
-            push(@implContentInternals, "    return v8Array(${getterString}, info.GetIsolate());\n");
-            push(@implContentInternals, "}\n\n");
+            $func .= "    return v8Array(${getterString}, info.GetIsolate());\n";
+            $func .= "}\n\n";
+            AddToImplFunctionInternal($func);
             return;
         }
 
         AddIncludesForType($returnType);
         # Check for a wrapper in the wrapper cache. If there is one, we know that a hidden reference has already
         # been created. If we don't find a wrapper, we create both a wrapper and a hidden reference.
-        push(@implContentInternals, "    RefPtr<$returnType> result = ${getterString};\n");
+        $func .= "    RefPtr<$returnType> result = ${getterString};\n";
         if ($forMainWorldSuffix) {
-          push(@implContentInternals, "    v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper${forMainWorldSuffix}(result.get())) : v8Undefined();\n");
+          $func .= "    v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper${forMainWorldSuffix}(result.get())) : v8Undefined();\n";
         } else {
-          push(@implContentInternals, "    v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper(result.get(), info.GetIsolate())) : v8Undefined();\n");
+          $func .= "    v8::Handle<v8::Value> wrapper = result.get() ? v8::Handle<v8::Value>(DOMDataStore::getWrapper(result.get(), info.GetIsolate())) : v8Undefined();\n";
         }
-        push(@implContentInternals, "    if (wrapper.IsEmpty()) {\n");
-        push(@implContentInternals, "        wrapper = toV8(result.get(), info.Holder(), info.GetIsolate());\n"); # FIXME: Could use wrap here since the wrapper is empty.
-        push(@implContentInternals, "        if (!wrapper.IsEmpty())\n");
-        push(@implContentInternals, "            V8HiddenPropertyName::setNamedHiddenReference(info.Holder(), \"${attrName}\", wrapper);\n");
-        push(@implContentInternals, "    }\n");
-        push(@implContentInternals, "    return wrapper;\n");
-        push(@implContentInternals, "}\n\n");
-        push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+        $func .= "    if (wrapper.IsEmpty()) {\n";
+        $func .= "        wrapper = toV8(result.get(), info.Holder(), info.GetIsolate());\n"; # FIXME: Could use wrap here since the wrapper is empty.
+        $func .= "        if (!wrapper.IsEmpty())\n";
+        $func .= "            V8HiddenPropertyName::setNamedHiddenReference(info.Holder(), \"${attrName}\", wrapper);\n";
+        $func .= "    }\n";
+        $func .= "    return wrapper;\n";
+        $func .= "}\n\n";
+        $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+        AddToImplFunctionInternal($func);
         return;
     }
 
     if (($codeGenerator->IsSVGAnimatedType($interfaceName) or $interfaceName eq "SVGViewSpec") and $codeGenerator->IsSVGTypeNeedingTearOff($attrType)) {
         AddToImplIncludes("V8$attrType.h");
         my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
         # Convert from abstract SVGProperty to real type, so the right toJS() method can be invoked.
-        push(@implContentInternals, "    return toV8Fast$forMainWorldSuffix(static_cast<$svgNativeType*>($result), info, imp);\n");
+        $func .= "    return toV8Fast$forMainWorldSuffix(static_cast<$svgNativeType*>($result), info, imp);\n";
     } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($attrType) and not $interfaceName =~ /List$/) {
         AddToImplIncludes("V8$attrType.h");
         AddToImplIncludes("SVGPropertyTearOff.h");
         my $tearOffType = $codeGenerator->GetSVGTypeNeedingTearOff($attrType);
         my $wrappedValue;
         if ($codeGenerator->IsSVGTypeWithWritablePropertiesNeedingTearOff($attrType) and not defined $attribute->signature->extendedAttributes->{"Immutable"}) {
             my $getter = $result;
             $getter =~ s/imp->//;
             $getter =~ s/\(\)//;
 
@@ skipping 17 matching lines @@
 
                 $wrappedValue = "WTF::getPtr(${tearOffType}::create(imp, $result, $updateMethod))";
             }
         } elsif ($tearOffType =~ /SVGStaticListPropertyTearOff/) {
                 $wrappedValue = "WTF::getPtr(${tearOffType}::create(imp, $result))";
         } elsif ($tearOffType =~ /SVG(Point|PathSeg)List/) {
                 $wrappedValue = "WTF::getPtr($result)";
         } else {
                 $wrappedValue = "WTF::getPtr(${tearOffType}::create($result))";
         }
-        push(@implContentInternals, "    return toV8Fast$forMainWorldSuffix($wrappedValue, info, imp);\n");
+        $func .= "    return toV8Fast$forMainWorldSuffix($wrappedValue, info, imp);\n";
     } elsif ($attribute->signature->type eq "MessagePortArray") {
         AddToImplIncludes("MessagePort.h");
         AddToImplIncludes("V8MessagePort.h");
         my $getterFunc = $codeGenerator->WK_lcfirst($attribute->signature->name);
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     MessagePortArray* ports = imp->${getterFunc}();
     if (!ports)
         return v8::Array::New(0);
     MessagePortArray portsCopy(*ports);
     v8::Local<v8::Array> portArray = v8::Array::New(portsCopy.size());
     for (size_t i = 0; i < portsCopy.size(); ++i)
         portArray->Set(v8Integer(i, info.GetIsolate()), toV8Fast$forMainWorldSuffix(portsCopy[i].get(), info, imp));
     return portArray;
 END
     } elsif ($attribute->signature->type eq "SerializedScriptValue" && $attrExt->{"CachedAttribute"}) {
         my $getterFunc = $codeGenerator->WK_lcfirst($attribute->signature->name);
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     RefPtr<SerializedScriptValue> serialized = imp->${getterFunc}();
     value = serialized ? serialized->deserialize() : v8::Handle<v8::Value>(v8Null(info.GetIsolate()));
     info.Holder()->SetHiddenValue(propertyName, value);
     return value;
 END
     } else {
-        push(@implContentInternals, "    return " . NativeToJSValue($attribute->signature, $result, "info.Holder()", "info.GetIsolate()", "info", "imp", "ReturnUnsafeHandle", $forMainWorldSuffix).";\n");
+        $func .= "    return " . NativeToJSValue($attribute->signature, $result, "info.Holder()", "info.GetIsolate()", "info", "imp", "ReturnUnsafeHandle", $forMainWorldSuffix).";\n";
     }
 
-    push(@implContentInternals, "}\n\n");  # end of getter
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "}\n\n";  # end of getter
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateReplaceableAttrSetterCallback
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
-    push(@implContentInternals, "static void ${interfaceName}ReplaceableAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n");
-    push(@implContentInternals, "{\n");
-    push(@implContentInternals, GenerateFeatureObservation($interface->extendedAttributes->{"MeasureAs"}));
-    push(@implContentInternals, "    return ${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter(name, value, info);\n");
-    push(@implContentInternals, "}\n\n");
+    my $func = "";
+    $func .= "static void ${interfaceName}ReplaceableAttrSetterCallback(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n";
+    $func .= "{\n";
+    $func .= GenerateFeatureObservation($interface->extendedAttributes->{"MeasureAs"});
+    $func .= "    return ${interfaceName}V8Internal::${interfaceName}ReplaceableAttrSetter(name, value, info);\n";
+    $func .= "}\n\n";
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateReplaceableAttrSetter
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
-    push(@implContentInternals, <<END);
+    my $func = "";
+    $func .= <<END;
 static void ${interfaceName}ReplaceableAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
 {
 END
     if ($interface->extendedAttributes->{"CheckSecurity"}) {
         AddToImplIncludes("Frame.h");
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     ${interfaceName}* imp = V8${interfaceName}::toNative(info.Holder());
     if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame()))
         return;
 END
     }
 
-    push(@implContentInternals, <<END);
+    $func .= <<END;
     info.This()->ForceSet(name, value);
 }
 
 END
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateCustomElementInvocationScopeIfNeeded
 {
-    my $out = shift;
+    my $out = "";

[haraken, 2013/04/16 09:40:36]

Maybe $code is a better name?

Either way, let's make variable names consistent. For example:

- Use $function for building up code for a function.
- Use $code for building up code that is part of any function.

WDYT?

[kojih, 2013/04/16 11:00:07]

as discussed offline:
basically use $code
use $subCode if variable name will conflict

     my $ext = shift;
 
     if ($ext->{"DeliverCustomElementCallbacks"}) {
         if ($ext->{"Reflect"}) {
             die "IDL error: [Reflect] and [DeliverCustomElementCallbacks] cannot coexist yet";
         }
 
         AddToImplIncludes("CustomElementRegistry.h", "CUSTOM_ELEMENTS");
-        push(@$out, <<END);
+        $out .= <<END;
 #if ENABLE(CUSTOM_ELEMENTS)
     CustomElementRegistry::CallbackDeliveryScope deliveryScope;
 #endif
 END
     }
+    return $out;
 }
 
 sub GenerateNormalAttrSetterCallback
 {
     my $attribute = shift;
     my $interface = shift;
     my $forMainWorldSuffix = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
     my $attrExt = $attribute->signature->extendedAttributes;
     my $attrName = $attribute->signature->name;
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
 
-    push(@implContentInternals, "static void ${attrName}AttrSetterCallback${forMainWorldSuffix}(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n");
-    push(@implContentInternals, "{\n");
-    push(@implContentInternals, GenerateFeatureObservation($attrExt->{"MeasureAs"}));
+    $func .= "static void ${attrName}AttrSetterCallback${forMainWorldSuffix}(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n";
+    $func .= "{\n";
+    $func .= GenerateFeatureObservation($attrExt->{"MeasureAs"});
     if (HasCustomSetter($attrExt)) {
-        push(@implContentInternals, "    ${v8InterfaceName}::${attrName}AttrSetterCustom(name, value, info);\n");
+        $func .= "    ${v8InterfaceName}::${attrName}AttrSetterCustom(name, value, info);\n";
     } else {
-        push(@implContentInternals, "    ${interfaceName}V8Internal::${attrName}AttrSetter${forMainWorldSuffix}(name, value, info);\n");
+        $func .= "    ${interfaceName}V8Internal::${attrName}AttrSetter${forMainWorldSuffix}(name, value, info);\n";
     }
-    push(@implContentInternals, "}\n\n");
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "}\n\n";
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateNormalAttrSetter
 {
     my $attribute = shift;
     my $interface = shift;
     my $forMainWorldSuffix = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
     my $attrName = $attribute->signature->name;
     my $attrExt = $attribute->signature->extendedAttributes;
     my $attrType = $attribute->signature->type;
 
     if (HasCustomSetter($attrExt)) {
         return;
     }
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
-    push(@implContentInternals, "static void ${attrName}AttrSetter${forMainWorldSuffix}(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n");
-    push(@implContentInternals, "{\n");
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
+    $func .= "static void ${attrName}AttrSetter${forMainWorldSuffix}(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)\n";
+    $func .= "{\n";
 
     # If the "StrictTypeChecking" extended attribute is present, and the attribute's type is an
     # interface type, then if the incoming value does not implement that interface, a TypeError is
     # thrown rather than silently passing NULL to the C++ code.
     # Per the Web IDL and ECMAScript specifications, incoming values can always be converted to both
     # strings and numbers, so do not throw TypeError if the attribute is of these types.
     if ($attribute->signature->extendedAttributes->{"StrictTypeChecking"}) {
         my $argType = $attribute->signature->type;
         if (IsWrapperType($argType)) {
-            push(@implContentInternals, "    if (!isUndefinedOrNull(value) && !V8${argType}::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate()))) {\n");
-            push(@implContentInternals, "        throwTypeError(0, info.GetIsolate());\n");
-            push(@implContentInternals, "        return;\n");
-            push(@implContentInternals, "    }\n");
+            $func .= "    if (!isUndefinedOrNull(value) && !V8${argType}::HasInstance(value, info.GetIsolate(), worldType(info.GetIsolate()))) {\n";
+            $func .= "        throwTypeError(0, info.GetIsolate());\n";
+            $func .= "        return;\n";
+            $func .= "    }\n";
         }
     }
 
     my $svgNativeType = $codeGenerator->GetSVGTypeNeedingTearOff($interfaceName);
     if ($svgNativeType) {
         my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($interfaceName);
         if ($svgWrappedNativeType =~ /List$/) {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     $svgNativeType* imp = ${v8InterfaceName}::toNative(info.Holder());
 END
         } else {
             AddToImplIncludes("ExceptionCode.h");
-            push(@implContentInternals, "    $svgNativeType* wrapper = ${v8InterfaceName}::toNative(info.Holder());\n");
-            push(@implContentInternals, "    if (wrapper->isReadOnly()) {\n");
-            push(@implContentInternals, "        setDOMException(NO_MODIFICATION_ALLOWED_ERR, info.GetIsolate());\n");
-            push(@implContentInternals, "        return;\n");
-            push(@implContentInternals, "    }\n");
-            push(@implContentInternals, "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n");
-            push(@implContentInternals, "    $svgWrappedNativeType* imp = &impInstance;\n");
+            $func .= "    $svgNativeType* wrapper = ${v8InterfaceName}::toNative(info.Holder());\n";
+            $func .= "    if (wrapper->isReadOnly()) {\n";
+            $func .= "        setDOMException(NO_MODIFICATION_ALLOWED_ERR, info.GetIsolate());\n";
+            $func .= "        return;\n";
+            $func .= "    }\n";
+            $func .= "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n";
+            $func .= "    $svgWrappedNativeType* imp = &impInstance;\n";
         }
     } elsif ($attrExt->{"OnProto"}) {
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(info.Holder());
 END
     } else {
         my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
         if ($reflect && $codeGenerator->InheritsInterface($interface, "Node") && $codeGenerator->IsStringType($attrType)) {
             # Generate super-compact call for regular attribute setter:
             my $contentAttributeName = $reflect eq "VALUE_IS_MISSING" ? lc $attrName : $reflect;
             my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
             AddToImplIncludes("${namespace}.h");
-            push(@implContentInternals, "    Element* imp = V8Element::toNative(info.Holder());\n");
-            push(@implContentInternals, "    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, value);\n");
-            push(@implContentInternals, "    imp->setAttribute(${namespace}::${contentAttributeName}Attr, stringResource);\n");
-            push(@implContentInternals, "}\n\n");
-            push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+            $func .= "    Element* imp = V8Element::toNative(info.Holder());\n";
+            $func .= "    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, value);\n";
+            $func .= "    imp->setAttribute(${namespace}::${contentAttributeName}Attr, stringResource);\n";
+            $func .= "}\n\n";
+            $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+            AddToImplFunctionInternal($func);
             return;
             # Skip the rest of the function!
         }
 
         if (!$attribute->isStatic) {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(info.Holder());
 END
         }
     }
 
     my $nativeType = GetNativeTypeFromSignature($attribute->signature, 0);
     if ($attribute->signature->type eq "EventListener") {
         if ($interface->name eq "DOMWindow") {
-            push(@implContentInternals, "    if (!imp->document())\n");
-            push(@implContentInternals, "        return;\n");
+            $func .= "    if (!imp->document())\n";
+            $func .= "        return;\n";
         }
     } else {
         my $value = JSValueToNative($attribute->signature, "value", "info.GetIsolate()");
         my $arrayType = $codeGenerator->GetArrayType($nativeType);
 
         if ($nativeType =~ /^V8StringResource/) {
-            push(@implContentInternals, "    " . ConvertToV8StringResource($attribute->signature, $nativeType, "v", $value, "VOID") . "\n");
+            $func .= "    " . ConvertToV8StringResource($attribute->signature, $nativeType, "v", $value, "VOID") . "\n";
         } elsif ($arrayType) {
-            push(@implContentInternals, "    Vector<$arrayType> v = $value;\n");
+            $func .= "    Vector<$arrayType> v = $value;\n";
         } elsif ($attribute->signature->extendedAttributes->{"EnforceRange"}) {
-            push(@implContentInternals, "    V8TRYCATCH_WITH_TYPECHECK_VOID($nativeType, v, $value, info.GetIsolate());\n");
+            $func .= "    V8TRYCATCH_WITH_TYPECHECK_VOID($nativeType, v, $value, info.GetIsolate());\n";
         } else {
-            push(@implContentInternals, "    V8TRYCATCH_VOID($nativeType, v, $value);\n");
+            $func .= "    V8TRYCATCH_VOID($nativeType, v, $value);\n";
         }
     }
 
     if ($codeGenerator->IsEnumType($attrType)) {
         # setter ignores invalid enumeration values
         my @enumValues = $codeGenerator->ValidEnumValues($attrType);
         my @validEqualities = ();
         foreach my $enumValue (@enumValues) {
             push(@validEqualities, "string == \"$enumValue\"");
         }
         my $enumValidationExpression = join(" || ", @validEqualities);
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     String string = v;
     if (!($enumValidationExpression))
         return;
 END
     }
 
     my $result = "v";
     my $returnType = $attribute->signature->type;
     if ($codeGenerator->IsRefPtrType($returnType) && !$codeGenerator->GetArrayType($returnType)) {
         $result = "WTF::getPtr(" . $result . ")";
     }
 
-    GenerateCustomElementInvocationScopeIfNeeded(\@implContentInternals, $attribute->signature->extendedAttributes);
+    $func .= GenerateCustomElementInvocationScopeIfNeeded($attribute->signature->extendedAttributes);
 
     my $useExceptions = 1 if $attribute->signature->extendedAttributes->{"SetterRaisesException"};
 
     if ($useExceptions) {
         AddToImplIncludes("ExceptionCode.h");
-        push(@implContentInternals, "    ExceptionCode ec = 0;\n");
+        $func .= "    ExceptionCode ec = 0;\n";
     }
 
     if ($interfaceName eq "SVGNumber") {
-        push(@implContentInternals, "    *imp = $result;\n");
+        $func .= "    *imp = $result;\n";
     } else {
         if ($attribute->signature->type eq "EventListener") {
             my $implSetterFunctionName = $codeGenerator->WK_ucfirst($attrName);
             AddToImplIncludes("V8AbstractEventListener.h");
             if (!$codeGenerator->InheritsInterface($interface, "Node")) {
-                push(@implContentInternals, "    transferHiddenDependency(info.Holder(), imp->$attrName(), value, ${v8InterfaceName}::eventListenerCacheIndex, info.GetIsolate());\n");
+                $func .= "    transferHiddenDependency(info.Holder(), imp->$attrName(), value, ${v8InterfaceName}::eventListenerCacheIndex, info.GetIsolate());\n";
             }
             AddToImplIncludes("V8EventListenerList.h");
             if ($interfaceName eq "WorkerContext" and $attribute->signature->name eq "onerror") {
                 AddToImplIncludes("V8WorkerContextErrorHandler.h");
-                push(@implContentInternals, "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8WorkerContextErrorHandler>(value, true)");
+                $func .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8WorkerContextErrorHandler>(value, true)";
             } elsif ($interfaceName eq "DOMWindow" and $attribute->signature->name eq "onerror") {
                 AddToImplIncludes("V8WindowErrorHandler.h");
-                push(@implContentInternals, "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8WindowErrorHandler>(value, true)");
+                $func .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8WindowErrorHandler>(value, true)";
             } else {
-                push(@implContentInternals, "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(value, true, ListenerFindOrCreate)");
+                $func .= "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(value, true, ListenerFindOrCreate)";
             }
-            push(@implContentInternals, ", ec") if $useExceptions;
-            push(@implContentInternals, ");\n");
+            $func .= ", ec" if $useExceptions;
+            $func .= ");\n";
         } else {
             my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
             push(@arguments, $result);
             push(@arguments, "ec") if $useExceptions;
             if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
                 my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
                 AddToImplIncludes("${implementedBy}.h");
                 unshift(@arguments, "imp") if !$attribute->isStatic;
                 $functionName = "${implementedBy}::${functionName}";
             } elsif ($attribute->isStatic) {
                 $functionName = "${interfaceName}::${functionName}";
             } else {
                 $functionName = "imp->${functionName}";
             }
-            unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentInternals, "    ", 1));
-            push(@implContentInternals, "    ${functionName}(" . join(", ", @arguments) . ");\n");
+            my ($arg, $code) = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, "    ", 1);
+            $func .= $code;
+            unshift(@arguments, @$arg);
+            $func .= "    ${functionName}(" . join(", ", @arguments) . ");\n";
         }
     }
 
     if ($useExceptions) {
-        push(@implContentInternals, "    if (UNLIKELY(ec))\n");
-        push(@implContentInternals, "        setDOMException(ec, info.GetIsolate());\n");
+        $func .= "    if (UNLIKELY(ec))\n";
+        $func .= "        setDOMException(ec, info.GetIsolate());\n";
     }
 
     if ($codeGenerator->ExtendedAttributeContains($attribute->signature->extendedAttributes->{"CallWith"}, "ScriptState")) {
-        push(@implContentInternals, "    if (state.hadException())\n");
-        push(@implContentInternals, "        throwError(state.exception(), info.GetIsolate());\n");
+        $func .= "    if (state.hadException())\n";
+        $func .= "        throwError(state.exception(), info.GetIsolate());\n";
     }
 
     if ($svgNativeType) {
         if ($useExceptions) {
-            push(@implContentInternals, "    if (!ec)\n");
-            push(@implContentInternals, "        wrapper->commitChange();\n");
+            $func .= "    if (!ec)\n";
+            $func .= "        wrapper->commitChange();\n";
         } else {
-            push(@implContentInternals, "    wrapper->commitChange();\n");
+            $func .= "    wrapper->commitChange();\n";
         }
     }
 
     if ($attribute->signature->type eq "SerializedScriptValue" && $attribute->signature->extendedAttributes->{"CachedAttribute"}) {
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     info.Holder()->DeleteHiddenValue(v8::String::NewSymbol("${attrName}")); // Invalidate the cached value.
 END
     }
 
-    push(@implContentInternals, "    return;\n");
-    push(@implContentInternals, "}\n\n");  # end of setter
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "    return;\n";
+    $func .= "}\n\n";  # end of setter
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateParametersCheckExpression
 {
     my $numParameters = shift;
     my $function = shift;
 
     my @andExpression = ();
     push(@andExpression, "args.Length() == $numParameters");
     my $parameterIndex = 0;
@@ skipping 70 matching lines @@
     # Generate code for choosing the correct overload to call. Overloads are
     # chosen based on the total number of arguments passed and the type of
     # values passed in non-primitive argument slots. When more than a single
     # overload is applicable, precedence is given according to the order of
     # declaration in the IDL.
 
     my $name = $function->signature->name;
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
     my $leastNumMandatoryParams = 255;
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
-    push(@implContentInternals, <<END);
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
+    $func .= <<END;
 static v8::Handle<v8::Value> ${name}Method${forMainWorldSuffix}(const v8::Arguments& args)
 {
 END
-    push(@implContentInternals, GenerateFeatureObservation($function->signature->extendedAttributes->{"MeasureAs"}));
+    $func .= GenerateFeatureObservation($function->signature->extendedAttributes->{"MeasureAs"});
 
     foreach my $overload (@{$function->{overloads}}) {
         my ($numMandatoryParams, $parametersCheck) = GenerateFunctionParametersCheck($overload);
         $leastNumMandatoryParams = $numMandatoryParams if ($numMandatoryParams < $leastNumMandatoryParams);
-        push(@implContentInternals, "    if ($parametersCheck)\n");
+        $func .= "    if ($parametersCheck)\n";
         my $overloadedIndexString = $overload->{overloadIndex};
-        push(@implContentInternals, "        return ${name}${overloadedIndexString}Method${forMainWorldSuffix}(args);\n");
+        $func .= "        return ${name}${overloadedIndexString}Method${forMainWorldSuffix}(args);\n";
     }
     if ($leastNumMandatoryParams >= 1) {
-        push(@implContentInternals, "    if (args.Length() < $leastNumMandatoryParams)\n");
-        push(@implContentInternals, "        return throwNotEnoughArgumentsError(args.GetIsolate());\n");
+        $func .= "    if (args.Length() < $leastNumMandatoryParams)\n";
+        $func .= "        return throwNotEnoughArgumentsError(args.GetIsolate());\n";
     }
-    push(@implContentInternals, <<END);
+    $func .= <<END;
     return throwTypeError(0, args.GetIsolate());
 END
-    push(@implContentInternals, "}\n\n");
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "}\n\n";
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateFunctionCallback
 {
     my $function = shift;
     my $interface = shift;
     my $forMainWorldSuffix = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
     my $name = $function->signature->name;
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
-    push(@implContentInternals, <<END);
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
+    $func .= <<END;
 static v8::Handle<v8::Value> ${name}MethodCallback${forMainWorldSuffix}(const v8::Arguments& args)
 {
 END
-    push(@implContentInternals, GenerateFeatureObservation($function->signature->extendedAttributes->{"MeasureAs"}));
+    $func .= GenerateFeatureObservation($function->signature->extendedAttributes->{"MeasureAs"});
     if (HasCustomMethod($function->signature->extendedAttributes)) {
-        push(@implContentInternals, "    return ${v8InterfaceName}::${name}MethodCustom(args);\n");
+        $func .= "    return ${v8InterfaceName}::${name}MethodCustom(args);\n";
     } else {
-        push(@implContentInternals, "    return ${interfaceName}V8Internal::${name}Method${forMainWorldSuffix}(args);\n");
+        $func .= "    return ${interfaceName}V8Internal::${name}Method${forMainWorldSuffix}(args);\n";
     }
-    push(@implContentInternals, "}\n\n");
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "}\n\n";
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateFunction
 {
     my $function = shift;
     my $interface = shift;
     my $forMainWorldSuffix = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
     my $name = $function->signature->name;
     my $funcExt = $function->signature->extendedAttributes;
 
     if (HasCustomMethod($funcExt)) {
         return;
     }
 
     if (@{$function->{overloads}} > 1) {
         # Append a number to an overloaded method's name to make it unique:
         $name = $name . $function->{overloadIndex};
     }
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
-    push(@implContentInternals, "#if ${conditionalString}\n\n") if $conditionalString;
-    push(@implContentInternals, "static v8::Handle<v8::Value> ${name}Method${forMainWorldSuffix}(const v8::Arguments& args)\n");
-    push(@implContentInternals, "{\n");
+    my $func = "";
+    $func .= "#if ${conditionalString}\n\n" if $conditionalString;
+    $func .= "static v8::Handle<v8::Value> ${name}Method${forMainWorldSuffix}(const v8::Arguments& args)\n";
+    $func .= "{\n";
 
     if ($name eq "addEventListener" || $name eq "removeEventListener") {
         my $lookupType = ($name eq "addEventListener") ? "OrCreate" : "Only";
         my $passRefPtrHandling = ($name eq "addEventListener") ? "" : ".get()";
         my $hiddenDependencyAction = ($name eq "addEventListener") ? "create" : "remove";
 
         AddToImplIncludes("V8EventListenerList.h");
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFind${lookupType});
     if (listener) {
         V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<WithNullCheck>, stringResource, args[0]);
         V8${interfaceName}::toNative(args.Holder())->${name}(stringResource, listener${passRefPtrHandling}, args[2]->BooleanValue());
 END
         if (!$codeGenerator->InheritsInterface($interface, "Node")) {
-            push(@implContentInternals, <<END);
+            $func .= <<END;
         ${hiddenDependencyAction}HiddenDependency(args.Holder(), args[1], V8${interfaceName}::eventListenerCacheIndex, args.GetIsolate());
 END
         }
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     }
     return v8Undefined();
 }
 
 END
-        push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+        $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+        AddToImplFunctionInternal($func);
         return;
     }
 
-    push(@implContentInternals, GenerateArgumentsCountCheck($function, $interface));
+    $func .= GenerateArgumentsCountCheck($function, $interface);
 
     if ($name eq "set" and $interface->extendedAttributes->{"TypedArray"}) {
         AddToImplIncludes("V8ArrayBufferViewCustom.h");
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     return setWebGLArrayHelper<$interfaceName, ${v8InterfaceName}>(args);
 }
 
 END
+        AddToImplFunctionInternal($func);
         return;
     }
 
     my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
 
     if ($svgNativeType) {
         my $nativeClassName = GetNativeType($interfaceName); 
         if ($interfaceName =~ /List$/) {
-            push(@implContentInternals, "    $nativeClassName imp = ${v8InterfaceName}::toNative(args.Holder());\n");
+            $func .= "    $nativeClassName imp = ${v8InterfaceName}::toNative(args.Holder());\n";
         } else {
             AddToImplIncludes("ExceptionCode.h");
-            push(@implContentInternals, "    $nativeClassName wrapper = ${v8InterfaceName}::toNative(args.Holder());\n");
-            push(@implContentInternals, "    if (wrapper->isReadOnly())\n");
-            push(@implContentInternals, "        return setDOMException(NO_MODIFICATION_ALLOWED_ERR, args.GetIsolate());\n");
+            $func .= "    $nativeClassName wrapper = ${v8InterfaceName}::toNative(args.Holder());\n";
+            $func .= "    if (wrapper->isReadOnly())\n";
+            $func .= "        return setDOMException(NO_MODIFICATION_ALLOWED_ERR, args.GetIsolate());\n";
             my $svgWrappedNativeType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($interfaceName);
-            push(@implContentInternals, "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n");
-            push(@implContentInternals, "    $svgWrappedNativeType* imp = &impInstance;\n");
+            $func .= "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n";
+            $func .= "    $svgWrappedNativeType* imp = &impInstance;\n";
         }
     } elsif (!$function->isStatic) {
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     ${interfaceName}* imp = ${v8InterfaceName}::toNative(args.Holder());
 END
     }
 
-    GenerateCustomElementInvocationScopeIfNeeded(\@implContentInternals, $funcExt);
+    $func .= GenerateCustomElementInvocationScopeIfNeeded($funcExt);
 
     # Check domain security if needed
     if ($interface->extendedAttributes->{"CheckSecurity"} && !$function->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
         # We have not find real use cases yet.
         AddToImplIncludes("Frame.h");
-        push(@implContentInternals, <<END);
+        $func .= <<END;
     if (!BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame()))
         return v8Undefined();
 END
     }
 
     my $raisesExceptions = $function->signature->extendedAttributes->{"RaisesException"};
     if (!$raisesExceptions) {
         foreach my $parameter (@{$function->parameters}) {
             if ((!$parameter->extendedAttributes->{"Callback"} and TypeCanFailConversion($parameter)) or $parameter->extendedAttributes->{"IsIndex"}) {
                 $raisesExceptions = 1;
             }
         }
     }
 
     if ($raisesExceptions) {
         AddToImplIncludes("ExceptionCode.h");
-        push(@implContentInternals, "    ExceptionCode ec = 0;\n");
-        push(@implContentInternals, "    {\n");
+        $func .= "    ExceptionCode ec = 0;\n";
+        $func .= "    {\n";
         # The brace here is needed to prevent the ensuing 'goto fail's from jumping past constructors
         # of objects (like Strings) declared later, causing compile errors. The block scope ends
         # right before the label 'fail:'.
     }
 
     if ($function->signature->extendedAttributes->{"CheckSecurityForNode"}) {
-        push(@implContentInternals, "    if (!BindingSecurity::shouldAllowAccessToNode(BindingState::instance(), imp->" . $function->signature->name . "(ec)))\n");
-        push(@implContentInternals, "        return v8::Handle<v8::Value>(v8Null(args.GetIsolate()));\n");
+        $func .= "    if (!BindingSecurity::shouldAllowAccessToNode(BindingState::instance(), imp->" . $function->signature->name . "(ec)))\n";
+        $func .= "        return v8::Handle<v8::Value>(v8Null(args.GetIsolate()));\n";
 END
     }
 
     my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interfaceName, $forMainWorldSuffix);
-    push(@implContentInternals, $parameterCheckString);
+    $func .= $parameterCheckString;
 
     # Build the function call string.
-    push(@implContentInternals, GenerateFunctionCallString($function, $paramIndex, "    ", $interfaceName, $forMainWorldSuffix, %replacements));
+    $func .= GenerateFunctionCallString($function, $paramIndex, "    ", $interfaceName, $forMainWorldSuffix, %replacements);
 
     if ($raisesExceptions) {
-        push(@implContentInternals, "    }\n");
-        push(@implContentInternals, "    fail:\n");
-        push(@implContentInternals, "    return setDOMException(ec, args.GetIsolate());\n");
+        $func .= "    }\n";
+        $func .= "    fail:\n";
+        $func .= "    return setDOMException(ec, args.GetIsolate());\n";
     }
 
-    push(@implContentInternals, "}\n\n");
-    push(@implContentInternals, "#endif // ${conditionalString}\n\n") if $conditionalString;
+    $func .= "}\n\n";
+    $func .= "#endif // ${conditionalString}\n\n" if $conditionalString;
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateCallWith
 {
     my $callWith = shift;
-    return () unless $callWith;
-    my $outputArray = shift;
+    return ([], "") unless $callWith;
     my $indent = shift;
     my $returnVoid = shift;
     my $function = shift;
+    my $code = "";
 
     my @callWithArgs;
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptState")) {
-        push(@$outputArray, $indent . "ScriptState* currentState = ScriptState::current();\n");
-        push(@$outputArray, $indent . "if (!currentState)\n");
-        push(@$outputArray, $indent . "    return" . ($returnVoid ? "" : " v8Undefined()") . ";\n");
-        push(@$outputArray, $indent . "ScriptState& state = *currentState;\n");
+        $code .= $indent . "ScriptState* currentState = ScriptState::current();\n";
+        $code .= $indent . "if (!currentState)\n";
+        $code .= $indent . "    return" . ($returnVoid ? "" : " v8Undefined()") . ";\n";
+        $code .= $indent . "ScriptState& state = *currentState;\n";
         push(@callWithArgs, "&state");
     }
     if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptExecutionContext")) {
-        push(@$outputArray, $indent . "ScriptExecutionContext* scriptContext = getScriptExecutionContext();\n");
+        $code .= $indent . "ScriptExecutionContext* scriptContext = getScriptExecutionContext();\n";
         push(@callWithArgs, "scriptContext");
     }
     if ($function and $codeGenerator->ExtendedAttributeContains($callWith, "ScriptArguments")) {
-        push(@$outputArray, $indent . "RefPtr<ScriptArguments> scriptArguments(createScriptArguments(args, " . @{$function->parameters} . "));\n");
+        $code .= $indent . "RefPtr<ScriptArguments> scriptArguments(createScriptArguments(args, " . @{$function->parameters} . "));\n";
         push(@callWithArgs, "scriptArguments.release()");
         AddToImplIncludes("ScriptArguments.h");
         AddToImplIncludes("ScriptCallStackFactory.h");
     }
-    return @callWithArgs;
+    return ([@callWithArgs], $code);
 }
 
 sub GenerateArgumentsCountCheck
 {
     my $function = shift;
     my $interface = shift;
 
     my $numMandatoryParams = 0;
     my $allowNonOptional = 1;
     foreach my $param (@{$function->parameters}) {
@@ skipping 201 matching lines @@
         $paramIndex++;
     }
     return ($parameterCheckString, $paramIndex, %replacements);
 }
 
 sub GenerateOverloadedConstructorCallback
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
-    push(@implContentInternals, <<END);
+    my $func = "";
+    $func .= <<END;
 static v8::Handle<v8::Value> constructor(const v8::Arguments& args)
 {
 END
     my $leastNumMandatoryParams = 255;
     foreach my $constructor (@{$interface->constructors}) {
         my $name = "constructor" . $constructor->{overloadedIndex};
         my ($numMandatoryParams, $parametersCheck) = GenerateFunctionParametersCheck($constructor);
         $leastNumMandatoryParams = $numMandatoryParams if ($numMandatoryParams < $leastNumMandatoryParams);
-        push(@implContentInternals, "    if ($parametersCheck)\n");
-        push(@implContentInternals, "        return ${interfaceName}V8Internal::${name}(args);\n");
+        $func .= "    if ($parametersCheck)\n";
+        $func .= "        return ${interfaceName}V8Internal::${name}(args);\n";
     }
     if ($leastNumMandatoryParams >= 1) {
-        push(@implContentInternals, "    if (args.Length() < $leastNumMandatoryParams)\n");
-        push(@implContentInternals, "        return throwNotEnoughArgumentsError(args.GetIsolate());\n");
+        $func .= "    if (args.Length() < $leastNumMandatoryParams)\n";
+        $func .= "        return throwNotEnoughArgumentsError(args.GetIsolate());\n";
     }
-    push(@implContentInternals, <<END);
+    $func .= <<END;
     return throwTypeError(0, args.GetIsolate());
 END
-    push(@implContentInternals, "}\n\n");
+    $func .= "}\n\n";
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateSingleConstructorCallback
 {
     my $interface = shift;
     my $function = shift;
 
     my $interfaceName = $interface->name;
     my $overloadedIndexString = "";
     if ($function->{overloadedIndex} > 0) {
         $overloadedIndexString .= $function->{overloadedIndex};
     }
 
     my $raisesExceptions = $function->signature->extendedAttributes->{"RaisesException"};
     if ($interface->extendedAttributes->{"RaisesException"}) {
         $raisesExceptions = 1;
     }
     if (!$raisesExceptions) {
         foreach my $parameter (@{$function->parameters}) {
             if ((!$parameter->extendedAttributes->{"Callback"} and TypeCanFailConversion($parameter)) or $parameter->extendedAttributes->{"IsIndex"}) {
                 $raisesExceptions = 1;
             }
         }
     }
 
     my @beforeArgumentList;
     my @afterArgumentList;
-    push(@implContentInternals, <<END);
+    my $func = "";
+    $func .= <<END;
 static v8::Handle<v8::Value> constructor${overloadedIndexString}(const v8::Arguments& args)
 {
 END
 
     if ($function->{overloadedIndex} == 0) {
-        push(@implContentInternals, GenerateArgumentsCountCheck($function, $interface));
+        $func .= GenerateArgumentsCountCheck($function, $interface);
     }
 
     if ($raisesExceptions) {
         AddToImplIncludes("ExceptionCode.h");
-        push(@implContentInternals, "\n");
-        push(@implContentInternals, "    ExceptionCode ec = 0;\n");
+        $func .= "\n";
+        $func .= "    ExceptionCode ec = 0;\n";
     }
 
     # FIXME: Currently [Constructor(...)] does not yet support optional arguments without [Default=...]
     my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interfaceName, "");
-    push(@implContentInternals, $parameterCheckString);
+    $func .= $parameterCheckString;
 
     if ($interface->extendedAttributes->{"CallWith"} && $interface->extendedAttributes->{"CallWith"} eq "ScriptExecutionContext") {
         push(@beforeArgumentList, "context");
-        push(@implContentInternals, <<END);
+        $func .= <<END;
 
     ScriptExecutionContext* context = getScriptExecutionContext();
 END
     }
 
     if ($interface->extendedAttributes->{"RaisesException"}) {
         push(@afterArgumentList, "ec");
     }
 
     my @argumentList;
     my $index = 0;
     foreach my $parameter (@{$function->parameters}) {
         last if $index eq $paramIndex;
         if ($replacements{$parameter->name}) {
             push(@argumentList, $replacements{$parameter->name});
         } else {
             push(@argumentList, $parameter->name);
         }
         $index++;
     }
 
     my $argumentString = join(", ", @beforeArgumentList, @argumentList, @afterArgumentList);
-    push(@implContentInternals, "\n");
-    push(@implContentInternals, "    RefPtr<${interfaceName}> impl = ${interfaceName}::create(${argumentString});\n");
-    push(@implContentInternals, "    v8::Handle<v8::Object> wrapper = args.Holder();\n");
+    $func .= "\n";
+    $func .= "    RefPtr<${interfaceName}> impl = ${interfaceName}::create(${argumentString});\n";
+    $func .= "    v8::Handle<v8::Object> wrapper = args.Holder();\n";
 
     if ($interface->extendedAttributes->{"RaisesException"}) {
-        push(@implContentInternals, "    if (ec)\n");
-        push(@implContentInternals, "        goto fail;\n");
+        $func .= "    if (ec)\n";
+        $func .= "        goto fail;\n";
     }
 
-    push(@implContentInternals, <<END);
+    $func .= <<END;
 
     V8DOMWrapper::associateObjectWithWrapper(impl.release(), &V8${interfaceName}::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
     return wrapper;
 END
 
     if ($raisesExceptions) {
-        push(@implContentInternals, "    fail:\n");
-        push(@implContentInternals, "    return setDOMException(ec, args.GetIsolate());\n");
+        $func .= "    fail:\n";
+        $func .= "    return setDOMException(ec, args.GetIsolate());\n";
     }
 
-    push(@implContentInternals, "}\n");
-    push(@implContentInternals, "\n");
+    $func .= "}\n";
+    $func .= "\n";
+    AddToImplFunctionInternal($func);
 }
 
 sub GenerateConstructorCallback
 {
     my $interface = shift;
 
     my $interfaceName = $interface->name;
-    push(@implContent, "v8::Handle<v8::Value> V8${interfaceName}::constructorCallback(const v8::Arguments& args)\n");
-    push(@implContent, "{\n");
-    push(@implContent, GenerateFeatureObservation($interface->extendedAttributes->{"MeasureAs"}));
-    push(@implContent, GenerateConstructorHeader());
+    my $func = "";
+    $func .= "v8::Handle<v8::Value> V8${interfaceName}::constructorCallback(const v8::Arguments& args)\n";
+    $func .= "{\n";
+    $func .= GenerateFeatureObservation($interface->extendedAttributes->{"MeasureAs"});
+    $func .= GenerateConstructorHeader();
     if (HasCustomConstructor($interface)) {
-        push(@implContent, "    return V8${interfaceName}::constructorCustom(args);\n");
+        $func .= "    return V8${interfaceName}::constructorCustom(args);\n";
     } else {
-        push(@implContent, "    return ${interfaceName}V8Internal::constructor(args);\n");
+        $func .= "    return ${interfaceName}V8Internal::constructor(args);\n";
     }
-    push(@implContent, "}\n\n");
+    $func .= "}\n\n";
+    AddToImplFunction($func);
 }
 
 sub GenerateConstructor
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
     if (@{$interface->constructors} == 1) {
         GenerateSingleConstructorCallback($interface, @{$interface->constructors}[0]);
     } else {
         foreach my $constructor (@{$interface->constructors}) {
             GenerateSingleConstructorCallback($interface, $constructor);
         }
         GenerateOverloadedConstructorCallback($interface);
     }
 }
 
 sub GenerateEventConstructor
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
 
     AddToImplIncludes("Dictionary.h");
-    push(@implContentInternals, <<END);
+    AddToImplFunctionInternal(<<END);
 static v8::Handle<v8::Value> constructor(const v8::Arguments& args)
 {
-END
-    push(@implContentInternals, <<END);
     if (args.Length() < 1)
         return throwNotEnoughArgumentsError(args.GetIsolate());
 
     V8TRYCATCH_FOR_V8STRINGRESOURCE(V8StringResource<>, type, args[0]);
     ${interfaceName}Init eventInit;
     if (args.Length() >= 2) {
         V8TRYCATCH(Dictionary, options, Dictionary(args[1], args.GetIsolate()));
         if (!fill${interfaceName}Init(eventInit, options))
             return v8Undefined();
     }
 
     RefPtr<${interfaceName}> event = ${interfaceName}::create(type, eventInit);
 
     v8::Handle<v8::Object> wrapper = args.Holder();
     V8DOMWrapper::associateObjectWithWrapper(event.release(), &V8${interfaceName}::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
     return wrapper;
 }
 END
 
-    push(@implContent, <<END);
+    my $func = "";
+    $func .= <<END;
 bool fill${interfaceName}Init(${interfaceName}Init& eventInit, const Dictionary& options)
 {
 END
 
     foreach my $interfaceBase (@{$interface->parents}) {
-        push(@implContent, <<END);
+        $func .= <<END;
     if (!fill${interfaceBase}Init(eventInit, options))
         return false;
 
 END
     }
 
     for (my $index = 0; $index < @{$interface->attributes}; $index++) {
         my $attribute = @{$interface->attributes}[$index];
         if ($attribute->signature->extendedAttributes->{"InitializedByEventConstructor"}) {
             my $attributeName = $attribute->signature->name;
-            push(@implContent, "    options.get(\"$attributeName\", eventInit.$attributeName);\n");
+            $func .= "    options.get(\"$attributeName\", eventInit.$attributeName);\n";
         }
     }
 
-    push(@implContent, <<END);
+    $func .= <<END;
     return true;
 }
 
 END
+    AddToImplFunction($func);
 }
 
 sub GenerateTypedArrayConstructor
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
     my $viewType = GetTypeNameOfExternalTypedArray($interface);
     my $type = $interface->extendedAttributes->{"TypedArray"};
     AddToImplIncludes("V8ArrayBufferViewCustom.h");
 
-    push(@implContentInternals, <<END);
+    AddToImplFunctionInternal(<<END);
 static v8::Handle<v8::Value> constructor(const v8::Arguments& args)
 {
     return constructWebGLArray<$interfaceName, V8${interfaceName}, $type>(args, &V8${interfaceName}::info, $viewType);
 }
 
 END
 }
 
 sub GenerateNamedConstructor
 {
@@ skipping 23 matching lines @@
     if ($codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject")) {
         $toActiveDOMObject = "${v8InterfaceName}::toActiveDOMObject";
     }
 
     my $toEventTarget = "0";
     if ($codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
         $toEventTarget = "${v8InterfaceName}::toEventTarget";
     }
 
     AddToImplIncludes("Frame.h");
-    push(@implContent, <<END);
+    AddToImplStuff(<<END);
 WrapperTypeInfo ${v8InterfaceName}Constructor::info = { ${v8InterfaceName}Constructor::GetTemplate, ${v8InterfaceName}::derefObject, $toActiveDOMObject, $toEventTarget, 0, ${v8InterfaceName}::installPerContextPrototypeProperties, 0, WrapperTypeObjectPrototype };
 
+END
+
+    my $func = "";
+    $func .= <<END;
 static v8::Handle<v8::Value> ${v8InterfaceName}ConstructorCallback(const v8::Arguments& args)
 {
     ${maybeObserveFeature}
 END
-    push(@implContent, GenerateConstructorHeader());
+    $func .= GenerateConstructorHeader();
     AddToImplIncludes("V8Document.h");
-    push(@implContent, <<END);
+    $func .= <<END;
     Document* document = currentDocument(BindingState::instance());
 
     // Make sure the document is added to the DOM Node map. Otherwise, the ${interfaceName} instance
     // may end up being the only node in the map and get garbage-collected prematurely.
     toV8(document, args.Holder(), args.GetIsolate());
 
 END
 
-    push(@implContent, GenerateArgumentsCountCheck($function, $interface));
+    $func .= GenerateArgumentsCountCheck($function, $interface);
 
     if ($raisesExceptions) {
         AddToImplIncludes("ExceptionCode.h");
-        push(@implContent, "\n");
-        push(@implContent, "    ExceptionCode ec = 0;\n");
+        $func .= "\n";
+        $func .= "    ExceptionCode ec = 0;\n";
     }
 
     my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interfaceName);
-    push(@implContent, $parameterCheckString);
+    $func .= $parameterCheckString;
 
     push(@beforeArgumentList, "document");
 
     if ($interface->extendedAttributes->{"RaisesException"}) {
         push(@afterArgumentList, "ec");
     }
 
     my @argumentList;
     my $index = 0;
     foreach my $parameter (@{$function->parameters}) {
         last if $index eq $paramIndex;
         if ($replacements{$parameter->name}) {
             push(@argumentList, $replacements{$parameter->name});
         } else {
             push(@argumentList, $parameter->name);
         }
         $index++;
     }
 
     my $argumentString = join(", ", @beforeArgumentList, @argumentList, @afterArgumentList);
-    push(@implContent, "\n");
-    push(@implContent, "    RefPtr<${interfaceName}> impl = ${interfaceName}::createForJSConstructor(${argumentString});\n");
-    push(@implContent, "    v8::Handle<v8::Object> wrapper = args.Holder();\n");
+    $func .= "\n";
+    $func .= "    RefPtr<${interfaceName}> impl = ${interfaceName}::createForJSConstructor(${argumentString});\n";
+    $func .= "    v8::Handle<v8::Object> wrapper = args.Holder();\n";
 
     if ($interface->extendedAttributes->{"RaisesException"}) {
-        push(@implContent, "    if (ec)\n");
-        push(@implContent, "        goto fail;\n");
+        $func .= "    if (ec)\n";
+        $func .= "        goto fail;\n";
     }
 
-    push(@implContent, <<END);
+    $func .= <<END;
 
     V8DOMWrapper::associateObjectWithWrapper(impl.release(), &${v8InterfaceName}Constructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
     return wrapper;
 END
 
     if ($raisesExceptions) {
-        push(@implContent, "    fail:\n");
-        push(@implContent, "    return setDOMException(ec, args.GetIsolate());\n");
+        $func .= "    fail:\n";
+        $func .= "    return setDOMException(ec, args.GetIsolate());\n";
     }
 
-    push(@implContent, "}\n");
+    $func .= "}\n";
+    AddToImplFunction($func);
 
-    push(@implContent, <<END);
+    $func = <<END;
 
 v8::Persistent<v8::FunctionTemplate> ${v8InterfaceName}Constructor::GetTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     static v8::Persistent<v8::FunctionTemplate> cachedTemplate;
     if (!cachedTemplate.IsEmpty())
         return cachedTemplate;
 
     v8::HandleScope scope;
     v8::Local<v8::FunctionTemplate> result = v8::FunctionTemplate::New(${v8InterfaceName}ConstructorCallback);
 
     v8::Local<v8::ObjectTemplate> instance = result->InstanceTemplate();
     instance->SetInternalFieldCount(${v8InterfaceName}::internalFieldCount);
     result->SetClassName(v8::String::NewSymbol("${interfaceName}"));
     result->Inherit(${v8InterfaceName}::GetTemplate(isolate, currentWorldType));
 
     cachedTemplate = v8::Persistent<v8::FunctionTemplate>::New(isolate, result);
     return cachedTemplate;
 }
 
 END
+    AddToImplFunction($func);
 }
 
 sub GenerateConstructorHeader
 {
     my $content = <<END;
     if (!args.IsConstructCall())
         return throwTypeError("DOM object constructor cannot be called as a function.", args.GetIsolate());
 
     if (ConstructorMode::current() == ConstructorMode::WrapExistingObject)
         return args.Holder();
 
 END
     return $content;
 }
 
 sub GenerateBatchedAttributeData
 {
     my $interface = shift;
     my $attributes = shift;
+    my $out = "";
     my $interfaceName = $interface->name;
 
     foreach my $attribute (@$attributes) {
         my $conditionalString = $codeGenerator->GenerateConditionalString($attribute->signature);
-        push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
-        GenerateSingleBatchedAttribute($interfaceName, $attribute, ",", "");
-        push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
+        my $code = "";
+        $code .= "#if ${conditionalString}\n" if $conditionalString;
+        $code .= GenerateSingleBatchedAttribute($interfaceName, $attribute, ",", "");
+        $code .= "#endif // ${conditionalString}\n" if $conditionalString;
+        $out .= $code;
     }
+    return $out;
 }
 
 sub GenerateSingleBatchedAttribute
 {
     my $interfaceName = shift;
     my $attribute = shift;
     my $delimiter = shift;
     my $indent = shift;
+    my $out = "";
     my $attrName = $attribute->signature->name;
     my $attrExt = $attribute->signature->extendedAttributes;
 
     my $accessControl = "v8::DEFAULT";
     if ($attrExt->{"DoNotCheckSecurityOnGetter"}) {
         $accessControl = "v8::ALL_CAN_READ";
     } elsif ($attrExt->{"DoNotCheckSecurityOnSetter"}) {
         $accessControl = "v8::ALL_CAN_WRITE";
     } elsif ($attrExt->{"DoNotCheckSecurity"}) {
         $accessControl = "v8::ALL_CAN_READ";
@@ skipping 69 matching lines @@
     }
 
     if (!$attrExt->{"PerWorldBindings"}) {
       $getterForMainWorld = "0";
       $setterForMainWorld = "0";
     }
 
     my $commentInfo = "Attribute '$attrName' (Type: '" . $attribute->type .
                       "' ExtAttr: '" . join(' ', keys(%{$attrExt})) . "')";
 
-    push(@implContent, $indent . "    \/\/ $commentInfo\n");
-    push(@implContent, $indent . "    {\"$attrName\", $getter, $setter, $getterForMainWorld, $setterForMainWorld, $data, $accessControl, static_cast<v8::PropertyAttribute>($propAttr), $on_proto}" . $delimiter . "\n");
+    $out .= $indent . "    \/\/ $commentInfo\n";
+    $out .= $indent . "    {\"$attrName\", $getter, $setter, $getterForMainWorld, $setterForMainWorld, $data, $accessControl, static_cast<v8::PropertyAttribute>($propAttr), $on_proto}" . $delimiter . "\n";
+    return $out;
 }
 
 sub IsStandardFunction
 {
     my $interface = shift;
     my $function = shift;
 
     my $interfaceName = $interface->name;
     my $attrExt = $function->signature->extendedAttributes;
     return 0 if $attrExt->{"Unforgeable"};
     return 0 if $function->isStatic;
     return 0 if $attrExt->{"EnabledAtRuntime"};
     return 0 if $attrExt->{"EnabledPerContext"};
     return 0 if RequiresCustomSignature($function);
     return 0 if $attrExt->{"DoNotCheckSignature"};
     return 0 if ($attrExt->{"DoNotCheckSecurity"} && ($interface->extendedAttributes->{"CheckSecurity"} || $interfaceName eq "DOMWindow"));
     return 0 if $attrExt->{"NotEnumerable"};
     return 0 if $attrExt->{"ReadOnly"};
     return 1;
 }
 
 sub GenerateNonStandardFunction
 {
     my $interface = shift;
     my $function = shift;
+    my $out = "";
 
     my $interfaceName = $interface->name;
     my $attrExt = $function->signature->extendedAttributes;
     my $name = $function->signature->name;
 
     my $property_attributes = "v8::DontDelete";
     if ($attrExt->{"NotEnumerable"}) {
         $property_attributes .= " | v8::DontEnum";
     }
     if ($attrExt->{"ReadOnly"}) {
@@ skipping 20 matching lines @@
         # Only call Set()/SetAccessor() if this method should be enabled
         my $enable_function = GetContextEnableFunction($function->signature);
         $conditional = "if (${enable_function}(impl->document()))\n        ";
     }
 
     if ($interface->extendedAttributes->{"CheckSecurity"} && $attrExt->{"DoNotCheckSecurity"}) {
         # Functions that are marked DoNotCheckSecurity are always readable but if they are changed
         # and then accessed on a different domain we do not return the underlying value but instead
         # return a new copy of the original function. This is achieved by storing the changed value
         # as hidden property.
-        push(@implContent, <<END);
+        $out .= <<END;
 
     // $commentInfo
     ${conditional}$template->SetAccessor(v8::String::NewSymbol("$name"), ${interfaceName}V8Internal::${name}AttrGetterCallback, ${interfaceName}V8Internal::${interfaceName}DomainSafeFunctionSetter, v8Undefined(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>($property_attributes));
 END
-        return;
+        return $out;
     }
 
     my $signature = "defaultSignature";
     if ($attrExt->{"DoNotCheckSignature"} || $function->isStatic) {
        $signature = "v8::Local<v8::Signature>()";
     }
 
     if (RequiresCustomSignature($function)) {
         $signature = "${name}Signature";
-        push(@implContent, "\n    // Custom Signature '$name'\n", CreateCustomSignature($function));
+        $out .= "\n    // Custom Signature '$name'\n" . CreateCustomSignature($function);
     }
 
     if ($property_attributes eq "v8::DontDelete") {
         $property_attributes = "";
     } else {
         $property_attributes = ", static_cast<v8::PropertyAttribute>($property_attributes)";
     }
 
     if ($template eq "proto" && $conditional eq "" && $signature eq "defaultSignature" && $property_attributes eq "") {
         die "This shouldn't happen: Intraface '$interfaceName' $commentInfo\n";
     }
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
-    push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
+    $out .= "#if ${conditionalString}\n" if $conditionalString;
     if ($function->signature->extendedAttributes->{"PerWorldBindings"}) {
-        push(@implContent, "    if (currentWorldType == MainWorld) {\n");
-        push(@implContent, "        ${conditional}$template->Set(v8::String::NewSymbol(\"$name\"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallbackForMainWorld, v8Undefined(), ${signature})$property_attributes);\n");
-        push(@implContent, "    } else {\n");
-        push(@implContent, "        ${conditional}$template->Set(v8::String::NewSymbol(\"$name\"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallback, v8Undefined(), ${signature})$property_attributes);\n");
-        push(@implContent, "    }\n");
+        $out .= "    if (currentWorldType == MainWorld) {\n";
+        $out .= "        ${conditional}$template->Set(v8::String::NewSymbol(\"$name\"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallbackForMainWorld, v8Undefined(), ${signature})$property_attributes);\n";
+        $out .= "    } else {\n";
+        $out .= "        ${conditional}$template->Set(v8::String::NewSymbol(\"$name\"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallback, v8Undefined(), ${signature})$property_attributes);\n";
+        $out .= "    }\n";
     } else {
-        push(@implContent, "    ${conditional}$template->Set(v8::String::NewSymbol(\"$name\"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallback, v8Undefined(), ${signature})$property_attributes);\n");
+        $out .= "    ${conditional}$template->Set(v8::String::NewSymbol(\"$name\"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallback, v8Undefined(), ${signature})$property_attributes);\n";
     }
-    push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
+    $out .= "#endif // ${conditionalString}\n" if $conditionalString;
+    return $out;
 }
 
 sub GenerateImplementationIndexer
 {
     my $interface = shift;
     my $indexer = shift;
+    my $out = "";
+
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
     # FIXME: Figure out what NumericIndexedGetter is really supposed to do. Right now, it's only set on WebGL-related files.
     my $hasCustomSetter = $interface->extendedAttributes->{"CustomIndexedSetter"} && !$interface->extendedAttributes->{"NumericIndexedGetter"};
     my $hasGetter = $interface->extendedAttributes->{"IndexedGetter"} || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
 
     # FIXME: Investigate and remove this nastinesss. In V8, named property handling and indexer handling are apparently decoupled,
     # which means that object[X] where X is a number doesn't reach named property indexer. So we need to provide
     # simplistic, mirrored indexer handling in addition to named property handling.
     my $isSpecialCase = exists $indexerSpecialCases{$interfaceName};
     if ($isSpecialCase) {
         $hasGetter = 1;
         if ($interface->extendedAttributes->{"CustomNamedSetter"}) {
             $hasCustomSetter = 1;
         }
     }
 
     my $hasEnumerator = !$isSpecialCase && $codeGenerator->InheritsInterface($interface, "Node");
 
     # FIXME: Find a way to not have to special-case HTMLOptionsCollection.
     if ($interfaceName eq "HTMLOptionsCollection") {
         $hasEnumerator = 1;
         $hasGetter = 1;
     }
 
     if (!$hasGetter) {
-        return;
+        return "";
     }
 
     AddToImplIncludes("V8Collection.h");
 
     if (!$indexer) {
         $indexer = $codeGenerator->FindSuperMethod($interface, "item");
     }
 
     my $indexerType = $indexer ? $indexer->type : 0;
 
     # FIXME: Remove this once toV8 helper methods are implemented (see https://bugs.webkit.org/show_bug.cgi?id=32563).
     if ($interfaceName eq "WebKitCSSKeyframesRule") {
         $indexerType = "WebKitCSSKeyframeRule";
     }
 
     if ($indexerType && !$hasCustomSetter) {
         if ($indexerType eq "DOMString") {
             my $conversion = $indexer->extendedAttributes->{"TreatReturnedNullStringAs"};
             if ($conversion && $conversion eq "Null") {
-                push(@implContent, <<END);
+                $out .= <<END;
     setCollectionStringOrUndefinedIndexedGetter<${interfaceName}>(desc);
 END
             } else {
-                push(@implContent, <<END);
+                $out .= <<END;
     setCollectionStringIndexedGetter<${interfaceName}>(desc);
 END
             }
         } else {
-            push(@implContent, <<END);
+            $out .= <<END;
     setCollectionIndexedGetter<${interfaceName}, ${indexerType}>(desc);
 END
             # Include the header for this indexer type, because setCollectionIndexedGetter() requires toV8() for this type.
             AddToImplIncludes("V8${indexerType}.h");
         }
 
-        return;
+        return $out;
     }
 
     my $hasDeleter = $interface->extendedAttributes->{"CustomDeleteProperty"};
     my $setOn = "Instance";
 
     # V8 has access-check callback API (see ObjectTemplate::SetAccessCheckCallbacks) and it's used on DOMWindow
     # instead of deleters or enumerators. In addition, the getter should be set on prototype template, to
     # get implementation straight out of the DOMWindow prototype regardless of what prototype is actually set
     # on the object.
     if ($interfaceName eq "DOMWindow") {
         $setOn = "Prototype";
         $hasDeleter = 0;
     }
 
-    push(@implContent, "    desc->${setOn}Template()->SetIndexedPropertyHandler(${v8InterfaceName}::indexedPropertyGetter");
-    push(@implContent, $hasCustomSetter ? ", ${v8InterfaceName}::indexedPropertySetter" : ", 0");
-    push(@implContent, ", 0"); # IndexedPropertyQuery -- not being used at the moment.
-    push(@implContent, $hasDeleter ? ", ${v8InterfaceName}::indexedPropertyDeleter" : ", 0");
-    push(@implContent, ", nodeCollectionIndexedPropertyEnumerator<${interfaceName}>") if $hasEnumerator;
-    push(@implContent, ");\n");
+    $out .= "    desc->${setOn}Template()->SetIndexedPropertyHandler(${v8InterfaceName}::indexedPropertyGetter";
+    $out .= $hasCustomSetter ? ", ${v8InterfaceName}::indexedPropertySetter" : ", 0";
+    $out .= ", 0"; # IndexedPropertyQuery -- not being used at the moment.
+    $out .= $hasDeleter ? ", ${v8InterfaceName}::indexedPropertyDeleter" : ", 0";
+    $out .= ", nodeCollectionIndexedPropertyEnumerator<${interfaceName}>" if $hasEnumerator;
+    $out .= ");\n";
+    return $out;
 }
 
+# @return (templateConfigCode, name)
 sub GenerateImplementationNamedPropertyGetter
 {
     my $interface = shift;
     my $namedPropertyGetter = shift;
+    my $implContentGlobal = shift;
+    my $tmplConfig = "";
+    my $namedPropertydGetter = "";
+
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
+    if (!$namedPropertyGetter) {
+        $namedPropertyGetter = $codeGenerator->FindSuperMethod($interface, "namedItem");
+    }
+
     if ($interface->extendedAttributes->{"NamedGetter"}) {
         AddToImplIncludes("V8Collection.h");
         my $type = $namedPropertyGetter->type;
-        push(@implContent, <<END);
+        $tmplConfig .= <<END;
     desc->InstanceTemplate()->SetNamedPropertyHandler(${v8InterfaceName}::namedPropertyGetter, 0, 0, 0, 0);
 END
+
+        $namedPropertydGetter .= <<END;

[haraken, 2013/04/16 09:40:36]

Can't you do this like AddToImplContent(<<END) ? Then you can avoid returning
$namedPropertydGetter from this method.

[kojih, 2013/04/16 11:00:07]

Great, I did it.

+v8::Handle<v8::Value> ${v8InterfaceName}::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
+{
+    if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
+        return v8Undefined();
+    if (info.Holder()->HasRealNamedCallbackProperty(name))
+        return v8Undefined();
+
+    v8::Local<v8::Object> object = info.Holder();
+    v8::Handle<v8::Object> creationContext = info.Holder();
+    v8::Isolate* isolate = info.GetIsolate();
+
+    ASSERT(V8DOMWrapper::maybeDOMWrapper(object));
+    ASSERT(toWrapperTypeInfo(object) != &V8Node::info);
+    $interfaceName* collection = toNative(object);
+
+    AtomicString propertyName = toWebCoreAtomicStringWithNullCheck(name);
+    RefPtr<$type> element = collection->namedItem(propertyName);
+
+    if (!element)
+        return v8Undefined();
+
+    return toV8(element.release(), creationContext, isolate);
+}
+
+END
     }
 
     my $hasCustomNamedGetter = $interface->extendedAttributes->{"CustomNamedGetter"};
     # FIXME: make consistent between IDL and implementation. Then remove these special cases.
     $hasCustomNamedGetter = 1 if $interfaceName eq "HTMLAppletElement";
     $hasCustomNamedGetter = 1 if $interfaceName eq "HTMLEmbedElement";
     $hasCustomNamedGetter = 1 if $interfaceName eq "HTMLObjectElement";
     $hasCustomNamedGetter = 1 if $interfaceName eq "DOMWindow";
     $hasCustomNamedGetter = 0 if $interfaceName eq "HTMLDocument";
 
     if ($hasCustomNamedGetter) {
         my $hasCustomNamedSetter = $interface->extendedAttributes->{"CustomNamedSetter"};
         my $hasDeleter = $interface->extendedAttributes->{"CustomDeleteProperty"};
         my $hasEnumerator = $interface->extendedAttributes->{"CustomEnumerateProperty"};
         my $setOn = "Instance";
 
         # V8 has access-check callback API (see ObjectTemplate::SetAccessCheckCallbacks) and it's used on DOMWindow
         # instead of deleters or enumerators. In addition, the getter should be set on prototype template, to
         # get implementation straight out of the DOMWindow prototype regardless of what prototype is actually set
         # on the object.
         if ($interfaceName eq "DOMWindow") {
             $setOn = "Prototype";
             $hasDeleter = 0;
             $hasEnumerator = 0;
         }
 
-        push(@implContent, "    desc->${setOn}Template()->SetNamedPropertyHandler(${v8InterfaceName}::namedPropertyGetter, ");
-        push(@implContent, $hasCustomNamedSetter ? "${v8InterfaceName}::namedPropertySetter, " : "0, ");
+        $tmplConfig .= "    desc->${setOn}Template()->SetNamedPropertyHandler(${v8InterfaceName}::namedPropertyGetter, ";
+        $tmplConfig .= $hasCustomNamedSetter ? "${v8InterfaceName}::namedPropertySetter, " : "0, ";
         # If there is a custom enumerator, there MUST be custom query to properly communicate property attributes.
-        push(@implContent, $hasEnumerator ? "${v8InterfaceName}::namedPropertyQuery, " : "0, ");
-        push(@implContent, $hasDeleter ? "${v8InterfaceName}::namedPropertyDeleter, " : "0, ");
-        push(@implContent, $hasEnumerator ? "${v8InterfaceName}::namedPropertyEnumerator" : "0");
-        push(@implContent, ");\n");
+        $tmplConfig .= $hasEnumerator ? "${v8InterfaceName}::namedPropertyQuery, " : "0, ";
+        $tmplConfig .= $hasDeleter ? "${v8InterfaceName}::namedPropertyDeleter, " : "0, ";
+        $tmplConfig .= $hasEnumerator ? "${v8InterfaceName}::namedPropertyEnumerator" : "0";
+        $tmplConfig .= ");\n";
     }
+
+    return ($tmplConfig, $namedPropertydGetter);

[haraken, 2013/04/16 09:40:36]

Ditto. We want to avoid returning $namedPropertydGetter.

 }
 
 sub GenerateImplementationCustomCall
 {
     my $interface = shift;
+    my $out = "";
+
     my $interfaceName = $interface->name;
 
     if ($interface->extendedAttributes->{"CustomCall"}) {
-        push(@implContent, "    desc->InstanceTemplate()->SetCallAsFunctionHandler(V8${interfaceName}::callAsFunctionCallback);\n");
+        $out .= "    desc->InstanceTemplate()->SetCallAsFunctionHandler(V8${interfaceName}::callAsFunctionCallback);\n";
     }
+    return $out;
 }
 
 sub GenerateImplementationMasqueradesAsUndefined
 {
     my $interface = shift;
+    my $out = "";
+
     if ($interface->extendedAttributes->{"MasqueradesAsUndefined"})
     {
-        push(@implContent, "    desc->InstanceTemplate()->MarkAsUndetectable();\n");
+        $out .= "    desc->InstanceTemplate()->MarkAsUndetectable();\n";
     }
+    return $out;
 }
 
 sub GenerateImplementation
 {
     my $object = shift;
     my $interface = shift;
     my $interfaceName = $interface->name;
     my $visibleInterfaceName = $codeGenerator->GetVisibleInterfaceName($interface);
     my $v8InterfaceName = "V8$interfaceName";
     my $nativeType = GetNativeTypeForConversions($interface);
     my $vtableNameGnu = GetGnuVTableNameForInterface($interface);
     my $vtableRefGnu = GetGnuVTableRefForInterface($interface);
     my $vtableRefWin = GetWinVTableRefForInterface($interface);
 
     # - Add default header template
     push(@implContentHeader, GenerateImplementationContentHeader($interface));
 
+    my $implContentGlobal = [];

[haraken, 2013/04/16 09:40:36]

Is this needed?

[kojih, 2013/04/16 11:00:07]

no, removed.

+
     AddToImplIncludes("BindingState.h");
     AddToImplIncludes("ContextFeatures.h");
     AddToImplIncludes("RuntimeEnabledFeatures.h");
     AddToImplIncludes("V8Binding.h");
     AddToImplIncludes("V8DOMWrapper.h");
 
     AddIncludesForType($interfaceName);
 
     my $toActiveDOMObject = $codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject") ? "${v8InterfaceName}::toActiveDOMObject" : "0";
     my $toEventTarget = $codeGenerator->InheritsExtendedAttribute($interface, "EventTarget") ? "${v8InterfaceName}::toEventTarget" : "0";
     my $rootForGC = NeedsCustomOpaqueRootForGC($interface) ? "${v8InterfaceName}::opaqueRootForGC" : "0";
 
     # Find the super descriptor.
     my $parentClass = "";
     my $parentClassTemplate = "";
     foreach (@{$interface->parents}) {
         my $parent = $_;
         AddToImplIncludes("V8${parent}.h");
         $parentClass = "V8" . $parent;
         $parentClassTemplate = $parentClass . "::GetTemplate(isolate, currentWorldType)";
         last;
     }
 
-    push(@implContentInternals, <<END) if $vtableNameGnu;
+    AddToImplStuffInternal(<<END) if $vtableNameGnu;
 #if ENABLE(BINDING_INTEGRITY)
 #if defined(OS_WIN)
 #pragma warning(disable: 4483)
 extern "C" { extern void (*const ${vtableRefWin}[])(); }
 #else
 extern "C" { extern void* ${vtableNameGnu}[]; }
 #endif
 #endif // ENABLE(BINDING_INTEGRITY)
 
 END
 
-    push(@implContentInternals, "namespace WebCore {\n\n");
+    AddToImplStuffInternal("namespace WebCore {\n\n");
 
-    push(@implContentInternals, <<END) if $vtableNameGnu;
+    AddToImplFunctionInternal(<<END) if $vtableNameGnu;
 #if ENABLE(BINDING_INTEGRITY)
 // This checks if a DOM object that is about to be wrapped is valid.
 // Specifically, it checks that a vtable of the DOM object is equal to
 // a vtable of an expected class.
 // Due to a dangling pointer, the DOM object you are wrapping might be
 // already freed or realloced. If freed, the check will fail because
 // a free list pointer should be stored at the head of the DOM object.
 // If realloced, the check will fail because the vtable of the DOM object
 // differs from the expected vtable (unless the same class of DOM object
 // is realloced on the slot).
@@ skipping 10 matching lines @@
 }
 #endif // ENABLE(BINDING_INTEGRITY)
 
 END
 
 
     my $parentClassInfo = $parentClass ? "&${parentClass}::info" : "0";
 
     my $WrapperTypePrototype = $interface->isException ? "WrapperTypeErrorPrototype" : "WrapperTypeObjectPrototype";
 
-    push(@implContentInternals, "WrapperTypeInfo ${v8InterfaceName}::info = { ${v8InterfaceName}::GetTemplate, ${v8InterfaceName}::derefObject, $toActiveDOMObject, $toEventTarget, $rootForGC, ${v8InterfaceName}::installPerContextPrototypeProperties, $parentClassInfo, $WrapperTypePrototype };\n\n");
-    push(@implContentInternals, "namespace ${interfaceName}V8Internal {\n\n");
+    my $code = "WrapperTypeInfo ${v8InterfaceName}::info = { ${v8InterfaceName}::GetTemplate, ${v8InterfaceName}::derefObject, $toActiveDOMObject, $toEventTarget, ";
+    $code .= "$rootForGC, ${v8InterfaceName}::installPerContextPrototypeProperties, $parentClassInfo, $WrapperTypePrototype };\n\n";
+    AddToImplStuffInternal($code);
+    AddToImplStuffInternal("namespace ${interfaceName}V8Internal {\n\n");
 
-    push(@implContentInternals, "template <typename T> void V8_USE(T) { }\n\n");
+    AddToImplStuffInternal("template <typename T> void V8_USE(T) { }\n\n");
 
     my $hasConstructors = 0;
     my $hasReplaceable = 0;
 
     # Generate property accessors for attributes.
     for (my $index = 0; $index < @{$interface->attributes}; $index++) {
         my $attribute = @{$interface->attributes}[$index];
         my $attrType = $attribute->signature->type;
         my $attrExt = $attribute->signature->extendedAttributes;
 
@@ skipping 43 matching lines @@
     if (NeedsCustomOpaqueRootForGC($interface)) {
         GenerateOpaqueRootForGC($interface);
     }
 
     if ($interface->extendedAttributes->{"CheckSecurity"} && $interface->name ne "DOMWindow") {
         GenerateSecurityCheckFunctions($interface);
     }
 
     if ($interface->extendedAttributes->{"TypedArray"}) {
         my $viewType = GetTypeNameOfExternalTypedArray($interface);
-        push(@implContent, <<END);
+        AddToImplFunction(<<END);
 v8::Handle<v8::Object> wrap($interfaceName* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT(impl);
     v8::Handle<v8::Object> wrapper = ${v8InterfaceName}::createWrapper(impl, creationContext, isolate);
     if (!wrapper.IsEmpty())
         wrapper->SetIndexedPropertiesToExternalArrayData(impl->baseAddress(), $viewType, impl->length());
     return wrapper;
 }
 
 END
@@ skipping 39 matching lines @@
             }
         }
 
         # Separate out functions that are enabled per context so we can process them specially.
         if ($function->signature->extendedAttributes->{"EnabledPerContext"}) {
             push(@enabledPerContextFunctions, $function);
         } else {
             push(@normalFunctions, $function);
         }
     }
-    if (!$namedPropertyGetter) {
-        $namedPropertyGetter = $codeGenerator->FindSuperMethod($interface, "namedItem");
-    }
 
     if ($needsDomainSafeFunctionSetter) {
         GenerateDomainSafeFunctionSetter($interfaceName);
     }
 
     # Attributes
     my $attributes = $interface->attributes;
 
     # For the DOMWindow interface we partition the attributes into the
     # ones that disallows shadowing and the rest.
@@ skipping 10 matching lines @@
             push(@enabledAtRuntimeAttributes, $attribute);
         } elsif ($attribute->signature->extendedAttributes->{"EnabledPerContext"}) {
             push(@enabledPerContextAttributes, $attribute);
         } else {
             push(@normalAttributes, $attribute);
         }
     }
     $attributes = \@normalAttributes;
     # Put the attributes that disallow shadowing on the shadow object.
     if (@disallowsShadowing) {
-        push(@implContent, "static const V8DOMConfiguration::BatchedAttribute shadowAttrs[] = {\n");
-        GenerateBatchedAttributeData($interface, \@disallowsShadowing);
-        push(@implContent, "};\n\n");
+        my $stuff = "";

[haraken, 2013/04/16 09:40:36]

$stuff is too ambiguous. $code ?

+        $stuff .= "static const V8DOMConfiguration::BatchedAttribute shadowAttrs[] = {\n";
+        $stuff .= GenerateBatchedAttributeData($interface, \@disallowsShadowing);
+        $stuff .= "};\n\n";
+        AddToImplStuff($stuff);
     }
 
     my $has_attributes = 0;
     if (@$attributes) {
         $has_attributes = 1;
-        push(@implContent, "static const V8DOMConfiguration::BatchedAttribute ${v8InterfaceName}Attrs[] = {\n");
-        GenerateBatchedAttributeData($interface, $attributes);
-        push(@implContent, "};\n\n");
+        my $stuff = "";
+        $stuff .= "static const V8DOMConfiguration::BatchedAttribute ${v8InterfaceName}Attrs[] = {\n";
+        $stuff .= GenerateBatchedAttributeData($interface, $attributes);
+        $stuff .= "};\n\n";
+        AddToImplStuff($stuff);
     }
 
     # Setup table of standard callback functions
     my $num_callbacks = 0;
     my $has_callbacks = 0;
+    my $stuff = "";
     foreach my $function (@normalFunctions) {
         # Only one table entry is needed for overloaded methods:
         next if $function->{overloadIndex} > 1;
         # Don't put any nonstandard functions into this table:
         next if !IsStandardFunction($interface, $function);
         if (!$has_callbacks) {
             $has_callbacks = 1;
-            push(@implContent, "static const V8DOMConfiguration::BatchedMethod ${v8InterfaceName}Methods[] = {\n");
+            $stuff .= "static const V8DOMConfiguration::BatchedMethod ${v8InterfaceName}Methods[] = {\n";
         }
         my $name = $function->signature->name;
         my $methodForMainWorld = "0";
         if ($function->signature->extendedAttributes->{"PerWorldBindings"}) {
             $methodForMainWorld = "${interfaceName}V8Internal::${name}MethodCallbackForMainWorld";
         }
         my $conditionalString = $codeGenerator->GenerateConditionalString($function->signature);
-        push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
-        push(@implContent, <<END);
+        $stuff .= "#if ${conditionalString}\n" if $conditionalString;
+        $stuff .= <<END;
     {"$name", ${interfaceName}V8Internal::${name}MethodCallback, ${methodForMainWorld}},
 END
-        push(@implContent, "#endif\n") if $conditionalString;
+        $stuff .= "#endif\n" if $conditionalString;
         $num_callbacks++;
     }
-    push(@implContent, "};\n\n")  if $has_callbacks;
+    $stuff .= "};\n\n"  if $has_callbacks;
+    AddToImplStuff($stuff);
 
     # Setup constants
     my $has_constants = 0;
     my @constantsEnabledAtRuntime;
+    $stuff = "";
     if (@{$interface->constants}) {
         $has_constants = 1;
-        push(@implContent, "static const V8DOMConfiguration::BatchedConstant ${v8InterfaceName}Consts[] = {\n");
+        $stuff .= "static const V8DOMConfiguration::BatchedConstant ${v8InterfaceName}Consts[] = {\n";
     }
     foreach my $constant (@{$interface->constants}) {
         my $name = $constant->name;
         my $value = $constant->value;
         my $attrExt = $constant->extendedAttributes;
         my $conditional = $attrExt->{"Conditional"};
         my $implementedBy = $attrExt->{"ImplementedBy"};
         if ($implementedBy) {
             AddToImplIncludes("${implementedBy}.h");
         }
         if ($attrExt->{"EnabledAtRuntime"}) {
             push(@constantsEnabledAtRuntime, $constant);
         } else {
             if ($conditional) {
                 my $conditionalString = $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
-                push(@implContent, "#if ${conditionalString}\n");
+                $stuff .= "#if ${conditionalString}\n";
             }
             # If the value we're dealing with is a hex number, preprocess it into a signed integer
             # here, rather than running static_cast<signed int> in the generated code.
             if (substr($value, 0, 2) eq "0x") {
               $value = unpack('i', pack('I', hex($value)));
             }
-            push(@implContent, <<END);
+            $stuff .= <<END;
     {"${name}", $value},
 END
-            push(@implContent, "#endif\n") if $conditional;
+            $stuff .= "#endif\n" if $conditional;
         }
     }
     if ($has_constants) {
-        push(@implContent, "};\n\n");
-        push(@implContent, $codeGenerator->GenerateCompileTimeCheckForEnumsIfNeeded($interface));
+        $stuff .= "};\n\n";
+        $stuff .= join "", $codeGenerator->GenerateCompileTimeCheckForEnumsIfNeeded($interface);
+        AddToImplStuff($stuff);
     }
 
     if (!HasCustomConstructor($interface)) {
         if ($interface->extendedAttributes->{"NamedConstructor"}) {
             GenerateNamedConstructor(@{$interface->constructors}[0], $interface);
         } elsif ($interface->extendedAttributes->{"Constructor"}) {
             GenerateConstructor($interface);
         } elsif ($codeGenerator->IsConstructorTemplate($interface, "Event")) {
             GenerateEventConstructor($interface);
         } elsif ($codeGenerator->IsConstructorTemplate($interface, "TypedArray")) {
             GenerateTypedArrayConstructor($interface);
         }
     }
     if (IsConstructable($interface)) {
         GenerateConstructorCallback($interface);
     }
 
-    push(@implContentInternals, "} // namespace ${interfaceName}V8Internal\n\n");
+    AddToImplStuffInternal("} // namespace ${interfaceName}V8Internal\n\n");
 
     my $access_check = "";
     if ($interface->extendedAttributes->{"CheckSecurity"} && $interfaceName ne "DOMWindow") {
         $access_check = "instance->SetAccessCheckCallbacks(${interfaceName}V8Internal::namedSecurityCheck, ${interfaceName}V8Internal::indexedSecurityCheck, v8::External::New(&${v8InterfaceName}::info));";
     }
 
     # For the DOMWindow interface, generate the shadow object template
     # configuration method.
     if ($interfaceName eq "DOMWindow") {
-        push(@implContent, <<END);
+        AddToImplFunction(<<END);
 static v8::Persistent<v8::ObjectTemplate> ConfigureShadowObjectTemplate(v8::Persistent<v8::ObjectTemplate> templ, v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     V8DOMConfiguration::batchConfigureAttributes(templ, v8::Handle<v8::ObjectTemplate>(), shadowAttrs, WTF_ARRAY_LENGTH(shadowAttrs), isolate, currentWorldType);
 
     // Install a security handler with V8.
     templ->SetAccessCheckCallbacks(V8DOMWindow::namedSecurityCheckCustom, V8DOMWindow::indexedSecurityCheckCustom, v8::External::New(&V8DOMWindow::info));
     templ->SetInternalFieldCount(V8DOMWindow::internalFieldCount);
     return templ;
 }
 END
     }
 
     if (!$parentClassTemplate) {
         $parentClassTemplate = "v8::Persistent<v8::FunctionTemplate>()";
     }
 
     # Generate the template configuration method
-    push(@implContent,  <<END);
+    my $func = "";
+    $func .=  <<END;
 static v8::Persistent<v8::FunctionTemplate> Configure${v8InterfaceName}Template(v8::Persistent<v8::FunctionTemplate> desc, v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     desc->ReadOnlyPrototype();
 
     v8::Local<v8::Signature> defaultSignature;
 END
     if ($interface->extendedAttributes->{"EnabledAtRuntime"}) {
         my $enable_function = GetRuntimeEnableFunctionName($interface);
-        push(@implContent, <<END);
+        $func .= <<END;
     if (!${enable_function}())
         defaultSignature = V8DOMConfiguration::configureTemplate(desc, \"\", $parentClassTemplate, ${v8InterfaceName}::internalFieldCount, 0, 0, 0, 0, isolate, currentWorldType);
     else
 END
     }
-    push(@implContent,  <<END);
+    $func .=  <<END;
     defaultSignature = V8DOMConfiguration::configureTemplate(desc, \"${visibleInterfaceName}\", $parentClassTemplate, ${v8InterfaceName}::internalFieldCount,
 END
     # Set up our attributes if we have them
     if ($has_attributes) {
-        push(@implContent, <<END);
+        $func .= <<END;
         ${v8InterfaceName}Attrs, WTF_ARRAY_LENGTH(${v8InterfaceName}Attrs),
 END
     } else {
-        push(@implContent, <<END);
+        $func .= <<END;
         0, 0,
 END
     }
 
     if ($has_callbacks) {
-        push(@implContent, <<END);
+        $func .= <<END;
         ${v8InterfaceName}Methods, WTF_ARRAY_LENGTH(${v8InterfaceName}Methods), isolate, currentWorldType);
 END
     } else {
-        push(@implContent, <<END);
+        $func .= <<END;
         0, 0, isolate, currentWorldType);
 END
     }
 
     AddToImplIncludes("wtf/UnusedParam.h");
-    push(@implContent, <<END);
+    $func .= <<END;
     UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
 END
 
     if (IsConstructable($interface)) {
-        push(@implContent, "    desc->SetCallHandler(${v8InterfaceName}::constructorCallback);\n");
+        $func .= "    desc->SetCallHandler(${v8InterfaceName}::constructorCallback);\n";
     }
 
     if ($access_check or @enabledAtRuntimeAttributes or @normalFunctions or $has_constants) {
-        push(@implContent,  <<END);
+        $func .=  <<END;
     v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
     v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
     UNUSED_PARAM(instance); // In some cases, it will not be used.
     UNUSED_PARAM(proto); // In some cases, it will not be used.
 END
     }
 
     if ($access_check) {
-        push(@implContent,  "    $access_check\n");
+        $func .=  "    $access_check\n";
     }
 
     # Setup the enable-at-runtime attrs if we have them
     foreach my $runtime_attr (@enabledAtRuntimeAttributes) {
         my $enable_function = GetRuntimeEnableFunctionName($runtime_attr->signature);
         my $conditionalString = $codeGenerator->GenerateConditionalString($runtime_attr->signature);
-        push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
-        push(@implContent, "    if (${enable_function}()) {\n");
-        push(@implContent, "        static const V8DOMConfiguration::BatchedAttribute attrData =\\\n");
-        GenerateSingleBatchedAttribute($interfaceName, $runtime_attr, ";", "    ");
-        push(@implContent, <<END);
+        $func .= "\n#if ${conditionalString}\n" if $conditionalString;
+        $func .= "    if (${enable_function}()) {\n";
+        $func .= "        static const V8DOMConfiguration::BatchedAttribute attrData =\\\n";
+        $func .= GenerateSingleBatchedAttribute($interfaceName, $runtime_attr, ";", "    ");
+        $func .= <<END;
         V8DOMConfiguration::configureAttribute(instance, proto, attrData, isolate, currentWorldType);
     }
 END
-        push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
+        $func .= "\n#endif // ${conditionalString}\n" if $conditionalString;
     }
 
     # Setup the enable-at-runtime constants if we have them
     foreach my $runtime_const (@constantsEnabledAtRuntime) {
         my $enable_function = GetRuntimeEnableFunctionName($runtime_const);
         my $conditionalString = $codeGenerator->GenerateConditionalString($runtime_const);
         my $name = $runtime_const->name;
         my $value = $runtime_const->value;
-        push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
-        push(@implContent, "    if (${enable_function}()) {\n");
-        push(@implContent, <<END);
+        $func .= "\n#if ${conditionalString}\n" if $conditionalString;
+        $func .= "    if (${enable_function}()) {\n";
+        $func .= <<END;
         static const V8DOMConfiguration::BatchedConstant constData = {"${name}", static_cast<signed int>(${value})};
         V8DOMConfiguration::batchConfigureConstants(desc, proto, &constData, 1, isolate);
 END
-        push(@implContent, "    }\n");
-        push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
+        $func .= "    }\n";
+        $func .= "\n#endif // ${conditionalString}\n" if $conditionalString;
     }
 
-    GenerateImplementationIndexer($interface, $indexer);
-    GenerateImplementationNamedPropertyGetter($interface, $namedPropertyGetter);
-    GenerateImplementationCustomCall($interface);
-    GenerateImplementationMasqueradesAsUndefined($interface);
+    $func .= GenerateImplementationIndexer($interface, $indexer);
+
+    my ($tmplConfig, $namedPropertydGetter) = GenerateImplementationNamedPropertyGetter($interface, $namedPropertyGetter, $implContentGlobal);
+    $func .= $tmplConfig;
+    $func .= GenerateImplementationCustomCall($interface);
+    $func .= GenerateImplementationMasqueradesAsUndefined($interface);
 
     # Define our functions with Set() or SetAccessor()
     my $total_functions = 0;
     foreach my $function (@normalFunctions) {
         # Only one accessor is needed for overloaded methods:
         next if $function->{overloadIndex} > 1;
 
         $total_functions++;
         next if IsStandardFunction($interface, $function);
-        GenerateNonStandardFunction($interface, $function);
+        $func .= GenerateNonStandardFunction($interface, $function);
         $num_callbacks++;
     }
 
     die "Wrong number of callbacks generated for $interfaceName ($num_callbacks, should be $total_functions)" if $num_callbacks != $total_functions;
 
     if ($has_constants) {
-        push(@implContent, <<END);
+        $func .= <<END;
     V8DOMConfiguration::batchConfigureConstants(desc, proto, ${v8InterfaceName}Consts, WTF_ARRAY_LENGTH(${v8InterfaceName}Consts), isolate);
 END
     }
 
     # Special cases
     if ($interfaceName eq "DOMWindow") {
-        push(@implContent, <<END);
+        $func .= <<END;
 
     proto->SetInternalFieldCount(V8DOMWindow::internalFieldCount);
     desc->SetHiddenPrototype(true);
     instance->SetInternalFieldCount(V8DOMWindow::internalFieldCount);
     // Set access check callbacks, but turned off initially.
     // When a context is detached from a frame, turn on the access check.
     // Turning on checks also invalidates inline caches of the object.
     instance->SetAccessCheckCallbacks(V8DOMWindow::namedSecurityCheckCustom, V8DOMWindow::indexedSecurityCheckCustom, v8::External::New(&V8DOMWindow::info), false);
 END
     }
     if ($interfaceName eq "HTMLDocument" or $interfaceName eq "DedicatedWorkerContext" or $interfaceName eq "SharedWorkerContext") {
-        push(@implContent, <<END);
+        $func .= <<END;
     desc->SetHiddenPrototype(true);
 END
     }
     if ($interfaceName eq "Location") {
-        push(@implContent, <<END);
+        $func .= <<END;
 
     // For security reasons, these functions are on the instance instead
     // of on the prototype object to ensure that they cannot be overwritten.
     instance->SetAccessor(v8::String::NewSymbol("reload"), V8Location::reloadAttrGetterCustom, 0, v8Undefined(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly));
     instance->SetAccessor(v8::String::NewSymbol("replace"), V8Location::replaceAttrGetterCustom, 0, v8Undefined(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly));
     instance->SetAccessor(v8::String::NewSymbol("assign"), V8Location::assignAttrGetterCustom, 0, v8Undefined(), v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly));
 END
     }
 
-    push(@implContent, <<END);
+    $func .= <<END;
 
     // Custom toString template
     desc->Set(v8::String::NewSymbol("toString"), V8PerIsolateData::current()->toStringTemplate());
     return desc;
 }
 
+END
+    AddToImplFunction($func);
+
+    AddToImplFunction(join "", $namedPropertydGetter);

[haraken, 2013/04/16 09:40:36]

You might want to do it in GenerateImplementationNamedPropertyGetter(). Would it
be hard for some dependency reason?

+
+    AddToImplFunction(<<END);
 v8::Persistent<v8::FunctionTemplate> ${v8InterfaceName}::GetTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     V8PerIsolateData* data = V8PerIsolateData::from(isolate);
     V8PerIsolateData::TemplateMap::iterator result = data->templateMap(currentWorldType).find(&info);
     if (result != data->templateMap(currentWorldType).end())
         return result->value;
 
     v8::HandleScope handleScope;
     v8::Persistent<v8::FunctionTemplate> templ =
         Configure${v8InterfaceName}Template(data->rawTemplate(&info, currentWorldType), isolate, currentWorldType);
     data->templateMap(currentWorldType).add(&info, templ);
     return templ;
 }
 
+END
+    AddToImplFunction(<<END);
 bool ${v8InterfaceName}::HasInstance(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, currentWorldType);
 }
 
+END
+    AddToImplFunction(<<END);
 bool ${v8InterfaceName}::HasInstanceInAnyWorld(v8::Handle<v8::Value> value, v8::Isolate* isolate)
 {
     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, MainWorld)
         || V8PerIsolateData::from(isolate)->hasInstance(&info, value, IsolatedWorld)
         || V8PerIsolateData::from(isolate)->hasInstance(&info, value, WorkerWorld);
 }
 
 END
 
     if (@enabledPerContextAttributes) {
-        push(@implContent, <<END);
+        my $func = "";
+        $func .= <<END;
 void ${v8InterfaceName}::installPerContextProperties(v8::Handle<v8::Object> instance, ${nativeType}* impl, v8::Isolate* isolate)
 {
     v8::Local<v8::Object> proto = v8::Local<v8::Object>::Cast(instance->GetPrototype());
     // When building QtWebkit with V8 this variable is unused when none of the features are enabled.
     UNUSED_PARAM(proto);
 END
 
         # Setup the enable-by-settings attrs if we have them
         foreach my $runtimeAttr (@enabledPerContextAttributes) {
             my $enableFunction = GetContextEnableFunction($runtimeAttr->signature);
             my $conditionalString = $codeGenerator->GenerateConditionalString($runtimeAttr->signature);
-            push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
-            push(@implContent, "    if (${enableFunction}(impl->document())) {\n");
-            push(@implContent, "        static const V8DOMConfiguration::BatchedAttribute attrData =\\\n");
-            GenerateSingleBatchedAttribute($interfaceName, $runtimeAttr, ";", "    ");
-            push(@implContent, <<END);
+            $func .= "\n#if ${conditionalString}\n" if $conditionalString;
+            $func .= "    if (${enableFunction}(impl->document())) {\n";
+            $func .= "        static const V8DOMConfiguration::BatchedAttribute attrData =\\\n";
+            $func .= GenerateSingleBatchedAttribute($interfaceName, $runtimeAttr, ";", "    ");
+            $func .= <<END;
         V8DOMConfiguration::configureAttribute(instance, proto, attrData, isolate);
 END
-            push(@implContent, "    }\n");
-            push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
+            $func .= "    }\n";
+            $func .= "#endif // ${conditionalString}\n" if $conditionalString;
         }
-        push(@implContent, <<END);
+        $func .= <<END;
 }
 
 END
+        AddToImplFunction($func);
     }
 
     if (@enabledPerContextFunctions) {
-        push(@implContent, <<END);
+        my $func = "";
+        $func .= <<END;
 void ${v8InterfaceName}::installPerContextPrototypeProperties(v8::Handle<v8::Object> proto, v8::Isolate* isolate)
 {
     UNUSED_PARAM(proto);
 END
         # Setup the enable-by-settings functions if we have them
-        push(@implContent,  <<END);
+        $func .=  <<END;
     v8::Local<v8::Signature> defaultSignature = v8::Signature::New(GetTemplate(isolate, worldType(isolate)));
     UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
 
     ScriptExecutionContext* context = toScriptExecutionContext(proto->CreationContext());
 END
 
         foreach my $runtimeFunc (@enabledPerContextFunctions) {
             my $enableFunction = GetContextEnableFunction($runtimeFunc->signature);
             my $conditionalString = $codeGenerator->GenerateConditionalString($runtimeFunc->signature);
-            push(@implContent, "\n#if ${conditionalString}\n") if $conditionalString;
-            push(@implContent, "    if (context && context->isDocument() && ${enableFunction}(toDocument(context))) {\n");
+            $func .= "\n#if ${conditionalString}\n" if $conditionalString;
+            $func .= "    if (context && context->isDocument() && ${enableFunction}(toDocument(context))) {\n";
             my $name = $runtimeFunc->signature->name;
-            push(@implContent, <<END);
+            $func .= <<END;
         proto->Set(v8::String::NewSymbol("${name}"), v8::FunctionTemplate::New(${interfaceName}V8Internal::${name}MethodCallback, v8Undefined(), defaultSignature)->GetFunction());
 END
-            push(@implContent, "    }\n");
-            push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
+            $func .= "    }\n";
+            $func .= "#endif // ${conditionalString}\n" if $conditionalString;
         }
 
-        push(@implContent, <<END);
+        $func .= <<END;
 }
 
 END
+        AddToImplFunction($func);
     }
 
     if ($codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject")) {
         # MessagePort is handled like an active dom object even though it doesn't inherit
         # from ActiveDOMObject, so don't try to cast it to ActiveDOMObject.
         my $returnValue = $interfaceName eq "MessagePort" ? "0" : "toNative(object)";
-        push(@implContent, <<END);
+        AddToImplFunction(<<END);
 ActiveDOMObject* ${v8InterfaceName}::toActiveDOMObject(v8::Handle<v8::Object> object)
 {
     return $returnValue;
 }
 
 END
     }
 
     if ($codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
-        push(@implContent, <<END);
+        AddToImplFunction(<<END);
 EventTarget* ${v8InterfaceName}::toEventTarget(v8::Handle<v8::Object> object)
 {
     return toNative(object);
 }
 
 END
     }
 
     if ($interfaceName eq "DOMWindow") {
-        push(@implContent, <<END);
+        AddToImplFunction(<<END);
 v8::Persistent<v8::ObjectTemplate> V8DOMWindow::GetShadowObjectTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     if (currentWorldType == MainWorld) {
         static v8::Persistent<v8::ObjectTemplate> V8DOMWindowShadowObjectCacheForMainWorld;
         if (V8DOMWindowShadowObjectCacheForMainWorld.IsEmpty()) {
             V8DOMWindowShadowObjectCacheForMainWorld = v8::Persistent<v8::ObjectTemplate>::New(isolate, v8::ObjectTemplate::New());
             ConfigureShadowObjectTemplate(V8DOMWindowShadowObjectCacheForMainWorld, isolate, currentWorldType);
         }
         return V8DOMWindowShadowObjectCacheForMainWorld;
     } else {
         static v8::Persistent<v8::ObjectTemplate> V8DOMWindowShadowObjectCacheForNonMainWorld;
         if (V8DOMWindowShadowObjectCacheForNonMainWorld.IsEmpty()) {
             V8DOMWindowShadowObjectCacheForNonMainWorld = v8::Persistent<v8::ObjectTemplate>::New(isolate, v8::ObjectTemplate::New());
             ConfigureShadowObjectTemplate(V8DOMWindowShadowObjectCacheForNonMainWorld, isolate, currentWorldType);
         }
         return V8DOMWindowShadowObjectCacheForNonMainWorld;
     }
 }
 
 END
     }
 
-    # FIXME: Separate array for generated code and move this block to GenerateImplementationNamedPropertyGetter
-    if ( $interface->extendedAttributes->{"NamedGetter"} ) {
-        my $type = $namedPropertyGetter->type;
-        push(@implContent, <<END);
-v8::Handle<v8::Value> ${v8InterfaceName}::namedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
-    if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
-        return v8Undefined();
-    if (info.Holder()->HasRealNamedCallbackProperty(name))
-        return v8Undefined();
-
-    v8::Local<v8::Object> object = info.Holder();
-    v8::Handle<v8::Object> creationContext = info.Holder();
-    v8::Isolate* isolate = info.GetIsolate();
-
-    ASSERT(V8DOMWrapper::maybeDOMWrapper(object));
-    ASSERT(toWrapperTypeInfo(object) != &V8Node::info);
-    $interfaceName* collection = toNative(object);
-
-    AtomicString propertyName = toWebCoreAtomicStringWithNullCheck(name);
-    RefPtr<$type> element = collection->namedItem(propertyName);
-
-    if (!element)
-        return v8Undefined();
-
-    return toV8(element.release(), creationContext, isolate);
-}
-END
-    }
-
     GenerateToV8Converters($interface, $v8InterfaceName, $nativeType);
 
-    push(@implContent, <<END);
+    AddToImplFunction(<<END);
 void ${v8InterfaceName}::derefObject(void* object)
 {
     static_cast<${nativeType}*>(object)->deref();
 }
 
+END
+    AddToImplStuff(<<END);
 } // namespace WebCore
 END
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
-    push(@implContent, "\n#endif // ${conditionalString}\n") if $conditionalString;
+    AddToImplStuff("\n#endif // ${conditionalString}\n") if $conditionalString;
 
     # We've already added the header for this file in implContentHeader, so remove
     # it from implIncludes to ensure we don't #include it twice.
     delete $implIncludes{"${v8InterfaceName}.h"};
 }
 
+
+
 sub GenerateHeaderContentHeader
 {
     my $interface = shift;
     my $v8InterfaceName = "V8" . $interface->name;
     my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
 
     my @headerContentHeader = split("\r", $headerTemplate);
 
     push(@headerContentHeader, "\n#ifndef ${v8InterfaceName}" . "_h\n");
     push(@headerContentHeader, "#define ${v8InterfaceName}" . "_h\n\n");
@@ skipping 18 matching lines @@
 sub GenerateCallbackHeader
 {
     my $object = shift;
     my $interface = shift;
 
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
 
     # - Add default header template
-    push(@headerContent, GenerateHeaderContentHeader($interface));
+    AddToHeader(GenerateHeaderContentHeader($interface));
 
     my @unsortedIncludes = ();
     push(@unsortedIncludes, "#include \"ActiveDOMCallback.h\"");
     push(@unsortedIncludes, "#include \"DOMWrapperWorld.h\"");
     push(@unsortedIncludes, "#include \"$interfaceName.h\"");
     push(@unsortedIncludes, "#include \"ScopedPersistent.h\"");
     push(@unsortedIncludes, "#include <v8.h>");
     push(@unsortedIncludes, "#include <wtf/Forward.h>");
-    push(@headerContent, join("\n", sort @unsortedIncludes));
+    AddToHeader(join("\n", sort @unsortedIncludes));
     
-    push(@headerContent, "\n\nnamespace WebCore {\n\n");
-    push(@headerContent, "class ScriptExecutionContext;\n\n");
-    push(@headerContent, "class $v8InterfaceName : public $interfaceName, public ActiveDOMCallback {\n");
+    AddToHeader("\n\nnamespace WebCore {\n\n");
+    AddToHeader("class ScriptExecutionContext;\n\n");
+    AddToHeader("class $v8InterfaceName : public $interfaceName, public ActiveDOMCallback {\n");
 
-    push(@headerContent, <<END);
+    AddToHeader(<<END);
 public:
     static PassRefPtr<${v8InterfaceName}> create(v8::Handle<v8::Value> value, ScriptExecutionContext* context)
     {
         ASSERT(value->IsObject());
         ASSERT(context);
         return adoptRef(new ${v8InterfaceName}(v8::Handle<v8::Object>::Cast(value), context));
     }
 
     virtual ~${v8InterfaceName}();
 
 END
 
     # Functions
     my $numFunctions = @{$interface->functions};
     if ($numFunctions > 0) {
-        push(@headerContent, "    // Functions\n");
+        AddToHeader("    // Functions\n");
         foreach my $function (@{$interface->functions}) {
             my @params = @{$function->parameters};
             if (!$function->signature->extendedAttributes->{"Custom"} &&
                 !(GetNativeType($function->signature->type) eq "bool")) {
-                    push(@headerContent, "    COMPILE_ASSERT(false)");
+                    AddToHeader("    COMPILE_ASSERT(false)");
             }
 
-            push(@headerContent, "    virtual " . GetNativeTypeForCallbacks($function->signature->type) . " " . $function->signature->name . "(");
+            AddToHeader("    virtual " . GetNativeTypeForCallbacks($function->signature->type) . " " . $function->signature->name . "(");
 
             my @args = ();
             foreach my $param (@params) {
                 push(@args, GetNativeTypeForCallbacks($param->type) . " " . $param->name);
             }
-            push(@headerContent, join(", ", @args));
-            push(@headerContent, ");\n");
+            AddToHeader(join(", ", @args));
+            AddToHeader(");\n");
         }
     }
 
-    push(@headerContent, <<END);
+    AddToHeader(<<END);
 
     virtual ScriptExecutionContext* scriptExecutionContext() const { return ContextDestructionObserver::scriptExecutionContext(); }
 
 private:
     ${v8InterfaceName}(v8::Handle<v8::Object>, ScriptExecutionContext*);
 
     ScopedPersistent<v8::Object> m_callback;
     RefPtr<DOMWrapperWorld> m_world;
 };
 
 END
 
-    push(@headerContent, "}\n\n");
-    push(@headerContent, "#endif // $v8InterfaceName" . "_h\n\n");
+    AddToHeader("}\n\n");
+    AddToHeader("#endif // $v8InterfaceName" . "_h\n\n");
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
-    push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
+    AddToHeader("#endif // ${conditionalString}\n") if $conditionalString;
 }
 
 sub GenerateCallbackImplementation
 {
     my $object = shift;
     my $interface = shift;
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
     # - Add default header template
     push(@implContentHeader, GenerateImplementationContentHeader($interface));
 
     AddToImplIncludes("ScriptExecutionContext.h");
     AddToImplIncludes("V8Binding.h");
     AddToImplIncludes("V8Callback.h");
 
-    push(@implContent, "#include <wtf/Assertions.h>\n\n");
-    push(@implContent, "namespace WebCore {\n\n");
-    push(@implContent, <<END);
+    AddToImplStuff("#include <wtf/Assertions.h>\n\n");
+    AddToImplStuff("namespace WebCore {\n\n");
+
+    AddToImplFunction(<<END);
 ${v8InterfaceName}::${v8InterfaceName}(v8::Handle<v8::Object> callback, ScriptExecutionContext* context)
     : ActiveDOMCallback(context)
     , m_callback(callback)
     , m_world(context->isDocument() ? DOMWrapperWorld::isolatedWorld(v8::Context::GetCurrent()) : 0)
 {
 }
 
+END
+
+    AddToImplFunction(<<END);
 ${v8InterfaceName}::~${v8InterfaceName}()
 {
 }
 
 END
 
     # Functions
     my $numFunctions = @{$interface->functions};
     if ($numFunctions > 0) {
-        push(@implContent, "// Functions\n");
+        AddToImplStuff("// Functions\n");
         foreach my $function (@{$interface->functions}) {
+            my $func = "";
             my @params = @{$function->parameters};
             if ($function->signature->extendedAttributes->{"Custom"} ||
                 !(GetNativeTypeForCallbacks($function->signature->type) eq "bool")) {
                 next;
             }
 
             AddIncludesForType($function->signature->type);
-            push(@implContent, "\n" . GetNativeTypeForCallbacks($function->signature->type) . " ${v8InterfaceName}::" . $function->signature->name . "(");
+            $func .= "\n" . GetNativeTypeForCallbacks($function->signature->type) . " ${v8InterfaceName}::" . $function->signature->name . "(";
 
             my @args = ();
             my @argsCheck = ();
             my $thisType = $function->signature->extendedAttributes->{"PassThisToCallback"};
             foreach my $param (@params) {
                 my $paramName = $param->name;
                 AddIncludesForType($param->type);
                 push(@args, GetNativeTypeForCallbacks($param->type) . " " . $paramName);
                 if ($thisType and $thisType eq $param->type) {
                     push(@argsCheck, <<END);
     ASSERT(${paramName});
 
 END
                 }
             }
-            push(@implContent, join(", ", @args));
+            $func .= join(", ", @args);
 
-            push(@implContent, ")\n");
-            push(@implContent, "{\n");
-            push(@implContent, @argsCheck) if @argsCheck;
-            push(@implContent, "    if (!canInvokeCallback())\n");
-            push(@implContent, "        return true;\n\n");
-            push(@implContent, "    v8::HandleScope handleScope;\n\n");
-            push(@implContent, "    v8::Handle<v8::Context> v8Context = toV8Context(scriptExecutionContext(), m_world.get());\n");
-            push(@implContent, "    if (v8Context.IsEmpty())\n");
-            push(@implContent, "        return true;\n\n");
-            push(@implContent, "    v8::Context::Scope scope(v8Context);\n\n");
+            $func .= ")\n";
+            $func .= "{\n";
+            $func .= join "", @argsCheck if @argsCheck;
+            $func .= "    if (!canInvokeCallback())\n";
+            $func .= "        return true;\n\n";
+            $func .= "    v8::HandleScope handleScope;\n\n";
+            $func .= "    v8::Handle<v8::Context> v8Context = toV8Context(scriptExecutionContext(), m_world.get());\n";
+            $func .= "    if (v8Context.IsEmpty())\n";
+            $func .= "        return true;\n\n";
+            $func .= "    v8::Context::Scope scope(v8Context);\n\n";
 
             @args = ();
             foreach my $param (@params) {
                 my $paramName = $param->name;
-                push(@implContent, "    v8::Handle<v8::Value> ${paramName}Handle = " . NativeToJSValue($param, $paramName, "v8::Handle<v8::Object>()", "v8Context->GetIsolate()", "") . ";\n");
-                push(@implContent, "    if (${paramName}Handle.IsEmpty()) {\n");
-                push(@implContent, "        if (!isScriptControllerTerminating())\n");
-                push(@implContent, "            CRASH();\n");
-                push(@implContent, "        return true;\n");
-                push(@implContent, "    }\n");
+                $func .= "    v8::Handle<v8::Value> ${paramName}Handle = " . NativeToJSValue($param, $paramName, "v8::Handle<v8::Object>()", "v8Context->GetIsolate()", "") . ";\n";
+                $func .= "    if (${paramName}Handle.IsEmpty()) {\n";
+                $func .= "        if (!isScriptControllerTerminating())\n";
+                $func .= "            CRASH();\n";
+                $func .= "        return true;\n";
+                $func .= "    }\n";
                 push(@args, "        ${paramName}Handle");
             }
 
             if (scalar(@args) > 0) {
-                push(@implContent, "\n    v8::Handle<v8::Value> argv[] = {\n");
-                push(@implContent, join(",\n", @args));
-                push(@implContent, "\n    };\n\n");
+                $func .= "\n    v8::Handle<v8::Value> argv[] = {\n";
+                $func .= join(",\n", @args);
+                $func .= "\n    };\n\n";
             } else {
-                push(@implContent, "\n    v8::Handle<v8::Value> *argv = 0;\n\n");
+                $func .= "\n    v8::Handle<v8::Value> *argv = 0;\n\n";
             }
-            push(@implContent, "    bool callbackReturnValue = false;\n");
+            $func .= "    bool callbackReturnValue = false;\n";
             if ($thisType) {
                 foreach my $param (@params) {
                     next if $param->type ne $thisType;
                     my $paramName = $param->name;
-                    push(@implContent, "    return !invokeCallback(m_callback.get(), v8::Handle<v8::Object>::Cast(${paramName}Handle), " . scalar(@params) . ", argv, callbackReturnValue, scriptExecutionContext());\n");
+                    $func .= "    return !invokeCallback(m_callback.get(), v8::Handle<v8::Object>::Cast(${paramName}Handle), " . scalar(@params) . ", argv, callbackReturnValue, scriptExecutionContext());\n";
+                    AddToImplFunction($func);
                     last;
                 }
             } else {
-                push(@implContent, "    return !invokeCallback(m_callback.get(), " . scalar(@params) . ", argv, callbackReturnValue, scriptExecutionContext());\n");
+                $func .= "    return !invokeCallback(m_callback.get(), " . scalar(@params) . ", argv, callbackReturnValue, scriptExecutionContext());\n";
             }
-            push(@implContent, "}\n");
+            $func .= "}\n";
+            AddToImplFunction($func);
         }
     }
 
-    push(@implContent, "\n} // namespace WebCore\n\n");
+    AddToImplStuff("\n} // namespace WebCore\n\n");
 
     my $conditionalString = $codeGenerator->GenerateConditionalString($interface);
-    push(@implContent, "#endif // ${conditionalString}\n") if $conditionalString;
+    AddToImplStuff("#endif // ${conditionalString}\n") if $conditionalString;
 }
 
 sub BaseInterfaceName
 {
     my $interface = shift;
 
     while (@{$interface->parents}) {
         $interface = $codeGenerator->ParseInterface(@{$interface->parents}[0]);
     }
 
     return $interface->name;
 }
 
 sub GenerateToV8Converters
 {
     my $interface = shift;
     my $v8InterfaceName = shift;
     my $nativeType = shift;
     my $interfaceName = $interface->name;
 
     if ($interface->extendedAttributes->{"NoWrapperCache"} || $interface->extendedAttributes->{"SuppressToJSObject"}) {
         return;
     }
 
     AddToImplIncludes("Frame.h");
 
     my $createWrapperArgumentType = GetPassRefPtrType($nativeType);
     my $baseType = BaseInterfaceName($interface);
 
-    push(@implContent, <<END);
+    my $func = "";
+    $func .= <<END;
 
 v8::Handle<v8::Object> ${v8InterfaceName}::createWrapper(${createWrapperArgumentType} impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT(impl.get());
     ASSERT(DOMDataStore::getWrapper(impl.get(), isolate).IsEmpty());
 END
 
     my $vtableNameGnu = GetGnuVTableNameForInterface($interface);
-    push(@implContent, <<END) if $vtableNameGnu;
+    $func .= <<END if $vtableNameGnu;
 
 #if ENABLE(BINDING_INTEGRITY)
     checkTypeOrDieTrying(impl.get());
 #endif
 END
 
-    push(@implContent, <<END) if ($baseType ne $interfaceName);
+    $func .= <<END if ($baseType ne $interfaceName);
     ASSERT(static_cast<void*>(static_cast<${baseType}*>(impl.get())) == static_cast<void*>(impl.get()));
 END
 
     if ($codeGenerator->InheritsInterface($interface, "Document")) {
-        push(@implContent, <<END);
+        $func .= <<END;
     if (Frame* frame = impl->frame()) {
         if (frame->script()->initializeMainWorld()) {
             // initializeMainWorld may have created a wrapper for the object, retry from the start.
             v8::Handle<v8::Object> wrapper = DOMDataStore::getWrapper(impl.get(), isolate);
             if (!wrapper.IsEmpty())
                 return wrapper;
         }
     }
 END
     }
 
-    push(@implContent, <<END);
+    $func .= <<END;
 
     v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &info, impl.get(), isolate);
     if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 
     installPerContextProperties(wrapper, impl.get(), isolate);
     V8DOMWrapper::associateObjectWithWrapper(impl, &info, wrapper, isolate, hasDependentLifetime ? WrapperConfiguration::Dependent : WrapperConfiguration::Independent);
     return wrapper;
 }
 END
+    AddToImplFunction($func);
 }
 
 sub GenerateSecurityCheckFunctions
 {
     my $interface = shift;
     my $interfaceName = $interface->name;
     my $v8InterfaceName = "V8$interfaceName";
 
-    push(@implContentInternals, <<END);
+    AddToImplFunctionInternal(<<END);
 bool indexedSecurityCheck(v8::Local<v8::Object> host, uint32_t index, v8::AccessType type, v8::Local<v8::Value>)
 {
     $interfaceName* imp =  ${v8InterfaceName}::toNative(host);
     return BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError);
 }
 
+END
+    AddToImplFunctionInternal(<<END);
 bool namedSecurityCheck(v8::Local<v8::Object> host, v8::Local<v8::Value> key, v8::AccessType type, v8::Local<v8::Value>)
 {
     $interfaceName* imp =  ${v8InterfaceName}::toNative(host);
     return BindingSecurity::shouldAllowAccessToFrame(BindingState::instance(), imp->frame(), DoNotReportSecurityError);
 }
 
 END
 }
 
 sub GetNativeTypeForConversions
@@ skipping 147 matching lines @@
         AddToImplIncludes("${implementedBy}.h");
         unshift(@arguments, "imp") if !$function->isStatic;
         $functionName = "${implementedBy}::${name}";
     } elsif ($function->isStatic) {
         $functionName = "${interfaceName}::${name}";
     } else {
         $functionName = "imp->${name}";
     }
 
     my $callWith = $function->signature->extendedAttributes->{"CallWith"};
-    my @callWithOutput = ();
-    my @callWithArgs = GenerateCallWith($callWith, \@callWithOutput, $indent, 0, $function);
-    $result .= join("", @callWithOutput);
-    unshift(@arguments, @callWithArgs);
-    $index += @callWithArgs;
-    $numberOfParameters += @callWithArgs;
+    my ($callWithArgs, $code) = GenerateCallWith($callWith, $indent, 0, $function);
+    $result .= $code;
+    unshift(@arguments, @$callWithArgs);
+    $index += @$callWithArgs;
+    $numberOfParameters += @$callWithArgs;
 
     foreach my $parameter (@{$function->parameters}) {
         if ($index eq $numberOfParameters) {
             last;
         }
         my $paramName = $parameter->name;
         my $paramType = $parameter->type;
 
         if ($replacements{$paramName}) {
             push @arguments, $replacements{$paramName};
@@ skipping 582 matching lines @@
     }
     foreach my $condition (sort keys %implIncludeConditions) {
         $contents .= "\n#if " . $codeGenerator->GenerateConditionalStringFromAttributeValue($condition) . "\n";
         foreach my $include (sort @{$implIncludeConditions{$condition}}) {
             $contents .= "#include $include\n";
         }
         $contents .= "#endif\n";
     }
 
     $contents .= "\n";
-    $contents .= join "", @implContentInternals, @implContent;
+    $contents .= join "", @implInternalStuff, @implStuff;
     $codeGenerator->UpdateFile($implFileName, $contents);
 
     %implIncludes = ();
     @implContentHeader = ();
-    @implContentInternals = ();
-    @implContent = ();
+    @implInternalStuff = ();
+    @implStuff = ();
 
     # Update a .h file if the contents are changed.
     $contents = join "", @headerContent;
     $codeGenerator->UpdateFile($headerFileName, $contents);
 
     @headerContent = ();
 }
 
 sub ConvertToV8StringResource
 {
@@ skipping 40 matching lines @@
 
 sub GetPassRefPtrType
 {
     my $v8InterfaceName = shift;
 
     my $angleBracketSpace = $v8InterfaceName =~ />$/ ? " " : "";
     return "PassRefPtr<${v8InterfaceName}${angleBracketSpace}>";
 }
 
 1;