Attachment #129729 for bug #79375

View Details Raw Unified Return to Bug 79375

| Differences between



2012-03-01  Pablo Flouret  <pablof@motorola.com>

        Fix code generators to correctly guard header declarations that have a [Conditional] attribute.
        https://bugs.webkit.org/show_bug.cgi?id=79375

        Reviewed by NOBODY (OOPS!).

        In most cases code generators weren't checking the Conditional attribute
        when generating code in headers for function/attribute/constants, they
        were just guarding against the Conditional for the whole interface.

        * bindings/scripts/CodeGeneratorCPP.pm:
        (GenerateHeader):
        * bindings/scripts/CodeGeneratorJS.pm:
        (GenerateHeader):
        * bindings/scripts/CodeGeneratorObjC.pm:
        (GenerateHeader):
        * bindings/scripts/CodeGeneratorV8.pm:
        (GenerateHeader):
        * bindings/scripts/test/CPP/WebDOMTestInterface.h:
        * bindings/scripts/test/CPP/WebDOMTestObj.h:
        * bindings/scripts/test/JS/JSTestInterface.h:
        (JSTestInterface):
        (WebCore):
        * bindings/scripts/test/JS/JSTestObj.h:
        (WebCore):
        * bindings/scripts/test/ObjC/DOMTestInterface.h:
        * bindings/scripts/test/ObjC/DOMTestObj.h:


2012-02-29  Jason Liu  <jason.liu@torchmobile.com.cn>

        [BlackBerry]Make about:cache feature available in release version.

Lines 494-501 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm +3 lines
494	AddForwardDeclarationsForType($type, 1);	494	AddForwardDeclarationsForType($type, 1);
495	}	495	}
496		496
		497	my $conditionalString = GenerateConditionalString($function->signature);
		498	push(@headerFunctions, "#if ${conditionalString}\n") if $conditionalString;
497	push(@headerFunctions, " ");	499	push(@headerFunctions, " ");
498	push(@headerFunctions, $functionDeclaration);	500	push(@headerFunctions, $functionDeclaration);
		501	push(@headerFunctions, "#endif\n") if $conditionalString;
