IDL compiler: [PerContextEnabled] for getters

Source/bindings/scripts/code_generator_v8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 756 matching lines @@
 
     if ($interface->name eq "Window") {
         $header{classPublic}->add(<<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 (@perContextEnabledAttributes) {
         $header{classPublic}->add(<<END);
-    static void installPerContextProperties(v8::Handle<v8::Object>, ${nativeType}*, v8::Isolate*);
+    static void installPerContextEnabledProperties(v8::Handle<v8::Object>, ${nativeType}*, v8::Isolate*);
 END
     } else {
         $header{classPublic}->add(<<END);
-    static void installPerContextProperties(v8::Handle<v8::Object>, ${nativeType}*, v8::Isolate*) { }
+    static void installPerContextEnabledProperties(v8::Handle<v8::Object>, ${nativeType}*, v8::Isolate*) { }
 END
     }
 
     if (@perContextEnabledFunctions) {
         $header{classPublic}->add(<<END);
-    static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*);
+    static void installPerContextEnabledPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*);
 END
     } else {
         $header{classPublic}->add(<<END);
-    static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
+    static void installPerContextEnabledPrototypeProperties(v8::Handle<v8::Object>, v8::Isolate*) { }
 END
     }
 
     if ($interfaceName eq "HTMLElement") {
         $header{classPublic}->add(<<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") {
         $header{classPublic}->add(<<END);
@@ skipping 2089 matching lines @@
     if (InheritsExtendedAttribute($interface, "ActiveDOMObject")) {
         $toActiveDOMObject = "${v8ClassName}::toActiveDOMObject";
     }
 
     my $toEventTarget = "0";
     if (InheritsInterface($interface, "EventTarget")) {
         $toEventTarget = "${v8ClassName}::toEventTarget";
     }
 
     $implementation{nameSpaceWebCore}->add(<<END);
-WrapperTypeInfo ${v8ClassName}Constructor::info = { ${v8ClassName}Constructor::GetTemplate, ${v8ClassName}::derefObject, $toActiveDOMObject, $toEventTarget, 0, ${v8ClassName}::installPerContextPrototypeProperties, 0, WrapperTypeObjectPrototype };
+WrapperTypeInfo ${v8ClassName}Constructor::info = { ${v8ClassName}Constructor::GetTemplate, ${v8ClassName}::derefObject, $toActiveDOMObject, $toEventTarget, 0, ${v8ClassName}::installPerContextEnabledPrototypeProperties, 0, WrapperTypeObjectPrototype };
 
 END
 
     my $code = "";
     $code .= <<END;
 static void ${v8ClassName}ConstructorCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
 END
     $code .= $maybeObserveFeature if $maybeObserveFeature;
     $code .= $maybeDeprecateFeature if $maybeDeprecateFeature;
@@ skipping 1133 matching lines @@
 {
     WebCore::initializeScriptWrappableForInterface(object);
 }
 
 namespace WebCore {
 END
         $implementation{nameSpaceWebCore}->addHeader($code);
     }
 
     my $code = "WrapperTypeInfo ${v8ClassName}::info = { ${v8ClassName}::GetTemplate, ${v8ClassName}::derefObject, $toActiveDOMObject, $toEventTarget, ";
-    $code .= "$rootForGC, ${v8ClassName}::installPerContextPrototypeProperties, $parentClassInfo, $WrapperTypePrototype };\n";
+    $code .= "$rootForGC, ${v8ClassName}::installPerContextEnabledPrototypeProperties, $parentClassInfo, $WrapperTypePrototype };\n";
     $implementation{nameSpaceWebCore}->addHeader($code);
 
     $implementation{nameSpaceInternal}->add("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];
@@ skipping 123 matching lines @@
     my @runtimeEnabledAttributes;
     my @perContextEnabledAttributes;
     my @normalAttributes;
     my @staticAttributes;
     foreach my $attribute (@$attributes) {
 
         if ($attribute->isStatic) {
             push(@staticAttributes, $attribute);
         } elsif ($interfaceName eq "Window" && $attribute->extendedAttributes->{"Unforgeable"}) {
             push(@disallowsShadowing, $attribute);
-        } elsif ($attribute->extendedAttributes->{"RuntimeEnabled"} || $attribute->extendedAttributes->{"PerContextEnabled"}) {
-            if ($attribute->extendedAttributes->{"PerContextEnabled"}) {
-                push(@perContextEnabledAttributes, $attribute);
-            }
-            if ($attribute->extendedAttributes->{"RuntimeEnabled"}) {
-                push(@runtimeEnabledAttributes, $attribute);
-            }
+        } elsif ($attribute->extendedAttributes->{"PerContextEnabled"}) {
+            push(@perContextEnabledAttributes, $attribute);
+        } elsif ($attribute->extendedAttributes->{"RuntimeEnabled"}) {
+            push(@runtimeEnabledAttributes, $attribute);
         } else {
             push(@normalAttributes, $attribute);
         }
     }
     AddToImplIncludes("bindings/v8/V8DOMConfiguration.h");
     # Put the attributes that disallow shadowing on the shadow object.
     if (@disallowsShadowing) {
         my $code = "";
         $code .= "static const V8DOMConfiguration::AttributeConfiguration shadowAttributes[] = {\n";
         $code .= GenerateAttributeConfigurationArray($interface, \@disallowsShadowing);
@@ skipping 143 matching lines @@
     UNUSED_PARAM(proto);
 END
     }
 
     if ($access_check) {
         $code .=  "    $access_check\n";
     }
 
     # Setup the enable-at-runtime attributes if we have them
     foreach my $runtime_attr (@runtimeEnabledAttributes) {
-        next if grep { $_ eq $runtime_attr } @perContextEnabledAttributes;
         my $runtimeEnabledFunction = GetRuntimeEnabledFunctionName($runtime_attr);
         my $conditionalString = GenerateConditionalString($runtime_attr);
         $code .= "#if ${conditionalString}\n" if $conditionalString;
         $code .= "    if (${runtimeEnabledFunction}()) {\n";
         $code .= "        static const V8DOMConfiguration::AttributeConfiguration attributeConfiguration =\\\n";
         $code .= GenerateAttributeConfiguration($interface, $runtime_attr, ";", "    ");
         $code .= <<END;
         V8DOMConfiguration::installAttribute(instance, proto, attributeConfiguration, isolate, currentWorldType);
     }
 END
@@ skipping 123 matching lines @@
     return V8PerIsolateData::from(isolate)->hasInstance(&info, value, MainWorld)
         || V8PerIsolateData::from(isolate)->hasInstance(&info, value, IsolatedWorld)
         || V8PerIsolateData::from(isolate)->hasInstance(&info, value, WorkerWorld);
 }
 
 END
 
     if (@perContextEnabledAttributes) {
         my $code = "";
         $code .= <<END;
-void ${v8ClassName}::installPerContextProperties(v8::Handle<v8::Object> instance, ${nativeType}* impl, v8::Isolate* isolate)
+void ${v8ClassName}::installPerContextEnabledProperties(v8::Handle<v8::Object> instance, ${nativeType}* impl, v8::Isolate* isolate)
 {
     v8::Local<v8::Object> proto = v8::Local<v8::Object>::Cast(instance->GetPrototype());
 END
 
         # Setup the enable-by-settings attributes if we have them
-        foreach my $runtimeAttribute (@perContextEnabledAttributes) {
-            my $contextEnabledFunction = GetContextEnabledFunctionName($runtimeAttribute);
-            my $conditionalString = GenerateConditionalString($runtimeAttribute);
-            $code .= "\n#if ${conditionalString}\n" if $conditionalString;
-            if (grep { $_ eq $runtimeAttribute } @runtimeEnabledAttributes) {
-                my $runtimeEnabledFunction = GetRuntimeEnabledFunctionName($runtimeAttribute);
-                $code .= "    if (${contextEnabledFunction}(impl->document()) && ${runtimeEnabledFunction}()) {\n";
-            } else {
-                $code .= "    if (${contextEnabledFunction}(impl->document())) {\n";
-            }
+        foreach my $perContextEnabledAttribute (@perContextEnabledAttributes) {
+            my $contextEnabledFunction = GetContextEnabledFunctionName($perContextEnabledAttribute);
+            $code .= "    if (${contextEnabledFunction}(impl->document())) {\n";
 
-            $code .= "        static const V8DOMConfiguration::AttributeConfiguration    attributeConfiguration =\\\n";
-            $code .= GenerateAttributeConfiguration($interface, $runtimeAttribute, ";", "    ");
+            $code .= "        static const V8DOMConfiguration::AttributeConfiguration attributeConfiguration =\\\n";
+            $code .= GenerateAttributeConfiguration($interface, $perContextEnabledAttribute, ";", "    ");
             $code .= <<END;
         V8DOMConfiguration::installAttribute(instance, proto, attributeConfiguration, isolate);
 END
             $code .= "    }\n";
-            $code .= "#endif // ${conditionalString}\n" if $conditionalString;
         }
         $code .= <<END;
 }
 
 END
         $implementation{nameSpaceWebCore}->add($code);
     }
 
     if (@perContextEnabledFunctions) {
         my $code = "";
         $code .= <<END;
-void ${v8ClassName}::installPerContextPrototypeProperties(v8::Handle<v8::Object> proto, v8::Isolate* isolate)
+void ${v8ClassName}::installPerContextEnabledPrototypeProperties(v8::Handle<v8::Object> proto, v8::Isolate* isolate)
 {
     UNUSED_PARAM(proto);
 END
         # Setup the enable-by-settings functions if we have them
         $code .=  <<END;
     v8::Local<v8::Signature> defaultSignature = v8::Signature::New(GetTemplate(isolate, worldType(isolate)));
     UNUSED_PARAM(defaultSignature);
 
     ExecutionContext* context = toExecutionContext(proto->CreationContext());
 END
@@ skipping 416 matching lines @@
       $code .= <<END;
     for (unsigned i = 0, n = impl->numberOfChannels(); i < n; i++) {
         Float32Array* channelData = impl->getChannelData(i);
         channelData->buffer()->setDeallocationObserver(V8ArrayBufferDeallocationObserver::instance());
     }
 END
     }
 
 
     $code .= <<END;
-    installPerContextProperties(wrapper, impl.get(), isolate);
+    installPerContextEnabledProperties(wrapper, impl.get(), isolate);
     V8DOMWrapper::associateObjectWithWrapper<$v8ClassName>(impl, &info, wrapper, isolate, $wrapperConfiguration);
     return wrapper;
 }
 
 END
     $implementation{nameSpaceWebCore}->add($code);
 }
 
 sub GenerateSecurityCheckFunctions
 {
@@ skipping 1223 matching lines @@
     my $interface = shift;
 
     return 1 if $interface->extendedAttributes->{"CustomToV8"};
     return 1 if $interface->extendedAttributes->{"SpecialWrapFor"};
     return 1 if InheritsInterface($interface, "Document");
 
     return 0;
 }
 
 1;