Diff
Modified: trunk/Source/WebCore/ChangeLog (109514 => 109515)
--- trunk/Source/WebCore/ChangeLog 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/ChangeLog 2012-03-02 06:50:12 UTC (rev 109515)
@@ -1,3 +1,33 @@
+2012-03-01 Pablo Flouret <[email protected]>
+
+ Fix code generators to correctly guard header declarations that have a [Conditional] attribute.
+ https://bugs.webkit.org/show_bug.cgi?id=79375
+
+ Reviewed by Kentaro Hara.
+
+ 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-03-01 Dana Jansens <[email protected]>
[chromium] Make opaque paint tracker aware of SkCanvas layers
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-03-02 06:50:12 UTC (rev 109515)
@@ -494,8 +494,11 @@
AddForwardDeclarationsForType($type, 1);
}
+ my $conditionalString = GenerateConditionalString($function->signature);
+ push(@headerFunctions, "#if ${conditionalString}\n") if $conditionalString;
push(@headerFunctions, " ");
push(@headerFunctions, $functionDeclaration);
+ push(@headerFunctions, "#endif\n") if $conditionalString;
}
if (@headerFunctions > 0) {
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-03-02 06:50:12 UTC (rev 109515)
@@ -844,9 +844,12 @@
$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;
}
}
}
@@ -861,12 +864,17 @@
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;
}
}
}
@@ -880,8 +888,11 @@
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;
}
}
@@ -1067,20 +1078,26 @@
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"}) {
@@ -1097,14 +1114,11 @@
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 $conditional;
+ push(@headerContent, "#endif\n") if $conditionalString;
}
}
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2012-03-02 06:50:12 UTC (rev 109515)
@@ -920,6 +920,13 @@
AddForwardDeclarationsForType($type, $public) unless $public and $needsDeprecatedVersion;
}
+ my $functionConditionalString = GenerateConditionalString($function->signature);
+ if ($functionConditionalString) {
+ push(@headerFunctions, "#if ${functionConditionalString}\n") if $public;
+ push(@privateHeaderFunctions, "#if ${functionConditionalString}\n") unless $public;
+ push(@deprecatedHeaderFunctions, "#if ${functionConditionalString}\n") if $needsDeprecatedVersion;
+ }
+
push(@headerFunctions, $functionDeclaration) if $public;
push(@privateHeaderFunctions, $functionDeclaration) unless $public;
@@ -948,6 +955,12 @@
delete $publicInterfaces{$publicInterfaceKey};
}
+
+ if ($functionConditionalString) {
+ push(@headerFunctions, "#endif\n") if $public;
+ push(@privateHeaderFunctions, "#endif\n") unless $public;
+ push(@deprecatedHeaderFunctions, "#endif\n") if $needsDeprecatedVersion;
+ }
}
if (@headerFunctions > 0) {
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-03-02 06:50:12 UTC (rev 109515)
@@ -365,9 +365,12 @@
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"}) {
@@ -384,19 +387,24 @@
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);
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestInterface.h 2012-03-02 06:50:12 UTC (rev 109515)
@@ -64,8 +64,12 @@
void setSupplementalNode(const WebDOMNode&);
#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
void supplementalMethod1();
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
void supplementalMethod4();
+#endif
WebCore::TestInterface* impl() const;
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-03-02 06:50:12 UTC (rev 109515)
@@ -160,13 +160,23 @@
void methodWithOptionalString(const WebDOMString& str);
void methodWithOptionalStringIsUndefined(const WebDOMString& str);
void methodWithOptionalStringIsNullString(const WebDOMString& str);
+#if ENABLE(Condition1)
WebDOMString conditionalMethod1();
+#endif
+#if ENABLE(Condition1) && ENABLE(Condition2)
void conditionalMethod2();
+#endif
+#if ENABLE(Condition1) || ENABLE(Condition2)
void conditionalMethod3();
+#endif
void classMethod();
int classMethodWithOptional(int arg);
+#if ENABLE(Condition1)
void overloadedMethod1(int arg);
+#endif
+#if ENABLE(Condition1)
void overloadedMethod1(const WebDOMString& type);
+#endif
void convert1(const WebDOMa& );
void convert2(const WebDOMb& );
void convert3(const WebDOMc& );
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2012-03-02 06:50:12 UTC (rev 109515)
@@ -58,11 +58,17 @@
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
// Custom attributes
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::JSValue supplementalStr3(JSC::ExecState*) const;
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
void setSupplementalStr3(JSC::ExecState*, JSC::JSValue);
+#endif
// Custom functions
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::JSValue supplementalMethod3(JSC::ExecState*);
+#endif
TestInterface* impl() const { return m_impl; }
void releaseImpl() { m_impl->deref(); m_impl = 0; }
@@ -149,19 +155,35 @@
// Functions
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod1(JSC::ExecState*);
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod2(JSC::ExecState*);
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfacePrototypeFunctionSupplementalMethod3(JSC::ExecState*);
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::EncodedJSValue JSC_HOST_CALL jsTestInterfaceConstructorFunctionSupplementalMethod4(JSC::ExecState*);
+#endif
// Attributes
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::JSValue jsTestInterfaceSupplementalStr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::JSValue jsTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestInterfaceSupplementalStr2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::JSValue jsTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestInterfaceSupplementalStr3(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
JSC::JSValue jsTestInterfaceSupplementalNode(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestInterfaceSupplementalNode(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
JSC::JSValue jsTestInterfaceConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
// Constants
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2012-03-02 06:50:12 UTC (rev 109515)
@@ -184,13 +184,21 @@
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackArg(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg(JSC::ExecState*);
+#if ENABLE(Condition1)
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod1(JSC::ExecState*);
+#endif
+#if ENABLE(Condition1) && ENABLE(Condition2)
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod2(JSC::ExecState*);
+#endif
+#if ENABLE(Condition1) || ENABLE(Condition2)
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConditionalMethod3(JSC::ExecState*);
+#endif
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionOverloadedMethod(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethod(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionClassMethodWithOptional(JSC::ExecState*);
+#if ENABLE(Condition1)
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjConstructorFunctionOverloadedMethod1(JSC::ExecState*);
+#endif
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithUnsignedLongArray(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionGetSVGDocument(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionConvert1(JSC::ExecState*);
@@ -269,18 +277,30 @@
void setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
JSC::JSValue jsTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjWithScriptArgumentsAndCallStackAttribute(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#if ENABLE(Condition1)
JSC::JSValue jsTestObjConditionalAttr1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjConditionalAttr1(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition1) && ENABLE(Condition2)
JSC::JSValue jsTestObjConditionalAttr2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjConditionalAttr2(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition1) || ENABLE(Condition2)
JSC::JSValue jsTestObjConditionalAttr3(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjConditionalAttr3(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition1)
JSC::JSValue jsTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjConditionalAttr4Constructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition1) && ENABLE(Condition2)
JSC::JSValue jsTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjConditionalAttr5Constructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
+#if ENABLE(Condition1) || ENABLE(Condition2)
JSC::JSValue jsTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
void setJSTestObjConditionalAttr6Constructor(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
+#endif
JSC::JSValue jsTestObjCachedAttribute1(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
JSC::JSValue jsTestObjCachedAttribute2(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
JSC::JSValue jsTestObjContentDocument(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.h (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.h 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.h 2012-03-02 06:50:12 UTC (rev 109515)
@@ -58,10 +58,18 @@
- (DOMNode *)supplementalNode;
- (void)setSupplementalNode:(DOMNode *)newSupplementalNode;
#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
- (void)supplementalMethod1;
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
- (DOMTestObj *)supplementalMethod2:(NSString *)strArg objArg:(DOMTestObj *)objArg;
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
- (void)supplementalMethod3;
+#endif
+#if ENABLE(Condition11) || ENABLE(Condition12)
- (void)supplementalMethod4;
+#endif
@end
#endif
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h (109514 => 109515)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2012-03-02 06:47:13 UTC (rev 109514)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2012-03-02 06:50:12 UTC (rev 109515)
@@ -195,13 +195,23 @@
- (void)methodWithOptionalString:(NSString *)str;
- (void)methodWithOptionalStringIsUndefined:(NSString *)str;
- (void)methodWithOptionalStringIsNullString:(NSString *)str;
+#if ENABLE(Condition1)
- (NSString *)conditionalMethod1;
+#endif
+#if ENABLE(Condition1) && ENABLE(Condition2)
- (void)conditionalMethod2;
+#endif
+#if ENABLE(Condition1) || ENABLE(Condition2)
- (void)conditionalMethod3;
+#endif
- (void)classMethod;
- (int)classMethodWithOptional:(int)arg;
+#if ENABLE(Condition1)
- (void)overloadedMethod1:(int)arg;
+#endif
+#if ENABLE(Condition1)
- (void)overloadedMethod1:(NSString *)type;
+#endif
- (DOMSVGDocument *)getSVGDocument;
- (void)convert1:(DOMa *);
- (void)convert2:(DOMb *);
