Changeset 106776 in webkit


Ignore:
Timestamp:
Feb 5, 2012 11:06:00 PM (12 years ago)
Author:
haraken@chromium.org
Message:

Rename [TreatNullAs=EmptyString] to [TreatNullAs=NullString],
[TreatUndefinedAs=EmptyString] to [TreatUndefinedAs=NullString]
https://bugs.webkit.org/show_bug.cgi?id=77611

Reviewed by Adam Barth.

While the Web IDL spec requires [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString],
the current WebKit treats them as (not an empty string but) a null string.
To avoid confusion, this patch renames [TreatNullAs=EmptyString] to [TreatNullAs=NullString],
and [TreatUndefinedAs=EmptyString] to [TreatUndefinedAs=NullString].
(Eventually we should fix WebKit so that it uses an empty string and then
rename them to [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString].)

No tests. No change in behavior.

  • bindings/scripts/CodeGeneratorJS.pm: Added FIXME.

(JSValueToNative):

  • bindings/scripts/CodeGeneratorV8.pm: Ditto.

(GetNativeTypeFromSignature):

  • bindings/scripts/test/TestObj.idl:
  • css/CSSCharsetRule.idl:
  • css/CSSPageRule.idl:
  • css/CSSRule.idl:
  • css/CSSStyleDeclaration.idl:
  • css/CSSStyleRule.idl:
  • css/CSSValue.idl:
  • css/MediaList.idl:
  • css/WebKitCSSKeyframesRule.idl:
  • dom/Attr.idl:
  • dom/CharacterData.idl:
  • dom/DOMImplementation.idl:
  • dom/Document.idl:
  • dom/Element.idl:
  • dom/NamedNodeMap.idl:
  • dom/Node.idl:
  • dom/ProcessingInstruction.idl:
  • dom/ShadowRoot.idl:
  • fileapi/Blob.idl:
  • fileapi/DirectoryEntry.idl:
  • fileapi/DirectoryEntrySync.idl:
  • fileapi/Entry.idl:
  • fileapi/EntrySync.idl:
  • fileapi/WebKitBlobBuilder.idl:
  • html/HTMLAnchorElement.idl:
  • html/HTMLButtonElement.idl:
  • html/HTMLCanvasElement.idl:
  • html/HTMLDocument.idl:
  • html/HTMLElement.idl:
  • html/HTMLFieldSetElement.idl:
  • html/HTMLFormElement.idl:
  • html/HTMLFrameElement.idl:
  • html/HTMLInputElement.idl:
  • html/HTMLKeygenElement.idl:
  • html/HTMLMediaElement.idl:
  • html/HTMLObjectElement.idl:
  • html/HTMLOutputElement.idl:
  • html/HTMLScriptElement.idl:
  • html/HTMLSelectElement.idl:
  • html/HTMLTextAreaElement.idl:
  • html/HTMLTitleElement.idl:
  • html/canvas/CanvasRenderingContext2D.idl:
  • page/Console.idl:
  • page/DOMWindow.idl:
  • storage/StorageEvent.idl:
  • svg/SVGAngle.idl:
  • svg/SVGElement.idl:
  • svg/SVGLength.idl:
  • svg/SVGScriptElement.idl:
