Diff
Modified: trunk/Source/WebCore/ChangeLog (106574 => 106575)
--- trunk/Source/WebCore/ChangeLog 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/ChangeLog 2012-02-02 19:24:23 UTC (rev 106575)
@@ -1,3 +1,44 @@
+2012-02-02 Kentaro Hara <[email protected]>
+
+ 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.
+
2012-02-02 Anders Carlsson <[email protected]>
NPAPI will not send mouse up events when mouse is outside plugin area
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (106574 => 106575)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-02-02 19:24:23 UTC (rev 106575)
@@ -2868,8 +2868,13 @@
return "static_cast<Range::CompareHow>($value.toInt32(exec))" if $type eq "CompareHow";
if ($type eq "DOMString") {
- return "valueToStringWithNullCheck(exec, $value)" if ($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"};
- return "valueToStringWithUndefinedOrNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"};
+ if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
+ return "valueToStringWithUndefinedOrNullCheck(exec, $value)"
+ }
+ if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
+ return "valueToStringWithNullCheck(exec, $value)"
+ }
+ # FIXME: Add the case for 'if ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
return "ustringToString($value.isEmpty() ? UString() : $value.toString(exec)->value(exec))";
}
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (106574 => 106575)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-02-02 19:24:23 UTC (rev 106575)
@@ -3333,11 +3333,12 @@
if ($parameterIndex >= 0 && $type eq "V8Parameter") {
my $mode = "";
- if ($signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"}) {
+ if (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") and ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString")) {
$mode = "WithUndefinedOrNullCheck";
} elsif (($signature->extendedAttributes->{"TreatNullAs"} and $signature->extendedAttributes->{"TreatNullAs"} eq "EmptyString") or $signature->extendedAttributes->{"Reflect"}) {
$mode = "WithNullCheck";
}
+ # FIXME: Add the case for 'elsif ($signature->extendedAttributes->{"TreatUndefinedAs"} and $signature->extendedAttributes->{"TreatUndefinedAs"} eq "EmptyString"))'.
$type .= "<$mode>";
}
Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (106574 => 106575)
--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -192,7 +192,7 @@
void convert2(in [ConvertNullStringTo=Undefined] b);
void convert3(in [ConvertNullStringTo=False] c);
void convert4(in [TreatNullAs=EmptyString] d);
- void convert5(in [ConvertUndefinedOrNullToNullString] e);
+ void convert5(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] e);
attribute SVGPoint mutablePoint;
attribute [Immutable] SVGPoint immutablePoint;
Modified: trunk/Source/WebCore/dom/DOMImplementation.idl (106574 => 106575)
--- trunk/Source/WebCore/dom/DOMImplementation.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/dom/DOMImplementation.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -32,9 +32,9 @@
// DOM Level 2
- [OldStyleObjC] DocumentType createDocumentType(in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString qualifiedName,
- in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString publicId,
- in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString systemId)
+ [OldStyleObjC] 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)
raises(DOMException);
[OldStyleObjC] Document createDocument(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName,
Modified: trunk/Source/WebCore/dom/Document.idl (106574 => 106575)
--- trunk/Source/WebCore/dom/Document.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/dom/Document.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -128,7 +128,7 @@
boolean execCommand(in [Optional=CallWithDefaultValue] DOMString command,
in [Optional=CallWithDefaultValue] boolean userInterface,
- in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString value);
+ in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,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.
@@ -175,7 +175,7 @@
NodeList getElementsByName(in [Optional=CallWithDefaultValue] DOMString elementName);
#if defined(ENABLE_MICRODATA) && ENABLE_MICRODATA
- NodeList getItems(in [ConvertUndefinedOrNullToNullString, Optional=CallWithDefaultValue] DOMString typeNames);
+ NodeList getItems(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString, Optional=CallWithDefaultValue] DOMString typeNames);
#endif
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
Modified: trunk/Source/WebCore/fileapi/Blob.idl (106574 => 106575)
--- trunk/Source/WebCore/fileapi/Blob.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/fileapi/Blob.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -40,7 +40,7 @@
#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, ConvertUndefinedOrNullToNullString] DOMString contentType);
+ Blob webkitSlice(in [Optional] long long start, in [Optional] long long end, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString contentType);
#endif
#endif
};
Modified: trunk/Source/WebCore/fileapi/DirectoryEntry.idl (106574 => 106575)
--- trunk/Source/WebCore/fileapi/DirectoryEntry.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/fileapi/DirectoryEntry.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -36,8 +36,8 @@
NoStaticTables
] DirectoryEntry : Entry {
DirectoryReader createReader();
- [Custom] void getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
- [Custom] void getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in [Optional] WebKitFlags flags, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+ [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);
void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
};
}
Modified: trunk/Source/WebCore/fileapi/DirectoryEntrySync.idl (106574 => 106575)
--- trunk/Source/WebCore/fileapi/DirectoryEntrySync.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/fileapi/DirectoryEntrySync.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -36,8 +36,8 @@
NoStaticTables
] DirectoryEntrySync : EntrySync {
DirectoryReaderSync createReader() raises (FileException);
- [Custom] FileEntrySync getFile(in [ConvertUndefinedOrNullToNullString] DOMString path, in WebKitFlags flags) raises (FileException);
- [Custom] DirectoryEntrySync getDirectory(in [ConvertUndefinedOrNullToNullString] DOMString path, in WebKitFlags flags) 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);
void removeRecursively() raises (FileException);
};
}
Modified: trunk/Source/WebCore/fileapi/Entry.idl (106574 => 106575)
--- trunk/Source/WebCore/fileapi/Entry.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/fileapi/Entry.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -41,8 +41,8 @@
readonly attribute DOMFileSystem filesystem;
void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
- void moveTo(in DirectoryEntry parent, in [Optional, ConvertUndefinedOrNullToNullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
- void copyTo(in DirectoryEntry parent, in [Optional, ConvertUndefinedOrNullToNullString] DOMString name, in [Optional, Callback] EntryCallback 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);
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);
Modified: trunk/Source/WebCore/fileapi/EntrySync.idl (106574 => 106575)
--- trunk/Source/WebCore/fileapi/EntrySync.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/fileapi/EntrySync.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -41,8 +41,8 @@
readonly attribute DOMFileSystemSync filesystem;
Metadata getMetadata() raises (FileException);
- EntrySync moveTo(in DirectoryEntrySync parent, in [ConvertUndefinedOrNullToNullString] DOMString name) raises (FileException);
- EntrySync copyTo(in DirectoryEntrySync parent, in [ConvertUndefinedOrNullToNullString] DOMString name) 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);
DOMString toURL();
void remove() raises (FileException);
DirectoryEntrySync getParent();
Modified: trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl (106574 => 106575)
--- trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/fileapi/WebKitBlobBuilder.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -35,13 +35,13 @@
NoStaticTables
] WebKitBlobBuilder {
#if !defined(LANGUAGE_OBJECTIVE_C)
- Blob getBlob(in [Optional, ConvertUndefinedOrNullToNullString] DOMString contentType);
+ Blob getBlob(in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] 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, ConvertUndefinedOrNullToNullString] DOMString endings) raises (DOMException);
+ void append(in DOMString value, in [Optional, TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString endings) raises (DOMException);
};
}
Modified: trunk/Source/WebCore/html/HTMLButtonElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLButtonElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLButtonElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -39,7 +39,7 @@
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
void click();
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLCanvasElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -33,7 +33,7 @@
attribute long width;
attribute long height;
- [Custom] DOMString toDataURL(in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString type)
+ [Custom] DOMString toDataURL(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString type)
raises(DOMException);
#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLFieldSetElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -25,7 +25,7 @@
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
};
}
Modified: trunk/Source/WebCore/html/HTMLInputElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLInputElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLInputElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -73,7 +73,7 @@
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
void select();
void click();
Modified: trunk/Source/WebCore/html/HTMLKeygenElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLKeygenElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -44,7 +44,7 @@
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
readonly attribute NodeList labels;
};
Modified: trunk/Source/WebCore/html/HTMLObjectElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLObjectElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLObjectElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -46,7 +46,7 @@
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
// Introduced in DOM Level 2:
readonly attribute [CheckAccessToNode] Document contentDocument;
Modified: trunk/Source/WebCore/html/HTMLOutputElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLOutputElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLOutputElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -36,7 +36,7 @@
readonly attribute ValidityState validity;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
readonly attribute NodeList labels;
};
Modified: trunk/Source/WebCore/html/HTMLSelectElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLSelectElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLSelectElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -40,7 +40,7 @@
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
// Modified in DOM Level 2:
readonly attribute HTMLOptionsCollection options;
Modified: trunk/Source/WebCore/html/HTMLTextAreaElement.idl (106574 => 106575)
--- trunk/Source/WebCore/html/HTMLTextAreaElement.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/html/HTMLTextAreaElement.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -45,7 +45,7 @@
readonly attribute boolean willValidate;
readonly attribute DOMString validationMessage;
boolean checkValidity();
- void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
+ void setCustomValidity(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString error);
// WinIE & FireFox extension:
attribute long selectionStart;
Modified: trunk/Source/WebCore/page/Console.idl (106574 => 106575)
--- trunk/Source/WebCore/page/Console.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/page/Console.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -51,8 +51,8 @@
[Custom] void profileEnd(in DOMString title);
#endif
- void time(in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString title);
- [CustomArgumentHandling] void timeEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
+ void time(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString title);
+ [CustomArgumentHandling] void timeEnd(in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString] DOMString title);
[CustomArgumentHandling] void timeStamp();
[CustomArgumentHandling] void group();
[CustomArgumentHandling] void groupCollapsed();
Modified: trunk/Source/WebCore/page/DOMWindow.idl (106574 => 106575)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-02-02 19:12:48 UTC (rev 106574)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-02-02 19:24:23 UTC (rev 106575)
@@ -81,7 +81,7 @@
void alert(in [Optional=CallWithDefaultValue] DOMString message);
boolean confirm(in [Optional=CallWithDefaultValue] DOMString message);
[ConvertNullStringTo=Null] DOMString prompt(in [Optional=CallWithDefaultValue] DOMString message,
- in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString defaultValue);
+ in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString defaultValue);
boolean find(in [Optional=CallWithDefaultValue] DOMString string,
in [Optional=CallWithDefaultValue] boolean caseSensitive,
@@ -147,7 +147,7 @@
// DOM Level 2 Style Interface
CSSStyleDeclaration getComputedStyle(in [Optional=CallWithDefaultValue] Element element,
- in [ConvertUndefinedOrNullToNullString,Optional=CallWithDefaultValue] DOMString pseudoElement);
+ in [TreatNullAs=EmptyString, TreatUndefinedAs=EmptyString,Optional=CallWithDefaultValue] DOMString pseudoElement);
// WebKit extensions
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
