Changeset 107312 in webkit


Ignore:
Timestamp:
Feb 9, 2012 4:56:29 PM (12 years ago)
Author:
haraken@chromium.org
Message:

Rename [ConvertNullStringTo=] to [TreatReturnedNullStringAs=]
​https://bugs.webkit.org/show_bug.cgi?id=78108

Reviewed by Adam Barth.

[ConvertNullStringTo=] is not descriptive. To clarify that it specifies
the behavior when the null string is returned by WebCore, this patch renames
[ConvertNullStringTo=] to [TreatReturnedNullStringAs=]. This change is also
for naming consistency with [TreatNullAs] and [TreatUndefinedAs].

No tests. No change in behavior.

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateGetOwnPropertySlotBody):
(NativeToJSValue):

  • bindings/scripts/CodeGeneratorV8.pm:

(GenerateImplementationIndexer):
(NativeToJSValue):

  • bindings/scripts/test/TestObj.idl:
  • css/CSSCharsetRule.idl:
  • css/CSSImportRule.idl:
  • css/CSSPageRule.idl:
  • css/CSSRule.idl:
  • css/CSSStyleDeclaration.idl:
  • css/CSSStyleRule.idl:
  • css/CSSValue.idl:
  • css/MediaList.idl:
  • css/StyleSheet.idl:
  • css/WebKitCSSKeyframesRule.idl:
  • dom/Attr.idl:
  • dom/CharacterData.idl:
  • dom/Clipboard.idl:
  • dom/DOMStringList.idl:
  • dom/Document.idl:
  • dom/DocumentType.idl:
  • dom/Element.idl:
  • dom/Entity.idl:
  • dom/MutationRecord.idl:
  • dom/Node.idl:
  • dom/Notation.idl:
  • dom/ProcessingInstruction.idl:
  • html/DOMTokenList.idl:
  • html/DOMURL.idl:
  • html/HTMLMediaElement.idl:
  • html/canvas/WebGLDebugShaders.idl:
  • html/canvas/WebGLRenderingContext.idl:
  • page/DOMWindow.idl:
  • storage/IDBObjectStore.idl:
  • storage/IDBRequest.idl:
  • storage/Storage.idl:
  • storage/StorageEvent.idl:
  • websockets/WebSocket.idl:
  • xml/XMLHttpRequest.idl:
  • xml/XPathNSResolver.idl:
  • xml/XSLTProcessor.idl:
