Rename [ConvertNullStringTo=] to [TreatReturnedNullStringAs=]
authorharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Feb 2012 07:20:19 +0000 (07:20 +0000)
committerharaken@chromium.org <haraken@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Feb 2012 07:20:19 +0000 (07:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78108

Reviewed by Adam Barth.

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

No tests. No change in behavior.

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateGetOwnPropertySlotBody):
(NativeToJSValue):
* bindings/scripts/CodeGeneratorV8.pm:
(GenerateImplementationIndexer):
(NativeToJSValue):

* bindings/scripts/test/TestObj.idl: No change in run-bindings-tests results.

* css/CSSCharsetRule.idl:
* css/CSSImportRule.idl:
* css/CSSPageRule.idl:
* css/CSSRule.idl:
* css/CSSStyleDeclaration.idl:
* css/CSSStyleRule.idl:
* css/CSSValue.idl:
* css/MediaList.idl:
* css/StyleSheet.idl:
* css/WebKitCSSKeyframesRule.idl:
* dom/Attr.idl:
* dom/CharacterData.idl:
* dom/Clipboard.idl:
* dom/DOMStringList.idl:
* dom/Document.idl:
* dom/DocumentType.idl:
* dom/Element.idl:
* dom/Entity.idl:
* dom/MutationRecord.idl:
* dom/Node.idl:
* dom/Notation.idl:
* dom/ProcessingInstruction.idl:
* html/DOMTokenList.idl:
* html/DOMURL.idl:
* html/HTMLMediaElement.idl:
* html/canvas/WebGLDebugShaders.idl:
* html/canvas/WebGLRenderingContext.idl:
* page/DOMWindow.idl:
* storage/IDBObjectStore.idl:
* storage/IDBRequest.idl:
* storage/Storage.idl:
* storage/StorageEvent.idl:
* websockets/WebSocket.idl:
* xml/XMLHttpRequest.idl:
* xml/XPathNSResolver.idl:
* xml/XSLTProcessor.idl:

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

40 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/CSSImportRule.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/StyleSheet.idl
Source/WebCore/css/WebKitCSSKeyframesRule.idl
Source/WebCore/dom/Attr.idl
Source/WebCore/dom/CharacterData.idl
Source/WebCore/dom/Clipboard.idl
Source/WebCore/dom/DOMStringList.idl
Source/WebCore/dom/Document.idl
Source/WebCore/dom/DocumentType.idl
Source/WebCore/dom/Element.idl
Source/WebCore/dom/Entity.idl
Source/WebCore/dom/MutationRecord.idl
Source/WebCore/dom/Node.idl
Source/WebCore/dom/Notation.idl
Source/WebCore/dom/ProcessingInstruction.idl
Source/WebCore/html/DOMTokenList.idl
Source/WebCore/html/DOMURL.idl
Source/WebCore/html/HTMLMediaElement.idl
Source/WebCore/html/canvas/WebGLDebugShaders.idl
Source/WebCore/html/canvas/WebGLRenderingContext.idl
Source/WebCore/page/DOMWindow.idl
Source/WebCore/storage/IDBObjectStore.idl
Source/WebCore/storage/IDBRequest.idl
Source/WebCore/storage/Storage.idl
Source/WebCore/storage/StorageEvent.idl
Source/WebCore/websockets/WebSocket.idl
Source/WebCore/xml/XMLHttpRequest.idl
Source/WebCore/xml/XPathNSResolver.idl
Source/WebCore/xml/XSLTProcessor.idl

