Changeset 152154 in webkit


Ignore:
Timestamp:
Jun 28, 2013 1:20:19 AM (11 years ago)
Author:
Christophe Dumez
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:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r152150 r152154  
     12013-06-28  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        Use & instead of | in the value of [CallWith]
     4        https://bugs.webkit.org/show_bug.cgi?id=118054
     5
     6        Reviewed by Kentaro Hara.
     7
     8        [CallWith=ScriptExecutionContext|ScriptState] meant that both the
     9        ScriptExecutionContext AND the ScriptState would be passed as
     10        arguments to the implementation (not one OR the other).
     11
     12        This patch changes the semantics for those IDL extended attributes
     13        to make it less confusing. Proper usage is now:
     14        [CallWith=ScriptExecutionContext&ScriptState]
     15
     16        No new tests, covered by existing bindings tests.
     17
     18        * bindings/scripts/CodeGenerator.pm:
     19        (ExtendedAttributeContains):
     20        * bindings/scripts/test/TestObj.idl:
     21        * page/Console.idl:
     22
    1232013-06-27  Kangil Han  <kangil.han@samsung.com>
    224

  • trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm

    r151499 r152154  
    799799    my $keyword = shift;
    800800
    801     my @callWithKeywords = split /\s*\|\s*/, $callWith;
     801    my @callWithKeywords = split /\s*\&\s*/, $callWith;
    802802    return grep { $_ eq $keyword } @callWithKeywords;
    803803}

  • trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

    r151912 r152154  
    120120    [CallWith=ScriptState, RaisesException] TestObj withScriptStateObjException();
    121121    [CallWith=ScriptExecutionContext] void withScriptExecutionContext();
    122     [CallWith=ScriptExecutionContext|ScriptState] void withScriptExecutionContextAndScriptState();
    123     [CallWith=ScriptExecutionContext|ScriptState, RaisesException] TestObj withScriptExecutionContextAndScriptStateObjException();
    124     [CallWith=  ScriptExecutionContext  |  ScriptState  ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
    125     [CallWith=ScriptArguments|CallStack] void withScriptArgumentsAndCallStack();
     122    [CallWith=ScriptExecutionContext&ScriptState] void withScriptExecutionContextAndScriptState();
     123    [CallWith=ScriptExecutionContext&ScriptState, RaisesException] TestObj withScriptExecutionContextAndScriptStateObjException();
     124    [CallWith=  ScriptExecutionContext  &  ScriptState  ] TestObj withScriptExecutionContextAndScriptStateWithSpaces();
     125    [CallWith=ScriptArguments&CallStack] void withScriptArgumentsAndCallStack();
    126126
    127127    [CallWith=ScriptState] attribute long withScriptStateAttribute;
    … …  
    129129    [CallWith=ScriptState, GetterRaisesException] attribute TestObj withScriptStateAttributeRaises;
    130130    [CallWith=ScriptExecutionContext, GetterRaisesException] attribute TestObj withScriptExecutionContextAttributeRaises;
    131     [CallWith=ScriptExecutionContext|ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
    132     [CallWith=ScriptExecutionContext|ScriptState,GetterRaisesException] attribute TestObj withScriptExecutionContextAndScriptStateAttributeRaises;
    133     [CallWith=  ScriptExecutionContext  |  ScriptState  ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
    134     [CallWith=ScriptArguments|CallStack] attribute TestObj withScriptArgumentsAndCallStackAttribute;
     131    [CallWith=ScriptExecutionContext&ScriptState] attribute TestObj withScriptExecutionContextAndScriptStateAttribute;
     132    [CallWith=ScriptExecutionContext&ScriptState,GetterRaisesException] attribute TestObj withScriptExecutionContextAndScriptStateAttributeRaises;
     133    [CallWith=  ScriptExecutionContext  &  ScriptState  ] attribute TestObj withScriptExecutionContextAndScriptStateWithSpacesAttribute;
     134    [CallWith=ScriptArguments&CallStack] attribute TestObj withScriptArgumentsAndCallStackAttribute;
    135135
    136136    // 'Optional' extended attribute

  • trunk/Source/WebCore/page/Console.idl

    r151774 r152154  
    3232] interface Console {
    3333
    34     [CallWith=ScriptArguments|ScriptState] void debug();
    35     [CallWith=ScriptArguments|ScriptState] void error();
    36     [CallWith=ScriptArguments|ScriptState] void info();
    37     [CallWith=ScriptArguments|ScriptState] void log();
    38     [CallWith=ScriptArguments|ScriptState] void warn();
    39     [CallWith=ScriptArguments|ScriptState] void dir();
    40     [CallWith=ScriptArguments|ScriptState] void dirxml();
    41     [CallWith=ScriptArguments|ScriptState] void table();
    42     [CallWith=ScriptArguments|ScriptState] void trace();
    43     [CallWith=ScriptArguments|ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
    44     [CallWith=ScriptArguments|ScriptState] void count();
     34    [CallWith=ScriptArguments&ScriptState] void debug();
     35    [CallWith=ScriptArguments&ScriptState] void error();
     36    [CallWith=ScriptArguments&ScriptState] void info();
     37    [CallWith=ScriptArguments&ScriptState] void log();
     38    [CallWith=ScriptArguments&ScriptState] void warn();
     39    [CallWith=ScriptArguments&ScriptState] void dir();
     40    [CallWith=ScriptArguments&ScriptState] void dirxml();
     41    [CallWith=ScriptArguments&ScriptState] void table();
     42    [CallWith=ScriptArguments&ScriptState] void trace();
     43    [CallWith=ScriptArguments&ScriptState, ImplementedAs=assertCondition] void assert(boolean condition);
     44    [CallWith=ScriptArguments&ScriptState] void count();
    4545
    4646    // As per spec: http://www.w3.org/TR/WebIDL/#idl-sequence
    … …  
    5454    [CallWith=ScriptState] void timeEnd([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
    5555    [CallWith=ScriptArguments] void timeStamp();
    56     [CallWith=ScriptArguments|ScriptState] void group();
    57     [CallWith=ScriptArguments|ScriptState] void groupCollapsed();
     56    [CallWith=ScriptArguments&ScriptState] void group();
     57    [CallWith=ScriptArguments&ScriptState] void groupCollapsed();
    5858    void groupEnd();
    59     [CallWith=ScriptArguments|ScriptState] void clear();
     59    [CallWith=ScriptArguments&ScriptState] void clear();
    6060};
    6161
Note: See TracChangeset for help on using the changeset viewer.