Rename [TreatNullAs=EmptyString] to [TreatNullAs=NullString],
authorharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Feb 2012 07:06:00 +0000 (07:06 +0000)
committerharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Feb 2012 07:06:00 +0000 (07:06 +0000)
[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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index a7eeb79cf9b6aa606c3ebfdcf90396579041f22e..1de50988dff6870e26640c40c7baf10804b2edea 100644 (file)
@@ -1,3 +1,75 @@
+2012-02-05  Kentaro Hara  <haraken@chromium.org>
+
+        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:
+
 2012-02-05  Kentaro Hara  <haraken@chromium.org>
 
         Rename [JSCCustom*] IDL to [JSCustom*] IDL
index 1a6f6aad25729f86aa49e43c5bc3423e2efbf5bb..37774a46435f286788b31471a3ba839fad9547e7 100644 (file)
@@ -2868,13 +2868,15 @@ sub JSValueToNative
     return "static_cast<Range::CompareHow>($value.toInt32(exec))" if $type eq "CompareHow";
 
     if ($type eq "DOMString") {
-        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
+        # FIXME: This implements [TreatNullAs=NullString] and [TreatUndefinedAs=NullString],
+        # but the Web IDL spec requires [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString].
+        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString")) {
             return "valueToStringWithUndefinedOrNullCheck(exec, $value)"
         }
-        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
+        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") or $signature->extendedAttributes->{"Reflect"}) {
             return "valueToStringWithNullCheck(exec, $value)"
         }
-        # FIXME: Add the case for 'if ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
+        # FIXME: Add the case for 'if ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString"))'.
         return "ustringToString($value.isEmpty() ? UString() : $value.toString(exec)->value(exec))";
     }
 
index c2a65c174a847f042f72cca274924679393993f3..a52ec292fa2a6fe53b6d524a750174724270194c 100644 (file)
@@ -3309,13 +3309,15 @@ sub GetNativeTypeFromSignature
     $type = GetNativeType($type, $parameterIndex >= 0 ? 1 : 0);
 
     if ($parameterIndex >= 0 && $type eq "V8Parameter") {
+        # FIXME: This implements [TreatNullAs=NullString] and [TreatUndefinedAs=NullString],
+        # but the Web IDL spec requires [TreatNullAs=EmptyString] and [TreatUndefinedAs=EmptyString].
         my $mode = "";
-        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
+        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString")) {
             $mode = "WithUndefinedOrNullCheck";
-        } elsif (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
+        } elsif (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "NullString") or $signature->extendedAttributes->{"Reflect"}) {
             $mode = "WithNullCheck";
         }
-        # FIXME: Add the case for 'elsif ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
+        # FIXME: Add the case for 'elsif ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "NullString"))'.
         $type .= "<$mode>";
     }
 
index 120f9f7b03811749579bdb3579e31ee89c93e84d..36c1fba66dcced3fc19e03943f6214fde26333e4 100644 (file)
@@ -191,8 +191,8 @@ module test {
         void convert1(in [ConvertNullStringTo=Null] a);
         void convert2(in [ConvertNullStringTo=Undefined] b);
         void convert3(in [ConvertNullStringTo=False] c);
-        void convert4(in [TreatNullAs=EmptyString] d);
-        void convert5(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] e);
+        void convert4(in [TreatNullAs=NullString] d);
+        void convert5(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] e);
 
         attribute SVGPoint mutablePoint;
         attribute [Immutable] SVGPoint immutablePoint;
index 87f796affc67c40fbe15d5468f0d98209c3887d0..be23871d0e2265972532c3c39d5192e07dc38acd 100644 (file)
@@ -25,7 +25,7 @@ module css {
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
         readonly attribute [ConvertNullStringTo=Null] DOMString encoding;
 #else
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString encoding
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString encoding
                      setter raises(DOMException);
 #endif
     };
