Changeset 106575 in webkit


Ignore:
Timestamp:
Feb 2, 2012 11:24:23 AM (12 years ago)
Author:
haraken@chromium.org
Message:

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

Reviewed by Adam Barth.

This patch renames [ConvertUndefinedOrNullToNullString] to
[TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString], according to the spec
(​http://dev.w3.org/2006/webapi/WebIDL/#TreatNullAs,
​http://dev.w3.org/2006/webapi/WebIDL/#TreatUndefinedAs).

No tests. No changes in behavior.

  • bindings/scripts/CodeGeneratorJS.pm:

(JSValueToNative):

  • bindings/scripts/CodeGeneratorV8.pm:

(GetNativeTypeFromSignature):

  • dom/DOMImplementation.idl:
  • dom/Document.idl:
  • fileapi/Blob.idl:
  • fileapi/DirectoryEntry.idl:
  • fileapi/DirectoryEntrySync.idl:
  • fileapi/Entry.idl:
  • fileapi/EntrySync.idl:
  • fileapi/WebKitBlobBuilder.idl:
  • html/HTMLButtonElement.idl:
  • html/HTMLCanvasElement.idl:
  • html/HTMLFieldSetElement.idl:
  • html/HTMLInputElement.idl:
  • html/HTMLKeygenElement.idl:
  • html/HTMLObjectElement.idl:
  • html/HTMLOutputElement.idl:
  • html/HTMLSelectElement.idl:
  • html/HTMLTextAreaElement.idl:
  • page/Console.idl:
  • page/DOMWindow.idl:
  • bindings/scripts/test/TestObj.idl: No changes in run-bindings-tests results.
Location:
trunk/Source/WebCore
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r106572 r106575  
     12012-02-02  Kentaro Hara  <haraken@chromium.org>
     2
     3        Rename [ConvertUndefinedOrNullToNullString] to
     4        [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString]
     5        https://bugs.webkit.org/show_bug.cgi?id=77611
     6
     7        Reviewed by Adam Barth.
     8
     9        This patch renames [ConvertUndefinedOrNullToNullString] to
     10        [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString], according to the spec
     11        (http://dev.w3.org/2006/webapi/WebIDL/#TreatNullAs,
     12        http://dev.w3.org/2006/webapi/WebIDL/#TreatUndefinedAs).
     13
     14        No tests. No changes in behavior.
     15
     16        * bindings/scripts/CodeGeneratorJS.pm:
     17        (JSValueToNative):
     18        * bindings/scripts/CodeGeneratorV8.pm:
     19        (GetNativeTypeFromSignature):
     20        * dom/DOMImplementation.idl:
     21        * dom/Document.idl:
     22        * fileapi/Blob.idl:
     23        * fileapi/DirectoryEntry.idl:
     24        * fileapi/DirectoryEntrySync.idl:
     25        * fileapi/Entry.idl:
     26        * fileapi/EntrySync.idl:
     27        * fileapi/WebKitBlobBuilder.idl:
     28        * html/HTMLButtonElement.idl:
     29        * html/HTMLCanvasElement.idl:
     30        * html/HTMLFieldSetElement.idl:
     31        * html/HTMLInputElement.idl:
     32        * html/HTMLKeygenElement.idl:
     33        * html/HTMLObjectElement.idl:
     34        * html/HTMLOutputElement.idl:
     35        * html/HTMLSelectElement.idl:
     36        * html/HTMLTextAreaElement.idl:
     37        * page/Console.idl:
     38        * page/DOMWindow.idl:
     39
     40        * bindings/scripts/test/TestObj.idl: No changes in run-bindings-tests results.
     41
    1422012-02-02  Anders Carlsson  <andersca@apple.com>
    243

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

    r106536 r106575  
    28692869
    28702870    if ($type eq "DOMString") {
    2871         return "valueToStringWithNullCheck(exec, $value)" if ($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"};
    2872         return "valueToStringWithUndefinedOrNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"};
     2871        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
     2872            return "valueToStringWithUndefinedOrNullCheck(exec, $value)"
     2873        }
     2874        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
     2875            return "valueToStringWithNullCheck(exec, $value)"
     2876        }
     2877        # FIXME: Add the case for 'if ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
    28732878        return "ustringToString($value.isEmpty() ? UString() : $value.toString(exec)->value(exec))";
    28742879    }

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

    r106536 r106575  
    33343334    if ($parameterIndex >= 0 && $type eq "V8Parameter") {
    33353335        my $mode = "";
    3336         if ($signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"}) {
     3336        if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
    33373337            $mode = "WithUndefinedOrNullCheck";
    33383338        } elsif (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
    33393339            $mode = "WithNullCheck";
    33403340        }
     3341        # FIXME: Add the case for 'elsif ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
    33413342        $type .= "<$mode>";
    33423343    }

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

    r106536 r106575  
    193193        void convert3(in [ConvertNullStringTo=False] c);
    194194        void convert4(in [TreatNullAs=EmptyString] d);
    195         void convert5(in [ConvertUndefinedOrNullToNullString] e);
     195        void convert5(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] e);
    196196
    197197        attribute SVGPoint mutablePoint;

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

    r106534 r106575  
    3333        // DOM Level 2
    3434
    35         [OldStyleObjC] DocumentType createDocumentType(in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString qualifiedName,
    36                                                        in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString publicId,
    37                                                        in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString systemId)
     35        [OldStyleObjC] DocumentType createDocumentType(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName,
     36                                                       in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString publicId,
     37                                                       in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString systemId)
    3838            raises(DOMException);
    3939        [OldStyleObjC] Document createDocument(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,

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

    r106534 r106575  
    129129        boolean            execCommand(in [Optional=CallWithDefaultValue] DOMString command,
    130130                                       in [Optional=CallWithDefaultValue] boolean userInterface,
    131                                        in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString value);
     131                                       in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString value);
    132132
    133133#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
    … …  
    176176
    177177#if defined(ENABLE_MICRODATA) && ENABLE_MICRODATA
    178         NodeList getItems(in [ConvertUndefinedOrNullToNullString, Optional=CallWithDefaultValue] DOMString typeNames);
     178        NodeList getItems(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString, Optional=CallWithDefaultValue] DOMString typeNames);
    179179#endif
    180180

  • trunk/Source/WebCore/fileapi/Blob.idl

    r105506 r106575  
    4141#if !defined(LANGUAGE_OBJECTIVE_C)
    4242#if defined(ENABLE_BLOB) && ENABLE_BLOB
    43         Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, ConvertUndefinedOrNullToNullString] DOMString contentType);
     43        Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
    4444#endif
    4545#endif

  • trunk/Source/WebCore/fileapi/DirectoryEntry.idl

    r101718 r106575  
    3737    ] DirectoryEntry : Entry {
    3838        DirectoryReader createReader();
    39         [Custom] void getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    40         [Custom] void getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     39        [Custom] void getFile(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     40        [Custom] void getDirectory(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4141        void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4242    };

  • trunk/Source/WebCore/fileapi/DirectoryEntrySync.idl

    r91486 r106575  
    3737    ] DirectoryEntrySync : EntrySync {
    3838        DirectoryReaderSync createReader() raises (FileException);
    39         [Custom] FileEntrySync getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in WebKitFlags flags) raises (FileException);
    40         [Custom] DirectoryEntrySync getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in WebKitFlags flags) raises (FileException);
     39        [Custom] FileEntrySync getFile(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in WebKitFlags flags) raises (FileException);
     40        [Custom] DirectoryEntrySync getDirectory(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString path, in WebKitFlags flags) raises (FileException);
    4141        void removeRecursively() raises (FileException);
    4242    };

  • trunk/Source/WebCore/fileapi/Entry.idl

    r103501 r106575  
    4242
    4343        void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    44         void moveTo(in DirectoryEntry parent, in [Optional, ConvertUndefinedOrNullToNullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    45         void copyTo(in DirectoryEntry parent, in [Optional, ConvertUndefinedOrNullToNullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     44        void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     45        void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
    4646        DOMString toURL();
    4747        void remove(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);

  • trunk/Source/WebCore/fileapi/EntrySync.idl

    r91486 r106575  
    4242
    4343        Metadata getMetadata() raises (FileException);
    44         EntrySync moveTo(in DirectoryEntrySync parent, in [ConvertUndefinedOrNullToNullString] DOMString name) raises (FileException);
    45         EntrySync copyTo(in DirectoryEntrySync parent, in [ConvertUndefinedOrNullToNullString] DOMString name) raises (FileException);
     44        EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name) raises (FileException);
     45        EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString name) raises (FileException);
    4646        DOMString toURL();
    4747        void remove() raises (FileException);

  • trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl

    r99764 r106575  
    3636    ] WebKitBlobBuilder {
    3737#if !defined(LANGUAGE_OBJECTIVE_C)
    38         Blob getBlob(in [Optional, ConvertUndefinedOrNullToNullString] DOMString contentType);
     38        Blob getBlob(in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
    3939#endif
    4040        void append(in Blob blob);
    … …  
    4242        void append(in ArrayBuffer arrayBuffer);
    4343#endif
    44         void append(in DOMString value, in [Optional, ConvertUndefinedOrNullToNullString] DOMString endings) raises (DOMException);
     44        void append(in DOMString value, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString endings) raises (DOMException);
    4545    };
    4646

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

    r106534 r106575  
    4040        readonly attribute DOMString validationMessage;
    4141        boolean checkValidity();
    42         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     42        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    4343
    4444        void click();

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

    r92327 r106575  
    3434        attribute long height;
    3535
    36         [Custom] DOMString toDataURL(in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString type)
     36        [Custom] DOMString toDataURL(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString type)
    3737            raises(DOMException);
    3838

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

    r92327 r106575  
    2626        readonly attribute DOMString       validationMessage;
    2727        boolean  checkValidity();
    28         void     setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     28        void     setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    2929    };
    3030

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

    r106534 r106575  
    7474        readonly attribute DOMString validationMessage;
    7575        boolean checkValidity();
    76         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     76        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    7777        void select();
    7878        void click();

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

    r92327 r106575  
    4545        readonly attribute DOMString validationMessage;
    4646        boolean checkValidity();
    47         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     47        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    4848
    4949        readonly attribute NodeList labels;

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

    r106536 r106575  
    4747        readonly attribute DOMString validationMessage;
    4848        boolean checkValidity();
    49         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     49        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    5050
    5151        // Introduced in DOM Level 2:

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

    r106534 r106575  
    3737        readonly attribute DOMString validationMessage;
    3838        boolean checkValidity();
    39         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     39        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    4040
    4141        readonly attribute NodeList labels;

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

    r106534 r106575  
    4141        readonly attribute DOMString validationMessage;
    4242        boolean checkValidity();
    43         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     43        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    4444
    4545        // Modified in DOM Level 2:

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

    r106534 r106575  
    4646        readonly attribute DOMString validationMessage;
    4747        boolean checkValidity();
    48         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     48        void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
    4949
    5050        // WinIE & FireFox extension:

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

    r92328 r106575  
    5252#endif
    5353
    54         void time(in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString title);
    55         [CustomArgumentHandling] void timeEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
     54        void time(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString title);
     55        [CustomArgumentHandling] void timeEnd(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString title);
    5656        [CustomArgumentHandling] void timeStamp();
    5757        [CustomArgumentHandling] void group();

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

    r106535 r106575  
    8282        boolean confirm(in [Optional=CallWithDefaultValue] DOMString message);
    8383        [ConvertNullStringTo=Null] DOMString prompt(in [Optional=CallWithDefaultValue] DOMString message,
    84                                                     in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString defaultValue);
     84                                                    in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString defaultValue);
    8585
    8686        boolean find(in [Optional=CallWithDefaultValue] DOMString string,
    … …  
    148148        // DOM Level 2 Style Interface
    149149        CSSStyleDeclaration getComputedStyle(in [Optional=CallWithDefaultValue] Element element,
    150                                              in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString pseudoElement);
     150                                             in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString pseudoElement);
    151151
    152152        // WebKit extensions
Note: See TracChangeset for help on using the changeset viewer.