499	}	502	}
500		503
501	if (@headerFunctions > 0) {	504	if (@headerFunctions > 0) {



            $numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomGetter"} || $attribute->signature->extendedAttributes->{"JSCustomGetter"});
            $numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomSetter"} || $attribute->signature->extendedAttributes->{"JSCustomSetter"});
            if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {
                my $conditionalString = GenerateConditionalString($attribute->signature);
                push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
                push(@headerContent, "    JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");
                $numCachedAttributes++;
                $needsMarkChildren = 1;
                push(@headerContent, "#endif\n") if $conditionalString;
            }
        }
    }

        push(@headerContent, "\n    // Custom attributes\n");

        foreach my $attribute (@{$dataNode->attributes}) {
            my $conditionalString = GenerateConditionalString($attribute->signature);
            if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"JSCustom"} || $attribute->signature->extendedAttributes->{"CustomGetter"} || $attribute->signature->extendedAttributes->{"JSCustomGetter"}) {
                push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
                my $methodName = $codeGenerator->WK_lcfirst($attribute->signature->name);
                push(@headerContent, "    JSC::JSValue " . $methodName . "(JSC::ExecState*) const;\n");
                push(@headerContent, "#endif\n") if $conditionalString;
            }
            if (($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"JSCustom"} || $attribute->signature->extendedAttributes->{"CustomSetter"} || $attribute->signature->extendedAttributes->{"JSCustomSetter"}) && $attribute->type !~ /^readonly/) {
                push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
                push(@headerContent, "    void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(JSC::ExecState*, JSC::JSValue);\n");
                push(@headerContent, "#endif\n") if $conditionalString;
            }
        }
    }

        foreach my $function (@{$dataNode->functions}) {
            next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCustom"};
            next if $function->{overloads} && $function->{overloadIndex} != 1;
            my $conditionalString = GenerateConditionalString($function->signature);
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($function->signature->name);
            push(@headerContent, "    JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");
            push(@headerContent, "#endif\n") if $conditionalString;
        }
    }


        push(@headerContent,"// Functions\n\n");
        foreach my $function (@{$dataNode->functions}) {
            next if $function->{overloadIndex} && $function->{overloadIndex} > 1;
            my $conditionalString = GenerateConditionalString($function->signature);
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            my $functionName = GetFunctionName($className, $function);
            push(@headerContent, "JSC::EncodedJSValue JSC_HOST_CALL ${functionName}(JSC::ExecState*);\n");
            push(@headerContent, "#endif\n") if $conditionalString;
        }
    }

    if ($numAttributes > 0 || !$dataNode->extendedAttributes->{"OmitConstructor"}) {
        push(@headerContent,"// Attributes\n\n");
        foreach my $attribute (@{$dataNode->attributes}) {
            my $conditionalString = GenerateConditionalString($attribute->signature);
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
            push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
            unless ($attribute->type =~ /readonly/) {
                my $setter = "setJS" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
                push(@headerContent, "void ${setter}(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);\n");
            }
            push(@headerContent, "#endif\n") if $conditionalString;
        }
        
        if (!$dataNode->extendedAttributes->{"OmitConstructor"}) {

    if ($numConstants > 0) {
        push(@headerContent,"// Constants\n\n");
        foreach my $constant (@{$dataNode->constants}) {
            my $conditionalString = GenerateConditionalString($constant);
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($constant->name);
            my $conditional = $constant->extendedAttributes->{"Conditional"};
            if ($conditional) {
                my $conditionalString = $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
                push(@headerContent, "#if ${conditionalString}\n");
            }
            push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
            push(@headerContent, "#endif\n") if $conditionalString;
        }
    }


Lines 920-925 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm +13 lines
920	AddForwardDeclarationsForType($type, $public) unless $public and $needsDeprecatedVersion;	920	AddForwardDeclarationsForType($type, $public) unless $public and $needsDeprecatedVersion;
921	}	921	}
922		922
		923	my $functionConditionalString = GenerateConditionalString($function->signature);
		924	if ($functionConditionalString) {
		925	push(@headerFunctions, "#if ${functionConditionalString}\n") if $public;
		926	push(@privateHeaderFunctions, "#if ${functionConditionalString}\n") unless $public;
		927	push(@deprecatedHeaderFunctions, "#if ${functionConditionalString}\n") if $needsDeprecatedVersion;
		928	}
		929
923	push(@headerFunctions, $functionDeclaration) if $public;	930	push(@headerFunctions, $functionDeclaration) if $public;
924	push(@privateHeaderFunctions, $functionDeclaration) unless $public;	931	push(@privateHeaderFunctions, $functionDeclaration) unless $public;
925		932
Lines 948-953 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm_sec2
948		955
949	delete $publicInterfaces{$publicInterfaceKey};	956	delete $publicInterfaces{$publicInterfaceKey};
950	}	957	}
		958
		959	if ($functionConditionalString) {
		960	push(@headerFunctions, "#endif\n") if $public;
		961	push(@privateHeaderFunctions, "#endif\n") unless $public;
		962	push(@deprecatedHeaderFunctions, "#endif\n") if $needsDeprecatedVersion;
		963	}