index 9c8b519..6d86ba8 100644 (file)
@@ -1,3 +1,63 @@
+2012-02-08  Kentaro Hara  <haraken@chromium.org>
+
+        Rename [ConvertNullStringTo=] to [TreatReturnedNullStringAs=]
+        https://bugs.webkit.org/show_bug.cgi?id=78108
+
+        Reviewed by Adam Barth.
+
+        [ConvertNullStringTo=] is not descriptive. To clarify that it specifies
+        the behavior when the null string is returned by WebCore, this patch renames
+        [ConvertNullStringTo=] to [TreatReturnedNullStringAs=]. This change is also
+        for naming consistency with [TreatNullAs] and [TreatUndefinedAs].
+
+        No tests. No change in behavior.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateGetOwnPropertySlotBody):
+        (NativeToJSValue):
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateImplementationIndexer):
+        (NativeToJSValue):
+
+        * bindings/scripts/test/TestObj.idl: No change in run-bindings-tests results.
+
+        * css/CSSCharsetRule.idl:
+        * css/CSSImportRule.idl:
+        * css/CSSPageRule.idl:
+        * css/CSSRule.idl:
+        * css/CSSStyleDeclaration.idl:
+        * css/CSSStyleRule.idl:
+        * css/CSSValue.idl:
+        * css/MediaList.idl:
+        * css/StyleSheet.idl:
+        * css/WebKitCSSKeyframesRule.idl:
+        * dom/Attr.idl:
+        * dom/CharacterData.idl:
+        * dom/Clipboard.idl:
+        * dom/DOMStringList.idl:
+        * dom/Document.idl:
+        * dom/DocumentType.idl:
+        * dom/Element.idl:
+        * dom/Entity.idl:
+        * dom/MutationRecord.idl:
+        * dom/Node.idl:
+        * dom/Notation.idl:
+        * dom/ProcessingInstruction.idl:
+        * html/DOMTokenList.idl:
+        * html/DOMURL.idl:
+        * html/HTMLMediaElement.idl:
+        * html/canvas/WebGLDebugShaders.idl:
+        * html/canvas/WebGLRenderingContext.idl:
+        * page/DOMWindow.idl:
+        * storage/IDBObjectStore.idl:
+        * storage/IDBRequest.idl:
+        * storage/Storage.idl:
+        * storage/StorageEvent.idl:
+        * websockets/WebSocket.idl:
+        * xml/XMLHttpRequest.idl:
+        * xml/XPathNSResolver.idl:
+        * xml/XSLTProcessor.idl:
+
 2012-02-08  Andreas Kling  <awesomekling@apple.com>
 
         Simplify ownership of StyledElement::additionalAttributeStyles().
index 3312fc2..4d64979 100644 (file)
@@ -437,7 +437,7 @@ sub GenerateGetOwnPropertySlotBody
         push(@getOwnPropertySlotImpl, "    bool ok;\n");
         push(@getOwnPropertySlotImpl, "    unsigned index = propertyName.toUInt32(ok);\n");
 
