diff --git a/dom/public/idl/base/nsIDOMBarProp.idl b/dom/public/idl/base/nsIDOMBarProp.idl index 7b87aaeeb57..6532748155b 100644 --- a/dom/public/idl/base/nsIDOMBarProp.idl +++ b/dom/public/idl/base/nsIDOMBarProp.idl @@ -24,7 +24,5 @@ [scriptable, uuid(9eb2c150-1d56-11d3-8221-0060083a0bcf)] interface nsIDOMBarProp : nsISupports { - - attribute boolean visible; + attribute boolean visible; }; - diff --git a/dom/public/idl/base/nsIDOMCRMFObject.idl b/dom/public/idl/base/nsIDOMCRMFObject.idl index 2a70af7e40a..27339d9fe21 100644 --- a/dom/public/idl/base/nsIDOMCRMFObject.idl +++ b/dom/public/idl/base/nsIDOMCRMFObject.idl @@ -24,7 +24,5 @@ [scriptable, uuid(16da46c0-208d-11d4-8a7c-006008c844c3)] interface nsIDOMCRMFObject : nsISupports { - - readonly attribute DOMString request; + readonly attribute DOMString request; }; - diff --git a/dom/public/idl/base/nsIDOMCrypto.idl b/dom/public/idl/base/nsIDOMCrypto.idl index c9b070bfd29..3c0e658bfc8 100644 --- a/dom/public/idl/base/nsIDOMCrypto.idl +++ b/dom/public/idl/base/nsIDOMCrypto.idl @@ -24,15 +24,16 @@ [scriptable, uuid(f45efbe0-1d52-11d4-8a7c-006008c844c3)] interface nsIDOMCrypto : nsISupports { - readonly attribute DOMString version; + readonly attribute DOMString version; - nsIDOMCRMFObject generateCRMFRequest(/* ... */); - DOMString importUserCertificates(in DOMString nickname, in DOMString cmmfResponse, in boolean doForcedBackup); - DOMString popChallengeResponse(in DOMString challenge); - DOMString random(in long numBytes); - DOMString signText(/* ... */); - void alert(in DOMString message); - void logout(); - void disableRightClick(); + nsIDOMCRMFObject generateCRMFRequest(/* ... */); + DOMString importUserCertificates(in DOMString nickname, + in DOMString cmmfResponse, + in boolean doForcedBackup); + DOMString popChallengeResponse(in DOMString challenge); + DOMString random(in long numBytes); + DOMString signText(/* ... */); + void alert(in DOMString message); + void logout(); + void disableRightClick(); }; - diff --git a/dom/public/idl/base/nsIDOMHistory.idl b/dom/public/idl/base/nsIDOMHistory.idl index 6b81b82c684..afd9346eb00 100644 --- a/dom/public/idl/base/nsIDOMHistory.idl +++ b/dom/public/idl/base/nsIDOMHistory.idl @@ -24,15 +24,13 @@ [scriptable, uuid(896d1d20-b4c4-11d2-bd93-00805f8ae3f4)] interface nsIDOMHistory : nsISupports { + readonly attribute long length; + readonly attribute DOMString current; + readonly attribute DOMString previous; + readonly attribute DOMString next; - readonly attribute long length; - readonly attribute DOMString current; - readonly attribute DOMString previous; - readonly attribute DOMString next; - - void back(); - void forward(); - void go(/* ... */); - DOMString item(in unsigned long index); + void back(); + void forward(); + void go(/* ... */); + DOMString item(in unsigned long index); }; - diff --git a/dom/public/idl/base/nsIDOMLocation.idl b/dom/public/idl/base/nsIDOMLocation.idl index 2ff3af25f58..d93308947ab 100644 --- a/dom/public/idl/base/nsIDOMLocation.idl +++ b/dom/public/idl/base/nsIDOMLocation.idl @@ -24,20 +24,18 @@ [scriptable, uuid(a6cf906d-15b3-11d2-932e-00805f8add32)] interface Location : nsISupports { + attribute DOMString hash; + attribute DOMString host; + attribute DOMString hostname; + attribute DOMString href; + attribute DOMString pathname; + attribute DOMString port; + attribute DOMString protocol; + attribute DOMString search; - attribute DOMString hash; - attribute DOMString host; - attribute DOMString hostname; - [noscript] attribute DOMString href; - attribute DOMString pathname; - attribute DOMString port; - attribute DOMString protocol; - attribute DOMString search; + [noscript] void reload(in boolean forceget); + [noscript] void replace(in DOMString url); + void assign(in DOMString url); - [noscript] void reload(in boolean forceget); - [noscript] void replace(in DOMString url); - void assign(in DOMString url); - - DOMString toString(); + DOMString toString(); }; - diff --git a/dom/public/idl/base/nsIDOMMimeType.idl b/dom/public/idl/base/nsIDOMMimeType.idl index 5ad5b996016..2049f3f3495 100644 --- a/dom/public/idl/base/nsIDOMMimeType.idl +++ b/dom/public/idl/base/nsIDOMMimeType.idl @@ -24,9 +24,8 @@ [scriptable, uuid(f6134682-f28b-11d2-8360-c90899049c3c)] interface nsIDOMMimeType : nsISupports { - readonly attribute DOMString description; - readonly attribute nsIDOMPlugin enabledPlugin; - readonly attribute DOMString suffixes; - readonly attribute DOMString type; + readonly attribute DOMString description; + readonly attribute nsIDOMPlugin enabledPlugin; + readonly attribute DOMString suffixes; + readonly attribute DOMString type; }; - diff --git a/dom/public/idl/base/nsIDOMMimeTypeArray.idl b/dom/public/idl/base/nsIDOMMimeTypeArray.idl index 22c94d6cb0c..9011e6d2923 100644 --- a/dom/public/idl/base/nsIDOMMimeTypeArray.idl +++ b/dom/public/idl/base/nsIDOMMimeTypeArray.idl @@ -24,8 +24,9 @@ [scriptable, uuid(f6134683-f28b-11d2-8360-c90899049c3c)] interface nsIDOMMimeTypeArray : nsISupports { - readonly attribute unsigned long length; - nsIDOMMimeType item(in unsigned long index); - nsIDOMMimeType namedItem(in DOMString name); + readonly attribute unsigned long length; + + nsIDOMMimeType item(in unsigned long index); + nsIDOMMimeType namedItem(in DOMString name); }; diff --git a/dom/public/idl/base/nsIDOMNSLocation.idl b/dom/public/idl/base/nsIDOMNSLocation.idl index 5b3fcfd7ccd..81359f510fb 100644 --- a/dom/public/idl/base/nsIDOMNSLocation.idl +++ b/dom/public/idl/base/nsIDOMNSLocation.idl @@ -22,9 +22,8 @@ #include "domstubs.idl" [scriptable, uuid(a6cf9108-15b3-11d2-932e-00805f8add32)] -interface NSLocation : nsISupports +interface nsIDOMNSLocation : nsISupports { - void reload(/* ... */); - void replace(/* ... */); + void reload(/* ... */); + void replace(/* ... */); }; - diff --git a/dom/public/idl/base/nsIDOMNavigator.idl b/dom/public/idl/base/nsIDOMNavigator.idl index 2891d0209bb..8a7f2a038c8 100644 --- a/dom/public/idl/base/nsIDOMNavigator.idl +++ b/dom/public/idl/base/nsIDOMNavigator.idl @@ -24,25 +24,27 @@ [scriptable, uuid(a6cf906e-15b3-11d2-932e-00805f8add32)] interface nsIDOMNavigator : nsISupports { + readonly attribute DOMString appCodeName; + readonly attribute DOMString appName; + readonly attribute DOMString appVersion; + readonly attribute DOMString language; + readonly attribute nsIDOMMimeTypeArray mimeTypes; + readonly attribute DOMString platform; + readonly attribute DOMString oscpu; + readonly attribute DOMString vendor; + readonly attribute DOMString vendorSub; + readonly attribute DOMString product; + readonly attribute DOMString productSub; + readonly attribute nsIDOMPluginArray plugins; + readonly attribute DOMString securityPolicy; + readonly attribute DOMString userAgent; + readonly attribute boolean cookieEnabled; - readonly attribute DOMString appCodeName; - readonly attribute DOMString appName; - readonly attribute DOMString appVersion; - readonly attribute DOMString language; - readonly attribute nsIDOMMimeTypeArray mimeTypes; - readonly attribute DOMString platform; - readonly attribute DOMString oscpu; - readonly attribute DOMString vendor; - readonly attribute DOMString vendorSub; - readonly attribute DOMString product; - readonly attribute DOMString productSub; - readonly attribute nsIDOMPluginArray plugins; - readonly attribute DOMString securityPolicy; - readonly attribute DOMString userAgent; - readonly attribute boolean cookieEnabled; + boolean javaEnabled(); + boolean taintEnabled(); - boolean javaEnabled(); - boolean taintEnabled(); - jsval preference(/* ... */); + // XXX This one's tough, would nsISupports preference(in DOMString + // pref /*, ... */); work? + + // jsval preference(/* ... */); }; - diff --git a/dom/public/idl/base/nsIDOMPkcs11.idl b/dom/public/idl/base/nsIDOMPkcs11.idl index 2d917ea5dca..f9d59bc5163 100644 --- a/dom/public/idl/base/nsIDOMPkcs11.idl +++ b/dom/public/idl/base/nsIDOMPkcs11.idl @@ -24,8 +24,9 @@ [scriptable, uuid(9fd42950-25e7-11d4-8a7d-006008c844c3)] interface nsIDOMPkcs11 : nsISupports { - - long deletemodule(in DOMString moduleName); - long addmodule(in DOMString moduleName, in DOMString libraryFullPath, in long cryptoMechanismFlags, in long cipherFlags); + long deletemodule(in DOMString moduleName); + long addmodule(in DOMString moduleName, + in DOMString libraryFullPath, + in long cryptoMechanismFlags, + in long cipherFlags); }; - diff --git a/dom/public/idl/base/nsIDOMPlugin.idl b/dom/public/idl/base/nsIDOMPlugin.idl index 98d97eda74b..24fa1ecc143 100644 --- a/dom/public/idl/base/nsIDOMPlugin.idl +++ b/dom/public/idl/base/nsIDOMPlugin.idl @@ -24,13 +24,11 @@ [scriptable, uuid(f6134681-f28b-11d2-8360-c90899049c3c)] interface nsIDOMPlugin : nsISupports { - readonly attribute DOMString description; - readonly attribute DOMString filename; - readonly attribute DOMString name; + readonly attribute DOMString description; + readonly attribute DOMString filename; + readonly attribute DOMString name; - - readonly attribute unsigned long length; - nsIDOMMimeType item(in unsigned long index); - nsIDOMMimeType namedItem(in DOMString name); + readonly attribute unsigned long length; + nsIDOMMimeType item(in unsigned long index); + nsIDOMMimeType namedItem(in DOMString name); }; - diff --git a/dom/public/idl/base/nsIDOMPluginArray.idl b/dom/public/idl/base/nsIDOMPluginArray.idl index 7c878196cd1..eac36db12e9 100644 --- a/dom/public/idl/base/nsIDOMPluginArray.idl +++ b/dom/public/idl/base/nsIDOMPluginArray.idl @@ -24,9 +24,10 @@ [scriptable, uuid(f6134680-f28b-11d2-8360-c90899049c3c)] interface nsIDOMPluginArray : nsISupports { - readonly attribute unsigned long length; - nsIDOMPlugin item(in unsigned long index); - nsIDOMPlugin namedItem(in DOMString name); - void refresh(in boolean reloadDocuments); -}; + readonly attribute unsigned long length; + nsIDOMPlugin item(in unsigned long index); + nsIDOMPlugin namedItem(in DOMString name); + + void refresh(in boolean reloadDocuments); +}; diff --git a/dom/public/idl/base/nsIDOMScreen.idl b/dom/public/idl/base/nsIDOMScreen.idl index ef875287fb8..20b94b389c8 100644 --- a/dom/public/idl/base/nsIDOMScreen.idl +++ b/dom/public/idl/base/nsIDOMScreen.idl @@ -24,16 +24,14 @@ [scriptable, uuid(77947960-b4af-11d2-bd93-00805f8ae3f4)] interface nsIDOMScreen : nsISupports { - - readonly attribute long top; - readonly attribute long left; - readonly attribute long width; - readonly attribute long height; - readonly attribute long pixelDepth; - readonly attribute long colorDepth; - readonly attribute long availWidth; - readonly attribute long availHeight; - readonly attribute long availLeft; - readonly attribute long availTop; + readonly attribute long top; + readonly attribute long left; + readonly attribute long width; + readonly attribute long height; + readonly attribute long pixelDepth; + readonly attribute long colorDepth; + readonly attribute long availWidth; + readonly attribute long availHeight; + readonly attribute long availLeft; + readonly attribute long availTop; }; - diff --git a/dom/public/idl/base/nsIDOMWindow.idl b/dom/public/idl/base/nsIDOMWindow.idl index 79cb1c3899d..25326ffb1df 100644 --- a/dom/public/idl/base/nsIDOMWindow.idl +++ b/dom/public/idl/base/nsIDOMWindow.idl @@ -24,22 +24,25 @@ [scriptable, uuid(a6cf906b-15b3-11d2-932e-00805f8add32)] interface nsIDOMWindow : nsISupports { - readonly attribute nsIDOMDocument document; - readonly attribute nsIDOMWindow parent; + readonly attribute nsIDOMDocument document; + readonly attribute nsIDOMWindow parent; - /* [replaceable] readonly attribute nsIDOMWindow top; */ - [noscript] readonly attribute nsIDOMWindow top; + /* [replaceable] readonly attribute nsIDOMWindow top; */ + [noscript] readonly attribute nsIDOMWindow top; - /* [replaceable] readonly attribute nsIDOMBarProp scrollbars; */ - [noscript] readonly attribute nsIDOMBarProp scrollbars; - readonly attribute nsIDOMWindowCollection frames; - attribute DOMString name; - readonly attribute long scrollX; - readonly attribute long scrollY; - void scrollTo(in long xScroll, in long yScroll); - void scrollBy(in long xScrollDif, in long yScrollDif); - nsISelection getSelection(); - void scrollByLines(in long numLines); - void scrollByPages(in long numPages); + /* [replaceable] readonly attribute nsIDOMBarProp scrollbars; */ + [noscript] readonly attribute nsIDOMBarProp scrollbars; + + readonly attribute nsIDOMWindowCollection frames; + + /* XXX: Shouldn't name be replaceable? */ + attribute DOMString name; + readonly attribute long scrollX; + readonly attribute long scrollY; + + void scrollTo(in long xScroll, in long yScroll); + void scrollBy(in long xScrollDif, in long yScrollDif); + nsISelection getSelection(); + void scrollByLines(in long numLines); + void scrollByPages(in long numPages); }; - diff --git a/dom/public/idl/base/nsIDOMWindowCollection.idl b/dom/public/idl/base/nsIDOMWindowCollection.idl index ff47ef7f328..876d649895a 100644 --- a/dom/public/idl/base/nsIDOMWindowCollection.idl +++ b/dom/public/idl/base/nsIDOMWindowCollection.idl @@ -24,9 +24,8 @@ [scriptable, uuid(a6cf906f-15b3-11d2-932e-00805f8add32)] interface nsIDOMWindowCollection : nsISupports { + readonly attribute unsigned long length; - readonly attribute unsigned long length; - nsIDOMWindow item(in unsigned long index); - nsIDOMWindow namedItem(in DOMString name); + nsIDOMWindow item(in unsigned long index); + nsIDOMWindow namedItem(in DOMString name); }; - diff --git a/dom/public/idl/base/nsIDOMWindowInternal.idl b/dom/public/idl/base/nsIDOMWindowInternal.idl index 62028f3d93e..267573e0ac3 100644 --- a/dom/public/idl/base/nsIDOMWindowInternal.idl +++ b/dom/public/idl/base/nsIDOMWindowInternal.idl @@ -24,106 +24,111 @@ [scriptable, uuid(9c911860-7dd9-11d4-9a83-000064657374)] interface nsIDOMWindowInternal : nsIDOMWindow { - - readonly attribute nsIDOMWindowInternal window; - readonly attribute nsIDOMWindowInternal self; - readonly attribute nsIDOMNavigator navigator; - readonly attribute nsIDOMScreen screen; - readonly attribute nsIDOMHistory history; + readonly attribute nsIDOMWindowInternal window; + readonly attribute nsIDOMWindowInternal self; + readonly attribute nsIDOMNavigator navigator; + readonly attribute nsIDOMScreen screen; + readonly attribute nsIDOMHistory history; - /* [replaceable] readonly attribute nsIDOMWindowInternal _content; */ - [noscript] readonly attribute nsIDOMWindowInternal content; + /* Wwhhhhhaaaaaaaaggghh, this is an invalid name in IDL + * [replaceable] _content; + */ + [noscript] readonly attribute nsIDOMWindowInternal content; - /* [replaceable] readonly attribute nsISidebar sidebar; */ - [noscript] readonly attribute nsISidebar sidebar; + /* [replaceable] sidebar; */ + [noscript] readonly attribute nsISidebar sidebar; - /* [replaceable] readonly attribute nsIPrompt prompter; */ - [noscript] readonly attribute nsIPrompt prompter; + /* [replaceable] prompter; */ + [noscript] readonly attribute nsIPrompt prompter; + /* [replaceable] menubar; */ + [noscript] readonly attribute nsIDOMBarProp menubar; - /* [replaceable] readonly attribute nsIDOMBarProp menubar; */ - [noscript] readonly attribute nsIDOMBarProp menubar; + /* [replaceable] toolbar; */ + [noscript] readonly attribute nsIDOMBarProp toolbar; - /* [replaceable] readonly attribute nsIDOMBarProp toolbar; */ - [noscript] readonly attribute nsIDOMBarProp toolbar; + /* [replaceable] locationbar; */ + [noscript] readonly attribute nsIDOMBarProp locationbar; - /* [replaceable] readonly attribute nsIDOMBarProp locationbar; */ - [noscript] readonly attribute nsIDOMBarProp locationbar; + /* [replaceable] personalbar; */ + [noscript] readonly attribute nsIDOMBarProp personalbar; - /* [replaceable] readonly attribute nsIDOMBarProp personalbar; */ - [noscript] readonly attribute nsIDOMBarProp personalbar; + /* [replaceable] statusbar; */ + [noscript] readonly attribute nsIDOMBarProp statusbar; - /* [replaceable] readonly attribute nsIDOMBarProp statusbar; */ - [noscript] readonly attribute nsIDOMBarProp statusbar; + /* [replaceable] directories; */ + [noscript] readonly attribute nsIDOMBarProp directories; + readonly attribute boolean closed; + readonly attribute nsIDOMCrypto crypto; + readonly attribute nsIDOMPkcs11 pkcs11; - /* [replaceable] readonly attribute nsIDOMBarProp directories; */ - [noscript] readonly attribute nsIDOMBarProp directories; - readonly attribute boolean closed; - readonly attribute nsIDOMCrypto crypto; - readonly attribute nsIDOMPkcs11 pkcs11; + /* [replaceable] controllers; */ + [noscript] readonly attribute nsIControllers controllers; + attribute nsIDOMWindowInternal opener; + attribute DOMString status; + attribute DOMString defaultStatus; + // Can't do this! attribute jsval location; + attribute DOMString title; - /* [replaceable] readonly attribute nsIControllers controllers; */ - [noscript] readonly attribute nsIControllers controllers; - attribute nsIDOMWindowInternal opener; - attribute DOMString status; - attribute DOMString defaultStatus; - attribute jsval location; - attribute DOMString title; - attribute long innerWidth; - attribute long innerHeight; - attribute long outerWidth; - attribute long outerHeight; - attribute long screenX; - attribute long screenY; - attribute long pageXOffset; - attribute long pageYOffset; + // XXX: IMO the below attributes should be readonly!!! + attribute long innerWidth; + attribute long innerHeight; + attribute long outerWidth; + attribute long outerHeight; + attribute long screenX; + attribute long screenY; + attribute long pageXOffset; + attribute long pageYOffset; - /* [replaceable] readonly attribute unsigned long length; */ - [noscript] readonly attribute unsigned long length; + /* [replaceable] length; */ + [noscript] readonly attribute unsigned long length; - void dump(in DOMString str); - void alert(/* ... */); - boolean confirm(/* ... */); - // XXX prompt() should be changed back to return a string once - // the DOM APIs allow us to return null js values for a string. - // in the meantime, this is the only way to do that: - jsval prompt(/* ... */); - void focus(); - void blur(); - void back(); - void forward(); - void home(); - void stop(); - void print(); + void dump(in DOMString str); + void alert(in DOMString text /*, ... */); + boolean confirm(in DOMString text /*, ... */); - void moveTo(in long xPos, in long yPos); - void moveBy(in long xDif, in long yDif); - void resizeTo(in long width, in long height); - void resizeBy(in long widthDif, in long heightDif); - void sizeToContent(); - void GetAttention(); - void scroll(in long xScroll, in long yScroll); + // XXX prompt() should be changed back to return a string once + // the DOM APIs allow us to return null js values for a string. + // in the meantime, this is the only way to do that: - void clearTimeout(in long timerID); - void clearInterval(in long timerID); - long setTimeout(/* ... */); - long setInterval(/* ... */); + // XXX jsval prompt(/* ... */); - void captureEvents(in long eventFlags); - void releaseEvents(in long eventFlags); - void routeEvent(in nsIDOMEvent evt); - void enableExternalCapture(); - void disableExternalCapture(); - void setCursor(in DOMString cursor); + void focus(); + void blur(); - nsIDOMWindowInternal open(/* ... */); - nsIDOMWindowInternal openDialog(/* ... */); - void close(/* ... */); + void back(); + void forward(); + void home(); + void stop(); - void updateCommands(in DOMString action); + void print(); - DOMString escape(in DOMString str); - DOMString unescape(in DOMString str); + void moveTo(in long xPos, in long yPos); + void moveBy(in long xDif, in long yDif); + void resizeTo(in long width, in long height); + void resizeBy(in long widthDif, in long heightDif); + void sizeToContent(); + void GetAttention(); + void scroll(in long xScroll, in long yScroll); + void clearTimeout(in long timerID); + void clearInterval(in long timerID); + long setTimeout(/* ... */); + long setInterval(/* ... */); + + void captureEvents(in long eventFlags); + void releaseEvents(in long eventFlags); + void routeEvent(in nsIDOMEvent evt); + void enableExternalCapture(); + void disableExternalCapture(); + void setCursor(in DOMString cursor); + + nsIDOMWindowInternal open(/* ... */); + nsIDOMWindowInternal openDialog(/* ... */); + void close(/* ... */); + + void updateCommands(in DOMString action); + + DOMString escape(in DOMString str); + DOMString unescape(in DOMString str); }; -