951	}	964	}
952		965
953	if (@headerFunctions > 0) {	966	if (@headerFunctions > 0) {



        my $attrExt = $function->signature->extendedAttributes;

        if (($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) && !$attrExt->{"ImplementedBy"} && $function->{overloadIndex} == 1) {
            my $conditionalString = GenerateConditionalString($function->signature);
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            push(@headerContent, <<END);
    static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments&);
END
            push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
        }

        if ($attrExt->{"V8EnabledAtRuntime"}) {

    foreach my $attribute (@{$dataNode->attributes}) {
        my $name = $attribute->signature->name;
        my $attrExt = $attribute->signature->extendedAttributes;
        my $conditionalString = GenerateConditionalString($attribute->signature);
        if (($attrExt->{"V8CustomGetter"} || $attrExt->{"CustomGetter"} ||
             $attrExt->{"V8Custom"} || $attrExt->{"Custom"}) &&
            !$attrExt->{"ImplementedBy"}) {
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            push(@headerContent, <<END);
    static v8::Handle<v8::Value> ${name}AccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo&);
END
            push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
        }
        if (($attrExt->{"V8CustomSetter"} || $attrExt->{"CustomSetter"} ||
             $attrExt->{"V8Custom"} || $attrExt->{"Custom"}) &&
            !$attrExt->{"ImplementedBy"}) {
            push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
            push(@headerContent, <<END);
    static void ${name}AccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value>, const v8::AccessorInfo&);
END
            push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
        }
        if ($attrExt->{"V8EnabledAtRuntime"}) {
            push(@enabledAtRuntime, $attribute);

Lines 64-71 public: a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h_sec1
- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h +4 lines
64	void setSupplementalNode(const WebDOMNode&);	64	void setSupplementalNode(const WebDOMNode&);
65	#endif	65	#endif
66		66
		67	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
67	void supplementalMethod1();	68	void supplementalMethod1();
		69	#endif
		70	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
68	void supplementalMethod4();	71	void supplementalMethod4();
		72	#endif
69		73
70	WebCore::TestInterface* impl() const;	74	WebCore::TestInterface* impl() const;
71		75

Lines 175-187 public: a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h +10 lines
175	void methodWithOptionalString(const WebDOMString& str);	175	void methodWithOptionalString(const WebDOMString& str);
176	void methodWithOptionalStringIsUndefined(const WebDOMString& str);	176	void methodWithOptionalStringIsUndefined(const WebDOMString& str);
177	void methodWithOptionalStringIsNullString(const WebDOMString& str);	177	void methodWithOptionalStringIsNullString(const WebDOMString& str);
		178	#if ENABLE(Condition1)
178	WebDOMString conditionalMethod1();	179	WebDOMString conditionalMethod1();
		180	#endif
		181	#if ENABLE(Condition1) && ENABLE(Condition2)
179	void conditionalMethod2();	182	void conditionalMethod2();
		183	#endif
		184	#if ENABLE(Condition1) \|\| ENABLE(Condition2)
180	void conditionalMethod3();	185	void conditionalMethod3();
		186	#endif
181	void classMethod();	187	void classMethod();
182	int classMethodWithOptional(int arg);	188	int classMethodWithOptional(int arg);
		189	#if ENABLE(Condition1)
183	void overloadedMethod1(int arg);	190	void overloadedMethod1(int arg);
		191	#endif
		192	#if ENABLE(Condition1)
184	void overloadedMethod1(const WebDOMString& type);	193	void overloadedMethod1(const WebDOMString& type);
		194	#endif
185	void convert1(const WebDOMa& );	195	void convert1(const WebDOMa& );
186	void convert2(const WebDOMb& );	196	void convert2(const WebDOMb& );
187	void convert3(const WebDOMc& );	197	void convert3(const WebDOMc& );

Lines 58-68 public: a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h +22 lines
58	static JSC::JSValue getConstructor(JSC::ExecState, JSC::JSGlobalObject);	58	static JSC::JSValue getConstructor(JSC::ExecState, JSC::JSGlobalObject);
59		59
60	// Custom attributes	60	// Custom attributes
		61	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
61	JSC::JSValue supplementalStr3(JSC::ExecState*) const;	62	JSC::JSValue supplementalStr3(JSC::ExecState*) const;
		63	#endif
		64	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
62	void setSupplementalStr3(JSC::ExecState*, JSC::JSValue);	65	void setSupplementalStr3(JSC::ExecState*, JSC::JSValue);
		66	#endif
63		67
64	// Custom functions	68	// Custom functions
		69	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
65	JSC::JSValue supplementalMethod3(JSC::ExecState*);	70	JSC::JSValue supplementalMethod3(JSC::ExecState*);
		71	#endif
66	TestInterface* impl() const { return m_impl; }	72	TestInterface* impl() const { return m_impl; }
67	void releaseImpl() { m_impl->deref(); m_impl = 0; }	73	void releaseImpl() { m_impl->deref(); m_impl = 0; }
68		74
Lines 149-167 protected: a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h_sec2
149		155
150	// Functions	156	// Functions
151		157
		158	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
152	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod1(JSC::ExecState*);	159	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod1(JSC::ExecState*);
		160	#endif
		161	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
153	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod2(JSC::ExecState*);	162	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod2(JSC::ExecState*);
		163	#endif
		164	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
154	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod3(JSC::ExecState*);	165	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod3(JSC::ExecState*);
		166	#endif
		167	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
155	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfaceConstructorFunctionSupplementalMethod4(JSC::ExecState*);	168	JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfaceConstructorFunctionSupplementalMethod4(JSC::ExecState*);
		169	#endif
156	// Attributes	170	// Attributes
157		171
		172	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
158	JSC::JSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	173	JSC::JSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
		174	#endif
		175	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
159	JSC::JSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	176	JSC::JSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
160	void setJSTestInterfaceSupplementalStr2(JSC::ExecState, JSC::JSObject, JSC::JSValue);	177	void setJSTestInterfaceSupplementalStr2(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		178	#endif
		179	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
161	JSC::JSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	180	JSC::JSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
162	void setJSTestInterfaceSupplementalStr3(JSC::ExecState, JSC::JSObject, JSC::JSValue);	181	void setJSTestInterfaceSupplementalStr3(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		182	#endif
		183	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
163	JSC::JSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	184	JSC::JSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
164	void setJSTestInterfaceSupplementalNode(JSC::ExecState, JSC::JSObject, JSC::JSValue);	185	void setJSTestInterfaceSupplementalNode(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		186	#endif
165	JSC::JSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	187	JSC::JSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
166	// Constants	188	// Constants
167		189

Lines 184-196 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalSt a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h +20 lines
184	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackArg(JSC::ExecState*);	184	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackArg(JSC::ExecState*);
185	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg(JSC::ExecState*);	185	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg(JSC::ExecState*);
186	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg(JSC::ExecState*);	186	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg(JSC::ExecState*);
		187	#if ENABLE(Condition1)
187	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod1(JSC::ExecState*);	188	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod1(JSC::ExecState*);
		189	#endif
		190	#if ENABLE(Condition1) && ENABLE(Condition2)
188	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod2(JSC::ExecState*);	191	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod2(JSC::ExecState*);
		192	#endif
		193	#if ENABLE(Condition1) \|\| ENABLE(Condition2)
189	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod3(JSC::ExecState*);	194	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod3(JSC::ExecState*);
		195	#endif
190	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(JSC::ExecState*);	196	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(JSC::ExecState*);
191	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod(JSC::ExecState*);	197	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod(JSC::ExecState*);
192	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethodWithOptional(JSC::ExecState*);	198	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethodWithOptional(JSC::ExecState*);
		199	#if ENABLE(Condition1)
193	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionOverloadedMethod1(JSC::ExecState*);	200	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionOverloadedMethod1(JSC::ExecState*);
		201	#endif
194	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongArray(JSC::ExecState*);	202	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongArray(JSC::ExecState*);
195	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(JSC::ExecState*);	203	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(JSC::ExecState*);
196	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(JSC::ExecState*);	204	JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(JSC::ExecState*);
Lines 269-286 JSC::JSValue jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribut a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h_sec2
269	void setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState, JSC::JSObject, JSC::JSValue);	277	void setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState, JSC::JSObject, JSC::JSValue);
270	JSC::JSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	278	JSC::JSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
271	void setJSTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState, JSC::JSObject, JSC::JSValue);	279	void setJSTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		280	#if ENABLE(Condition1)
272	JSC::JSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	281	JSC::JSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
273	void setJSTestObjConditionalAttr1(JSC::ExecState, JSC::JSObject, JSC::JSValue);	282	void setJSTestObjConditionalAttr1(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		283	#endif
		284	#if ENABLE(Condition1) && ENABLE(Condition2)
274	JSC::JSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	285	JSC::JSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
275	void setJSTestObjConditionalAttr2(JSC::ExecState, JSC::JSObject, JSC::JSValue);	286	void setJSTestObjConditionalAttr2(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		287	#endif
		288	#if ENABLE(Condition1) \|\| ENABLE(Condition2)
276	JSC::JSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	289	JSC::JSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
277	void setJSTestObjConditionalAttr3(JSC::ExecState, JSC::JSObject, JSC::JSValue);	290	void setJSTestObjConditionalAttr3(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		291	#endif
		292	#if ENABLE(Condition1)
278	JSC::JSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	293	JSC::JSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
279	void setJSTestObjConditionalAttr4Constructor(JSC::ExecState, JSC::JSObject, JSC::JSValue);	294	void setJSTestObjConditionalAttr4Constructor(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		295	#endif
		296	#if ENABLE(Condition1) && ENABLE(Condition2)
280	JSC::JSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	297	JSC::JSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
281	void setJSTestObjConditionalAttr5Constructor(JSC::ExecState, JSC::JSObject, JSC::JSValue);	298	void setJSTestObjConditionalAttr5Constructor(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		299	#endif
		300	#if ENABLE(Condition1) \|\| ENABLE(Condition2)
282	JSC::JSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	301	JSC::JSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
283	void setJSTestObjConditionalAttr6Constructor(JSC::ExecState, JSC::JSObject, JSC::JSValue);	302	void setJSTestObjConditionalAttr6Constructor(JSC::ExecState, JSC::JSObject, JSC::JSValue);
		303	#endif
284	JSC::JSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	304	JSC::JSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
285	JSC::JSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	305	JSC::JSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
286	JSC::JSValue jsTestObjContentDocument(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);	306	JSC::JSValue jsTestObjContentDocument(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);

Lines 58-67 enum { a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.h_sec1
- a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.h +8 lines
58	- (DOMNode *)supplementalNode;	58	- (DOMNode *)supplementalNode;
59	- (void)setSupplementalNode:(DOMNode *)newSupplementalNode;	59	- (void)setSupplementalNode:(DOMNode *)newSupplementalNode;
60	#endif	60	#endif
		61	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
61	- (void)supplementalMethod1;	62	- (void)supplementalMethod1;
		63	#endif
		64	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
62	- (DOMTestObj )supplementalMethod2:(NSString )strArg objArg:(DOMTestObj *)objArg;	65	- (DOMTestObj )supplementalMethod2:(NSString )strArg objArg:(DOMTestObj *)objArg;
		66	#endif
		67	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
63	- (void)supplementalMethod3;	68	- (void)supplementalMethod3;
		69	#endif
		70	#if ENABLE(Condition11) \|\| ENABLE(Condition12)
64	- (void)supplementalMethod4;	71	- (void)supplementalMethod4;
		72	#endif
65	@end	73	@end
66		74
67	#endif	75	#endif

Lines 195-207 enum { a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h_sec1
- a/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h +10 lines
195	- (void)methodWithOptionalString:(NSString *)str;	195	- (void)methodWithOptionalString:(NSString *)str;
196	- (void)methodWithOptionalStringIsUndefined:(NSString *)str;	196	- (void)methodWithOptionalStringIsUndefined:(NSString *)str;
197	- (void)methodWithOptionalStringIsNullString:(NSString *)str;	197	- (void)methodWithOptionalStringIsNullString:(NSString *)str;
		198	#if ENABLE(Condition1)
198	- (NSString *)conditionalMethod1;	199	- (NSString *)conditionalMethod1;
		200	#endif
		201	#if ENABLE(Condition1) && ENABLE(Condition2)
199	- (void)conditionalMethod2;	202	- (void)conditionalMethod2;
		203	#endif
		204	#if ENABLE(Condition1) \|\| ENABLE(Condition2)
200	- (void)conditionalMethod3;	205	- (void)conditionalMethod3;
		206	#endif
201	- (void)classMethod;	207	- (void)classMethod;
202	- (int)classMethodWithOptional:(int)arg;	208	- (int)classMethodWithOptional:(int)arg;
		209	#if ENABLE(Condition1)
203	- (void)overloadedMethod1:(int)arg;	210	- (void)overloadedMethod1:(int)arg;
		211	#endif
		212	#if ENABLE(Condition1)
204	- (void)overloadedMethod1:(NSString *)type;	213	- (void)overloadedMethod1:(NSString *)type;
		214	#endif
205	- (DOMSVGDocument *)getSVGDocument;	215	- (DOMSVGDocument *)getSVGDocument;
206	- (void)convert1:(DOMa *);	216	- (void)convert1:(DOMa *);
207	- (void)convert2:(DOMb *);	217	- (void)convert2:(DOMb *);

Return to Bug 79375

Lines 844-852 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm -6 / +20 lines
844	$numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomGetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomGetter"});	844	$numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomGetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomGetter"});
845	$numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomSetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomSetter"});	845	$numCustomAttributes++ if ($attribute->signature->extendedAttributes->{"CustomSetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomSetter"});
846	if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {	846	if ($attribute->signature->extendedAttributes->{"CachedAttribute"}) {
		847	my $conditionalString = GenerateConditionalString($attribute->signature);
		848	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
847	push(@headerContent, " JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");	849	push(@headerContent, " JSC::WriteBarrier<JSC::Unknown> m_" . $attribute->signature->name . ";\n");
848	$numCachedAttributes++;	850	$numCachedAttributes++;
849	$needsMarkChildren = 1;	851	$needsMarkChildren = 1;
		852	push(@headerContent, "#endif\n") if $conditionalString;
850	}	853	}
851	}	854	}
852	}	855	}
Lines 861-872 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec2
861	push(@headerContent, "\n // Custom attributes\n");	864	push(@headerContent, "\n // Custom attributes\n");
862		865
863	foreach my $attribute (@{$dataNode->attributes}) {	866	foreach my $attribute (@{$dataNode->attributes}) {
		867	my $conditionalString = GenerateConditionalString($attribute->signature);
864	if ($attribute->signature->extendedAttributes->{"Custom"} \|\| $attribute->signature->extendedAttributes->{"JSCustom"} \|\| $attribute->signature->extendedAttributes->{"CustomGetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomGetter"}) {	868	if ($attribute->signature->extendedAttributes->{"Custom"} \|\| $attribute->signature->extendedAttributes->{"JSCustom"} \|\| $attribute->signature->extendedAttributes->{"CustomGetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomGetter"}) {
		869	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
865	my $methodName = $codeGenerator->WK_lcfirst($attribute->signature->name);	870	my $methodName = $codeGenerator->WK_lcfirst($attribute->signature->name);
866	push(@headerContent, " JSC::JSValue " . $methodName . "(JSC::ExecState*) const;\n");	871	push(@headerContent, " JSC::JSValue " . $methodName . "(JSC::ExecState*) const;\n");
		872	push(@headerContent, "#endif\n") if $conditionalString;
867	}	873	}
868	if (($attribute->signature->extendedAttributes->{"Custom"} \|\| $attribute->signature->extendedAttributes->{"JSCustom"} \|\| $attribute->signature->extendedAttributes->{"CustomSetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomSetter"}) && $attribute->type !~ /^readonly/) {	874	if (($attribute->signature->extendedAttributes->{"Custom"} \|\| $attribute->signature->extendedAttributes->{"JSCustom"} \|\| $attribute->signature->extendedAttributes->{"CustomSetter"} \|\| $attribute->signature->extendedAttributes->{"JSCustomSetter"}) && $attribute->type !~ /^readonly/) {
		875	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
869	push(@headerContent, " void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(JSC::ExecState*, JSC::JSValue);\n");	876	push(@headerContent, " void set" . $codeGenerator->WK_ucfirst($attribute->signature->name) . "(JSC::ExecState*, JSC::JSValue);\n");
		877	push(@headerContent, "#endif\n") if $conditionalString;
870	}	878	}
871	}	879	}
872	}	880	}
Lines 880-887 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec3
880	foreach my $function (@{$dataNode->functions}) {	888	foreach my $function (@{$dataNode->functions}) {
881	next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCustom"};	889	next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCustom"};
882	next if $function->{overloads} && $function->{overloadIndex} != 1;	890	next if $function->{overloads} && $function->{overloadIndex} != 1;
		891	my $conditionalString = GenerateConditionalString($function->signature);
		892	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
883	my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} \|\| $codeGenerator->WK_lcfirst($function->signature->name);	893	my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} \|\| $codeGenerator->WK_lcfirst($function->signature->name);
884	push(@headerContent, " JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");	894	push(@headerContent, " JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");
		895	push(@headerContent, "#endif\n") if $conditionalString;