-        # If the item function returns a string then we let the ConvertNullStringTo handle the cases
+        # If the item function returns a string then we let the TreatReturnedNullStringAs handle the cases
         # where the index is out of range.
         if (IndexGetterReturnsStrings($implClassName)) {
             push(@getOwnPropertySlotImpl, "    if (ok) {\n");
@@ -2936,13 +2936,13 @@ sub NativeToJSValue
 
     if ($codeGenerator->IsStringType($type)) {
         AddToImplIncludes("KURL.h", $conditional);
-        my $conv = $signature->extendedAttributes->{"ConvertNullStringTo"};
+        my $conv = $signature->extendedAttributes->{"TreatReturnedNullStringAs"};
         if (defined $conv) {
             return "jsStringOrNull(exec, $value)" if $conv eq "Null";
             return "jsStringOrUndefined(exec, $value)" if $conv eq "Undefined";
             return "jsStringOrFalse(exec, $value)" if $conv eq "False";
 
-            die "Unknown value for ConvertNullStringTo extended attribute";
+            die "Unknown value for TreatReturnedNullStringAs extended attribute";
         }
         $conv = $signature->extendedAttributes->{"ConvertScriptString"};
         return "jsOwnedStringOrNull(exec, $value)" if $conv;
index 7ea32a7..a6d3cc3 100644 (file)
@@ -2084,7 +2084,7 @@ sub GenerateImplementationIndexer
 
     if ($indexerType && !$hasCustomSetter) {
         if ($indexerType eq "DOMString") {
-            my $conversion = $indexer->extendedAttributes->{"ConvertNullStringTo"};
+            my $conversion = $indexer->extendedAttributes->{"TreatReturnedNullStringAs"};
             if ($conversion && $conversion eq "Null") {
                 push(@implContent, <<END);
     setCollectionStringOrNullIndexedGetter<${interfaceName}>(desc);
@@ -3714,13 +3714,13 @@ sub NativeToJSValue
     return "v8NumberArray($value)" if $type eq "double[]";
 
     if ($codeGenerator->IsStringType($type)) {
-        my $conv = $signature->extendedAttributes->{"ConvertNullStringTo"};
+        my $conv = $signature->extendedAttributes->{"TreatReturnedNullStringAs"};
         if (defined $conv) {
             return "v8StringOrNull($value)" if $conv eq "Null";
             return "v8StringOrUndefined($value)" if $conv eq "Undefined";
             return "v8StringOrFalse($value)" if $conv eq "False";
 
-            die "Unknown value for ConvertNullStringTo extended attribute";
+            die "Unknown value for TreatReturnedNullStringAs extended attribute";
         }
         $conv = $signature->extendedAttributes->{"ConvertScriptString"};
         return "v8StringOrNull($value)" if $conv;
index 2b919a2..8a4db17 100644 (file)
@@ -191,9 +191,9 @@ module test {
         [CheckAccessToNode] SVGDocument getSVGDocument()
             raises(DOMException);
 
-        void convert1(in [ConvertNullStringTo=Null] a);
-        void convert2(in [ConvertNullStringTo=Undefined] b);
-        void convert3(in [ConvertNullStringTo=False] c);
+        void convert1(in [TreatReturnedNullStringTo=Null] a);
+        void convert2(in [TreatReturnedNullStringTo=Undefined] b);
+        void convert3(in [TreatReturnedNullStringTo=False] c);
         void convert4(in [TreatNullAs=NullString] d);
         void convert5(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] e);
 
index be23871..2cee399 100644 (file)
@@ -23,9 +23,9 @@ module css {
     // Introduced in DOM Level 2:
     interface CSSCharsetRule : CSSRule {
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
-        readonly attribute [ConvertNullStringTo=Null] DOMString encoding;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString encoding;
 #else
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString encoding
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString encoding
                      setter raises(DOMException);
 #endif
     };
index 05654fe..decf0f1 100644 (file)
@@ -22,7 +22,7 @@ module css {
 
     // Introduced in DOM Level 2:
     interface CSSImportRule : CSSRule {
-        readonly attribute [ConvertNullStringTo=Null] DOMString href;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString href;
         readonly attribute MediaList media;
         readonly attribute CSSStyleSheet styleSheet;
     };
index 4f3747e..f58e011 100644 (file)
@@ -23,7 +23,7 @@ module css {
     // Introduced in DOM Level 2:
     interface CSSPageRule : CSSRule {
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
 
         readonly attribute CSSStyleDeclaration style;
 
index 2797526..c6e5519 100644 (file)
@@ -43,7 +43,7 @@ module css {
 
         readonly attribute unsigned short   type;
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
                      setter raises (DOMException);
 
         readonly attribute CSSStyleSheet    parentStyleSheet;
index 44a9326..541ea83 100644 (file)
@@ -30,14 +30,14 @@ module css {
         CustomGetPropertyNames,
         V8DependentLifetime
     ] CSSStyleDeclaration {
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString        cssText
                      setter raises(DOMException);
 
-        [ConvertNullStringTo=Null] DOMString          getPropertyValue(in [Optional=TreatAsUndefined] DOMString propertyName);
+        [TreatReturnedNullStringTo=Null] DOMString          getPropertyValue(in [Optional=TreatAsUndefined] DOMString propertyName);
         [JSCustom] CSSValue           getPropertyCSSValue(in [Optional=TreatAsUndefined] DOMString propertyName);
-        [ConvertNullStringTo=Null] DOMString          removeProperty(in [Optional=TreatAsUndefined] DOMString propertyName)
+        [TreatReturnedNullStringTo=Null] DOMString          removeProperty(in [Optional=TreatAsUndefined] DOMString propertyName)
             raises(DOMException);
-        [ConvertNullStringTo=Null] DOMString          getPropertyPriority(in [Optional=TreatAsUndefined] DOMString propertyName);
+        [TreatReturnedNullStringTo=Null] DOMString          getPropertyPriority(in [Optional=TreatAsUndefined] DOMString propertyName);
         [ObjCLegacyUnnamedParameters] void setProperty(in [Optional=TreatAsUndefined] DOMString propertyName, 
                                         in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString value, 
                                         in [Optional=TreatAsUndefined] DOMString priority)
@@ -48,7 +48,7 @@ module css {
         readonly attribute CSSRule          parentRule;
 
         // Extensions
-        [ConvertNullStringTo=Null] DOMString          getPropertyShorthand(in [Optional=TreatAsUndefined] DOMString propertyName);
+        [TreatReturnedNullStringTo=Null] DOMString          getPropertyShorthand(in [Optional=TreatAsUndefined] DOMString propertyName);
         boolean            isPropertyImplicit(in [Optional=TreatAsUndefined] DOMString propertyName);
     };
 
index c0a5e68..8f106c0 100644 (file)
@@ -23,7 +23,7 @@ module css {
     // Introduced in DOM Level 2:
     interface CSSStyleRule : CSSRule {
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString selectorText;
 
         readonly attribute CSSStyleDeclaration style;
 
index c462673..6e3c142 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=NullString] DOMString cssText
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString cssText
                      setter raises(DOMException);
 
         readonly attribute unsigned short cssValueType;
index e11698d..5acd526 100644 (file)
@@ -31,11 +31,11 @@ module stylesheets {
         IndexedGetter
     ] MediaList {
 
-                 attribute [TreatNullAs=NullString, ConvertNullStringTo=Null] DOMString mediaText
+                 attribute [TreatNullAs=NullString, TreatReturnedNullStringTo=Null] DOMString mediaText
                      setter raises(DOMException);
         readonly attribute unsigned long length;
 
-        [ConvertNullStringTo=Null] DOMString item(in [Optional=TreatAsUndefined] unsigned long index);
+        [TreatReturnedNullStringTo=Null] DOMString item(in [Optional=TreatAsUndefined] unsigned long index);
         void deleteMedium(in [Optional=TreatAsUndefined] DOMString oldMedium)
             raises(DOMException);
         void appendMedium(in [Optional=TreatAsUndefined] DOMString newMedium)
index cad4da4..1568d6e 100644 (file)
@@ -28,12 +28,12 @@ module stylesheets {
         ObjCPolymorphic,
         V8DependentLifetime
     ] StyleSheet {
-        readonly attribute [ConvertNullStringTo=Null] DOMString        type;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString        type;
                  attribute boolean          disabled;
         readonly attribute Node             ownerNode;
         readonly attribute StyleSheet       parentStyleSheet;
-        readonly attribute [ConvertNullStringTo=Null] DOMString        href;
-        readonly attribute [ConvertNullStringTo=Null] DOMString        title;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString        href;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString        title;
         readonly attribute MediaList        media;
 
 #if defined(LANGUAGE_CPP) && LANGUAGE_CPP
index 567bf4d..85949ad 100644 (file)
@@ -33,7 +33,7 @@ module css {
         IndexedGetter
     ] WebKitCSSKeyframesRule : CSSRule {
 
-        attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString name;
+        attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString name;
         readonly attribute CSSRuleList cssRules;
         
         void insertRule(in [Optional=TreatAsUndefined] DOMString rule);
index e3a802c..63df692 100644 (file)
@@ -27,11 +27,11 @@ module core {
 
         // DOM Level 1
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString name;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString name;
 
         readonly attribute boolean specified;
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString value 
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString value 
                      setter raises(DOMException);
 
         // DOM Level 2
index ed6e613..4db954b 100644 (file)
@@ -26,7 +26,7 @@ module core {
 
         readonly attribute unsigned long length;
         
-        [ConvertNullStringTo=Null, ObjCLegacyUnnamedParameters] DOMString substringData(in [IsIndex,Optional=TreatAsUndefined] unsigned long offset, 
+        [TreatReturnedNullStringTo=Null, ObjCLegacyUnnamedParameters] DOMString substringData(in [IsIndex,Optional=TreatAsUndefined] unsigned long offset, 
                                                                          in [IsIndex,Optional=TreatAsUndefined] unsigned long length)
             raises(DOMException);
 
index dc453f2..a3e64de 100644 (file)
@@ -29,8 +29,8 @@
 module core {
 
     interface Clipboard {
-                 attribute [ConvertNullStringTo=Undefined] DOMString dropEffect;
-                 attribute [ConvertNullStringTo=Undefined] DOMString effectAllowed;
+                 attribute [TreatReturnedNullStringTo=Undefined] DOMString dropEffect;
+                 attribute [TreatReturnedNullStringTo=Undefined] DOMString effectAllowed;
         readonly attribute [CustomGetter] Array types;
         readonly attribute FileList files;
 
index 0640273..c57441a 100644 (file)
@@ -29,7 +29,7 @@ module core {
         IndexedGetter
     ] DOMStringList {
         readonly attribute unsigned long length;
-        [ConvertNullStringTo=Null] DOMString item(in [IsIndex,Optional=TreatAsUndefined] unsigned long index);
+        [TreatReturnedNullStringTo=Null] DOMString item(in [IsIndex,Optional=TreatAsUndefined] unsigned long index);
         boolean contains(in [Optional=TreatAsUndefined] DOMString string);
     };
 
index d72dbab..66f1c6f 100644 (file)
@@ -64,10 +64,10 @@ module core {
 
         // DOM Level 3 Core
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString inputEncoding;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString inputEncoding;
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString xmlEncoding;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString xmlVersion
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString xmlEncoding;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString xmlVersion
                     setter raises (DOMException);
                  attribute boolean xmlStandalone
                     setter raises (DOMException);
@@ -75,7 +75,7 @@ module core {
         Node               adoptNode(in [Optional=TreatAsUndefined] Node source)
             raises (DOMException);
 
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString documentURI;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString documentURI;
 
         // DOM Level 2 Events (DocumentEvents interface)
 
@@ -141,7 +141,7 @@ module core {
         boolean            queryCommandIndeterm(in [Optional=TreatAsUndefined] DOMString command);
         boolean            queryCommandState(in [Optional=TreatAsUndefined] DOMString command);
         boolean            queryCommandSupported(in [Optional=TreatAsUndefined] DOMString command);
-        [ConvertNullStringTo=False] DOMString queryCommandValue(in [Optional=TreatAsUndefined] DOMString command);
+        [TreatReturnedNullStringTo=False] DOMString queryCommandValue(in [Optional=TreatAsUndefined] DOMString command);
 
         // Moved down from HTMLDocument
 
@@ -184,9 +184,9 @@ module core {
 
         // IE extensions
 
-                 attribute [ConvertNullStringTo=Undefined, TreatNullAs=NullString] DOMString charset;
-        readonly attribute [ConvertNullStringTo=Undefined] DOMString defaultCharset;
-        readonly attribute [ConvertNullStringTo=Undefined] DOMString readyState;
+                 attribute [TreatReturnedNullStringTo=Undefined, TreatNullAs=NullString] DOMString charset;
+        readonly attribute [TreatReturnedNullStringTo=Undefined] DOMString defaultCharset;
+        readonly attribute [TreatReturnedNullStringTo=Undefined] DOMString readyState;
 
         Element            elementFromPoint(in [Optional=TreatAsUndefined] long x, 
                                             in [Optional=TreatAsUndefined] long y);
@@ -197,12 +197,12 @@ module core {
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
         DOMSelection       getSelection();
 #endif
-        readonly attribute [ConvertNullStringTo=Null] DOMString characterSet;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString characterSet;
 
         // WebKit extensions
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString selectedStylesheetSet;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString preferredStylesheetSet;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString selectedStylesheetSet;
 
 #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
         CSSStyleDeclaration createCSSStyleDeclaration();
index ed146fa..e8ba8dc 100644 (file)
@@ -31,9 +31,9 @@ module core {
 
         // DOM Level 2
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
-        readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
-        readonly attribute [ConvertNullStringTo=Null] DOMString internalSubset;        
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString publicId;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString systemId;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString internalSubset;        
 
     };
 
index ae9fe0b..363f11b 100644 (file)
@@ -27,9 +27,9 @@ module core {
 
         // DOM Level 1 Core
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString tagName;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString tagName;
 
-        [ConvertNullStringTo=Null] DOMString getAttribute(in [Optional=TreatAsUndefined] DOMString name);
+        [TreatReturnedNullStringTo=Null] DOMString getAttribute(in [Optional=TreatAsUndefined] DOMString name);
         [ObjCLegacyUnnamedParameters] void setAttribute(in [Optional=TreatAsUndefined] DOMString name,
                                          in [Optional=TreatAsUndefined] DOMString value)
             raises(DOMException);
index 8dacbe9..0696c2d 100644 (file)
@@ -20,9 +20,9 @@
 module core {
 
     interface Entity : Node {
-        readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
-        readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
-        readonly attribute [ConvertNullStringTo=Null] DOMString notationName;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString publicId;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString systemId;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString notationName;
     };
 
 }
index c19b41f..174c17d 100644 (file)
@@ -41,8 +41,8 @@ module core {
         readonly attribute Node nextSibling;
 
         readonly attribute DOMString attributeName;
-        readonly attribute [ConvertNullStringTo=Null] DOMString attributeNamespace;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString attributeNamespace;
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString oldValue;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString oldValue;
     };
 }
index 99faf35..34c6866 100644 (file)
@@ -51,10 +51,10 @@ module core {
         const unsigned short      DOCUMENT_FRAGMENT_NODE         = 11;
         const unsigned short      NOTATION_NODE                  = 12;
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString        nodeName;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString        nodeName;
 
                  // FIXME: the spec says this can also raise on retrieval.
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        nodeValue
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString        nodeValue
                      setter raises(DOMException);
 
         readonly attribute unsigned short   nodeType;
@@ -87,26 +87,26 @@ module core {
         [ObjCLegacyUnnamedParameters] boolean isSupported(in [Optional=TreatAsUndefined] DOMString feature, 
                                            in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString version);
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString        namespaceURI;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString        prefix
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString        namespaceURI;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString        prefix
                      setter raises(DOMException);
-        readonly attribute [ConvertNullStringTo=Null] DOMString        localName;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString        localName;
 
         boolean            hasAttributes();
 
         // Introduced in DOM Level 3:
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString       baseURI;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString       baseURI;
 
                  // FIXME: the spec says this can also raise on retrieval.
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString       textContent
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString       textContent
                      setter raises(DOMException);
 
         boolean            isSameNode(in [Optional=TreatAsUndefined] Node other);
         boolean            isEqualNode(in [Optional=TreatAsUndefined] Node other);
-        [ConvertNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString namespaceURI);
+        [TreatReturnedNullStringTo=Null] DOMString          lookupPrefix(in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString namespaceURI);
         boolean            isDefaultNamespace(in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString namespaceURI);
-        [ConvertNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString prefix);
+        [TreatReturnedNullStringTo=Null] DOMString          lookupNamespaceURI(in [TreatNullAs=NullString,Optional=TreatAsUndefined] DOMString prefix);
 
         // DocumentPosition
         const unsigned short      DOCUMENT_POSITION_DISCONNECTED = 0x01;
index 96351d2..dde7ddd 100644 (file)
@@ -20,8 +20,8 @@
 module core {
 
     interface Notation : Node {
-        readonly attribute [ConvertNullStringTo=Null] DOMString publicId;
-        readonly attribute [ConvertNullStringTo=Null] DOMString systemId;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString publicId;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString systemId;
     };
 
 }
index 9c673fd..9259147 100644 (file)
@@ -24,8 +24,8 @@ module core {
 
         // DOM Level 1
 
-        readonly attribute [ConvertNullStringTo=Null] DOMString target;
-                 attribute [ConvertNullStringTo=Null, TreatNullAs=NullString] DOMString data
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString target;
+                 attribute [TreatReturnedNullStringTo=Null, TreatNullAs=NullString] DOMString data
                      setter raises(DOMException);
 
         // interface LinkStyle from DOM Level 2 Style Sheets
index 88169ac..d6a97f1 100644 (file)
@@ -29,7 +29,7 @@ module core {
         IndexedGetter
     ] DOMTokenList {
         readonly attribute unsigned long length;
-        [ConvertNullStringTo=Null] DOMString item(in unsigned long index);
+        [TreatReturnedNullStringTo=Null] DOMString item(in unsigned long index);
         boolean contains(in DOMString token) raises(DOMException);
         void add(in DOMString token) raises(DOMException);
         void remove(in DOMString token) raises(DOMException);
index 4f9722d..426f757 100644 (file)
@@ -33,9 +33,9 @@ module html {
         JSNoStaticTables
     ] DOMURL {
 #if defined(ENABLE_MEDIA_STREAM) && ENABLE_MEDIA_STREAM
-        static [CallWith=ScriptExecutionContext,ConvertNullStringTo=Undefined] DOMString createObjectURL(in MediaStream stream);
+        static [CallWith=ScriptExecutionContext,TreatReturnedNullStringTo=Undefined] DOMString createObjectURL(in MediaStream stream);
 #endif
-        static [CallWith=ScriptExecutionContext,ConvertNullStringTo=Undefined] DOMString createObjectURL(in Blob blob);
+        static [CallWith=ScriptExecutionContext,TreatReturnedNullStringTo=Undefined] DOMString createObjectURL(in Blob blob);
         static [CallWith=ScriptExecutionContext] void revokeObjectURL(in DOMString url);
     };
 }
index 4129d47..2ec8ace 100644 (file)
@@ -117,7 +117,7 @@ module html {
     readonly attribute [V8EnabledAtRuntime=webkitVideoTrack] TextTrackList textTracks;
 #endif
 
-    attribute [Reflect, TreatNullAs=NullString, ConvertNullStringToNull] DOMString mediaGroup;
+    attribute [Reflect, TreatNullAs=NullString, TreatReturnedNullStringToNull] DOMString mediaGroup;
     attribute [CustomSetter] MediaController controller;
 };
 }
index 82d0475..990cea3 100644 (file)
@@ -29,6 +29,6 @@ module html {
         JSGenerateIsReachable=ImplContext,
         OmitConstructor
     ] WebGLDebugShaders {
-        [StrictTypeChecking, ConvertNullStringTo=Null] DOMString getTranslatedShaderSource(in WebGLShader shader) raises(DOMException);
+        [StrictTypeChecking, TreatReturnedNullStringTo=Null] DOMString getTranslatedShaderSource(in WebGLShader shader) raises(DOMException);
     };
 }
index 6db811d..bf8a7e3 100644 (file)
@@ -542,18 +542,18 @@ module html {
         [StrictTypeChecking, Custom] void getParameter();
         // any getProgramParameter(in WebGLProgram program, in unsigned long pname) raises(DOMException);
         [StrictTypeChecking, Custom] void getProgramParameter();
-        [StrictTypeChecking, ConvertNullStringTo=Null] DOMString getProgramInfoLog(in WebGLProgram program) raises(DOMException);
+        [StrictTypeChecking, TreatReturnedNullStringTo=Null] DOMString getProgramInfoLog(in WebGLProgram program) raises(DOMException);
         // any getRenderbufferParameter(in unsigned long target, in unsigned long pname) raises(DOMException);
         [StrictTypeChecking, Custom] void getRenderbufferParameter();
         // any getShaderParameter(in WebGLShader shader, in unsigned long pname) raises(DOMException);
         [StrictTypeChecking, Custom] void getShaderParameter() raises(DOMException);
 
-        [StrictTypeChecking, ConvertNullStringTo=Null] DOMString    getShaderInfoLog(in WebGLShader shader) raises(DOMException);
+        [StrictTypeChecking, TreatReturnedNullStringTo=Null] DOMString    getShaderInfoLog(in WebGLShader shader) raises(DOMException);
 
         // TBD
         // void glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
 
-        [StrictTypeChecking, ConvertNullStringTo=Null] DOMString    getShaderSource(in WebGLShader shader) raises(DOMException);
+        [StrictTypeChecking, TreatReturnedNullStringTo=Null] DOMString    getShaderSource(in WebGLShader shader) raises(DOMException);
 
         // DOMString[] getSupportedExtensions()
         [StrictTypeChecking, Custom] void getSupportedExtensions();
index 3260d67..05afb1e 100644 (file)
@@ -79,7 +79,7 @@ module window {
 
         void alert(in [Optional=TreatAsUndefined] DOMString message);
         boolean confirm(in [Optional=TreatAsUndefined] DOMString message);
-        [ConvertNullStringTo=Null] DOMString prompt(in [Optional=TreatAsUndefined] DOMString message,
+        [TreatReturnedNullStringTo=Null] DOMString prompt(in [Optional=TreatAsUndefined] DOMString message,
                                                     in [TreatNullAs=NullString, TreatUndefinedAs=NullString,Optional=TreatAsUndefined] DOMString defaultValue);
 
         boolean find(in [Optional=TreatAsUndefined] DOMString string,
index 0a91253..22ae884 100644 (file)
@@ -28,8 +28,8 @@ module storage {
     interface [
         Conditional=INDEXED_DATABASE
     ] IDBObjectStore {
-        readonly attribute [ConvertNullStringTo=Null] DOMString name;
-        readonly attribute [ConvertNullStringTo=Null] DOMString keyPath;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString name;
+        readonly attribute [TreatReturnedNullStringTo=Null] DOMString keyPath;
         readonly attribute DOMStringList indexNames;
         readonly attribute IDBTransaction transaction;
 
index 29f94cd..c2353fa 100644 (file)
@@ -38,7 +38,7 @@ module storage {
             getter raises (IDBDatabaseException);
         readonly attribute unsigned short errorCode
             getter raises (IDBDatabaseException);
-        readonly attribute [ConvertNullStringTo=Undefined] DOMString webkitErrorMessage
+        readonly attribute [TreatReturnedNullStringTo=Undefined] DOMString webkitErrorMessage
             getter raises (IDBDatabaseException);
         readonly attribute IDBAny source;
         readonly attribute IDBTransaction transaction;
index e656d52..aa4c613 100644 (file)
@@ -33,8 +33,8 @@ module storage {
         CustomNamedSetter,
     ] Storage {
         readonly attribute [NotEnumerable] unsigned long length;
-        [NotEnumerable, ConvertNullStringTo=Null] DOMString key(in unsigned long index);
-        [NotEnumerable, ConvertNullStringTo=Null] DOMString getItem(in DOMString key);
+        [NotEnumerable, TreatReturnedNullStringTo=Null] DOMString key(in unsigned long index);
+        [NotEnumerable, TreatReturnedNullStringTo=Null] DOMString getItem(in DOMString key);
         [NotEnumerable] void setItem(in DOMString key, in DOMString data) 
             raises(DOMException);
         [NotEnumerable] void removeItem(in DOMString key);
index 3e0c778..a525906 100644 (file)
@@ -29,8 +29,8 @@ module storage {
         ConstructorTemplate=Event
     ] StorageEvent : Event {
         readonly attribute [InitializedByEventConstructor] DOMString key;
-        readonly attribute [InitializedByEventConstructor, ConvertNullStringTo=Null] DOMString oldValue;
-        readonly attribute [InitializedByEventConstructor, ConvertNullStringTo=Null] DOMString newValue;
+        readonly attribute [InitializedByEventConstructor, TreatReturnedNullStringTo=Null] DOMString oldValue;
+        readonly attribute [InitializedByEventConstructor, TreatReturnedNullStringTo=Null] DOMString newValue;
         readonly attribute [InitializedByEventConstructor] DOMString url;
         readonly attribute [InitializedByEventConstructor] Storage storageArea;
 
index b8dee13..139282d 100644 (file)
@@ -57,10 +57,10 @@ module websockets {
         attribute EventListener onerror;
         attribute EventListener onclose;
 
-        readonly attribute [ConvertNullStringTo=Undefined] DOMString protocol;
-        readonly attribute [ConvertNullStringTo=Undefined] DOMString extensions;
+        readonly attribute [TreatReturnedNullStringTo=Undefined] DOMString protocol;
+        readonly attribute [TreatReturnedNullStringTo=Undefined] DOMString extensions;
 
-        attribute [ConvertNullStringTo=Undefined] DOMString binaryType
+        attribute [TreatReturnedNullStringTo=Undefined] DOMString binaryType
             setter raises(DOMException);
 
         // FIXME: Use overloading provided by our IDL code generator.
index b45baf2..7f52d27 100644 (file)
@@ -89,11 +89,11 @@ module xml {
         readonly attribute XMLHttpRequestUpload upload;
 
         // response
-        [ConvertNullStringTo=Undefined] DOMString getAllResponseHeaders()
+        [TreatReturnedNullStringTo=Undefined] DOMString getAllResponseHeaders()
             raises(DOMException);
-        [ConvertNullStringTo=Null] DOMString getResponseHeader(in DOMString header)
+        [TreatReturnedNullStringTo=Null] DOMString getResponseHeader(in DOMString header)
             raises(DOMException);
-        readonly attribute [CustomGetter] DOMString responseText // The custom getter implements ConvertNullStringTo=Null
+        readonly attribute [CustomGetter] DOMString responseText // The custom getter implements TreatReturnedNullStringTo=Null
             getter raises(DOMException);
         readonly attribute Document responseXML
             getter raises(DOMException);
index 58b343b..60d6fed 100644 (file)
@@ -24,7 +24,7 @@ module xpath {
         ObjCProtocol,
         OmitConstructor
     ] XPathNSResolver {
-        [ConvertNullStringTo=Null] DOMString lookupNamespaceURI(in [Optional=TreatAsUndefined] DOMString prefix);
+        [TreatReturnedNullStringTo=Null] DOMString lookupNamespaceURI(in [Optional=TreatAsUndefined] DOMString prefix);
     };
 
 }
index 4fcae9a..750edb6 100644 (file)
@@ -42,7 +42,7 @@ module xml {
         [Custom] Document transformToDocument(in Node source);
 
         [Custom] void setParameter(in DOMString namespaceURI, in DOMString localName, in DOMString value);
-        [Custom, ConvertNullStringTo=Undefined] DOMString getParameter(in DOMString namespaceURI, in DOMString localName);
+        [Custom, TreatReturnedNullStringTo=Undefined] DOMString getParameter(in DOMString namespaceURI, in DOMString localName);
         [Custom] void removeParameter(in DOMString namespaceURI, in DOMString localName);
         void clearParameters();