Title: [152154] trunk/Source/WebCore
- Revision
- 152154
- Author
- [email protected]
- Date
- 2013-06-28 01:20:19 -0700 (Fri, 28 Jun 2013)
Log Message
Use & instead of | in the value of [CallWith]
https://bugs.webkit.org/show_bug.cgi?id=118054
Reviewed by Kentaro Hara.
[CallWith=ScriptExecutionContext|ScriptState] meant that both the
ScriptExecutionContext AND the ScriptState would be passed as
arguments to the implementation (not one OR the other).
This patch changes the semantics for those IDL extended attributes
to make it less confusing. Proper usage is now:
[CallWith=ScriptExecutionContext&ScriptState]
No new tests, covered by existing bindings tests.
* bindings/scripts/CodeGenerator.pm:
(ExtendedAttributeContains):
* bindings/scripts/test/TestObj.idl:
* page/Console.idl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152153 => 152154)
--- trunk/Source/WebCore/ChangeLog 2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/ChangeLog 2013-06-28 08:20:19 UTC (rev 152154)
@@ -1,3 +1,25 @@
+2013-06-28 Christophe Dumez <[email protected]>
+
+ Use & instead of | in the value of [CallWith]
+ https://bugs.webkit.org/show_bug.cgi?id=118054
+
+ Reviewed by Kentaro Hara.
+
+ [CallWith=ScriptExecutionContext|ScriptState] meant that both the
+ ScriptExecutionContext AND the ScriptState would be passed as
+ arguments to the implementation (not one OR the other).
+
+ This patch changes the semantics for those IDL extended attributes
+ to make it less confusing. Proper usage is now:
+ [CallWith=ScriptExecutionContext&ScriptState]
+
+ No new tests, covered by existing bindings tests.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (ExtendedAttributeContains):
+ * bindings/scripts/test/TestObj.idl:
+ * page/Console.idl:
+
2013-06-27 Kangil Han <[email protected]>
HTMLAudioElement doesn't have to know about isVideo function
Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (152153 => 152154)
--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2013-06-28 08:20:19 UTC (rev 152154)
@@ -798,7 +798,7 @@
return 0 unless $callWith;
my $keyword = shift;
- my @callWithKeywords = split /\s*\|\s*/, $callWith;
+ my @callWithKeywords = split /\s*\&\s*/, $callWith;
return grep { $_ eq $keyword } @callWithKeywords;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (152153 => 152154)
--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2013-06-28 08:20:19 UTC (rev 152154)
@@ -119,19 +119,19 @@
[CallWith=ScriptState, RaisesException] void withScriptStateVoidException();
[CallWith=ScriptState, RaisesException] TestObj withScriptStateObjException();
[CallWith=ScriptExecutionContext] void withScriptExecutionContext();
- [CallWith=ScriptExecutionContext|ScriptState] void withScriptExecutionContextAndScriptState();
- [CallWith=ScriptExecutionContext|ScriptState, RaisesException] TestObj withScriptExecutionContextAndScriptStateObjException();
- [CallWith= ScriptExecutionContext | ScriptState ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
- [CallWith=ScriptArguments|CallStack] void withScriptArgumentsAndCallStack();
+ [CallWith=ScriptExecutionContext&ScriptState] void withScriptExecutionContextAndScriptState();
+ [CallWith=ScriptExecutionContext&ScriptState, RaisesException] TestObj withScriptExecutionContextAndScriptStateObjException();
+ [CallWith= ScriptExecutionContext & ScriptState ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
+ [CallWith=ScriptArguments&CallStack] void withScriptArgumentsAndCallStack();
[CallWith=ScriptState] attribute long withScriptStateAttribute;
[CallWith=ScriptExecutionContext] attribute TestObj withScriptExecutionContextAttribute;
[CallWith=ScriptState, GetterRaisesException] attribute TestObj withScriptStateAttributeRaises;
[CallWith=ScriptExecutionContext, GetterRaisesException] attribute TestObj withScriptExecutionContextAttributeRaises;
- [CallWith=ScriptExecutionContext|ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
- [CallWith=ScriptExecutionContext|ScriptState,GetterRaisesException] attribute TestObj withScriptExecutionContextAndScriptStateAttributeRaises;
- [CallWith= ScriptExecutionContext | ScriptState ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
- [CallWith=ScriptArguments|CallStack] attribute TestObj withScriptArgumentsAndCallStackAttribute;
+ [CallWith=ScriptExecutionContext&ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
+ [CallWith=ScriptExecutionContext&ScriptState,GetterRaisesException] attribute TestObj withScriptExecutionContextAndScriptStateAttributeRaises;
+ [CallWith= ScriptExecutionContext & ScriptState ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
+ [CallWith=ScriptArguments&CallStack] attribute TestObj withScriptArgumentsAndCallStackAttribute;
// 'Optional' extended attribute
void methodWithOptionalArg(optional long opt);
Modified: trunk/Source/WebCore/page/Console.idl (152153 => 152154)
--- trunk/Source/WebCore/page/Console.idl 2013-06-28 07:34:43 UTC (rev 152153)
+++ trunk/Source/WebCore/page/Console.idl 2013-06-28 08:20:19 UTC (rev 152154)
@@ -31,17 +31,17 @@
GenerateIsReachable=ImplFrame,
] interface Console {
- [CallWith=ScriptArguments|ScriptState] void debug();
- [CallWith=ScriptArguments|ScriptState] void error();
- [CallWith=ScriptArguments|ScriptState] void info();
- [CallWith=ScriptArguments|ScriptState] void log();
- [CallWith=ScriptArguments|ScriptState] void warn();
- [CallWith=ScriptArguments|ScriptState] void dir();
- [CallWith=ScriptArguments|ScriptState] void dirxml();
- [CallWith=ScriptArguments|ScriptState] void table();
- [CallWith=ScriptArguments|ScriptState] void trace();
- [CallWith=ScriptArguments|ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
- [CallWith=ScriptArguments|ScriptState] void count();
+ [CallWith=ScriptArguments&ScriptState] void debug();
+ [CallWith=ScriptArguments&ScriptState] void error();
+ [CallWith=ScriptArguments&ScriptState] void info();
+ [CallWith=ScriptArguments&ScriptState] void log();
+ [CallWith=ScriptArguments&ScriptState] void warn();
+ [CallWith=ScriptArguments&ScriptState] void dir();
+ [CallWith=ScriptArguments&ScriptState] void dirxml();
+ [CallWith=ScriptArguments&ScriptState] void table();
+ [CallWith=ScriptArguments&ScriptState] void trace();
+ [CallWith=ScriptArguments&ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
+ [CallWith=ScriptArguments&ScriptState] void count();
// As per spec: http://www.w3.org/TR/WebIDL/#idl-sequence
// "Sequences must not be used as the type of an attribute, constant or exception field."
@@ -53,9 +53,9 @@
void time([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
[CallWith=ScriptState] void timeEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
[CallWith=ScriptArguments] void timeStamp();
- [CallWith=ScriptArguments|ScriptState] void group();
- [CallWith=ScriptArguments|ScriptState] void groupCollapsed();
+ [CallWith=ScriptArguments&ScriptState] void group();
+ [CallWith=ScriptArguments&ScriptState] void groupCollapsed();
void groupEnd();
- [CallWith=ScriptArguments|ScriptState] void clear();
+ [CallWith=ScriptArguments&ScriptState] void clear();
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
