Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)

23 files changed, 56 insertions, 56 deletions

diff --git a/Source/WebCore/fileapi/Blob.idl b/Source/WebCore/fileapi/Blob.idl
index 9902cd454..1400dc1b3 100644
--- a/Source/WebCore/fileapi/Blob.idl
+++ b/Source/WebCore/fileapi/Blob.idl
@@ -31,16 +31,16 @@
 module html {
 
     interface [
-        GenerateIsReachable=Impl,
-        CustomToJS,
-        NoStaticTables
+        JSGenerateIsReachable=Impl,
+        JSCustomToJS,
+        JSNoStaticTables
     ] Blob {
         readonly attribute unsigned long long size;
         readonly attribute DOMString type;
 
 #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=NullString, TreatUndefinedAs=NullString] DOMString contentType);
 #endif
 #endif
     };
diff --git a/Source/WebCore/fileapi/DOMFileSystem.idl b/Source/WebCore/fileapi/DOMFileSystem.idl
index e7cdf7023..2e98fbf93 100644
--- a/Source/WebCore/fileapi/DOMFileSystem.idl
+++ b/Source/WebCore/fileapi/DOMFileSystem.idl
@@ -33,7 +33,7 @@ module storage {
     interface [
         Conditional=FILE_SYSTEM,
         ActiveDOMObject,
-        NoStaticTables
+        JSNoStaticTables
     ] DOMFileSystem {
         readonly attribute DOMString name;
         readonly attribute DirectoryEntry root;
diff --git a/Source/WebCore/fileapi/DOMFileSystemSync.idl b/Source/WebCore/fileapi/DOMFileSystemSync.idl
index b51d8ccd6..706aa5027 100644
--- a/Source/WebCore/fileapi/DOMFileSystemSync.idl
+++ b/Source/WebCore/fileapi/DOMFileSystemSync.idl
@@ -31,7 +31,7 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        NoStaticTables
+        JSNoStaticTables
     ] DOMFileSystemSync {
         readonly attribute DOMString name;
         readonly attribute DirectoryEntrySync root;
diff --git a/Source/WebCore/fileapi/DirectoryEntry.idl b/Source/WebCore/fileapi/DirectoryEntry.idl
index ac345e7dc..7d9246502 100644
--- a/Source/WebCore/fileapi/DirectoryEntry.idl
+++ b/Source/WebCore/fileapi/DirectoryEntry.idl
@@ -31,13 +31,13 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        GenerateNativeConverter,
-        GenerateToJS,
-        NoStaticTables
+        JSGenerateToNativeObject,
+        JSGenerateToJS,
+        JSNoStaticTables
     ] 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=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);
     };
 }
diff --git a/Source/WebCore/fileapi/DirectoryEntrySync.idl b/Source/WebCore/fileapi/DirectoryEntrySync.idl
index b0ab178ff..e4ca8d7ea 100644
--- a/Source/WebCore/fileapi/DirectoryEntrySync.idl
+++ b/Source/WebCore/fileapi/DirectoryEntrySync.idl
@@ -31,13 +31,13 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        GenerateNativeConverter,
-        GenerateToJS,
-        NoStaticTables
+        JSGenerateToNativeObject,
+        JSGenerateToJS,
+        JSNoStaticTables
     ] 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=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);
     };
 }
diff --git a/Source/WebCore/fileapi/DirectoryReader.idl b/Source/WebCore/fileapi/DirectoryReader.idl
index 831fb05bc..87ce8521d 100644
--- a/Source/WebCore/fileapi/DirectoryReader.idl
+++ b/Source/WebCore/fileapi/DirectoryReader.idl
@@ -31,7 +31,7 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        NoStaticTables
+        JSNoStaticTables
     ] DirectoryReader {
         void readEntries(in [Callback] EntriesCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
     };
diff --git a/Source/WebCore/fileapi/DirectoryReaderSync.idl b/Source/WebCore/fileapi/DirectoryReaderSync.idl
index aa3992832..a8ff685ce 100644
--- a/Source/WebCore/fileapi/DirectoryReaderSync.idl
+++ b/Source/WebCore/fileapi/DirectoryReaderSync.idl
@@ -31,7 +31,7 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        NoStaticTables
+        JSNoStaticTables
     ] DirectoryReaderSync {
         EntryArraySync readEntries() raises (FileException);
     };