885	}	896	}
886	}	897	}
887		898
Lines 1067-1086 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec4
1067	push(@headerContent,"// Functions\n\n");	1078	push(@headerContent,"// Functions\n\n");
1068	foreach my $function (@{$dataNode->functions}) {	1079	foreach my $function (@{$dataNode->functions}) {
1069	next if $function->{overloadIndex} && $function->{overloadIndex} > 1;	1080	next if $function->{overloadIndex} && $function->{overloadIndex} > 1;
		1081	my $conditionalString = GenerateConditionalString($function->signature);
		1082	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
1070	my $functionName = GetFunctionName($className, $function);	1083	my $functionName = GetFunctionName($className, $function);
1071	push(@headerContent, "JSC::EncodedJSValue JSC_HOST_CALL ${functionName}(JSC::ExecState*);\n");	1084	push(@headerContent, "JSC::EncodedJSValue JSC_HOST_CALL ${functionName}(JSC::ExecState*);\n");
		1085	push(@headerContent, "#endif\n") if $conditionalString;
1072	}	1086	}
1073	}	1087	}
1074		1088
1075	if ($numAttributes > 0 \|\| !$dataNode->extendedAttributes->{"OmitConstructor"}) {	1089	if ($numAttributes > 0 \|\| !$dataNode->extendedAttributes->{"OmitConstructor"}) {
1076	push(@headerContent,"// Attributes\n\n");	1090	push(@headerContent,"// Attributes\n\n");
1077	foreach my $attribute (@{$dataNode->attributes}) {	1091	foreach my $attribute (@{$dataNode->attributes}) {
		1092	my $conditionalString = GenerateConditionalString($attribute->signature);
		1093	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
1078	my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");	1094	my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
1079	push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");	1095	push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
1080	unless ($attribute->type =~ /readonly/) {	1096	unless ($attribute->type =~ /readonly/) {
1081	my $setter = "setJS" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");	1097	my $setter = "setJS" . $interfaceName . $codeGenerator->WK_ucfirst($attribute->signature->name) . ($attribute->signature->type =~ /Constructor$/ ? "Constructor" : "");
1082	push(@headerContent, "void ${setter}(JSC::ExecState, JSC::JSObject, JSC::JSValue);\n");	1098	push(@headerContent, "void ${setter}(JSC::ExecState, JSC::JSObject, JSC::JSValue);\n");
1083	}	1099	}
		1100	push(@headerContent, "#endif\n") if $conditionalString;
1084	}	1101	}
1085		1102
1086	if (!$dataNode->extendedAttributes->{"OmitConstructor"}) {	1103	if (!$dataNode->extendedAttributes->{"OmitConstructor"}) {
Lines 1097-1110 sub GenerateHeader a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec5
1097	if ($numConstants > 0) {	1114	if ($numConstants > 0) {
1098	push(@headerContent,"// Constants\n\n");	1115	push(@headerContent,"// Constants\n\n");
1099	foreach my $constant (@{$dataNode->constants}) {	1116	foreach my $constant (@{$dataNode->constants}) {
		1117	my $conditionalString = GenerateConditionalString($constant);
		1118	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
1100	my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($constant->name);	1119	my $getter = "js" . $interfaceName . $codeGenerator->WK_ucfirst($constant->name);
1101	my $conditional = $constant->extendedAttributes->{"Conditional"};
1102	if ($conditional) {
1103	my $conditionalString = $codeGenerator->GenerateConditionalStringFromAttributeValue($conditional);
1104	push(@headerContent, "#if ${conditionalString}\n");
1105	}
1106	push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");	1120	push(@headerContent, "JSC::JSValue ${getter}(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
1107	push(@headerContent, "#endif\n") if $conditional;	1121	push(@headerContent, "#endif\n") if $conditionalString;
1108	}	1122	}
1109	}	1123	}
1110		1124

Lines 365-373 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm +8 lines
365	my $attrExt = $function->signature->extendedAttributes;	365	my $attrExt = $function->signature->extendedAttributes;
366		366
367	if (($attrExt->{"Custom"} \|\| $attrExt->{"V8Custom"}) && !$attrExt->{"ImplementedBy"} && $function->{overloadIndex} == 1) {	367	if (($attrExt->{"Custom"} \|\| $attrExt->{"V8Custom"}) && !$attrExt->{"ImplementedBy"} && $function->{overloadIndex} == 1) {
		368	my $conditionalString = GenerateConditionalString($function->signature);
		369	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
368	push(@headerContent, <<END);	370	push(@headerContent, <<END);
369	static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments&);	371	static v8::Handle<v8::Value> ${name}Callback(const v8::Arguments&);
370	END	372	END
		373	push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
371	}	374	}
372		375
373	if ($attrExt->{"V8EnabledAtRuntime"}) {	376	if ($attrExt->{"V8EnabledAtRuntime"}) {
Lines 384-402 END a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm_sec2
384	foreach my $attribute (@{$dataNode->attributes}) {	387	foreach my $attribute (@{$dataNode->attributes}) {
385	my $name = $attribute->signature->name;	388	my $name = $attribute->signature->name;
386	my $attrExt = $attribute->signature->extendedAttributes;	389	my $attrExt = $attribute->signature->extendedAttributes;
		390	my $conditionalString = GenerateConditionalString($attribute->signature);
387	if (($attrExt->{"V8CustomGetter"} \|\| $attrExt->{"CustomGetter"} \|\|	391	if (($attrExt->{"V8CustomGetter"} \|\| $attrExt->{"CustomGetter"} \|\|
388	$attrExt->{"V8Custom"} \|\| $attrExt->{"Custom"}) &&	392	$attrExt->{"V8Custom"} \|\| $attrExt->{"Custom"}) &&
389	!$attrExt->{"ImplementedBy"}) {	393	!$attrExt->{"ImplementedBy"}) {
		394	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
390	push(@headerContent, <<END);	395	push(@headerContent, <<END);
391	static v8::Handle<v8::Value> ${name}AccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo&);	396	static v8::Handle<v8::Value> ${name}AccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo&);
392	END	397	END
		398	push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
393	}	399	}
394	if (($attrExt->{"V8CustomSetter"} \|\| $attrExt->{"CustomSetter"} \|\|	400	if (($attrExt->{"V8CustomSetter"} \|\| $attrExt->{"CustomSetter"} \|\|
395	$attrExt->{"V8Custom"} \|\| $attrExt->{"Custom"}) &&	401	$attrExt->{"V8Custom"} \|\| $attrExt->{"Custom"}) &&
396	!$attrExt->{"ImplementedBy"}) {	402	!$attrExt->{"ImplementedBy"}) {
		403	push(@headerContent, "#if ${conditionalString}\n") if $conditionalString;
397	push(@headerContent, <<END);	404	push(@headerContent, <<END);
398	static void ${name}AccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value>, const v8::AccessorInfo&);	405	static void ${name}AccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value>, const v8::AccessorInfo&);
399	END	406	END
		407	push(@headerContent, "#endif // ${conditionalString}\n") if $conditionalString;
400	}	408	}
401	if ($attrExt->{"V8EnabledAtRuntime"}) {	409	if ($attrExt->{"V8EnabledAtRuntime"}) {
402	push(@enabledAtRuntime, $attribute);	410	push(@enabledAtRuntime, $attribute);

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +30 lines
		1	2012-03-01 Pablo Flouret <pablof@motorola.com>
		2
		3	Fix code generators to correctly guard header declarations that have a [Conditional] attribute.
		4	https://bugs.webkit.org/show_bug.cgi?id=79375
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	In most cases code generators weren't checking the Conditional attribute
		9	when generating code in headers for function/attribute/constants, they
		10	were just guarding against the Conditional for the whole interface.
		11
		12	* bindings/scripts/CodeGeneratorCPP.pm:
		13	(GenerateHeader):
		14	* bindings/scripts/CodeGeneratorJS.pm:
		15	(GenerateHeader):
		16	* bindings/scripts/CodeGeneratorObjC.pm:
		17	(GenerateHeader):
		18	* bindings/scripts/CodeGeneratorV8.pm:
		19	(GenerateHeader):
		20	* bindings/scripts/test/CPP/WebDOMTestInterface.h:
		21	* bindings/scripts/test/CPP/WebDOMTestObj.h:
		22	* bindings/scripts/test/JS/JSTestInterface.h:
		23	(JSTestInterface):
		24	(WebCore):
		25	* bindings/scripts/test/JS/JSTestObj.h:
		26	(WebCore):
		27	* bindings/scripts/test/ObjC/DOMTestInterface.h:
		28	* bindings/scripts/test/ObjC/DOMTestObj.h:
		29
		30
1	2012-02-29 Jason Liu <jason.liu@torchmobile.com.cn>	31	2012-02-29 Jason Liu <jason.liu@torchmobile.com.cn>
2		32
3	[BlackBerry]Make about:cache feature available in release version.	33	[BlackBerry]Make about:cache feature available in release version.