Location:
trunk/Source/WebCore
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r107310 r107312  
     12012-02-09  Kentaro Hara  <haraken@chromium.org>
     2
     3        Rename [ConvertNullStringTo=] to [TreatReturnedNullStringAs=]
     4        https://bugs.webkit.org/show_bug.cgi?id=78108
     5
     6        Reviewed by Adam Barth.
     7
     8        [ConvertNullStringTo=] is not descriptive. To clarify that it specifies
     9        the behavior when the null string is returned by WebCore, this patch renames
     10        [ConvertNullStringTo=] to [TreatReturnedNullStringAs=]. This change is also
     11        for naming consistency with [TreatNullAs] and [TreatUndefinedAs].
     12
     13        No tests. No change in behavior.
     14
     15        * bindings/scripts/CodeGeneratorJS.pm:
     16        (GenerateGetOwnPropertySlotBody):
     17        (NativeToJSValue):
     18        * bindings/scripts/CodeGeneratorV8.pm:
     19        (GenerateImplementationIndexer):
     20        (NativeToJSValue):
     21        * bindings/scripts/test/TestObj.idl:
     22        * css/CSSCharsetRule.idl:
     23        * css/CSSImportRule.idl:
     24        * css/CSSPageRule.idl:
     25        * css/CSSRule.idl:
     26        * css/CSSStyleDeclaration.idl:
     27        * css/CSSStyleRule.idl:
     28        * css/CSSValue.idl:
     29        * css/MediaList.idl:
     30        * css/StyleSheet.idl:
     31        * css/WebKitCSSKeyframesRule.idl:
     32        * dom/Attr.idl:
     33        * dom/CharacterData.idl:
     34        * dom/Clipboard.idl:
     35        * dom/DOMStringList.idl:
     36        * dom/Document.idl:
     37        * dom/DocumentType.idl:
     38        * dom/Element.idl:
     39        * dom/Entity.idl:
     40        * dom/MutationRecord.idl:
     41        * dom/Node.idl:
     42        * dom/Notation.idl:
     43        * dom/ProcessingInstruction.idl:
     44        * html/DOMTokenList.idl:
     45        * html/DOMURL.idl:
     46        * html/HTMLMediaElement.idl:
     47        * html/canvas/WebGLDebugShaders.idl:
     48        * html/canvas/WebGLRenderingContext.idl:
     49        * page/DOMWindow.idl:
     50        * storage/IDBObjectStore.idl:
     51        * storage/IDBRequest.idl:
     52        * storage/Storage.idl:
     53        * storage/StorageEvent.idl:
     54        * websockets/WebSocket.idl:
     55        * xml/XMLHttpRequest.idl:
     56        * xml/XPathNSResolver.idl:
     57        * xml/XSLTProcessor.idl:
     58
    1592012-02-09  Tony Chang  <tony@chromium.org>
    260

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

    r107304 r107312  
    438438        push(@getOwnPropertySlotImpl, "    unsigned index = propertyName.toUInt32(ok);\n");
    439439
    440         # If the item function returns a string then we let the ConvertNullStringTo handle the cases
     440        # If the item function returns a string then we let the TreatReturnedNullStringAs handle the cases
    441441        # where the index is out of range.
    442442        if (IndexGetterReturnsStrings($implClassName)) {
    … …  
    29392939    if ($codeGenerator->IsStringType($type)) {
    29402940        AddToImplIncludes("KURL.h", $conditional);
    2941         my $conv = $signature->extendedAttributes->{"ConvertNullStringTo"};
     2941        my $conv = $signature->extendedAttributes->{"TreatReturnedNullStringAs"};
    29422942        if (defined $conv) {
    29432943            return "jsStringOrNull(exec, $value)" if $conv eq "Null";
    … …  
    29452945            return "jsStringOrFalse(exec, $value)" if $conv eq "False";
    29462946
    2947             die "Unknown value for ConvertNullStringTo extended attribute";
     2947            die "Unknown value for TreatReturnedNullStringAs extended attribute";
    29482948        }
    29492949        $conv = $signature->extendedAttributes->{"ConvertScriptString"};

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

    r107304 r107312  
    20852085    if ($indexerType && !$hasCustomSetter) {
    20862086        if ($indexerType eq "DOMString") {
    2087             my $conversion = $indexer->extendedAttributes->{"ConvertNullStringTo"};
     2087            my $conversion = $indexer->extendedAttributes->{"TreatReturnedNullStringAs"};
    20882088            if ($conversion && $conversion eq "Null") {
    20892089                push(@implContent, <<END);
    … …  
    37213721
    37223722    if ($codeGenerator->IsStringType($type)) {
    3723         my $conv = $signature->extendedAttributes->{"ConvertNullStringTo"};
     3723        my $conv = $signature->extendedAttributes->{"TreatReturnedNullStringAs"};
    37243724        if (defined $conv) {
    37253725            return "v8StringOrNull($value)" if $conv eq "Null";
    … …  
    37273727            return "v8StringOrFalse($value)" if $conv eq "False";
    37283728
    3729             die "Unknown value for ConvertNullStringTo extended attribute";
     3729            die "Unknown value for TreatReturnedNullStringAs extended attribute";
    37303730        }
    37313731        $conv = $signature->extendedAttributes->{"ConvertScriptString"};

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

    r107304 r107312  
    192192            raises(DOMException);
    193193
    194         void convert1(in [ConvertNullStringTo=Null] a);
    195         void convert2(in [ConvertNullStringTo=Undefined] b);
    196         void convert3(in [ConvertNullStringTo=False] c);
     194        void convert1(in [TreatReturnedNullStringAs=Null] a);
     195        void convert2(in [TreatReturnedNullStringAs=Undefined] b);
     196        void convert3(in [TreatReturnedNullStringAs=False] c);
    197197        void convert4(in [TreatNullAs=NullString] d);
    198198        void convert5(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] e);

  • trunk/Source/WebCore/css/CSSCharsetRule.idl

    r107204 r107312  
    2424    interface CSSCharsetRule : CSSRule {
    2525#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
    26         readonly attribute [ConvertNullStringTo=Null] DOMString encoding;
     26        readonly attribute [TreatReturnedNullStringAs=Null] DOMString encoding;
    2727#else
    28                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString encoding
     28                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString encoding
    2929                     setter raises(DOMException);
    3030#endif

  • trunk/Source/WebCore/css/CSSImportRule.idl

    r107204 r107312  
    2323    // Introduced in DOM Level 2:
    2424    interface CSSImportRule : CSSRule {
    25         readonly attribute [ConvertNullStringTo=Null] DOMString href;
     25        readonly attribute [TreatReturnedNullStringAs=Null] DOMString href;
    2626        readonly attribute MediaList media;
    2727        readonly attribute CSSStyleSheet styleSheet;

  • trunk/Source/WebCore/css/CSSPageRule.idl

    r107204 r107312  
    2424    interface CSSPageRule : CSSRule {
    2525
    26                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
     26                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString selectorText;
    2727
    2828        readonly attribute CSSStyleDeclaration style;

  • trunk/Source/WebCore/css/CSSRule.idl

    r107204 r107312  
    4444        readonly attribute unsigned short   type;
    4545
    46                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
     46                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString        cssText
    4747                     setter raises (DOMException);
    4848

  • trunk/Source/WebCore/css/CSSStyleDeclaration.idl

    r107304 r107312  
    3131        V8DependentLifetime
    3232    ] CSSStyleDeclaration {
    33                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
     33                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString        cssText
    3434                     setter raises(DOMException);
    3535
    36         [ConvertNullStringTo=Null] DOMString          getPropertyValue(in [Optional=DefaultIsUndefined] DOMString propertyName);
     36        [TreatReturnedNullStringAs=Null] DOMString          getPropertyValue(in [Optional=DefaultIsUndefined] DOMString propertyName);
    3737        [JSCustom] CSSValue           getPropertyCSSValue(in [Optional=DefaultIsUndefined] DOMString propertyName);
    38         [ConvertNullStringTo=Null] DOMString          removeProperty(in [Optional=DefaultIsUndefined] DOMString propertyName)
     38        [TreatReturnedNullStringAs=Null] DOMString          removeProperty(in [Optional=DefaultIsUndefined] DOMString propertyName)
    3939            raises(DOMException);
    40         [ConvertNullStringTo=Null] DOMString          getPropertyPriority(in [Optional=DefaultIsUndefined] DOMString propertyName);
     40        [TreatReturnedNullStringAs=Null] DOMString          getPropertyPriority(in [Optional=DefaultIsUndefined] DOMString propertyName);
    4141        [ObjCLegacyUnnamedParameters] void setProperty(in [Optional=DefaultIsUndefined] DOMString propertyName,
    4242                                        in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString value,
    … …  
    4949
    5050        // Extensions
    51         [ConvertNullStringTo=Null] DOMString          getPropertyShorthand(in [Optional=DefaultIsUndefined] DOMString propertyName);
     51        [TreatReturnedNullStringAs=Null] DOMString          getPropertyShorthand(in [Optional=DefaultIsUndefined] DOMString propertyName);
    5252        boolean            isPropertyImplicit(in [Optional=DefaultIsUndefined] DOMString propertyName);
    5353    };

  • trunk/Source/WebCore/css/CSSStyleRule.idl

    r107204 r107312  
    2424    interface CSSStyleRule : CSSRule {
    2525
    26                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
     26                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString selectorText;
    2727
    2828        readonly attribute CSSStyleDeclaration style;

  • trunk/Source/WebCore/css/CSSValue.idl

    r107204 r107312  
    3535        const unsigned short CSS_CUSTOM          = 3;
    3636
    37                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString cssText
     37                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString cssText
    3838                     setter raises(DOMException);
    3939

  • trunk/Source/WebCore/css/MediaList.idl

    r107304 r107312  
    3232    ] MediaList {
    3333
    34                  attribute [TreatNullAs=NullString, ConvertNullStringTo=Null] DOMString mediaText
     34                 attribute [TreatNullAs=NullString, TreatReturnedNullStringAs=Null] DOMString mediaText
    3535                     setter raises(DOMException);
    3636        readonly attribute unsigned long length;
    3737
    38         [ConvertNullStringTo=Null] DOMString item(in [Optional=DefaultIsUndefined] unsigned long index);
     38        [TreatReturnedNullStringAs=Null] DOMString item(in [Optional=DefaultIsUndefined] unsigned long index);
    3939        void deleteMedium(in [Optional=DefaultIsUndefined] DOMString oldMedium)
    4040            raises(DOMException);

  • trunk/Source/WebCore/css/StyleSheet.idl

    r107204 r107312  
    2929        V8DependentLifetime
    3030    ] StyleSheet {
    31         readonly attribute [ConvertNullStringTo=Null] DOMString        type;
     31        readonly attribute [TreatReturnedNullStringAs=Null] DOMString        type;
    3232                 attribute boolean          disabled;
    3333        readonly attribute Node             ownerNode;
    3434        readonly attribute StyleSheet       parentStyleSheet;
    35         readonly attribute [ConvertNullStringTo=Null] DOMString        href;
    36         readonly attribute [ConvertNullStringTo=Null] DOMString        title;
     35        readonly attribute [TreatReturnedNullStringAs=Null] DOMString        href;
     36        readonly attribute [TreatReturnedNullStringAs=Null] DOMString        title;
    3737        readonly attribute MediaList        media;
    3838

  • trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl

    r107304 r107312  
    3434    ] WebKitCSSKeyframesRule : CSSRule {
    3535
    36         attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString name;
     36        attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString name;
    3737        readonly attribute CSSRuleList cssRules;
    3838       

  • trunk/Source/WebCore/dom/Attr.idl

    r107204 r107312  
    2828        // DOM Level 1
    2929
    30         readonly attribute [ConvertNullStringTo=Null] DOMString name;
     30        readonly attribute [TreatReturnedNullStringAs=Null] DOMString name;
    3131
    3232        readonly attribute boolean specified;
    3333
    34                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString value
     34                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString value
    3535                     setter raises(DOMException);
    3636

  • trunk/Source/WebCore/dom/CharacterData.idl

    r107304 r107312  
    2727        readonly attribute unsigned long length;
    2828       
    29         [ConvertNullStringTo=Null, ObjCLegacyUnnamedParameters] DOMString substringData(in [IsIndex,Optional=DefaultIsUndefined] unsigned long offset,
     29        [TreatReturnedNullStringAs=Null, ObjCLegacyUnnamedParameters] DOMString substringData(in [IsIndex,Optional=DefaultIsUndefined] unsigned long offset,
    3030                                                                         in [IsIndex,Optional=DefaultIsUndefined] unsigned long length)
    3131            raises(DOMException);

  • trunk/Source/WebCore/dom/Clipboard.idl

    r107204 r107312  
    3030
    3131    interface Clipboard {
    32                  attribute [ConvertNullStringTo=Undefined] DOMString dropEffect;
    33                  attribute [ConvertNullStringTo=Undefined] DOMString effectAllowed;
     32                 attribute [TreatReturnedNullStringAs=Undefined] DOMString dropEffect;
     33                 attribute [TreatReturnedNullStringAs=Undefined] DOMString effectAllowed;
    3434        readonly attribute [CustomGetter] Array types;
    3535        readonly attribute FileList files;

  • trunk/Source/WebCore/dom/DOMStringList.idl

    r107304 r107312  
    3030    ] DOMStringList {
    3131        readonly attribute unsigned long length;
    32         [ConvertNullStringTo=Null] DOMString item(in [IsIndex,Optional=DefaultIsUndefined] unsigned long index);
     32        [TreatReturnedNullStringAs=Null] DOMString item(in [IsIndex,Optional=DefaultIsUndefined] unsigned long index);
    3333        boolean contains(in [Optional=DefaultIsUndefined] DOMString string);
    3434    };

  • trunk/Source/WebCore/dom/Document.idl

    r107304 r107312  
    6565        // DOM Level 3 Core
    6666
    67         readonly attribute [ConvertNullStringTo=Null] DOMString inputEncoding;
    68 
    69         readonly attribute [ConvertNullStringTo=Null] DOMString xmlEncoding;
    70                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString xmlVersion
     67        readonly attribute [TreatReturnedNullStringAs=Null] DOMString inputEncoding;
     68
     69        readonly attribute [TreatReturnedNullStringAs=Null] DOMString xmlEncoding;
     70                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString xmlVersion
    7171                    setter raises (DOMException);
    7272                 attribute boolean xmlStandalone
    … …  
    7676            raises (DOMException);
    7777
    78                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString documentURI;
     78                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString documentURI;
    7979
    8080        // DOM Level 2 Events (DocumentEvents interface)
    … …  
    142142        boolean            queryCommandState(in [Optional=DefaultIsUndefined] DOMString command);
    143143        boolean            queryCommandSupported(in [Optional=DefaultIsUndefined] DOMString command);
    144         [ConvertNullStringTo=False] DOMString queryCommandValue(in [Optional=DefaultIsUndefined] DOMString command);
     144        [TreatReturnedNullStringAs=False] DOMString queryCommandValue(in [Optional=DefaultIsUndefined] DOMString command);
    145145
    146146        // Moved down from HTMLDocument
    … …  
    185185        // IE extensions
    186186
    187                  attribute [ConvertNullStringTo=Undefined, TreatNullAs=NullString] DOMString charset;
    188         readonly attribute [ConvertNullStringTo=Undefined] DOMString defaultCharset;
    189         readonly attribute [ConvertNullStringTo=Undefined] DOMString readyState;
     187                 attribute [TreatReturnedNullStringAs=Undefined, TreatNullAs=NullString] DOMString charset;
     188        readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString defaultCharset;
     189        readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString readyState;
    190190
    191191        Element            elementFromPoint(in [Optional=DefaultIsUndefined] long x,
    … …  
    198198        DOMSelection       getSelection();
    199199#endif
    200         readonly attribute [ConvertNullStringTo=Null] DOMString characterSet;
     200        readonly attribute [TreatReturnedNullStringAs=Null] DOMString characterSet;
    201201
    202202        // WebKit extensions
    203203
    204         readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet;
    205                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectedStylesheetSet;
     204        readonly attribute [TreatReturnedNullStringAs=Null] DOMString preferredStylesheetSet;
     205                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString selectedStylesheetSet;
    206206
    207207#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT

  • trunk/Source/WebCore/dom/DocumentType.idl

    r107204 r107312  
    3232        // DOM Level 2
    3333
    34         readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
    35         readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
    36         readonly attribute [ConvertNullStringTo=Null] DOMString internalSubset;       
     34        readonly attribute [TreatReturnedNullStringAs=Null] DOMString publicId;
     35        readonly attribute [TreatReturnedNullStringAs=Null] DOMString systemId;
     36        readonly attribute [TreatReturnedNullStringAs=Null] DOMString internalSubset;       
    3737
    3838    };

  • trunk/Source/WebCore/dom/Element.idl

    r107304 r107312  
    2828        // DOM Level 1 Core
    2929
    30         readonly attribute [ConvertNullStringTo=Null] DOMString tagName;
    31 
    32         [ConvertNullStringTo=Null] DOMString getAttribute(in [Optional=DefaultIsUndefined] DOMString name);
     30        readonly attribute [TreatReturnedNullStringAs=Null] DOMString tagName;
     31
     32        [TreatReturnedNullStringAs=Null] DOMString getAttribute(in [Optional=DefaultIsUndefined] DOMString name);
    3333        [ObjCLegacyUnnamedParameters] void setAttribute(in [Optional=DefaultIsUndefined] DOMString name,
    3434                                         in [Optional=DefaultIsUndefined] DOMString value)

  • trunk/Source/WebCore/dom/Entity.idl

    r107204 r107312  
    2121
    2222    interface Entity : Node {
    23         readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
    24         readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
    25         readonly attribute [ConvertNullStringTo=Null] DOMString notationName;
     23        readonly attribute [TreatReturnedNullStringAs=Null] DOMString publicId;
     24        readonly attribute [TreatReturnedNullStringAs=Null] DOMString systemId;
     25        readonly attribute [TreatReturnedNullStringAs=Null] DOMString notationName;
    2626    };
    2727

  • trunk/Source/WebCore/dom/MutationRecord.idl

    r107204 r107312  
    4242
    4343        readonly attribute DOMString attributeName;
    44         readonly attribute [ConvertNullStringTo=Null] DOMString attributeNamespace;
     44        readonly attribute [TreatReturnedNullStringAs=Null] DOMString attributeNamespace;
    4545
    46         readonly attribute [ConvertNullStringTo=Null] DOMString oldValue;
     46        readonly attribute [TreatReturnedNullStringAs=Null] DOMString oldValue;
    4747    };
    4848}

  • trunk/Source/WebCore/dom/Node.idl

    r107304 r107312  
    5252        const unsigned short      NOTATION_NODE                  = 12;
    5353
    54         readonly attribute [ConvertNullStringTo=Null] DOMString        nodeName;
     54        readonly attribute [TreatReturnedNullStringAs=Null] DOMString        nodeName;
    5555
    5656                 // FIXME: the spec says this can also raise on retrieval.
    57                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        nodeValue
     57                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString        nodeValue
    5858                     setter raises(DOMException);
    5959
    … …  
    8888                                           in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString version);
    8989
    90         readonly attribute [ConvertNullStringTo=Null] DOMString        namespaceURI;
    91                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        prefix
     90        readonly attribute [TreatReturnedNullStringAs=Null] DOMString        namespaceURI;
     91                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString        prefix
    9292                     setter raises(DOMException);
    93         readonly attribute [ConvertNullStringTo=Null] DOMString        localName;
     93        readonly attribute [TreatReturnedNullStringAs=Null] DOMString        localName;
    9494
    9595        boolean            hasAttributes();
    … …  
    9797        // Introduced in DOM Level 3:
    9898
    99         readonly attribute [ConvertNullStringTo=Null] DOMString       baseURI;
     99        readonly attribute [TreatReturnedNullStringAs=Null] DOMString       baseURI;
    100100
    101101                 // FIXME: the spec says this can also raise on retrieval.
    102                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString       textContent
     102                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString       textContent
    103103                     setter raises(DOMException);
    104104
    105105        boolean            isSameNode(in [Optional=DefaultIsUndefined] Node other);
    106106        boolean            isEqualNode(in [Optional=DefaultIsUndefined] Node other);
    107         [ConvertNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString namespaceURI);
     107        [TreatReturnedNullStringAs=Null] DOMString          lookupPrefix(in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString namespaceURI);
    108108        boolean            isDefaultNamespace(in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString namespaceURI);
    109         [ConvertNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString prefix);
     109        [TreatReturnedNullStringAs=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=NullString,Optional=DefaultIsUndefined] DOMString prefix);
    110110
    111111        // DocumentPosition

  • trunk/Source/WebCore/dom/Notation.idl

    r107204 r107312  
    2121
    2222    interface Notation : Node {
    23         readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
    24         readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
     23        readonly attribute [TreatReturnedNullStringAs=Null] DOMString publicId;
     24        readonly attribute [TreatReturnedNullStringAs=Null] DOMString systemId;
    2525    };
    2626

  • trunk/Source/WebCore/dom/ProcessingInstruction.idl

    r107204 r107312  
    2525        // DOM Level 1
    2626
    27         readonly attribute [ConvertNullStringTo=Null] DOMString target;
    28                  attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString data
     27        readonly attribute [TreatReturnedNullStringAs=Null] DOMString target;
     28                 attribute [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] DOMString data
    2929                     setter raises(DOMException);
    3030

  • trunk/Source/WebCore/html/DOMTokenList.idl

    r107204 r107312  
    3030    ] DOMTokenList {
    3131        readonly attribute unsigned long length;
    32         [ConvertNullStringTo=Null] DOMString item(in unsigned long index);
     32        [TreatReturnedNullStringAs=Null] DOMString item(in unsigned long index);
    3333        boolean contains(in DOMString token) raises(DOMException);
    3434        void add(in DOMString token) raises(DOMException);

  • trunk/Source/WebCore/html/DOMURL.idl

    r107204 r107312  
    3434    ] DOMURL {
    3535#if defined(ENABLE_MEDIA_STREAM) && ENABLE_MEDIA_STREAM
    36         static [CallWith=ScriptExecutionContext,ConvertNullStringTo=Undefined] DOMString createObjectURL(in MediaStream stream);
     36        static [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Undefined] DOMString createObjectURL(in MediaStream stream);
    3737#endif
    38         static [CallWith=ScriptExecutionContext,ConvertNullStringTo=Undefined] DOMString createObjectURL(in Blob blob);
     38        static [CallWith=ScriptExecutionContext,TreatReturnedNullStringAs=Undefined] DOMString createObjectURL(in Blob blob);
    3939        static [CallWith=ScriptExecutionContext] void revokeObjectURL(in DOMString url);
    4040    };

  • trunk/Source/WebCore/html/HTMLMediaElement.idl

    r107304 r107312  
    118118#endif
    119119
    120     attribute [Reflect, TreatNullAs=NullString, ConvertNullStringToNull] DOMString mediaGroup;
     120    attribute [Reflect, TreatNullAs=NullString, TreatReturnedNullStringAsNull] DOMString mediaGroup;
    121121    attribute [CustomSetter] MediaController controller;
    122122};

  • trunk/Source/WebCore/html/canvas/WebGLDebugShaders.idl

    r107204 r107312  
    3030        OmitConstructor
    3131    ] WebGLDebugShaders {
    32         [StrictTypeChecking, ConvertNullStringTo=Null] DOMString getTranslatedShaderSource(in WebGLShader shader) raises(DOMException);
     32        [StrictTypeChecking, TreatReturnedNullStringAs=Null] DOMString getTranslatedShaderSource(in WebGLShader shader) raises(DOMException);
    3333    };
    3434}

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl

    r107204 r107312  
    543543        // any getProgramParameter(in WebGLProgram program, in unsigned long pname) raises(DOMException);
    544544        [StrictTypeChecking, Custom] void getProgramParameter();
    545         [StrictTypeChecking, ConvertNullStringTo=Null] DOMString getProgramInfoLog(in WebGLProgram program) raises(DOMException);
     545        [StrictTypeChecking, TreatReturnedNullStringAs=Null] DOMString getProgramInfoLog(in WebGLProgram program) raises(DOMException);
    546546        // any getRenderbufferParameter(in unsigned long target, in unsigned long pname) raises(DOMException);
    547547        [StrictTypeChecking, Custom] void getRenderbufferParameter();
    … …  
    549549        [StrictTypeChecking, Custom] void getShaderParameter() raises(DOMException);
    550550
    551         [StrictTypeChecking, ConvertNullStringTo=Null] DOMString    getShaderInfoLog(in WebGLShader shader) raises(DOMException);
     551        [StrictTypeChecking, TreatReturnedNullStringAs=Null] DOMString    getShaderInfoLog(in WebGLShader shader) raises(DOMException);
    552552
    553553        // TBD
    554554        // void glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
    555555
    556         [StrictTypeChecking, ConvertNullStringTo=Null] DOMString    getShaderSource(in WebGLShader shader) raises(DOMException);
     556        [StrictTypeChecking, TreatReturnedNullStringAs=Null] DOMString    getShaderSource(in WebGLShader shader) raises(DOMException);
    557557
    558558        // DOMString[] getSupportedExtensions()

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

    r107304 r107312  
    8080        void alert(in [Optional=DefaultIsUndefined] DOMString message);
    8181        boolean confirm(in [Optional=DefaultIsUndefined] DOMString message);
    82         [ConvertNullStringTo=Null] DOMString prompt(in [Optional=DefaultIsUndefined] DOMString message,
     82        [TreatReturnedNullStringAs=Null] DOMString prompt(in [Optional=DefaultIsUndefined] DOMString message,
    8383                                                    in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=DefaultIsUndefined] DOMString defaultValue);
    8484

  • trunk/Source/WebCore/storage/IDBObjectStore.idl

    r107204 r107312  
    2929        Conditional=INDEXED_DATABASE
    3030    ] IDBObjectStore {
    31         readonly attribute [ConvertNullStringTo=Null] DOMString name;
    32         readonly attribute [ConvertNullStringTo=Null] DOMString keyPath;
     31        readonly attribute [TreatReturnedNullStringAs=Null] DOMString name;
     32        readonly attribute [TreatReturnedNullStringAs=Null] DOMString keyPath;
    3333        readonly attribute DOMStringList indexNames;
    3434        readonly attribute IDBTransaction transaction;

  • trunk/Source/WebCore/storage/IDBRequest.idl

    r107204 r107312  
    3939        readonly attribute unsigned short errorCode
    4040            getter raises (IDBDatabaseException);
    41         readonly attribute [ConvertNullStringTo=Undefined] DOMString webkitErrorMessage
     41        readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString webkitErrorMessage
    4242            getter raises (IDBDatabaseException);
    4343        readonly attribute IDBAny source;

  • trunk/Source/WebCore/storage/Storage.idl

    r107204 r107312  
    3434    ] Storage {
    3535        readonly attribute [NotEnumerable] unsigned long length;
    36         [NotEnumerable, ConvertNullStringTo=Null] DOMString key(in unsigned long index);
    37         [NotEnumerable, ConvertNullStringTo=Null] DOMString getItem(in DOMString key);
     36        [NotEnumerable, TreatReturnedNullStringAs=Null] DOMString key(in unsigned long index);
     37        [NotEnumerable, TreatReturnedNullStringAs=Null] DOMString getItem(in DOMString key);
    3838        [NotEnumerable] void setItem(in DOMString key, in DOMString data)
    3939            raises(DOMException);

  • trunk/Source/WebCore/storage/StorageEvent.idl

    r107304 r107312  
    3030    ] StorageEvent : Event {
    3131        readonly attribute [InitializedByEventConstructor] DOMString key;
    32         readonly attribute [InitializedByEventConstructor, ConvertNullStringTo=Null] DOMString oldValue;
    33         readonly attribute [InitializedByEventConstructor, ConvertNullStringTo=Null] DOMString newValue;
     32        readonly attribute [InitializedByEventConstructor, TreatReturnedNullStringAs=Null] DOMString oldValue;
     33        readonly attribute [InitializedByEventConstructor, TreatReturnedNullStringAs=Null] DOMString newValue;
    3434        readonly attribute [InitializedByEventConstructor] DOMString url;
    3535        readonly attribute [InitializedByEventConstructor] Storage storageArea;

  • trunk/Source/WebCore/websockets/WebSocket.idl

    r107204 r107312  
    5858        attribute EventListener onclose;
    5959
    60         readonly attribute [ConvertNullStringTo=Undefined] DOMString protocol;
    61         readonly attribute [ConvertNullStringTo=Undefined] DOMString extensions;
     60        readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString protocol;
     61        readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString extensions;
    6262
    63         attribute [ConvertNullStringTo=Undefined] DOMString binaryType
     63        attribute [TreatReturnedNullStringAs=Undefined] DOMString binaryType
    6464            setter raises(DOMException);
    6565

  • trunk/Source/WebCore/xml/XMLHttpRequest.idl

    r107204 r107312  
    9090
    9191        // response
    92         [ConvertNullStringTo=Undefined] DOMString getAllResponseHeaders()
     92        [TreatReturnedNullStringAs=Undefined] DOMString getAllResponseHeaders()
    9393            raises(DOMException);
    94         [ConvertNullStringTo=Null] DOMString getResponseHeader(in DOMString header)
     94        [TreatReturnedNullStringAs=Null] DOMString getResponseHeader(in DOMString header)
    9595            raises(DOMException);
    96         readonly attribute [CustomGetter] DOMString responseText // The custom getter implements ConvertNullStringTo=Null
     96        readonly attribute [CustomGetter] DOMString responseText // The custom getter implements TreatReturnedNullStringAs=Null
    9797            getter raises(DOMException);
    9898        readonly attribute Document responseXML

  • trunk/Source/WebCore/xml/XPathNSResolver.idl

    r107304 r107312  
    2525        OmitConstructor
    2626    ] XPathNSResolver {
    27         [ConvertNullStringTo=Null] DOMString lookupNamespaceURI(in [Optional=DefaultIsUndefined] DOMString prefix);
     27        [TreatReturnedNullStringAs=Null] DOMString lookupNamespaceURI(in [Optional=DefaultIsUndefined] DOMString prefix);
    2828    };
    2929

  • trunk/Source/WebCore/xml/XSLTProcessor.idl

    r107204 r107312  
    4343
    4444        [Custom] void setParameter(in DOMString namespaceURI, in DOMString localName, in DOMString value);
    45         [Custom, ConvertNullStringTo=Undefined] DOMString getParameter(in DOMString namespaceURI, in DOMString localName);
     45        [Custom, TreatReturnedNullStringAs=Undefined] DOMString getParameter(in DOMString namespaceURI, in DOMString localName);
    4646        [Custom] void removeParameter(in DOMString namespaceURI, in DOMString localName);
    4747        void clearParameters();
Note: See TracChangeset for help on using the changeset viewer.