diff --git a/Source/WebCore/fileapi/Entry.idl b/Source/WebCore/fileapi/Entry.idl
index d6d280ba8..4be6c8b75 100644
--- a/Source/WebCore/fileapi/Entry.idl
+++ b/Source/WebCore/fileapi/Entry.idl
@@ -31,8 +31,8 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        CustomToJS,
-        NoStaticTables
+        JSCustomToJS,
+        JSNoStaticTables
     ] Entry {
         readonly attribute boolean isFile;
         readonly attribute boolean isDirectory;
@@ -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, 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=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);
diff --git a/Source/WebCore/fileapi/EntryArray.idl b/Source/WebCore/fileapi/EntryArray.idl
index dca782743..324dbc68b 100644
--- a/Source/WebCore/fileapi/EntryArray.idl
+++ b/Source/WebCore/fileapi/EntryArray.idl
@@ -31,8 +31,8 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        HasIndexGetter,
-        NoStaticTables
+        IndexedGetter,
+        JSNoStaticTables
     ] EntryArray {
         readonly attribute unsigned long length;
         Entry item(in [IsIndex] unsigned long index);
diff --git a/Source/WebCore/fileapi/EntryArraySync.idl b/Source/WebCore/fileapi/EntryArraySync.idl
index bd54f33ee..224a68a24 100644
--- a/Source/WebCore/fileapi/EntryArraySync.idl
+++ b/Source/WebCore/fileapi/EntryArraySync.idl
@@ -31,8 +31,8 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        HasIndexGetter,
-        NoStaticTables
+        IndexedGetter,
+        JSNoStaticTables
     ] EntryArraySync {
         readonly attribute unsigned long length;
         EntrySync item(in [IsIndex] unsigned long index);
diff --git a/Source/WebCore/fileapi/EntrySync.idl b/Source/WebCore/fileapi/EntrySync.idl
index 459a01441..2db476d33 100644
--- a/Source/WebCore/fileapi/EntrySync.idl
+++ b/Source/WebCore/fileapi/EntrySync.idl
@@ -31,8 +31,8 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        CustomToJS,
-        NoStaticTables
+        JSCustomToJS,
+        JSNoStaticTables
     ] EntrySync {
         readonly attribute boolean isFile;
         readonly attribute boolean isDirectory;
@@ -41,8 +41,8 @@ module storage {
         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=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();
diff --git a/Source/WebCore/fileapi/File.idl b/Source/WebCore/fileapi/File.idl
index 74a6f769f..4a6bbd3cb 100644
--- a/Source/WebCore/fileapi/File.idl
+++ b/Source/WebCore/fileapi/File.idl
@@ -26,9 +26,9 @@
 module html {
 
     interface [
-        GenerateNativeConverter,
-        GenerateToJS,
-        NoStaticTables
+        JSGenerateToNativeObject,
+        JSGenerateToJS,
+        JSNoStaticTables
     ] File : Blob {
         readonly attribute DOMString name;
 #if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
diff --git a/Source/WebCore/fileapi/FileEntry.idl b/Source/WebCore/fileapi/FileEntry.idl
index 73ef89563..d176cdeb8 100644
--- a/Source/WebCore/fileapi/FileEntry.idl
+++ b/Source/WebCore/fileapi/FileEntry.idl
@@ -31,9 +31,9 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        GenerateNativeConverter,
-        GenerateToJS,
-        NoStaticTables
+        JSGenerateToNativeObject,
+        JSGenerateToJS,
+        JSNoStaticTables
     ] FileEntry : Entry {
         void createWriter(in [Callback] FileWriterCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
         void file(in [Callback] FileCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
diff --git a/Source/WebCore/fileapi/FileEntrySync.idl b/Source/WebCore/fileapi/FileEntrySync.idl
index c56983959..0d79250da 100644
--- a/Source/WebCore/fileapi/FileEntrySync.idl
+++ b/Source/WebCore/fileapi/FileEntrySync.idl
@@ -31,9 +31,9 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        GenerateNativeConverter,
-        GenerateToJS,
-        NoStaticTables
+        JSGenerateToNativeObject,
+        JSGenerateToJS,
+        JSNoStaticTables
     ] FileEntrySync : EntrySync {
         File file() raises (FileException);
         FileWriterSync createWriter() raises (FileException);
diff --git a/Source/WebCore/fileapi/FileError.idl b/Source/WebCore/fileapi/FileError.idl
index bab815ad6..158d78488 100644
--- a/Source/WebCore/fileapi/FileError.idl
+++ b/Source/WebCore/fileapi/FileError.idl
@@ -31,7 +31,7 @@
 module html {
     interface [
         Conditional=BLOB|FILE_SYSTEM,
-        NoStaticTables
+        JSNoStaticTables
     ] FileError {
 #if !defined(LANGUAGE_OBJECTIVE_C)
         // FIXME: Some of constant names are already defined in DOMException.h for Objective-C binding and we cannot have the same names here (they are translated into a enum in the same namespace).
diff --git a/Source/WebCore/fileapi/FileException.idl b/Source/WebCore/fileapi/FileException.idl
index 10bd15177..65de225ff 100644
--- a/Source/WebCore/fileapi/FileException.idl
+++ b/Source/WebCore/fileapi/FileException.idl
@@ -31,8 +31,8 @@
 module html {
     interface [
         Conditional=BLOB|FILE_SYSTEM,
-        DontCheckEnums,
-        NoStaticTables
+        DoNotCheckConstants,
+        JSNoStaticTables
     ] FileException {
 
         readonly attribute unsigned short   code;
@@ -41,7 +41,7 @@ module html {
 
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
         // Override in a Mozilla compatible format
-        [DontEnum] DOMString toString();
+        [NotEnumerable] DOMString toString();
 #endif
 
         // FileExceptionCode
diff --git a/Source/WebCore/fileapi/FileList.idl b/Source/WebCore/fileapi/FileList.idl
index 0d0b046c3..0cdf86116 100644
--- a/Source/WebCore/fileapi/FileList.idl
+++ b/Source/WebCore/fileapi/FileList.idl
@@ -26,8 +26,8 @@
 module html {
 
     interface [
-        HasIndexGetter,
-        NoStaticTables
+        IndexedGetter,
+        JSNoStaticTables
     ] FileList {
         readonly attribute unsigned long length;
         File item(in [IsIndex] unsigned long index);
diff --git a/Source/WebCore/fileapi/FileReader.idl b/Source/WebCore/fileapi/FileReader.idl
index 7407c11c6..9a6440c30 100644
--- a/Source/WebCore/fileapi/FileReader.idl
+++ b/Source/WebCore/fileapi/FileReader.idl
@@ -36,7 +36,7 @@ module html {
         Constructor,
         CallWith=ScriptExecutionContext,
         EventTarget,
-        NoStaticTables
+        JSNoStaticTables
     ] FileReader {
         // ready states
         const unsigned short EMPTY = 0;
diff --git a/Source/WebCore/fileapi/FileReaderSync.idl b/Source/WebCore/fileapi/FileReaderSync.idl
index 62242f15a..77250da29 100644
--- a/Source/WebCore/fileapi/FileReaderSync.idl
+++ b/Source/WebCore/fileapi/FileReaderSync.idl
@@ -32,7 +32,7 @@ module html {
     interface [
         Conditional=BLOB,
         Constructor,
-        NoStaticTables
+        JSNoStaticTables
     ] FileReaderSync {
         [CallWith=ScriptExecutionContext] ArrayBuffer readAsArrayBuffer(in Blob blob)
             raises(FileException);
diff --git a/Source/WebCore/fileapi/FileWriter.idl b/Source/WebCore/fileapi/FileWriter.idl
index 4de2c9fdb..c6a88f366 100644
--- a/Source/WebCore/fileapi/FileWriter.idl
+++ b/Source/WebCore/fileapi/FileWriter.idl
@@ -35,7 +35,7 @@ module html {
         ActiveDOMObject,
         CallWith=ScriptExecutionContext,
         EventTarget,
-        NoStaticTables
+        JSNoStaticTables
     ] FileWriter {
         // ready states
         const unsigned short INIT = 0;
diff --git a/Source/WebCore/fileapi/Metadata.idl b/Source/WebCore/fileapi/Metadata.idl
index df50b66d7..ad477f771 100644
--- a/Source/WebCore/fileapi/Metadata.idl
+++ b/Source/WebCore/fileapi/Metadata.idl
@@ -31,7 +31,7 @@
 module storage {
     interface [
         Conditional=FILE_SYSTEM,
-        NoStaticTables
+        JSNoStaticTables
     ] Metadata {
         readonly attribute Date modificationTime;
     };
diff --git a/Source/WebCore/fileapi/OperationNotAllowedException.idl b/Source/WebCore/fileapi/OperationNotAllowedException.idl
index 215cbc436..d01a377f9 100644
--- a/Source/WebCore/fileapi/OperationNotAllowedException.idl
+++ b/Source/WebCore/fileapi/OperationNotAllowedException.idl
@@ -31,8 +31,8 @@
 module html {
     interface [
         Conditional=BLOB|FILE_SYSTEM,
-        DontCheckEnums,
-        NoStaticTables
+        DoNotCheckConstants,
+        JSNoStaticTables
     ] OperationNotAllowedException {
         readonly attribute unsigned short   code;
         readonly attribute DOMString        name;
@@ -40,7 +40,7 @@ module html {
 
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
         // Override in a Mozilla compatible format
-        [DontEnum] DOMString toString();
+        [NotEnumerable] DOMString toString();
 #endif
 
         const unsigned short NOT_ALLOWED_ERR = 1;
diff --git a/Source/WebCore/fileapi/WebKitBlobBuilder.idl b/Source/WebCore/fileapi/WebKitBlobBuilder.idl
index 4563613e9..5209ff8d4 100644
--- a/Source/WebCore/fileapi/WebKitBlobBuilder.idl
+++ b/Source/WebCore/fileapi/WebKitBlobBuilder.idl
@@ -31,17 +31,17 @@
 module html {
     interface [
         Constructor,
-        GenerateNativeConverter,
-        NoStaticTables
+        JSGenerateToNativeObject,
+        JSNoStaticTables
     ] WebKitBlobBuilder {
 #if !defined(LANGUAGE_OBJECTIVE_C)
-        Blob getBlob(in [Optional, ConvertUndefinedOrNullToNullString] 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, ConvertUndefinedOrNullToNullString] DOMString endings) raises (DOMException);
+        void append(in DOMString value, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString endings) raises (DOMException);
     };
 
 }