Location:
trunk/Source/WebCore
Files:
52 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r106773 r106776  
     12012-02-05  Kentaro Hara  <haraken@chromium.org>
     2
     3        Rename [TreatNullAs=EmptyString] to [TreatNullAs=NullString],
     4        [TreatUndefinedAs=EmptyString] to [TreatUndefinedAs=NullString]
     5        https://bugs.webkit.org/show_bug.cgi?id=77611
     6
     7        Reviewed by Adam Barth.
     8
     9        While the Web IDL spec requires [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString],
     10        the current WebKit treats them as (not an empty string but) a null string.
     11        To avoid confusion, this patch renames [TreatNullAs=EmptyString] to [TreatNullAs=NullString],
     12        and [TreatUndefinedAs=EmptyString] to [TreatUndefinedAs=NullString].
     13        (Eventually we should fix WebKit so that it uses an empty string and then
     14        rename them to [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString].)
     15
     16        No tests. No change in behavior.
     17
     18        * bindings/scripts/CodeGeneratorJS.pm: Added FIXME.
     19        (JSValueToNative):
     20        * bindings/scripts/CodeGeneratorV8.pm: Ditto.
     21        (GetNativeTypeFromSignature):
     22
     23        * bindings/scripts/test/TestObj.idl:
     24        * css/CSSCharsetRule.idl:
     25        * css/CSSPageRule.idl:
     26        * css/CSSRule.idl:
     27        * css/CSSStyleDeclaration.idl:
     28        * css/CSSStyleRule.idl:
     29        * css/CSSValue.idl:
     30        * css/MediaList.idl:
     31        * css/WebKitCSSKeyframesRule.idl:
     32        * dom/Attr.idl:
     33        * dom/CharacterData.idl:
     34        * dom/DOMImplementation.idl:
     35        * dom/Document.idl:
     36        * dom/Element.idl:
     37        * dom/NamedNodeMap.idl:
     38        * dom/Node.idl:
     39        * dom/ProcessingInstruction.idl:
     40        * dom/ShadowRoot.idl:
     41        * fileapi/Blob.idl:
     42        * fileapi/DirectoryEntry.idl:
     43        * fileapi/DirectoryEntrySync.idl:
     44        * fileapi/Entry.idl:
     45        * fileapi/EntrySync.idl:
     46        * fileapi/WebKitBlobBuilder.idl:
     47        * html/HTMLAnchorElement.idl:
     48        * html/HTMLButtonElement.idl:
     49        * html/HTMLCanvasElement.idl:
     50        * html/HTMLDocument.idl:
     51        * html/HTMLElement.idl:
     52        * html/HTMLFieldSetElement.idl:
     53        * html/HTMLFormElement.idl:
     54        * html/HTMLFrameElement.idl:
     55        * html/HTMLInputElement.idl:
     56        * html/HTMLKeygenElement.idl:
     57        * html/HTMLMediaElement.idl:
     58        * html/HTMLObjectElement.idl:
     59        * html/HTMLOutputElement.idl:
     60        * html/HTMLScriptElement.idl:
     61        * html/HTMLSelectElement.idl:
     62        * html/HTMLTextAreaElement.idl:
     63        * html/HTMLTitleElement.idl:
     64        * html/canvas/CanvasRenderingContext2D.idl:
     65        * page/Console.idl:
     66        * page/DOMWindow.idl:
     67        * storage/StorageEvent.idl:
     68        * svg/SVGAngle.idl:
     69        * svg/SVGElement.idl:
     70        * svg/SVGLength.idl:
     71        * svg/SVGScriptElement.idl:
     72
    1732012-02-05  Kentaro Hara  <haraken@chromium.org>
    274
  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r106773 r106776  
    28692869
    28702870    if ($type eq "DOMString") {
    2871         if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
     2871        # FIXME: This implements [TreatNullAs=NullString] and [TreatUndefinedAs=NullString],
     2872        # but the Web IDL spec requires [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString].
     2873        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString")) {
    28722874            return "valueToStringWithUndefinedOrNullCheck(exec, $value)"
    28732875        }
    2874         if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
     2876        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") or $signature->extendedAttributes->{"Reflect"}) {
    28752877            return "valueToStringWithNullCheck(exec, $value)"
    28762878        }
    2877         # FIXME: Add the case for 'if ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
     2879        # FIXME: Add the case for 'if ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString"))'.
    28782880        return "ustringToString($value.isEmpty() ? UString() : $value.toString(exec)->value(exec))";
    28792881    }
  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

    r106737 r106776  
    33103310
    33113311    if ($parameterIndex >= 0 && $type eq "V8Parameter") {
     3312        # FIXME: This implements [TreatNullAs=NullString] and [TreatUndefinedAs=NullString],
     3313        # but the Web IDL spec requires [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString].
    33123314        my $mode = "";
    3313         if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
     3315        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString")) {
    33143316            $mode = "WithUndefinedOrNullCheck";
    3315         } elsif (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
     3317        } elsif (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") or $signature->extendedAttributes->{"Reflect"}) {
    33163318            $mode = "WithNullCheck";
    33173319        }
    3318         # FIXME: Add the case for 'elsif ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
     3320        # FIXME: Add the case for 'elsif ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString"))'.
    33193321        $type .= "<$mode>";
    33203322    }
  • trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

    r106666 r106776  
    192192        void convert2(in [ConvertNullStringTo=Undefined] b);
    193193        void convert3(in [ConvertNullStringTo=False] c);
    194         void convert4(in [TreatNullAs=EmptyString] d);
    195         void convert5(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] e);
     194        void convert4(in [TreatNullAs=NullString] d);
     195        void convert5(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] e);
    196196
    197197        attribute SVGPoint mutablePoint;
  • trunk/Source/WebCore/css/CSSCharsetRule.idl

    r106534 r106776  
    2626        readonly attribute [ConvertNullStringTo=Null] DOMString encoding;
    2727#else
    28                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString encoding
     28                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString encoding
    2929                     setter raises(DOMException);
    3030#endif
  • trunk/Source/WebCore/css/CSSPageRule.idl

    r106534 r106776  
    2424    interface CSSPageRule : CSSRule {
    2525
    26                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString selectorText;
     26                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
    2727
    2828        readonly attribute CSSStyleDeclaration style;
  • trunk/Source/WebCore/css/CSSRule.idl

    r106737 r106776  
    4444        readonly attribute unsigned short   type;
    4545
    46                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        cssText
     46                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
    4747                     setter raises (DOMException);
    4848
  • trunk/Source/WebCore/css/CSSStyleDeclaration.idl

    r106773 r106776  
    3131        V8DependentLifetime
    3232    ] CSSStyleDeclaration {
    33                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        cssText
     33                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
    3434                     setter raises(DOMException);
    3535
     
    4040        [ConvertNullStringTo=Null] DOMString          getPropertyPriority(in [Optional=CallWithDefaultValue] DOMString propertyName);
    4141        [ObjCLegacyUnnamedParameters] void setProperty(in [Optional=CallWithDefaultValue] DOMString propertyName,
    42                                         in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString value,
     42                                        in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString value,
    4343                                        in [Optional=CallWithDefaultValue] DOMString priority)
    4444            raises(DOMException);
  • trunk/Source/WebCore/css/CSSStyleRule.idl

    r106534 r106776  
    2424    interface CSSStyleRule : CSSRule {
    2525
    26                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString selectorText;
     26                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
    2727
    2828        readonly attribute CSSStyleDeclaration style;
  • trunk/Source/WebCore/css/CSSValue.idl

    r106737 r106776  
    3535        const unsigned short CSS_CUSTOM          = 3;
    3636
    37                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString cssText
     37                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString cssText
    3838                     setter raises(DOMException);
    3939
  • trunk/Source/WebCore/css/MediaList.idl

    r106737 r106776  
    3232    ] MediaList {
    3333
    34                  attribute [TreatNullAs=EmptyString, ConvertNullStringTo=Null] DOMString mediaText
     34                 attribute [TreatNullAs=NullString, ConvertNullStringTo=Null] DOMString mediaText
    3535                     setter raises(DOMException);
    3636        readonly attribute unsigned long length;
  • trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl

    r106534 r106776  
    3434    ] WebKitCSSKeyframesRule : CSSRule {
    3535
    36         attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString name;
     36        attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString name;
    3737        readonly attribute CSSRuleList cssRules;
    3838       
  • trunk/Source/WebCore/dom/Attr.idl

    r106737 r106776  
    3232        readonly attribute boolean specified;
    3333
    34                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString value
     34                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString value
    3535                     setter raises(DOMException);
    3636
  • trunk/Source/WebCore/dom/CharacterData.idl

    r106660 r106776  
    2222    interface CharacterData : Node {
    2323
    24         attribute [TreatNullAs=EmptyString] DOMString data
     24        attribute [TreatNullAs=NullString] DOMString data
    2525            setter raises(DOMException);
    2626
  • trunk/Source/WebCore/dom/DOMImplementation.idl

    r106737 r106776  
    2929
    3030        [ObjCLegacyUnnamedParameters] boolean hasFeature(in [Optional=CallWithDefaultValue] DOMString feature,
    31                                           in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString version);
     31                                          in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString version);
    3232
    3333        // DOM Level 2
    3434
    35         [ObjCLegacyUnnamedParameters] DocumentType createDocumentType(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName,
    36                                                        in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString publicId,
    37                                                        in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString systemId)
     35        [ObjCLegacyUnnamedParameters] DocumentType createDocumentType(in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName,
     36                                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString publicId,
     37                                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString systemId)
    3838            raises(DOMException);
    39         [ObjCLegacyUnnamedParameters] Document createDocument(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    40                                                in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName,
    41                                                in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DocumentType doctype)
     39        [ObjCLegacyUnnamedParameters] Document createDocument(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     40                                               in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName,
     41                                               in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DocumentType doctype)
    4242            raises(DOMException);
    4343
  • trunk/Source/WebCore/dom/Document.idl

    r106737 r106776  
    3232        readonly attribute Element documentElement;
    3333
    34         [ReturnsNew] Element createElement(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString tagName)
     34        [ReturnsNew] Element createElement(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString tagName)
    3535            raises (DOMException);
    3636        DocumentFragment   createDocumentFragment();
     
    5353                                                   in [Optional] boolean deep)
    5454            raises (DOMException);
    55         [ObjCLegacyUnnamedParameters, ReturnsNew] Element createElementNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    56                                                            in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName)
    57             raises (DOMException);
    58         [ObjCLegacyUnnamedParameters, ReturnsNew] Attr createAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    59                                                           in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName)
    60             raises (DOMException);
    61         [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     55        [ObjCLegacyUnnamedParameters, ReturnsNew] Element createElementNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     56                                                           in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName)
     57            raises (DOMException);
     58        [ObjCLegacyUnnamedParameters, ReturnsNew] Attr createAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     59                                                          in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName)
     60            raises (DOMException);
     61        [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    6262                                                       in [Optional=CallWithDefaultValue] DOMString localName);
    6363        Element            getElementById(in [Optional=CallWithDefaultValue] DOMString elementId);
     
    6868
    6969        readonly attribute [ConvertNullStringTo=Null] DOMString xmlEncoding;
    70                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString xmlVersion
     70                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString xmlVersion
    7171                    setter raises (DOMException);
    7272                 attribute boolean xmlStandalone
     
    7676            raises (DOMException);
    7777
    78                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString documentURI;
     78                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString documentURI;
    7979
    8080        // DOM Level 2 Events (DocumentEvents interface)
     
    129129        boolean            execCommand(in [Optional=CallWithDefaultValue] DOMString command,
    130130                                       in [Optional=CallWithDefaultValue] boolean userInterface,
    131                                        in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString value);
     131                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString value);
    132132
    133133#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
     
    146146        // Moved down from HTMLDocument
    147147
    148                  attribute [TreatNullAs=EmptyString] DOMString title;
     148                 attribute [TreatNullAs=NullString] DOMString title;
    149149        readonly attribute DOMString referrer;
    150150#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    151                  attribute [TreatNullAs=EmptyString] DOMString domain
     151                 attribute [TreatNullAs=NullString] DOMString domain
    152152                     setter raises (DOMException);
    153153#else
     
    156156        readonly attribute DOMString URL;
    157157
    158                  attribute [TreatNullAs=EmptyString] DOMString cookie
     158                 attribute [TreatNullAs=NullString] DOMString cookie
    159159                     setter raises (DOMException),
    160160                     getter raises (DOMException);
     
    176176
    177177#if defined(ENABLE_MICRODATA) && ENABLE_MICRODATA
    178         NodeList getItems(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString, Optional=CallWithDefaultValue] DOMString typeNames);
     178        NodeList getItems(in [TreatNullAs=NullString, TreatUndefinedAs=NullString, Optional=CallWithDefaultValue] DOMString typeNames);
    179179#endif
    180180
     
    185185        // IE extensions
    186186
    187                  attribute [ConvertNullStringTo=Undefined, TreatNullAs=EmptyString] DOMString charset;
     187                 attribute [ConvertNullStringTo=Undefined, TreatNullAs=NullString] DOMString charset;
    188188        readonly attribute [ConvertNullStringTo=Undefined] DOMString defaultCharset;
    189189        readonly attribute [ConvertNullStringTo=Undefined] DOMString readyState;
     
    203203
    204204        readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet;
    205                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString selectedStylesheetSet;
     205                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectedStylesheetSet;
    206206
    207207#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
  • trunk/Source/WebCore/dom/Element.idl

    r106737 r106776  
    4444        // DOM Level 2 Core
    4545
    46         [ObjCLegacyUnnamedParameters] DOMString getAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     46        [ObjCLegacyUnnamedParameters] DOMString getAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    4747                                                in [Optional=CallWithDefaultValue] DOMString localName);
    48         [ObjCLegacyUnnamedParameters] void setAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     48        [ObjCLegacyUnnamedParameters] void setAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    4949                                           in [Optional=CallWithDefaultValue] DOMString qualifiedName,
    5050                                           in [Optional=CallWithDefaultValue] DOMString value)
    5151            raises(DOMException);
    52         [ObjCLegacyUnnamedParameters] void removeAttributeNS(in [TreatNullAs=EmptyString] DOMString namespaceURI,
     52        [ObjCLegacyUnnamedParameters] void removeAttributeNS(in [TreatNullAs=NullString] DOMString namespaceURI,
    5353                                              in DOMString localName);
    54         [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     54        [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    5555                                                       in [Optional=CallWithDefaultValue] DOMString localName);
    56         [ObjCLegacyUnnamedParameters] Attr getAttributeNodeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     56        [ObjCLegacyUnnamedParameters] Attr getAttributeNodeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    5757                                               in [Optional=CallWithDefaultValue] DOMString localName);
    5858        Attr setAttributeNodeNS(in [Optional=CallWithDefaultValue] Attr newAttr)
    5959            raises(DOMException);
    6060        boolean hasAttribute(in DOMString name);
    61         [ObjCLegacyUnnamedParameters] boolean hasAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     61        [ObjCLegacyUnnamedParameters] boolean hasAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    6262                                              in [Optional=CallWithDefaultValue] DOMString localName);
    6363
  • trunk/Source/WebCore/dom/NamedNodeMap.idl

    r106737 r106776  
    4343        // Introduced in DOM Level 2:
    4444
    45         [ObjCLegacyUnnamedParameters] Node getNamedItemNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     45        [ObjCLegacyUnnamedParameters] Node getNamedItemNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    4646                                           in [Optional=CallWithDefaultValue] DOMString localName)
    4747            // FIXME: the implementation does take an exceptioncode parameter.
     
    5151            raises(DOMException);
    5252
    53         [ObjCLegacyUnnamedParameters] Node removeNamedItemNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     53        [ObjCLegacyUnnamedParameters] Node removeNamedItemNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    5454                                              in [Optional=CallWithDefaultValue] DOMString localName)
    5555            raises(DOMException);
  • trunk/Source/WebCore/dom/Node.idl

    r106737 r106776  
    5555
    5656                 // FIXME: the spec says this can also raise on retrieval.
    57                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        nodeValue
     57                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        nodeValue
    5858                     setter raises(DOMException);
    5959
     
    8686
    8787        [ObjCLegacyUnnamedParameters] boolean isSupported(in [Optional=CallWithDefaultValue] DOMString feature,
    88                                            in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString version);
     88                                           in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString version);
    8989
    9090        readonly attribute [ConvertNullStringTo=Null] DOMString        namespaceURI;
    91                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        prefix
     91                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        prefix
    9292                     setter raises(DOMException);
    9393        readonly attribute [ConvertNullStringTo=Null] DOMString        localName;
     
    100100
    101101                 // FIXME: the spec says this can also raise on retrieval.
    102                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString       textContent
     102                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString       textContent
    103103                     setter raises(DOMException);
    104104
    105105        boolean            isSameNode(in [Optional=CallWithDefaultValue] Node other);
    106106        boolean            isEqualNode(in [Optional=CallWithDefaultValue] Node other);
    107         [ConvertNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI);
    108         boolean            isDefaultNamespace(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI);
    109         [ConvertNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString prefix);
     107        [ConvertNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI);
     108        boolean            isDefaultNamespace(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI);
     109        [ConvertNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString prefix);
    110110
    111111        // DocumentPosition
  • trunk/Source/WebCore/dom/ProcessingInstruction.idl

    r106534 r106776  
    2626
    2727        readonly attribute [ConvertNullStringTo=Null] DOMString target;
    28                  attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString data
     28                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString data
    2929                     setter raises(DOMException);
    3030
  • trunk/Source/WebCore/dom/ShadowRoot.idl

    r106666 r106776  
    3737        NodeList getElementsByClassName(in [Optional=CallWithDefaultValue] DOMString className);
    3838        NodeList getElementsByTagName(in [Optional=CallWithDefaultValue] DOMString tagName);
    39         NodeList getElementsByTagNameNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
     39        NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
    4040                                        in [Optional=CallWithDefaultValue] DOMString localName);
    4141    };
  • trunk/Source/WebCore/fileapi/Blob.idl

    r106737 r106776  
    4141#if !defined(LANGUAGE_OBJECTIVE_C)
    4242#if defined(ENABLE_BLOB) && ENABLE_BLOB
    43         Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
     43        Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString contentType);
    4444#endif
    4545#endif
  • trunk/Source/WebCore/fileapi/DirectoryEntry.idl

    r106737 r106776  
    3737    ] DirectoryEntry : Entry {
    3838        DirectoryReader createReader();
    39         [Custom] void getFile(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    40         [Custom] void getDirectory(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     39        [Custom] void getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     40        [Custom] void getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4141        void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4242    };
  • trunk/Source/WebCore/fileapi/DirectoryEntrySync.idl

    r106737 r106776  
    3737    ] DirectoryEntrySync : EntrySync {
    3838        DirectoryReaderSync createReader() raises (FileException);
    39         [Custom] FileEntrySync getFile(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in WebKitFlags flags) raises (FileException);
    40         [Custom] DirectoryEntrySync getDirectory(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in WebKitFlags flags) raises (FileException);
     39        [Custom] FileEntrySync getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in WebKitFlags flags) raises (FileException);
     40        [Custom] DirectoryEntrySync getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in WebKitFlags flags) raises (FileException);
    4141        void removeRecursively() raises (FileException);
    4242    };
  • trunk/Source/WebCore/fileapi/Entry.idl

    r106737 r106776  
    4242
    4343        void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    44         void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    45         void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     44        void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     45        void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4646        DOMString toURL();
    4747        void remove(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
  • trunk/Source/WebCore/fileapi/EntrySync.idl

    r106737 r106776  
    4242
    4343        Metadata getMetadata() raises (FileException);
    44         EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name) raises (FileException);
    45         EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name) raises (FileException);
     44        EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
     45        EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
    4646        DOMString toURL();
    4747        void remove() raises (FileException);
  • trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl

    r106737 r106776  
    3636    ] WebKitBlobBuilder {
    3737#if !defined(LANGUAGE_OBJECTIVE_C)
    38         Blob getBlob(in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
     38        Blob getBlob(in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString contentType);
    3939#endif
    4040        void append(in Blob blob);
     
    4242        void append(in ArrayBuffer arrayBuffer);
    4343#endif
    44         void append(in DOMString value, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString endings) raises (DOMException);
     44        void append(in DOMString value, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString endings) raises (DOMException);
    4545    };
    4646
  • trunk/Source/WebCore/html/HTMLAnchorElement.idl

    r106645 r106776  
    4444        readonly attribute DOMString search;
    4545#else
    46         attribute [TreatNullAs=EmptyString] DOMString hash;
    47         attribute [TreatNullAs=EmptyString] DOMString host;
    48         attribute [TreatNullAs=EmptyString] DOMString hostname;
    49         attribute [TreatNullAs=EmptyString] DOMString pathname;
    50         attribute [TreatNullAs=EmptyString] DOMString port;
    51         attribute [TreatNullAs=EmptyString] DOMString protocol;
    52         attribute [TreatNullAs=EmptyString] DOMString search;
     46        attribute [TreatNullAs=NullString] DOMString hash;
     47        attribute [TreatNullAs=NullString] DOMString host;
     48        attribute [TreatNullAs=NullString] DOMString hostname;
     49        attribute [TreatNullAs=NullString] DOMString pathname;
     50        attribute [TreatNullAs=NullString] DOMString port;
     51        attribute [TreatNullAs=NullString] DOMString protocol;
     52        attribute [TreatNullAs=NullString] DOMString search;
    5353
    54         readonly attribute [TreatNullAs=EmptyString] DOMString origin;
     54        readonly attribute [TreatNullAs=NullString] DOMString origin;
    5555#endif
    5656
  • trunk/Source/WebCore/html/HTMLButtonElement.idl

    r106575 r106776  
    2525
    2626        attribute [Reflect, URL] DOMString formAction;
    27         attribute [TreatNullAs=EmptyString] DOMString formEnctype;
    28         attribute [TreatNullAs=EmptyString] DOMString formMethod;
     27        attribute [TreatNullAs=NullString] DOMString formEnctype;
     28        attribute [TreatNullAs=NullString] DOMString formMethod;
    2929        attribute [Reflect] boolean formNoValidate;
    3030        attribute [Reflect] DOMString formTarget;
     
    4040        readonly attribute DOMString validationMessage;
    4141        boolean checkValidity();
    42         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     42        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    4343
    4444        void click();
  • trunk/Source/WebCore/html/HTMLCanvasElement.idl

    r106575 r106776  
    3434        attribute long height;
    3535
    36         [Custom] DOMString toDataURL(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString type)
     36        [Custom] DOMString toDataURL(in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString type)
    3737            raises(DOMException);
    3838
  • trunk/Source/WebCore/html/HTMLDocument.idl

    r106773 r106776  
    4949        readonly attribute long height;
    5050#endif
    51                  attribute [TreatNullAs=EmptyString] DOMString dir;
    52                  attribute [TreatNullAs=EmptyString] DOMString designMode;
     51                 attribute [TreatNullAs=NullString] DOMString dir;
     52                 attribute [TreatNullAs=NullString] DOMString designMode;
    5353        readonly attribute DOMString compatMode;
    5454
     
    5757
    5858        // Deprecated attributes
    59                  attribute [TreatNullAs=EmptyString] DOMString bgColor;
    60                  attribute [TreatNullAs=EmptyString] DOMString fgColor;
    61                  attribute [TreatNullAs=EmptyString] DOMString alinkColor;
    62                  attribute [TreatNullAs=EmptyString] DOMString linkColor;
    63                  attribute [TreatNullAs=EmptyString] DOMString vlinkColor;
     59                 attribute [TreatNullAs=NullString] DOMString bgColor;
     60                 attribute [TreatNullAs=NullString] DOMString fgColor;
     61                 attribute [TreatNullAs=NullString] DOMString alinkColor;
     62                 attribute [TreatNullAs=NullString] DOMString linkColor;
     63                 attribute [TreatNullAs=NullString] DOMString vlinkColor;
    6464    };
    6565
  • trunk/Source/WebCore/html/HTMLElement.idl

    r106534 r106776  
    4141
    4242        // Extensions
    43                  attribute [TreatNullAs=EmptyString] DOMString innerHTML
     43                 attribute [TreatNullAs=NullString] DOMString innerHTML
    4444                     setter raises(DOMException);
    45                  attribute [TreatNullAs=EmptyString] DOMString innerText
     45                 attribute [TreatNullAs=NullString] DOMString innerText
    4646                     setter raises(DOMException);
    47                  attribute [TreatNullAs=EmptyString] DOMString outerHTML
     47                 attribute [TreatNullAs=NullString] DOMString outerHTML
    4848                     setter raises(DOMException);
    49                  attribute [TreatNullAs=EmptyString] DOMString outerText
     49                 attribute [TreatNullAs=NullString] DOMString outerText
    5050                     setter raises(DOMException);
    5151
     
    6262        readonly attribute HTMLCollection children;
    6363
    64                  attribute [TreatNullAs=EmptyString] DOMString contentEditable
     64                 attribute [TreatNullAs=NullString] DOMString contentEditable
    6565                     setter raises(DOMException);
    6666        readonly attribute boolean isContentEditable;
  • trunk/Source/WebCore/html/HTMLFieldSetElement.idl

    r106575 r106776  
    2626        readonly attribute DOMString       validationMessage;
    2727        boolean  checkValidity();
    28         void     setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     28        void     setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    2929    };
    3030
  • trunk/Source/WebCore/html/HTMLFormElement.idl

    r106534 r106776  
    3232        attribute [Reflect=accept_charset] DOMString acceptCharset;
    3333        attribute [Reflect, URL] DOMString action;
    34         attribute [TreatNullAs=EmptyString] DOMString encoding;
    35         attribute [TreatNullAs=EmptyString] DOMString enctype;
    36         attribute [TreatNullAs=EmptyString] DOMString method;
     34        attribute [TreatNullAs=NullString] DOMString encoding;
     35        attribute [TreatNullAs=NullString] DOMString enctype;
     36        attribute [TreatNullAs=NullString] DOMString method;
    3737        attribute [Reflect] DOMString target;
    3838        attribute [Reflect] DOMString autocomplete;
  • trunk/Source/WebCore/html/HTMLFrameElement.idl

    r106536 r106776  
    4545#endif
    4646
    47         attribute [TreatNullAs=EmptyString, CustomSetter] DOMString location;
     47        attribute [TreatNullAs=NullString, CustomSetter] DOMString location;
    4848
    4949        readonly attribute long width;
  • trunk/Source/WebCore/html/HTMLInputElement.idl

    r106666 r106776  
    2222
    2323    interface HTMLInputElement : HTMLElement {
    24         attribute [TreatNullAs=EmptyString] DOMString defaultValue;
     24        attribute [TreatNullAs=NullString] DOMString defaultValue;
    2525        attribute [Reflect=checked] boolean defaultChecked;
    2626        attribute [Reflect] DOMString dirName;
    2727        readonly attribute HTMLFormElement form;
    2828        attribute [Reflect, URL] DOMString formAction;
    29         attribute [TreatNullAs=EmptyString] DOMString formEnctype;
    30         attribute [TreatNullAs=EmptyString] DOMString formMethod;
     29        attribute [TreatNullAs=NullString] DOMString formEnctype;
     30        attribute [TreatNullAs=NullString] DOMString formMethod;
    3131        attribute [Reflect] boolean formNoValidate;
    3232        attribute [Reflect] DOMString formTarget;
     
    5858        attribute [Reflect, URL] DOMString src;
    5959        attribute [Reflect] DOMString step;
    60         attribute [TreatNullAs=EmptyString] DOMString type; // readonly dropped as part of DOM level 2
     60        attribute [TreatNullAs=NullString] DOMString type; // readonly dropped as part of DOM level 2
    6161        attribute [Reflect] DOMString useMap;
    62         attribute [TreatNullAs=EmptyString] DOMString value;
     62        attribute [TreatNullAs=NullString] DOMString value;
    6363#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
    6464        attribute Date valueAsDate setter raises(DOMException);
     
    7474        readonly attribute DOMString validationMessage;
    7575        boolean checkValidity();
    76         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     76        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    7777        void select();
    7878        void click();
    7979
    8080#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
    81         void setValueForUser(in [TreatNullAs=EmptyString] DOMString value);
     81        void setValueForUser(in [TreatNullAs=NullString] DOMString value);
    8282#endif
    8383
  • trunk/Source/WebCore/html/HTMLKeygenElement.idl

    r106575 r106776  
    4545        readonly attribute DOMString validationMessage;
    4646        boolean checkValidity();
    47         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     47        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    4848
    4949        readonly attribute NodeList labels;
  • trunk/Source/WebCore/html/HTMLMediaElement.idl

    r106666 r106776  
    118118#endif
    119119
    120     attribute [Reflect, TreatNullAs=EmptyString, ConvertNullStringToNull] DOMString mediaGroup;
     120    attribute [Reflect, TreatNullAs=NullString, ConvertNullStringToNull] DOMString mediaGroup;
    121121    attribute [CustomSetter] MediaController controller;
    122122};
  • trunk/Source/WebCore/html/HTMLObjectElement.idl

    r106575 r106776  
    4747        readonly attribute DOMString validationMessage;
    4848        boolean checkValidity();
    49         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     49        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    5050
    5151        // Introduced in DOM Level 2:
  • trunk/Source/WebCore/html/HTMLOutputElement.idl

    r106575 r106776  
    3030
    3131        readonly attribute DOMString type;
    32         attribute [TreatNullAs=EmptyString] DOMString defaultValue;
    33         attribute [TreatNullAs=EmptyString] DOMString value;
     32        attribute [TreatNullAs=NullString] DOMString defaultValue;
     33        attribute [TreatNullAs=NullString] DOMString value;
    3434
    3535        readonly attribute boolean willValidate;
     
    3737        readonly attribute DOMString validationMessage;
    3838        boolean checkValidity();
    39         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     39        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    4040
    4141        readonly attribute NodeList labels;
  • trunk/Source/WebCore/html/HTMLScriptElement.idl

    r106534 r106776  
    2121
    2222    interface HTMLScriptElement : HTMLElement {
    23         attribute [TreatNullAs=EmptyString] DOMString text;
     23        attribute [TreatNullAs=NullString] DOMString text;
    2424        attribute [Reflect=for] DOMString htmlFor;
    2525        attribute [Reflect] DOMString event;
  • trunk/Source/WebCore/html/HTMLSelectElement.idl

    r106660 r106776  
    2727        readonly attribute DOMString type;
    2828        attribute long selectedIndex;
    29         attribute [TreatNullAs=EmptyString] DOMString value;
     29        attribute [TreatNullAs=NullString] DOMString value;
    3030       
    3131        // Modified in DOM Level 2:
     
    4141        readonly attribute DOMString validationMessage;
    4242        boolean checkValidity();
    43         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     43        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    4444
    4545        // Modified in DOM Level 2:
     
    4949        attribute [Reflect] boolean autofocus;
    5050        attribute boolean multiple;
    51         attribute [TreatNullAs=EmptyString] DOMString name;
     51        attribute [TreatNullAs=NullString] DOMString name;
    5252        attribute [Reflect] boolean required;
    5353        attribute long size;
  • trunk/Source/WebCore/html/HTMLTextAreaElement.idl

    r106575 r106776  
    2323
    2424    interface HTMLTextAreaElement : HTMLElement {
    25         attribute [TreatNullAs=EmptyString] DOMString defaultValue;
     25        attribute [TreatNullAs=NullString] DOMString defaultValue;
    2626        readonly attribute HTMLFormElement form;
    2727        readonly attribute ValidityState validity;
     
    3131        attribute [Reflect] boolean autofocus;
    3232        attribute long maxLength setter raises(DOMException);
    33         attribute [TreatNullAs=EmptyString] DOMString name;
     33        attribute [TreatNullAs=NullString] DOMString name;
    3434        attribute [Reflect] DOMString placeholder;
    3535        attribute [Reflect] boolean readOnly;
     
    3838        attribute [Reflect] DOMString wrap;
    3939        readonly attribute DOMString type;
    40         attribute [TreatNullAs=EmptyString] DOMString value;
     40        attribute [TreatNullAs=NullString] DOMString value;
    4141        readonly attribute unsigned long textLength;
    4242
     
    4646        readonly attribute DOMString validationMessage;
    4747        boolean checkValidity();
    48         void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
     48        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
    4949
    5050        // WinIE & FireFox extension:
  • trunk/Source/WebCore/html/HTMLTitleElement.idl

    r106534 r106776  
    2121
    2222    interface HTMLTitleElement : HTMLElement {
    23         attribute  [TreatNullAs=EmptyString] DOMString            text;
     23        attribute  [TreatNullAs=NullString] DOMString            text;
    2424    };
    2525
  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl

    r106534 r106776  
    5050
    5151        attribute float globalAlpha;
    52         attribute [TreatNullAs=EmptyString] DOMString globalCompositeOperation;
     52        attribute [TreatNullAs=NullString] DOMString globalCompositeOperation;
    5353
    5454        CanvasGradient createLinearGradient(in [Optional=CallWithDefaultValue] float x0,
     
    6666
    6767        attribute float lineWidth;
    68         attribute [TreatNullAs=EmptyString] DOMString lineCap;
    69         attribute [TreatNullAs=EmptyString] DOMString lineJoin;
     68        attribute [TreatNullAs=NullString] DOMString lineCap;
     69        attribute [TreatNullAs=NullString] DOMString lineJoin;
    7070        attribute float miterLimit;
    7171
     
    7373        attribute float shadowOffsetY;
    7474        attribute float shadowBlur;
    75         attribute [TreatNullAs=EmptyString] DOMString shadowColor;
     75        attribute [TreatNullAs=NullString] DOMString shadowColor;
    7676
    7777        // FIXME: These attributes should also be implemented for V8.
     
    205205            raises(DOMException);
    206206
    207         CanvasPattern createPattern(in HTMLCanvasElement canvas, in [TreatNullAs=EmptyString] DOMString repetitionType)
    208             raises (DOMException);
    209         CanvasPattern createPattern(in HTMLImageElement image, in [TreatNullAs=EmptyString] DOMString repetitionType)
     207        CanvasPattern createPattern(in HTMLCanvasElement canvas, in [TreatNullAs=NullString] DOMString repetitionType)
     208            raises (DOMException);
     209        CanvasPattern createPattern(in HTMLImageElement image, in [TreatNullAs=NullString] DOMString repetitionType)
    210210            raises (DOMException);
    211211        ImageData createImageData(in ImageData imagedata)
  • trunk/Source/WebCore/page/Console.idl

    r106737 r106776  
    5252#endif
    5353
    54         void time(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString title);
    55         [CustomArgumentHandling] void timeEnd(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString title);
     54        void time(in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString title);
     55        [CustomArgumentHandling] void timeEnd(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
    5656        [CustomArgumentHandling] void timeStamp();
    5757        [CustomArgumentHandling] void group();
  • trunk/Source/WebCore/page/DOMWindow.idl

    r106773 r106776  
    8282        boolean confirm(in [Optional=CallWithDefaultValue] DOMString message);
    8383        [ConvertNullStringTo=Null] DOMString prompt(in [Optional=CallWithDefaultValue] DOMString message,
    84                                                     in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString defaultValue);
     84                                                    in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString defaultValue);
    8585
    8686        boolean find(in [Optional=CallWithDefaultValue] DOMString string,
     
    148148        // DOM Level 2 Style Interface
    149149        CSSStyleDeclaration getComputedStyle(in [Optional=CallWithDefaultValue] Element element,
    150                                              in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString pseudoElement);
     150                                             in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString pseudoElement);
    151151
    152152        // WebKit extensions
     
    229229
    230230        // Base64
    231         DOMString atob(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString string)
     231        DOMString atob(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString string)
    232232            raises(DOMException);
    233         DOMString btoa(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString string)
     233        DOMString btoa(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString string)
    234234            raises(DOMException);
    235235
  • trunk/Source/WebCore/storage/StorageEvent.idl

    r106644 r106776  
    3939                              in [Optional=CallWithDefaultValue] boolean cancelableArg,
    4040                              in [Optional=CallWithDefaultValue] DOMString keyArg,
    41                               in [Optional=CallWithDefaultValue,TreatNullAs=EmptyString] DOMString oldValueArg,
    42                               in [Optional=CallWithDefaultValue,TreatNullAs=EmptyString] DOMString newValueArg,
     41                              in [Optional=CallWithDefaultValue,TreatNullAs=NullString] DOMString oldValueArg,
     42                              in [Optional=CallWithDefaultValue,TreatNullAs=NullString] DOMString newValueArg,
    4343                              in [Optional=CallWithDefaultValue] DOMString urlArg,
    4444                              in [Optional=CallWithDefaultValue] Storage storageAreaArg);
  • trunk/Source/WebCore/svg/SVGAngle.idl

    r106534 r106776  
    3737        attribute [StrictTypeChecking] float valueInSpecifiedUnits;
    3838
    39         attribute [TreatNullAs=EmptyString] DOMString valueAsString
     39        attribute [TreatNullAs=NullString] DOMString valueAsString
    4040            setter raises(DOMException);
    4141
  • trunk/Source/WebCore/svg/SVGElement.idl

    r106534 r106776  
    2828    ] SVGElement : Element {
    2929        attribute [Reflect] DOMString id;
    30         attribute [TreatNullAs=EmptyString] DOMString xmlbase setter raises(DOMException);
     30        attribute [TreatNullAs=NullString] DOMString xmlbase setter raises(DOMException);
    3131        readonly attribute SVGSVGElement ownerSVGElement;
    3232        readonly attribute SVGElement viewportElement;
  • trunk/Source/WebCore/svg/SVGLength.idl

    r106534 r106776  
    4545
    4646        attribute [StrictTypeChecking] float valueInSpecifiedUnits;
    47         attribute [TreatNullAs=EmptyString, StrictTypeChecking] DOMString valueAsString
     47        attribute [TreatNullAs=NullString, StrictTypeChecking] DOMString valueAsString
    4848            setter raises(DOMException);
    4949
  • trunk/Source/WebCore/svg/SVGScriptElement.idl

    r106534 r106776  
    3131                                                   SVGURIReference,
    3232                                                   SVGExternalResourcesRequired {
    33                  attribute [TreatNullAs=EmptyString] DOMString type
     33                 attribute [TreatNullAs=NullString] DOMString type
    3434                     /*setter raises(DOMException)*/;
    3535    };
Note: See TracChangeset for help on using the changeset viewer.