index a71c24ba8611d997af73ccfabd096c66ecec74f9..4f3747ea07f2da46358359ad6b690dc6b6bf3615 100644 (file)
@@ -23,7 +23,7 @@ module css {
     // Introduced in DOM Level 2:
     interface CSSPageRule : CSSRule {
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString selectorText;
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
 
         readonly attribute CSSStyleDeclaration style;
 
index 8447e34e8b2ec47b91d5bc2df2f5b5a52ad99414..279752662eacb171796aba9fd38770f8567e3f48 100644 (file)
@@ -43,7 +43,7 @@ module css {
 
         readonly attribute unsigned short   type;
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        cssText
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
                      setter raises (DOMException);
 
         readonly attribute CSSStyleSheet    parentStyleSheet;
index 80415e0a5f815f121a5028f0f5328824da5d91f8..59420ffc9c80c4bbc9234bc28448916ebea403df 100644 (file)
@@ -30,7 +30,7 @@ module css {
         CustomGetPropertyNames,
         V8DependentLifetime
     ] CSSStyleDeclaration {
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        cssText
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
                      setter raises(DOMException);
 
         [ConvertNullStringTo=Null] DOMString          getPropertyValue(in [Optional=CallWithDefaultValue] DOMString propertyName);
@@ -39,7 +39,7 @@ module css {
             raises(DOMException);
         [ConvertNullStringTo=Null] DOMString          getPropertyPriority(in [Optional=CallWithDefaultValue] DOMString propertyName);
         [ObjCLegacyUnnamedParameters] void setProperty(in [Optional=CallWithDefaultValue] DOMString propertyName, 
-                                        in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString value, 
+                                        in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString value, 
                                         in [Optional=CallWithDefaultValue] DOMString priority)
             raises(DOMException);
 
index aca408e29ea02926f2f434f9af42abaa3f457bed..c0a5e68220e141fb231771009a581269a9d95d20 100644 (file)
@@ -23,7 +23,7 @@ module css {
     // Introduced in DOM Level 2:
     interface CSSStyleRule : CSSRule {
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString selectorText;
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
 
         readonly attribute CSSStyleDeclaration style;
 
index 500043f871c9a3c1aee50a7346e19d02e5ec158f..c46267321c06c126fce804b2bfeb12dfdba6d829 100644 (file)
@@ -34,7 +34,7 @@ module css {
         const unsigned short CSS_VALUE_LIST      = 2;
         const unsigned short CSS_CUSTOM          = 3;
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString cssText
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString cssText
                      setter raises(DOMException);
 
         readonly attribute unsigned short cssValueType;
index 60e9740c6b3b37720ad8225380c4e518ecd2a979..a12831268554585d90de75fef175ec30c2d43bda 100644 (file)
@@ -31,7 +31,7 @@ module stylesheets {
         HasIndexGetter
     ] MediaList {
 
-                 attribute [TreatNullAs=EmptyString, ConvertNullStringTo=Null] DOMString mediaText
+                 attribute [TreatNullAs=NullString, ConvertNullStringTo=Null] DOMString mediaText
                      setter raises(DOMException);
         readonly attribute unsigned long length;
 
index 87c8dd65e9d5dc4a87e98e3d77f57a91d332570e..c694c5b52cc18e840eaf4800eb52afbbfc78b991 100644 (file)
@@ -33,7 +33,7 @@ module css {
         HasIndexGetter
     ] WebKitCSSKeyframesRule : CSSRule {
 
-        attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString name;
+        attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString name;
         readonly attribute CSSRuleList cssRules;
         
         void insertRule(in [Optional=CallWithDefaultValue] DOMString rule);
index 660b86b93bffcc1f55109d182cd241513ca781b7..6d1f4602de32f8fe946a59084cec21fe09111dfd 100644 (file)
@@ -31,7 +31,7 @@ module core {
 
         readonly attribute boolean specified;
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString value 
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString value 
                      setter raises(DOMException);
 
         // DOM Level 2
index 80a01afc423ee3f1f0837eaf574ddfbed1db5e38..dcf796ae55203279ccffdca848ef887ed7c5670e 100644 (file)
@@ -21,7 +21,7 @@ module core {
 
     interface CharacterData : Node {
 
-        attribute [TreatNullAs=EmptyString] DOMString data
+        attribute [TreatNullAs=NullString] DOMString data
             setter raises(DOMException);
 
         readonly attribute unsigned long length;
index be6315769df0147debd3c7543c922dca14b02bec..0a2368e529f875c6aea2d5fa111606fbcb8bb3d8 100644 (file)
@@ -28,17 +28,17 @@ module core {
         // DOM Level 1
 
         [ObjCLegacyUnnamedParameters] boolean hasFeature(in [Optional=CallWithDefaultValue] DOMString feature, 
-                                          in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString version);
+                                          in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString version);
 
         // DOM Level 2
 
-        [ObjCLegacyUnnamedParameters] DocumentType createDocumentType(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName,
-                                                       in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString publicId,
-                                                       in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString systemId)
+        [ObjCLegacyUnnamedParameters] DocumentType createDocumentType(in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName,
+                                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString publicId,
+                                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString systemId)
             raises(DOMException);
-        [ObjCLegacyUnnamedParameters] Document createDocument(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI, 
-                                               in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName, 
-                                               in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DocumentType doctype)
+        [ObjCLegacyUnnamedParameters] Document createDocument(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI, 
+                                               in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName, 
+                                               in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DocumentType doctype)
             raises(DOMException);
 
         // DOMImplementationCSS interface from DOM Level 2 CSS
index 99a47fafe976c4dd6aa839e9ff86e62cb9c9182b..f5ed87797140b6875bde8dc0a937686cbb51b5d9 100644 (file)
@@ -31,7 +31,7 @@ module core {
         readonly attribute DOMImplementation implementation;
         readonly attribute Element documentElement;
 
-        [ReturnsNew] Element createElement(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString tagName)
+        [ReturnsNew] Element createElement(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString tagName)
             raises (DOMException);
         DocumentFragment   createDocumentFragment();
         [ReturnsNew] Text createTextNode(in [Optional=CallWithDefaultValue] DOMString data);
@@ -52,13 +52,13 @@ module core {
         [ObjCLegacyUnnamedParameters, ReturnsNew] Node importNode(in [Optional=CallWithDefaultValue] Node importedNode,
                                                    in [Optional] boolean deep)
             raises (DOMException);
-        [ObjCLegacyUnnamedParameters, ReturnsNew] Element createElementNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
-                                                           in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName)
+        [ObjCLegacyUnnamedParameters, ReturnsNew] Element createElementNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+                                                           in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName)
             raises (DOMException);
-        [ObjCLegacyUnnamedParameters, ReturnsNew] Attr createAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
-                                                          in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName)
+        [ObjCLegacyUnnamedParameters, ReturnsNew] Attr createAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+                                                          in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName)
             raises (DOMException);
-        [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                        in [Optional=CallWithDefaultValue] DOMString localName);
         Element            getElementById(in [Optional=CallWithDefaultValue] DOMString elementId);
 
@@ -67,7 +67,7 @@ module core {
         readonly attribute [ConvertNullStringTo=Null] DOMString inputEncoding;
 
         readonly attribute [ConvertNullStringTo=Null] DOMString xmlEncoding;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString xmlVersion
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString xmlVersion
                     setter raises (DOMException);
                  attribute boolean xmlStandalone
                     setter raises (DOMException);
@@ -75,7 +75,7 @@ module core {
         Node               adoptNode(in [Optional=CallWithDefaultValue] Node source)
             raises (DOMException);
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString documentURI;
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString documentURI;
 
         // DOM Level 2 Events (DocumentEvents interface)
 
@@ -128,7 +128,7 @@ module core {
 
         boolean            execCommand(in [Optional=CallWithDefaultValue] DOMString command,
                                        in [Optional=CallWithDefaultValue] boolean userInterface,
-                                       in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString value);
+                                       in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString value);
 
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
         // FIXME: remove the these two versions once [Optional] is implemented for Objective-C.
@@ -145,17 +145,17 @@ module core {
 
         // Moved down from HTMLDocument
 
-                 attribute [TreatNullAs=EmptyString] DOMString title;
+                 attribute [TreatNullAs=NullString] DOMString title;
         readonly attribute DOMString referrer;
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-                 attribute [TreatNullAs=EmptyString] DOMString domain
+                 attribute [TreatNullAs=NullString] DOMString domain
                      setter raises (DOMException);
 #else
         readonly attribute DOMString domain;
 #endif
         readonly attribute DOMString URL;
 
-                 attribute [TreatNullAs=EmptyString] DOMString cookie
+                 attribute [TreatNullAs=NullString] DOMString cookie
                      setter raises (DOMException),
                      getter raises (DOMException);
 
@@ -175,7 +175,7 @@ module core {
         NodeList getElementsByName(in [Optional=CallWithDefaultValue] DOMString elementName);
 
 #if defined(ENABLE_MICRODATA) && ENABLE_MICRODATA
-        NodeList getItems(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString, Optional=CallWithDefaultValue] DOMString typeNames);
+        NodeList getItems(in [TreatNullAs=NullString, TreatUndefinedAs=NullString, Optional=CallWithDefaultValue] DOMString typeNames);
 #endif
 
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
@@ -184,7 +184,7 @@ module core {
 
         // IE extensions
 
-                 attribute [ConvertNullStringTo=Undefined, TreatNullAs=EmptyString] DOMString charset;
+                 attribute [ConvertNullStringTo=Undefined, TreatNullAs=NullString] DOMString charset;
         readonly attribute [ConvertNullStringTo=Undefined] DOMString defaultCharset;
         readonly attribute [ConvertNullStringTo=Undefined] DOMString readyState;
 
@@ -202,7 +202,7 @@ module core {
         // WebKit extensions
 
         readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString selectedStylesheetSet;
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectedStylesheetSet;
 
 #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
         CSSStyleDeclaration createCSSStyleDeclaration();
index 9fea638392f5fb0d0bd39436e9903a7e6f66866d..df91961f1006621bb607c287d92f16840005362b 100644 (file)
@@ -43,22 +43,22 @@ module core {
 
         // DOM Level 2 Core
 
-        [ObjCLegacyUnnamedParameters] DOMString getAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] DOMString getAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                 in [Optional=CallWithDefaultValue] DOMString localName);
-        [ObjCLegacyUnnamedParameters] void setAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] void setAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                            in [Optional=CallWithDefaultValue] DOMString qualifiedName, 
                                            in [Optional=CallWithDefaultValue] DOMString value)
             raises(DOMException);
-        [ObjCLegacyUnnamedParameters] void removeAttributeNS(in [TreatNullAs=EmptyString] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] void removeAttributeNS(in [TreatNullAs=NullString] DOMString namespaceURI,
                                               in DOMString localName);
-        [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                        in [Optional=CallWithDefaultValue] DOMString localName);
-        [ObjCLegacyUnnamedParameters] Attr getAttributeNodeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] Attr getAttributeNodeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                in [Optional=CallWithDefaultValue] DOMString localName);
         Attr setAttributeNodeNS(in [Optional=CallWithDefaultValue] Attr newAttr)
             raises(DOMException);
         boolean hasAttribute(in DOMString name);
-        [ObjCLegacyUnnamedParameters] boolean hasAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        [ObjCLegacyUnnamedParameters] boolean hasAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                               in [Optional=CallWithDefaultValue] DOMString localName);
 
         readonly attribute CSSStyleDeclaration style;
index b35913b75a1188c8f502ba4c73097f1f6dbbf78b..4bdd50753538d7609540847a3de004e7f2ed053f 100644 (file)
@@ -42,7 +42,7 @@ module core {
 
         // Introduced in DOM Level 2:
 
-        [ObjCLegacyUnnamedParameters] Node getNamedItemNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI, 
+        [ObjCLegacyUnnamedParameters] Node getNamedItemNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI, 
                                            in [Optional=CallWithDefaultValue] DOMString localName)
             // FIXME: the implementation does take an exceptioncode parameter.
             /*raises(DOMException)*/;
@@ -50,7 +50,7 @@ module core {
         Node setNamedItemNS(in [Optional=CallWithDefaultValue] Node node)
             raises(DOMException);
 
-        [ObjCLegacyUnnamedParameters] Node removeNamedItemNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI, 
+        [ObjCLegacyUnnamedParameters] Node removeNamedItemNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI, 
                                               in [Optional=CallWithDefaultValue] DOMString localName)
             raises(DOMException);
 
index 8489f4fd01a8abd052d10ab6d56d6ca3b668a605..9bebc12b2af81beda3ee647f69484319f9984504 100644 (file)
@@ -54,7 +54,7 @@ module core {
         readonly attribute [ConvertNullStringTo=Null] DOMString        nodeName;
 
                  // FIXME: the spec says this can also raise on retrieval.
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        nodeValue
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        nodeValue
                      setter raises(DOMException);
 
         readonly attribute unsigned short   nodeType;
@@ -85,10 +85,10 @@ module core {
         // Introduced in DOM Level 2:
 
         [ObjCLegacyUnnamedParameters] boolean isSupported(in [Optional=CallWithDefaultValue] DOMString feature, 
-                                           in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString version);
+                                           in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString version);
 
         readonly attribute [ConvertNullStringTo=Null] DOMString        namespaceURI;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString        prefix
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        prefix
                      setter raises(DOMException);
         readonly attribute [ConvertNullStringTo=Null] DOMString        localName;
 
@@ -99,14 +99,14 @@ module core {
         readonly attribute [ConvertNullStringTo=Null] DOMString       baseURI;
 
                  // FIXME: the spec says this can also raise on retrieval.
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString       textContent
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString       textContent
                      setter raises(DOMException);
 
         boolean            isSameNode(in [Optional=CallWithDefaultValue] Node other);
         boolean            isEqualNode(in [Optional=CallWithDefaultValue] Node other);
-        [ConvertNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI);
-        boolean            isDefaultNamespace(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI);
-        [ConvertNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString prefix);
+        [ConvertNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI);
+        boolean            isDefaultNamespace(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI);
+        [ConvertNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString prefix);
 
         // DocumentPosition
         const unsigned short      DOCUMENT_POSITION_DISCONNECTED = 0x01;
index 6f9f68dd4f2503e2df6854d6d0cdeaa5cdebd41b..9c673fdcbd23e65f5e8a160cbbd29332e6a7be86 100644 (file)
@@ -25,7 +25,7 @@ module core {
         // DOM Level 1
 
         readonly attribute [ConvertNullStringTo=Null] DOMString target;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=EmptyString] DOMString data
+                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString data
                      setter raises(DOMException);
 
         // interface LinkStyle from DOM Level 2 Style Sheets
index 955b38e07aae338cc9c373ac44e8bf9da3714b00..011d6795fbe3b28ce1c8c22b74c73969c35678b6 100644 (file)
@@ -36,7 +36,7 @@ module core {
         Element getElementById(in [Optional=CallWithDefaultValue] DOMString elementId);
         NodeList getElementsByClassName(in [Optional=CallWithDefaultValue] DOMString className);
         NodeList getElementsByTagName(in [Optional=CallWithDefaultValue] DOMString tagName);
-        NodeList getElementsByTagNameNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
+        NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                         in [Optional=CallWithDefaultValue] DOMString localName);
     };
 
index 758d05be154f3fc8ef71fb680601b21b2980fddb..1400dc1b3c347292c452f0983b72bf97612048f1 100644 (file)
@@ -40,7 +40,7 @@ module html {
 
 #if !defined(LANGUAGE_OBJECTIVE_C)
 #if defined(ENABLE_BLOB) && ENABLE_BLOB
-        Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
+        Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString contentType);
 #endif
 #endif
     };
index 561af2df2765da23e61b6ddc4303bc6482c08b32..b1766e6cb7b0c9c1b0df053ddcc604e72fa9354f 100644 (file)
@@ -36,8 +36,8 @@ module storage {
         JSNoStaticTables
     ] DirectoryEntry : Entry {
         DirectoryReader createReader();
-        [Custom] void getFile(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        [Custom] void getDirectory(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+        [Custom] void getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+        [Custom] void getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     };
 }
index 88af9453fbbc5778a78a9be188a7e9667bec62eb..194df1c332d07ed5f347db196d1c3555baa5939a 100644 (file)
@@ -36,8 +36,8 @@ module storage {
         JSNoStaticTables
     ] DirectoryEntrySync : EntrySync {
         DirectoryReaderSync createReader() raises (FileException);
-        [Custom] FileEntrySync getFile(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in WebKitFlags flags) raises (FileException);
-        [Custom] DirectoryEntrySync getDirectory(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in WebKitFlags flags) raises (FileException);
+        [Custom] FileEntrySync getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in WebKitFlags flags) raises (FileException);
+        [Custom] DirectoryEntrySync getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in WebKitFlags flags) raises (FileException);
         void removeRecursively() raises (FileException);
     };
 }
index 16e41ecc26cda1b31cf0d7e0d1fa44ebaaca2c00..4be6c8b75d4bde3bbe675ff0d7f66eb390c08091 100644 (file)
@@ -41,8 +41,8 @@ module storage {
         readonly attribute DOMFileSystem filesystem;
 
         void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+        void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+        void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         DOMString toURL();
         void remove(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void getParent(in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
index dbe998256b297500adb3643028bbb74a5b53873c..2db476d33561ffd27db103942dc6bef2ded2c08c 100644 (file)
@@ -41,8 +41,8 @@ module storage {
         readonly attribute DOMFileSystemSync filesystem;
 
         Metadata getMetadata() raises (FileException);
-        EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name) raises (FileException);
-        EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name) raises (FileException);
+        EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
+        EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
         DOMString toURL();
         void remove() raises (FileException);
         DirectoryEntrySync getParent();
index 21fb7bdb24efa88d1f3c864e8c727e50b26f6fab..1d212b712d64dbf262f7001c30260f38fa998dc9 100644 (file)
@@ -35,13 +35,13 @@ module html {
         JSNoStaticTables
     ] WebKitBlobBuilder {
 #if !defined(LANGUAGE_OBJECTIVE_C)
-        Blob getBlob(in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
+        Blob getBlob(in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString contentType);
 #endif
         void append(in Blob blob);
 #if defined(ENABLE_BLOB) && ENABLE_BLOB
         void append(in ArrayBuffer arrayBuffer);
 #endif
-        void append(in DOMString value, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString endings) raises (DOMException);
+        void append(in DOMString value, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString endings) raises (DOMException);
     };
 
 }
index 91cf655368da2cb3804fa0d5aae8461485f0014b..3c40b73b67ce755a19d3d65b9b68f194488df772 100644 (file)
@@ -43,15 +43,15 @@ module html {
         readonly attribute DOMString protocol;
         readonly attribute DOMString search;
 #else
-        attribute [TreatNullAs=EmptyString] DOMString hash;
-        attribute [TreatNullAs=EmptyString] DOMString host;
-        attribute [TreatNullAs=EmptyString] DOMString hostname;
-        attribute [TreatNullAs=EmptyString] DOMString pathname;
-        attribute [TreatNullAs=EmptyString] DOMString port;
-        attribute [TreatNullAs=EmptyString] DOMString protocol;
-        attribute [TreatNullAs=EmptyString] DOMString search;
+        attribute [TreatNullAs=NullString] DOMString hash;
+        attribute [TreatNullAs=NullString] DOMString host;
+        attribute [TreatNullAs=NullString] DOMString hostname;
+        attribute [TreatNullAs=NullString] DOMString pathname;
+        attribute [TreatNullAs=NullString] DOMString port;
+        attribute [TreatNullAs=NullString] DOMString protocol;
+        attribute [TreatNullAs=NullString] DOMString search;
 
-        readonly attribute [TreatNullAs=EmptyString] DOMString origin;
+        readonly attribute [TreatNullAs=NullString] DOMString origin;
 #endif
 
         readonly attribute DOMString text;
index f37c9704d64cc3889d408022f9ed0312aef65183..b8b8621f930180013b2ec08f1ce30e935b9a14c8 100644 (file)
@@ -24,8 +24,8 @@ module html {
         readonly attribute HTMLFormElement form;
 
         attribute [Reflect, URL] DOMString formAction;
-        attribute [TreatNullAs=EmptyString] DOMString formEnctype;
-        attribute [TreatNullAs=EmptyString] DOMString formMethod;
+        attribute [TreatNullAs=NullString] DOMString formEnctype;
+        attribute [TreatNullAs=NullString] DOMString formMethod;
         attribute [Reflect] boolean formNoValidate;
         attribute [Reflect] DOMString formTarget;
         readonly attribute ValidityState validity;
@@ -39,7 +39,7 @@ module html {
         readonly attribute boolean willValidate;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
 
         void click();
 
index d3e39ed6446ea907c21164baab3dbcc334400b3d..830d5e7119b3f01cb40f9e5c0697b6785ff513c8 100644 (file)
@@ -33,7 +33,7 @@ module html {
         attribute long width;
         attribute long height;
 
-        [Custom] DOMString toDataURL(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString type)
+        [Custom] DOMString toDataURL(in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString type)
             raises(DOMException);
 
 #if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
index 5adaabe50acd3e66ca07ad05ce25601560936271..21d0a2db6b1793674ebb6f96992e3c034811a4f9 100644 (file)
@@ -48,19 +48,19 @@ module html {
         readonly attribute long width;
         readonly attribute long height;
 #endif
-                 attribute [TreatNullAs=EmptyString] DOMString dir;
-                 attribute [TreatNullAs=EmptyString] DOMString designMode;
+                 attribute [TreatNullAs=NullString] DOMString dir;
+                 attribute [TreatNullAs=NullString] DOMString designMode;
         readonly attribute DOMString compatMode;
 
         readonly attribute Element activeElement;
         boolean hasFocus();
 
         // Deprecated attributes
-                 attribute [TreatNullAs=EmptyString] DOMString bgColor;
-                 attribute [TreatNullAs=EmptyString] DOMString fgColor;
-                 attribute [TreatNullAs=EmptyString] DOMString alinkColor;
-                 attribute [TreatNullAs=EmptyString] DOMString linkColor;
-                 attribute [TreatNullAs=EmptyString] DOMString vlinkColor;
+                 attribute [TreatNullAs=NullString] DOMString bgColor;
+                 attribute [TreatNullAs=NullString] DOMString fgColor;
+                 attribute [TreatNullAs=NullString] DOMString alinkColor;
+                 attribute [TreatNullAs=NullString] DOMString linkColor;
+                 attribute [TreatNullAs=NullString] DOMString vlinkColor;
     };
 
 }
index 068cb8d7428a3b433bc3db8264f2af0041ecf50d..a5debf69ee840b59fdeaebd9eb88eef72f0c0b04 100644 (file)
@@ -40,13 +40,13 @@ module html {
                  attribute [Reflect] DOMString accessKey;
 
         // Extensions
-                 attribute [TreatNullAs=EmptyString] DOMString innerHTML
+                 attribute [TreatNullAs=NullString] DOMString innerHTML
                      setter raises(DOMException);
-                 attribute [TreatNullAs=EmptyString] DOMString innerText
+                 attribute [TreatNullAs=NullString] DOMString innerText
                      setter raises(DOMException);
-                 attribute [TreatNullAs=EmptyString] DOMString outerHTML
+                 attribute [TreatNullAs=NullString] DOMString outerHTML
                      setter raises(DOMException);
-                 attribute [TreatNullAs=EmptyString] DOMString outerText
+                 attribute [TreatNullAs=NullString] DOMString outerText
                      setter raises(DOMException);
 
         Element insertAdjacentElement(in [Optional=CallWithDefaultValue] DOMString where,
@@ -61,7 +61,7 @@ module html {
 
         readonly attribute HTMLCollection children;
 
-                 attribute [TreatNullAs=EmptyString] DOMString contentEditable
+                 attribute [TreatNullAs=NullString] DOMString contentEditable
                      setter raises(DOMException);
         readonly attribute boolean isContentEditable;
 
index 512316dbd6a9f6d1c2463e2520488e535f591365..dd699c0e82b061ac1cdcee073c848fcca7609164 100644 (file)
@@ -25,7 +25,7 @@ module html {
         readonly attribute boolean         willValidate;
         readonly attribute DOMString       validationMessage;
         boolean  checkValidity();
-        void     setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void     setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
     };
 
 }
index d1884efe8ff379dda587954c52251379252d2396..d5e271784a4dfa64cdb14365d9e0b3d79e4814c3 100644 (file)
@@ -31,9 +31,9 @@ module html {
         attribute [Reflect] boolean noValidate;
         attribute [Reflect=accept_charset] DOMString acceptCharset;
         attribute [Reflect, URL] DOMString action;
-        attribute [TreatNullAs=EmptyString] DOMString encoding;
-        attribute [TreatNullAs=EmptyString] DOMString enctype;
-        attribute [TreatNullAs=EmptyString] DOMString method;
+        attribute [TreatNullAs=NullString] DOMString encoding;
+        attribute [TreatNullAs=NullString] DOMString enctype;
+        attribute [TreatNullAs=NullString] DOMString method;
         attribute [Reflect] DOMString target;
         attribute [Reflect] DOMString autocomplete;
         
index 1c6851b8a1ac1f6082a8423068f631006919ebb4..51a471621bea25929a90733e6ba6b5166883fbb9 100644 (file)
@@ -44,7 +44,7 @@ module html {
 #endif
 #endif
 
-        attribute [TreatNullAs=EmptyString, CustomSetter] DOMString location;
+        attribute [TreatNullAs=NullString, CustomSetter] DOMString location;
 
         readonly attribute long width;
         readonly attribute long height;
index c439ab3c1cf467b2df314a32dc1e07cacea73092..2028d024bb7a6930a5145ab0e386512a00d527ce 100644 (file)
 module html {
 
     interface HTMLInputElement : HTMLElement {
-        attribute [TreatNullAs=EmptyString] DOMString defaultValue;
+        attribute [TreatNullAs=NullString] DOMString defaultValue;
         attribute [Reflect=checked] boolean defaultChecked;
         attribute [Reflect] DOMString dirName;
         readonly attribute HTMLFormElement form;
         attribute [Reflect, URL] DOMString formAction;
-        attribute [TreatNullAs=EmptyString] DOMString formEnctype;
-        attribute [TreatNullAs=EmptyString] DOMString formMethod;
+        attribute [TreatNullAs=NullString] DOMString formEnctype;
+        attribute [TreatNullAs=NullString] DOMString formMethod;
         attribute [Reflect] boolean formNoValidate;
         attribute [Reflect] DOMString formTarget;
         readonly attribute ValidityState validity;
@@ -57,9 +57,9 @@ module html {
 #endif
         attribute [Reflect, URL] DOMString src;
         attribute [Reflect] DOMString step;
-        attribute [TreatNullAs=EmptyString] DOMString type; // readonly dropped as part of DOM level 2
+        attribute [TreatNullAs=NullString] DOMString type; // readonly dropped as part of DOM level 2
         attribute [Reflect] DOMString useMap;
-        attribute [TreatNullAs=EmptyString] DOMString value;
+        attribute [TreatNullAs=NullString] DOMString value;
 #if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
         attribute Date valueAsDate setter raises(DOMException);
 #endif
@@ -73,12 +73,12 @@ module html {
         readonly attribute boolean willValidate;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
         void select();
         void click();
 
 #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
-        void setValueForUser(in [TreatNullAs=EmptyString] DOMString value);
+        void setValueForUser(in [TreatNullAs=NullString] DOMString value);
 #endif
 
         // WinIE extension:
index 93d8d61f4e0689e4fed58fa3f90f16dac53fb5e1..914fb99b00a4b6e15ccab152083ece0c2344dd09 100644 (file)
@@ -44,7 +44,7 @@ module html {
         readonly attribute ValidityState validity;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
 
         readonly attribute NodeList labels;
     };
index aa50b2c7aeb42fbfcce0b0bff3891070943e1b89..e0ccf3b54b3e29fa72163fa00e99477b284779f9 100644 (file)
@@ -117,7 +117,7 @@ module html {
     readonly attribute [V8EnabledAtRuntime=webkitVideoTrack] TextTrackList textTracks;
 #endif
 
-    attribute [Reflect, TreatNullAs=EmptyString, ConvertNullStringToNull] DOMString mediaGroup;
+    attribute [Reflect, TreatNullAs=NullString, ConvertNullStringToNull] DOMString mediaGroup;
     attribute [CustomSetter] MediaController controller;
 };
 }
index a07ac66b61f307445bbeadee59a7a3b74dbcb2f9..01f8485c4b03ac2a2aae55bc63084916d4fb32ac 100644 (file)
@@ -46,7 +46,7 @@ module html {
         readonly attribute ValidityState validity;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
 
         // Introduced in DOM Level 2:
         readonly attribute [CheckAccessToNode] Document contentDocument;
index c2a41dab7156b1d7bdae4d0581105bbbc1a9b324..35761c335cd86e4e1350b8d2552cb3bf431f2af7 100644 (file)
@@ -29,14 +29,14 @@ module html {
         attribute [Reflect] DOMString name;
 
         readonly attribute DOMString type;
-        attribute [TreatNullAs=EmptyString] DOMString defaultValue;
-        attribute [TreatNullAs=EmptyString] DOMString value;
+        attribute [TreatNullAs=NullString] DOMString defaultValue;
+        attribute [TreatNullAs=NullString] DOMString value;
 
         readonly attribute boolean willValidate;
         readonly attribute ValidityState validity;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
 
         readonly attribute NodeList labels;
     };
index 03b5ac8165eaf0a238c7120885b970e635d36cf8..1e5c21e742727278a5da615ed933db63ca14f87e 100644 (file)
@@ -20,7 +20,7 @@
 module html {
 
     interface HTMLScriptElement : HTMLElement {
-        attribute [TreatNullAs=EmptyString] DOMString text;
+        attribute [TreatNullAs=NullString] DOMString text;
         attribute [Reflect=for] DOMString htmlFor;
         attribute [Reflect] DOMString event;
         attribute [Reflect] DOMString charset;
index a1204d00d5d73520a09f75534185f9c1611dae67..3e5c8f4357374710bc0b28fabd3fa2a574a464a2 100644 (file)
@@ -26,7 +26,7 @@ module html {
     ] HTMLSelectElement : HTMLElement {
         readonly attribute DOMString type;
         attribute long selectedIndex;
-        attribute [TreatNullAs=EmptyString] DOMString value;
+        attribute [TreatNullAs=NullString] DOMString value;
         
         // Modified in DOM Level 2:
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
@@ -40,7 +40,7 @@ module html {
         readonly attribute boolean willValidate;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
 
         // Modified in DOM Level 2:
         readonly attribute HTMLOptionsCollection options;
@@ -48,7 +48,7 @@ module html {
         attribute [Reflect] boolean disabled;
         attribute [Reflect] boolean autofocus;
         attribute boolean multiple;
-        attribute [TreatNullAs=EmptyString] DOMString name;
+        attribute [TreatNullAs=NullString] DOMString name;
         attribute [Reflect] boolean required;
         attribute long size;
         
index a035e88f3a5e25c696a2ff6af80128736ffaf10f..3b76115e5851a682235f1c0bbcb9073885fef83d 100644 (file)
@@ -22,7 +22,7 @@
 module html {
 
     interface HTMLTextAreaElement : HTMLElement {
-        attribute [TreatNullAs=EmptyString] DOMString defaultValue;
+        attribute [TreatNullAs=NullString] DOMString defaultValue;
         readonly attribute HTMLFormElement form;
         readonly attribute ValidityState validity;
         attribute long cols;
@@ -30,14 +30,14 @@ module html {
         attribute [Reflect] boolean disabled;
         attribute [Reflect] boolean autofocus;
         attribute long maxLength setter raises(DOMException);
-        attribute [TreatNullAs=EmptyString] DOMString name;
+        attribute [TreatNullAs=NullString] DOMString name;
         attribute [Reflect] DOMString placeholder;
         attribute [Reflect] boolean readOnly;
         attribute [Reflect] boolean required;
         attribute long rows;
         attribute [Reflect] DOMString wrap;
         readonly attribute DOMString type;
-        attribute [TreatNullAs=EmptyString] DOMString value;
+        attribute [TreatNullAs=NullString] DOMString value;
         readonly attribute unsigned long textLength;
 
         void select();
@@ -45,7 +45,7 @@ module html {
         readonly attribute boolean willValidate;
         readonly attribute DOMString validationMessage;
         boolean checkValidity();
-        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
+        void setCustomValidity(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString error);
 
         // WinIE & FireFox extension:
         attribute long selectionStart;
index 3692c39de1de30d37f509a06fc16d0d5c9cc1fd5..e691f7b131c9384e437176d574bd4b3abb64e2c4 100644 (file)
@@ -20,7 +20,7 @@
 module html {
 
     interface HTMLTitleElement : HTMLElement {
-        attribute  [TreatNullAs=EmptyString] DOMString            text;
+        attribute  [TreatNullAs=NullString] DOMString            text;
     };
 
 }
index d7efe13286ee88603b8d25692e1ee9611d0a7e82..d4560f7a0aaf705d6098eaedbed81f4fc94863f3 100644 (file)
@@ -49,7 +49,7 @@ module html {
                           in [Optional=CallWithDefaultValue] float dy);
 
         attribute float globalAlpha;
-        attribute [TreatNullAs=EmptyString] DOMString globalCompositeOperation;
+        attribute [TreatNullAs=NullString] DOMString globalCompositeOperation;
 
         CanvasGradient createLinearGradient(in [Optional=CallWithDefaultValue] float x0,
                                             in [Optional=CallWithDefaultValue] float y0,
@@ -65,14 +65,14 @@ module html {
             raises (DOMException);
 
         attribute float lineWidth;
-        attribute [TreatNullAs=EmptyString] DOMString lineCap;
-        attribute [TreatNullAs=EmptyString] DOMString lineJoin;
+        attribute [TreatNullAs=NullString] DOMString lineCap;
+        attribute [TreatNullAs=NullString] DOMString lineJoin;
         attribute float miterLimit;
 
         attribute float shadowOffsetX;
         attribute float shadowOffsetY;
         attribute float shadowBlur;
-        attribute [TreatNullAs=EmptyString] DOMString shadowColor;
+        attribute [TreatNullAs=NullString] DOMString shadowColor;
 
         // FIXME: These attributes should also be implemented for V8.
 #if !(defined(V8_BINDING) && V8_BINDING)
@@ -204,9 +204,9 @@ module html {
         void putImageData(in ImageData imagedata, in float dx, in float dy, in float dirtyX, in float dirtyY, in float dirtyWidth, in float dirtyHeight)
             raises(DOMException);
 
-        CanvasPattern createPattern(in HTMLCanvasElement canvas, in [TreatNullAs=EmptyString] DOMString repetitionType)
+        CanvasPattern createPattern(in HTMLCanvasElement canvas, in [TreatNullAs=NullString] DOMString repetitionType)
             raises (DOMException);
-        CanvasPattern createPattern(in HTMLImageElement image, in [TreatNullAs=EmptyString] DOMString repetitionType)
+        CanvasPattern createPattern(in HTMLImageElement image, in [TreatNullAs=NullString] DOMString repetitionType)
             raises (DOMException);
         ImageData createImageData(in ImageData imagedata)
             raises (DOMException);
index ef49c83ccbb954834f686cdeaf99b3a756ddbc7c..8f7f4be869278aff3270f0c6dfb6b752e46df285 100644 (file)
@@ -51,8 +51,8 @@ module window {
         [Custom] void profileEnd(in DOMString title);
 #endif
 
-        void time(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString title);
-        [CustomArgumentHandling] void timeEnd(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString title);
+        void time(in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString title);
+        [CustomArgumentHandling] void timeEnd(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString title);
         [CustomArgumentHandling] void timeStamp();
         [CustomArgumentHandling] void group();
         [CustomArgumentHandling] void groupCollapsed();
index 79a403c0e88f58c2ef1f6d6fb1682cc93ad5fd18..eaa1f57dba39fe16afc6794b9d0fcf22434998ea 100644 (file)
@@ -81,7 +81,7 @@ module window {
         void alert(in [Optional=CallWithDefaultValue] DOMString message);
         boolean confirm(in [Optional=CallWithDefaultValue] DOMString message);
         [ConvertNullStringTo=Null] DOMString prompt(in [Optional=CallWithDefaultValue] DOMString message,
-                                                    in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString defaultValue);
+                                                    in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString defaultValue);
 
         boolean find(in [Optional=CallWithDefaultValue] DOMString string,
                      in [Optional=CallWithDefaultValue] boolean caseSensitive,
@@ -147,7 +147,7 @@ module window {
 
         // DOM Level 2 Style Interface
         CSSStyleDeclaration getComputedStyle(in [Optional=CallWithDefaultValue] Element element,
-                                             in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString pseudoElement);
+                                             in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=CallWithDefaultValue] DOMString pseudoElement);
 
         // WebKit extensions
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
@@ -228,9 +228,9 @@ module window {
 #endif
 
         // Base64
-        DOMString atob(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString string)
+        DOMString atob(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString string)
             raises(DOMException);
-        DOMString btoa(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString string)
+        DOMString btoa(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString string)
             raises(DOMException);
 
         // Events
index fccbb816ae13caa02e6d24c1b817e3d5a6b34bc5..6414fcf11f0b10ffd8e298e0986376e5ddee25d3 100644 (file)
@@ -38,8 +38,8 @@ module storage {
                               in [Optional=CallWithDefaultValue] boolean canBubbleArg, 
                               in [Optional=CallWithDefaultValue] boolean cancelableArg, 
                               in [Optional=CallWithDefaultValue] DOMString keyArg, 
-                              in [Optional=CallWithDefaultValue,TreatNullAs=EmptyString] DOMString oldValueArg, 
-                              in [Optional=CallWithDefaultValue,TreatNullAs=EmptyString] DOMString newValueArg, 
+                              in [Optional=CallWithDefaultValue,TreatNullAs=NullString] DOMString oldValueArg, 
+                              in [Optional=CallWithDefaultValue,TreatNullAs=NullString] DOMString newValueArg, 
                               in [Optional=CallWithDefaultValue] DOMString urlArg, 
                               in [Optional=CallWithDefaultValue] Storage storageAreaArg);
 
index 61ec6348c86019bb719312f0cbd7e733aa3a9efd..24ab62f89e2ae118eddfca49b7062ba287e89d54 100644 (file)
@@ -36,7 +36,7 @@ module svg {
         attribute [StrictTypeChecking] float value;
         attribute [StrictTypeChecking] float valueInSpecifiedUnits;
 
-        attribute [TreatNullAs=EmptyString] DOMString valueAsString
+        attribute [TreatNullAs=NullString] DOMString valueAsString
             setter raises(DOMException);
 
         [StrictTypeChecking] void newValueSpecifiedUnits(in unsigned short unitType, in float valueInSpecifiedUnits)
index 21c700cb5c89fc15b7efdb9f875d8c3125e5fab9..77bba86f36131c79cef607a9251bc1b13a730833 100644 (file)
@@ -27,7 +27,7 @@ module svg {
         Conditional=SVG
     ] SVGElement : Element {
         attribute [Reflect] DOMString id;
-        attribute [TreatNullAs=EmptyString] DOMString xmlbase setter raises(DOMException);
+        attribute [TreatNullAs=NullString] DOMString xmlbase setter raises(DOMException);
         readonly attribute SVGSVGElement ownerSVGElement;
         readonly attribute SVGElement viewportElement;
     };
index f9af7de9c59d31b4ae953f50cc8b9d9509e5a24b..a5c952dfcaa975fb32dc947c18a372dd53479a10 100644 (file)
@@ -44,7 +44,7 @@ module svg {
             getter raises(DOMException);
 
         attribute [StrictTypeChecking] float valueInSpecifiedUnits;
-        attribute [TreatNullAs=EmptyString, StrictTypeChecking] DOMString valueAsString
+        attribute [TreatNullAs=NullString, StrictTypeChecking] DOMString valueAsString
             setter raises(DOMException);
 
         [StrictTypeChecking] void newValueSpecifiedUnits(in unsigned short unitType, 
index b5244e65cb3702f3dec9b2b3e3752302bdd36bbb..111ee59afa9099b67cd75e617be07d840e6bd7a9 100644 (file)
@@ -30,7 +30,7 @@ module svg {
     ] SVGScriptElement : SVGElement,
                                                    SVGURIReference,
                                                    SVGExternalResourcesRequired {
-                 attribute [TreatNullAs=EmptyString] DOMString type
+                 attribute [TreatNullAs=NullString] DOMString type
                      /*setter raises(DOMException)*/;
     };