From 4ef7dcc47fc771b3672a33be8ea8cc2688ad78ce Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Tue, 22 Dec 1998 22:03:20 +0000 Subject: [PATCH] Added script namespace management mechanism. This allows external native code to add symbols and constructors to the script global namespace. Added IID() static method generation to IDL generator. git-svn-id: svn://10.0.0.236/trunk@16821 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/public/base/nsIDOMLocation.h | 1 + mozilla/dom/public/base/nsIDOMNavigator.h | 1 + mozilla/dom/public/base/nsIDOMWindow.h | 1 + .../dom/public/base/nsIDOMWindowCollection.h | 1 + mozilla/dom/public/coreDom/nsIDOMAttr.h | 1 + .../dom/public/coreDom/nsIDOMCDATASection.h | 1 + .../dom/public/coreDom/nsIDOMCharacterData.h | 1 + mozilla/dom/public/coreDom/nsIDOMComment.h | 1 + .../public/coreDom/nsIDOMDOMImplementation.h | 1 + mozilla/dom/public/coreDom/nsIDOMDocument.h | 1 - .../public/coreDom/nsIDOMDocumentFragment.h | 1 + .../dom/public/coreDom/nsIDOMDocumentType.h | 1 + mozilla/dom/public/coreDom/nsIDOMElement.h | 1 + mozilla/dom/public/coreDom/nsIDOMEntity.h | 1 + .../public/coreDom/nsIDOMEntityReference.h | 1 + mozilla/dom/public/coreDom/nsIDOMNSDocument.h | 1 + .../dom/public/coreDom/nsIDOMNamedNodeMap.h | 1 + mozilla/dom/public/coreDom/nsIDOMNodeList.h | 1 + mozilla/dom/public/coreDom/nsIDOMNotation.h | 1 + .../coreDom/nsIDOMProcessingInstruction.h | 1 + mozilla/dom/public/coreDom/nsIDOMRange.h | 1 + mozilla/dom/public/coreDom/nsIDOMStyleSheet.h | 1 + .../coreDom/nsIDOMStyleSheetCollection.h | 1 + mozilla/dom/public/coreDom/nsIDOMText.h | 1 + mozilla/dom/public/coreEvents/nsIDOMEvent.h | 1 + .../public/coreEvents/nsIDOMEventCapturer.h | 1 + mozilla/dom/public/coreEvents/nsIDOMNSEvent.h | 1 + mozilla/dom/public/css/nsIDOMCSS2Properties.h | 1 + .../dom/public/css/nsIDOMCSSFontFaceRule.h | 1 + mozilla/dom/public/css/nsIDOMCSSImportRule.h | 1 + mozilla/dom/public/css/nsIDOMCSSMediaRule.h | 1 + mozilla/dom/public/css/nsIDOMCSSPageRule.h | 1 + mozilla/dom/public/css/nsIDOMCSSRule.h | 1 + .../public/css/nsIDOMCSSStyleDeclaration.h | 1 + mozilla/dom/public/css/nsIDOMCSSStyleRule.h | 1 + .../public/css/nsIDOMCSSStyleRuleCollection.h | 1 + mozilla/dom/public/css/nsIDOMCSSStyleSheet.h | 1 + mozilla/dom/public/css/nsIDOMCSSUnknownRule.h | 1 + .../dom/public/html/nsIDOMHTMLAnchorElement.h | 1 + .../dom/public/html/nsIDOMHTMLAppletElement.h | 1 + .../dom/public/html/nsIDOMHTMLAreaElement.h | 1 + mozilla/dom/public/html/nsIDOMHTMLBRElement.h | 1 + .../dom/public/html/nsIDOMHTMLBaseElement.h | 1 + .../public/html/nsIDOMHTMLBaseFontElement.h | 1 + .../public/html/nsIDOMHTMLBlockquoteElement.h | 1 + .../dom/public/html/nsIDOMHTMLBodyElement.h | 1 + .../dom/public/html/nsIDOMHTMLButtonElement.h | 1 + .../dom/public/html/nsIDOMHTMLCollection.h | 1 + .../dom/public/html/nsIDOMHTMLDListElement.h | 1 + .../public/html/nsIDOMHTMLDirectoryElement.h | 1 + .../dom/public/html/nsIDOMHTMLDivElement.h | 1 + mozilla/dom/public/html/nsIDOMHTMLDocument.h | 1 + mozilla/dom/public/html/nsIDOMHTMLElement.h | 1 + .../public/html/nsIDOMHTMLFieldSetElement.h | 1 + .../dom/public/html/nsIDOMHTMLFontElement.h | 1 + .../dom/public/html/nsIDOMHTMLFormElement.h | 1 + .../dom/public/html/nsIDOMHTMLFrameElement.h | 1 + .../public/html/nsIDOMHTMLFrameSetElement.h | 1 + mozilla/dom/public/html/nsIDOMHTMLHRElement.h | 1 + .../dom/public/html/nsIDOMHTMLHeadElement.h | 1 + .../public/html/nsIDOMHTMLHeadingElement.h | 1 + .../dom/public/html/nsIDOMHTMLHtmlElement.h | 1 + .../dom/public/html/nsIDOMHTMLIFrameElement.h | 1 + .../dom/public/html/nsIDOMHTMLImageElement.h | 11 +- .../dom/public/html/nsIDOMHTMLInputElement.h | 1 + .../public/html/nsIDOMHTMLIsIndexElement.h | 1 + mozilla/dom/public/html/nsIDOMHTMLLIElement.h | 1 + .../dom/public/html/nsIDOMHTMLLabelElement.h | 1 + .../dom/public/html/nsIDOMHTMLLegendElement.h | 1 + .../dom/public/html/nsIDOMHTMLLinkElement.h | 1 + .../dom/public/html/nsIDOMHTMLMapElement.h | 1 + .../dom/public/html/nsIDOMHTMLMenuElement.h | 1 + .../dom/public/html/nsIDOMHTMLMetaElement.h | 1 + .../dom/public/html/nsIDOMHTMLModElement.h | 1 + .../dom/public/html/nsIDOMHTMLOListElement.h | 1 + .../dom/public/html/nsIDOMHTMLObjectElement.h | 1 + .../public/html/nsIDOMHTMLOptGroupElement.h | 1 + .../dom/public/html/nsIDOMHTMLOptionElement.h | 1 + .../public/html/nsIDOMHTMLParagraphElement.h | 1 + .../dom/public/html/nsIDOMHTMLParamElement.h | 1 + .../dom/public/html/nsIDOMHTMLPreElement.h | 1 + .../dom/public/html/nsIDOMHTMLQuoteElement.h | 1 + .../dom/public/html/nsIDOMHTMLScriptElement.h | 1 + .../dom/public/html/nsIDOMHTMLSelectElement.h | 1 + .../dom/public/html/nsIDOMHTMLStyleElement.h | 1 + .../html/nsIDOMHTMLTableCaptionElement.h | 1 + .../public/html/nsIDOMHTMLTableCellElement.h | 1 + .../public/html/nsIDOMHTMLTableColElement.h | 1 + .../dom/public/html/nsIDOMHTMLTableElement.h | 1 + .../public/html/nsIDOMHTMLTableRowElement.h | 1 + .../html/nsIDOMHTMLTableSectionElement.h | 1 + .../public/html/nsIDOMHTMLTextAreaElement.h | 1 + .../dom/public/html/nsIDOMHTMLTitleElement.h | 1 + .../dom/public/html/nsIDOMHTMLUListElement.h | 1 + mozilla/dom/public/html/nsIDOMImage.h | 1 + .../public/html/nsIDOMNSHTMLButtonElement.h | 1 + .../dom/public/html/nsIDOMNSHTMLDocument.h | 1 + .../dom/public/html/nsIDOMNSHTMLFormElement.h | 1 + mozilla/dom/public/nsDOMCID.h | 2 +- mozilla/dom/public/nsIScriptNameSetRegistry.h | 13 +- .../dom/public/nsIScriptNameSpaceManager.h | 2 + mozilla/dom/src/base/nsJSEnvironment.cpp | 29 +- mozilla/dom/src/base/nsJSEnvironment.h | 2 + mozilla/dom/src/base/nsJSLocation.cpp | 48 +- mozilla/dom/src/base/nsJSNavigator.cpp | 28 +- mozilla/dom/src/base/nsJSUtils.cpp | 176 ++++-- mozilla/dom/src/base/nsJSUtils.h | 81 +-- mozilla/dom/src/base/nsJSWindow.cpp | 52 +- mozilla/dom/src/base/nsJSWindowCollection.cpp | 24 +- .../dom/src/base/nsScriptNameSpaceManager.cpp | 23 +- mozilla/dom/src/build/nsDOMFactory.cpp | 7 +- .../dom/src/build/nsScriptNameSetRegistry.cpp | 20 + .../dom/src/build/nsScriptNameSetRegistry.h | 2 + .../src/build/nsScriptNameSpaceManager.cpp | 23 +- mozilla/dom/src/coreDOM/nsJSAttr.cpp | 20 +- mozilla/dom/src/coreDOM/nsJSCDATASection.cpp | 14 +- mozilla/dom/src/coreDOM/nsJSCharacterData.cpp | 26 +- mozilla/dom/src/coreDOM/nsJSComment.cpp | 14 +- .../dom/src/coreDOM/nsJSDOMImplementation.cpp | 18 +- mozilla/dom/src/coreDOM/nsJSDocument.cpp | 62 +-- .../dom/src/coreDOM/nsJSDocumentFragment.cpp | 14 +- mozilla/dom/src/coreDOM/nsJSDocumentType.cpp | 20 +- mozilla/dom/src/coreDOM/nsJSElement.cpp | 46 +- mozilla/dom/src/coreDOM/nsJSEntity.cpp | 20 +- .../dom/src/coreDOM/nsJSEntityReference.cpp | 14 +- mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp | 28 +- mozilla/dom/src/coreDOM/nsJSNode.cpp | 60 +-- mozilla/dom/src/coreDOM/nsJSNodeList.cpp | 16 +- mozilla/dom/src/coreDOM/nsJSNotation.cpp | 18 +- .../src/coreDOM/nsJSProcessingInstruction.cpp | 20 +- mozilla/dom/src/coreDOM/nsJSRange.cpp | 52 +- mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp | 18 +- .../src/coreDOM/nsJSStyleSheetCollection.cpp | 16 +- mozilla/dom/src/coreDOM/nsJSText.cpp | 16 +- mozilla/dom/src/css/nsJSCSS2Properties.cpp | 506 +++++++++--------- mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp | 18 +- mozilla/dom/src/css/nsJSCSSImportRule.cpp | 24 +- mozilla/dom/src/css/nsJSCSSMediaRule.cpp | 22 +- mozilla/dom/src/css/nsJSCSSPageRule.cpp | 22 +- mozilla/dom/src/css/nsJSCSSRule.cpp | 20 +- .../dom/src/css/nsJSCSSStyleDeclaration.cpp | 34 +- mozilla/dom/src/css/nsJSCSSStyleRule.cpp | 22 +- .../src/css/nsJSCSSStyleRuleCollection.cpp | 16 +- mozilla/dom/src/css/nsJSCSSStyleSheet.cpp | 28 +- mozilla/dom/src/css/nsJSCSSUnknownRule.cpp | 14 +- mozilla/dom/src/events/nsJSEvent.cpp | 34 +- .../dom/src/html/nsJSHTMLAnchorElement.cpp | 58 +- .../dom/src/html/nsJSHTMLAppletElement.cpp | 58 +- mozilla/dom/src/html/nsJSHTMLAreaElement.cpp | 40 +- mozilla/dom/src/html/nsJSHTMLBRElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLBaseElement.cpp | 22 +- .../dom/src/html/nsJSHTMLBaseFontElement.cpp | 26 +- .../src/html/nsJSHTMLBlockquoteElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLBodyElement.cpp | 38 +- .../dom/src/html/nsJSHTMLButtonElement.cpp | 32 +- mozilla/dom/src/html/nsJSHTMLCollection.cpp | 24 +- mozilla/dom/src/html/nsJSHTMLDListElement.cpp | 16 +- .../dom/src/html/nsJSHTMLDirectoryElement.cpp | 16 +- mozilla/dom/src/html/nsJSHTMLDivElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLDocument.cpp | 88 +-- mozilla/dom/src/html/nsJSHTMLElement.cpp | 36 +- .../dom/src/html/nsJSHTMLFieldSetElement.cpp | 16 +- mozilla/dom/src/html/nsJSHTMLFontElement.cpp | 26 +- mozilla/dom/src/html/nsJSHTMLFormElement.cpp | 50 +- mozilla/dom/src/html/nsJSHTMLFrameElement.cpp | 44 +- .../dom/src/html/nsJSHTMLFrameSetElement.cpp | 22 +- mozilla/dom/src/html/nsJSHTMLHRElement.cpp | 28 +- mozilla/dom/src/html/nsJSHTMLHeadElement.cpp | 18 +- .../dom/src/html/nsJSHTMLHeadingElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp | 18 +- .../dom/src/html/nsJSHTMLIFrameElement.cpp | 54 +- mozilla/dom/src/html/nsJSHTMLImageElement.cpp | 98 ++-- mozilla/dom/src/html/nsJSHTMLInputElement.cpp | 66 +-- .../dom/src/html/nsJSHTMLIsIndexElement.cpp | 20 +- mozilla/dom/src/html/nsJSHTMLLIElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLLabelElement.cpp | 24 +- .../dom/src/html/nsJSHTMLLegendElement.cpp | 24 +- mozilla/dom/src/html/nsJSHTMLLinkElement.cpp | 48 +- mozilla/dom/src/html/nsJSHTMLMapElement.cpp | 20 +- mozilla/dom/src/html/nsJSHTMLMenuElement.cpp | 16 +- mozilla/dom/src/html/nsJSHTMLMetaElement.cpp | 30 +- mozilla/dom/src/html/nsJSHTMLModElement.cpp | 22 +- mozilla/dom/src/html/nsJSHTMLOListElement.cpp | 20 +- .../dom/src/html/nsJSHTMLObjectElement.cpp | 78 +-- .../dom/src/html/nsJSHTMLOptGroupElement.cpp | 20 +- .../dom/src/html/nsJSHTMLOptionElement.cpp | 30 +- .../dom/src/html/nsJSHTMLParagraphElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLParamElement.cpp | 30 +- mozilla/dom/src/html/nsJSHTMLPreElement.cpp | 14 +- mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp | 18 +- .../dom/src/html/nsJSHTMLScriptElement.cpp | 40 +- .../dom/src/html/nsJSHTMLSelectElement.cpp | 36 +- mozilla/dom/src/html/nsJSHTMLStyleElement.cpp | 24 +- .../src/html/nsJSHTMLTableCaptionElement.cpp | 18 +- .../dom/src/html/nsJSHTMLTableCellElement.cpp | 60 +-- .../dom/src/html/nsJSHTMLTableColElement.cpp | 34 +- mozilla/dom/src/html/nsJSHTMLTableElement.cpp | 74 +-- .../dom/src/html/nsJSHTMLTableRowElement.cpp | 40 +- .../src/html/nsJSHTMLTableSectionElement.cpp | 34 +- .../dom/src/html/nsJSHTMLTextAreaElement.cpp | 38 +- mozilla/dom/src/html/nsJSHTMLTitleElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLUListElement.cpp | 20 +- mozilla/dom/tools/JSStubGen.cpp | 110 ++-- mozilla/dom/tools/XPCOMGen.cpp | 15 +- mozilla/dom/tools/XPCOMGen.h | 1 + mozilla/layout/build/nsLayoutCID.h | 2 +- mozilla/layout/build/nsLayoutFactory.cpp | 139 +++-- .../webshell/tests/viewer/nsSetupRegistry.cpp | 8 +- mozilla/xpcom/base/IIDS.h | 6 +- mozilla/xpcom/src/IIDS.h | 6 +- mozilla/xpfe/bootstrap/nsSetupRegistry.cpp | 8 +- 211 files changed, 2197 insertions(+), 1862 deletions(-) diff --git a/mozilla/dom/public/base/nsIDOMLocation.h b/mozilla/dom/public/base/nsIDOMLocation.h index 1f6a0e0be00..2e3c945d91a 100644 --- a/mozilla/dom/public/base/nsIDOMLocation.h +++ b/mozilla/dom/public/base/nsIDOMLocation.h @@ -32,6 +32,7 @@ class nsIDOMLocation : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMLOCATION_IID; return iid; } NS_IMETHOD GetHash(nsString& aHash)=0; NS_IMETHOD SetHash(const nsString& aHash)=0; diff --git a/mozilla/dom/public/base/nsIDOMNavigator.h b/mozilla/dom/public/base/nsIDOMNavigator.h index 0f0cf564164..71573e2c908 100644 --- a/mozilla/dom/public/base/nsIDOMNavigator.h +++ b/mozilla/dom/public/base/nsIDOMNavigator.h @@ -31,6 +31,7 @@ class nsIDOMNavigator : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNAVIGATOR_IID; return iid; } NS_IMETHOD GetUserAgent(nsString& aUserAgent)=0; diff --git a/mozilla/dom/public/base/nsIDOMWindow.h b/mozilla/dom/public/base/nsIDOMWindow.h index 51349542054..80fe8910653 100644 --- a/mozilla/dom/public/base/nsIDOMWindow.h +++ b/mozilla/dom/public/base/nsIDOMWindow.h @@ -36,6 +36,7 @@ class nsIDOMWindow; class nsIDOMWindow : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMWINDOW_IID; return iid; } NS_IMETHOD GetWindow(nsIDOMWindow** aWindow)=0; diff --git a/mozilla/dom/public/base/nsIDOMWindowCollection.h b/mozilla/dom/public/base/nsIDOMWindowCollection.h index 3d5363e3c0f..68398b10300 100644 --- a/mozilla/dom/public/base/nsIDOMWindowCollection.h +++ b/mozilla/dom/public/base/nsIDOMWindowCollection.h @@ -32,6 +32,7 @@ class nsIDOMWindow; class nsIDOMWindowCollection : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMWINDOWCOLLECTION_IID; return iid; } NS_IMETHOD GetLength(PRUint32* aLength)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMAttr.h b/mozilla/dom/public/coreDom/nsIDOMAttr.h index beba3adafe7..2efbfd04c96 100644 --- a/mozilla/dom/public/coreDom/nsIDOMAttr.h +++ b/mozilla/dom/public/coreDom/nsIDOMAttr.h @@ -32,6 +32,7 @@ class nsIDOMAttr : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMATTR_IID; return iid; } NS_IMETHOD GetName(nsString& aName)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMCDATASection.h b/mozilla/dom/public/coreDom/nsIDOMCDATASection.h index 12ffdb0759a..cebab00f0a0 100644 --- a/mozilla/dom/public/coreDom/nsIDOMCDATASection.h +++ b/mozilla/dom/public/coreDom/nsIDOMCDATASection.h @@ -32,6 +32,7 @@ class nsIDOMCDATASection : public nsIDOMText { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCDATASECTION_IID; return iid; } }; diff --git a/mozilla/dom/public/coreDom/nsIDOMCharacterData.h b/mozilla/dom/public/coreDom/nsIDOMCharacterData.h index c25ab0683cb..e553067d636 100644 --- a/mozilla/dom/public/coreDom/nsIDOMCharacterData.h +++ b/mozilla/dom/public/coreDom/nsIDOMCharacterData.h @@ -32,6 +32,7 @@ class nsIDOMCharacterData : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCHARACTERDATA_IID; return iid; } NS_IMETHOD GetData(nsString& aData)=0; NS_IMETHOD SetData(const nsString& aData)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMComment.h b/mozilla/dom/public/coreDom/nsIDOMComment.h index 40f6a35e6b9..9c09641249b 100644 --- a/mozilla/dom/public/coreDom/nsIDOMComment.h +++ b/mozilla/dom/public/coreDom/nsIDOMComment.h @@ -32,6 +32,7 @@ class nsIDOMComment : public nsIDOMCharacterData { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCOMMENT_IID; return iid; } }; diff --git a/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h b/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h index 2ca6d6bde31..44040a4ab42 100644 --- a/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h +++ b/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h @@ -31,6 +31,7 @@ class nsIDOMDOMImplementation : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMDOMIMPLEMENTATION_IID; return iid; } NS_IMETHOD HasFeature(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn)=0; }; diff --git a/mozilla/dom/public/coreDom/nsIDOMDocument.h b/mozilla/dom/public/coreDom/nsIDOMDocument.h index a1ea9017627..d1aa2613f4c 100644 --- a/mozilla/dom/public/coreDom/nsIDOMDocument.h +++ b/mozilla/dom/public/coreDom/nsIDOMDocument.h @@ -43,7 +43,6 @@ class nsIDOMNodeList; class nsIDOMDocument : public nsIDOMNode { public: - static const nsIID& IID() { static nsIID iid = NS_IDOMDOCUMENT_IID; return iid; } NS_IMETHOD GetDoctype(nsIDOMDocumentType** aDoctype)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h b/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h index 6d5d90ed0da..0e307a789c2 100644 --- a/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h +++ b/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h @@ -32,6 +32,7 @@ class nsIDOMDocumentFragment : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMDOCUMENTFRAGMENT_IID; return iid; } }; diff --git a/mozilla/dom/public/coreDom/nsIDOMDocumentType.h b/mozilla/dom/public/coreDom/nsIDOMDocumentType.h index 43ef51c714f..6901bdba21f 100644 --- a/mozilla/dom/public/coreDom/nsIDOMDocumentType.h +++ b/mozilla/dom/public/coreDom/nsIDOMDocumentType.h @@ -33,6 +33,7 @@ class nsIDOMNamedNodeMap; class nsIDOMDocumentType : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMDOCUMENTTYPE_IID; return iid; } NS_IMETHOD GetName(nsString& aName)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMElement.h b/mozilla/dom/public/coreDom/nsIDOMElement.h index 651cab23d5d..c7b699a32e0 100644 --- a/mozilla/dom/public/coreDom/nsIDOMElement.h +++ b/mozilla/dom/public/coreDom/nsIDOMElement.h @@ -34,6 +34,7 @@ class nsIDOMNodeList; class nsIDOMElement : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMELEMENT_IID; return iid; } NS_IMETHOD GetTagName(nsString& aTagName)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMEntity.h b/mozilla/dom/public/coreDom/nsIDOMEntity.h index 453ac672b08..e99e32b70af 100644 --- a/mozilla/dom/public/coreDom/nsIDOMEntity.h +++ b/mozilla/dom/public/coreDom/nsIDOMEntity.h @@ -32,6 +32,7 @@ class nsIDOMEntity : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMENTITY_IID; return iid; } NS_IMETHOD GetPublicId(nsString& aPublicId)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMEntityReference.h b/mozilla/dom/public/coreDom/nsIDOMEntityReference.h index 9d62165abbc..d4ea56adf89 100644 --- a/mozilla/dom/public/coreDom/nsIDOMEntityReference.h +++ b/mozilla/dom/public/coreDom/nsIDOMEntityReference.h @@ -32,6 +32,7 @@ class nsIDOMEntityReference : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMENTITYREFERENCE_IID; return iid; } }; diff --git a/mozilla/dom/public/coreDom/nsIDOMNSDocument.h b/mozilla/dom/public/coreDom/nsIDOMNSDocument.h index 2ed2342b152..65cc75394d6 100644 --- a/mozilla/dom/public/coreDom/nsIDOMNSDocument.h +++ b/mozilla/dom/public/coreDom/nsIDOMNSDocument.h @@ -32,6 +32,7 @@ class nsIDOMStyleSheetCollection; class nsIDOMNSDocument : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNSDOCUMENT_IID; return iid; } NS_IMETHOD GetStyleSheets(nsIDOMStyleSheetCollection** aStyleSheets)=0; }; diff --git a/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h b/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h index 65be8a8f666..181eb317865 100644 --- a/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h +++ b/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h @@ -32,6 +32,7 @@ class nsIDOMNode; class nsIDOMNamedNodeMap : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNAMEDNODEMAP_IID; return iid; } NS_IMETHOD GetLength(PRUint32* aLength)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMNodeList.h b/mozilla/dom/public/coreDom/nsIDOMNodeList.h index 95deb34ee93..77cb063b6ab 100644 --- a/mozilla/dom/public/coreDom/nsIDOMNodeList.h +++ b/mozilla/dom/public/coreDom/nsIDOMNodeList.h @@ -32,6 +32,7 @@ class nsIDOMNode; class nsIDOMNodeList : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNODELIST_IID; return iid; } NS_IMETHOD GetLength(PRUint32* aLength)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMNotation.h b/mozilla/dom/public/coreDom/nsIDOMNotation.h index 35f7466f16b..ce457f4cbae 100644 --- a/mozilla/dom/public/coreDom/nsIDOMNotation.h +++ b/mozilla/dom/public/coreDom/nsIDOMNotation.h @@ -32,6 +32,7 @@ class nsIDOMNotation : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNOTATION_IID; return iid; } NS_IMETHOD GetPublicId(nsString& aPublicId)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h b/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h index 0c5529ac704..f160321c8a7 100644 --- a/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h +++ b/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h @@ -32,6 +32,7 @@ class nsIDOMProcessingInstruction : public nsIDOMNode { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMPROCESSINGINSTRUCTION_IID; return iid; } NS_IMETHOD GetTarget(nsString& aTarget)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMRange.h b/mozilla/dom/public/coreDom/nsIDOMRange.h index de04f60d50e..77a775f1381 100644 --- a/mozilla/dom/public/coreDom/nsIDOMRange.h +++ b/mozilla/dom/public/coreDom/nsIDOMRange.h @@ -34,6 +34,7 @@ class nsIDOMRange; class nsIDOMRange : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMRANGE_IID; return iid; } enum { START_TO_START = 0, START_TO_END = 1, diff --git a/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h b/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h index d3f893dcf2a..6064b16955d 100644 --- a/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h +++ b/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h @@ -31,6 +31,7 @@ class nsIDOMStyleSheet : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMSTYLESHEET_IID; return iid; } NS_IMETHOD GetType(nsString& aType)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h b/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h index 9823bfe7e02..9e3c40867fe 100644 --- a/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h +++ b/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h @@ -32,6 +32,7 @@ class nsIDOMStyleSheet; class nsIDOMStyleSheetCollection : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMSTYLESHEETCOLLECTION_IID; return iid; } NS_IMETHOD GetLength(PRUint32* aLength)=0; diff --git a/mozilla/dom/public/coreDom/nsIDOMText.h b/mozilla/dom/public/coreDom/nsIDOMText.h index f9ec9fae92c..766bd8c98cc 100644 --- a/mozilla/dom/public/coreDom/nsIDOMText.h +++ b/mozilla/dom/public/coreDom/nsIDOMText.h @@ -33,6 +33,7 @@ class nsIDOMText; class nsIDOMText : public nsIDOMCharacterData { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMTEXT_IID; return iid; } NS_IMETHOD SplitText(PRUint32 aOffset, nsIDOMText** aReturn)=0; }; diff --git a/mozilla/dom/public/coreEvents/nsIDOMEvent.h b/mozilla/dom/public/coreEvents/nsIDOMEvent.h index cc8c59c1442..31fd8166941 100644 --- a/mozilla/dom/public/coreEvents/nsIDOMEvent.h +++ b/mozilla/dom/public/coreEvents/nsIDOMEvent.h @@ -32,6 +32,7 @@ class nsIDOMNode; class nsIDOMEvent : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMEVENT_IID; return iid; } enum { VK_CANCEL = 3, VK_BACK = 8, diff --git a/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h b/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h index bb127e86c77..18b44d2b24c 100644 --- a/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h +++ b/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h @@ -32,6 +32,7 @@ class nsIDOMEventCapturer : public nsIDOMEventReceiver { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMEVENTCAPTURER_IID; return iid; } NS_IMETHOD CaptureEvent(const nsString& aType)=0; diff --git a/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h b/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h index dea5f397a02..3ec8c50ce93 100644 --- a/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h +++ b/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h @@ -32,6 +32,7 @@ class nsIDOMRenderingContext; class nsIDOMNSEvent : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNSEVENT_IID; return iid; } enum { EVENT_MOUSEDOWN = 1, EVENT_MOUSEUP = 2, diff --git a/mozilla/dom/public/css/nsIDOMCSS2Properties.h b/mozilla/dom/public/css/nsIDOMCSS2Properties.h index 9cd32af7077..c4f43ae3b27 100644 --- a/mozilla/dom/public/css/nsIDOMCSS2Properties.h +++ b/mozilla/dom/public/css/nsIDOMCSS2Properties.h @@ -32,6 +32,7 @@ class nsIDOMCSS2Properties : public nsIDOMCSSStyleDeclaration { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSS2PROPERTIES_IID; return iid; } NS_IMETHOD GetAzimuth(nsString& aAzimuth)=0; NS_IMETHOD SetAzimuth(const nsString& aAzimuth)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h b/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h index 469e532b03a..55985e7e857 100644 --- a/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h @@ -33,6 +33,7 @@ class nsIDOMCSSStyleDeclaration; class nsIDOMCSSFontFaceRule : public nsIDOMCSSRule { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSFONTFACERULE_IID; return iid; } NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0; NS_IMETHOD SetStyle(nsIDOMCSSStyleDeclaration* aStyle)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSImportRule.h b/mozilla/dom/public/css/nsIDOMCSSImportRule.h index c882fca6cd4..90ed13da480 100644 --- a/mozilla/dom/public/css/nsIDOMCSSImportRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSImportRule.h @@ -33,6 +33,7 @@ class nsIDOMCSSStyleSheet; class nsIDOMCSSImportRule : public nsIDOMCSSRule { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSIMPORTRULE_IID; return iid; } NS_IMETHOD GetHref(nsString& aHref)=0; NS_IMETHOD SetHref(const nsString& aHref)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSMediaRule.h b/mozilla/dom/public/css/nsIDOMCSSMediaRule.h index c9b13f56bf3..86ded5cd5c0 100644 --- a/mozilla/dom/public/css/nsIDOMCSSMediaRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSMediaRule.h @@ -33,6 +33,7 @@ class nsIDOMCSSStyleRuleCollection; class nsIDOMCSSMediaRule : public nsIDOMCSSRule { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSMEDIARULE_IID; return iid; } NS_IMETHOD GetMediaTypes(nsString& aMediaTypes)=0; NS_IMETHOD SetMediaTypes(const nsString& aMediaTypes)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSPageRule.h b/mozilla/dom/public/css/nsIDOMCSSPageRule.h index 5364b9a1233..83892fd7a89 100644 --- a/mozilla/dom/public/css/nsIDOMCSSPageRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSPageRule.h @@ -33,6 +33,7 @@ class nsIDOMCSSStyleDeclaration; class nsIDOMCSSPageRule : public nsIDOMCSSRule { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSPAGERULE_IID; return iid; } NS_IMETHOD GetName(nsString& aName)=0; NS_IMETHOD SetName(const nsString& aName)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSRule.h b/mozilla/dom/public/css/nsIDOMCSSRule.h index b3b40a40f57..7def21c964f 100644 --- a/mozilla/dom/public/css/nsIDOMCSSRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSRule.h @@ -32,6 +32,7 @@ class nsIDOMCSSStyleSheet; class nsIDOMCSSRule : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSRULE_IID; return iid; } enum { UNKNOWN_RULE = 0, STYLE_RULE = 1, diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h b/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h index 1f56da5fd5e..1bd090a3c95 100644 --- a/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h +++ b/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h @@ -31,6 +31,7 @@ class nsIDOMCSSStyleDeclaration : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLEDECLARATION_IID; return iid; } NS_IMETHOD GetCssText(nsString& aCssText)=0; NS_IMETHOD SetCssText(const nsString& aCssText)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleRule.h b/mozilla/dom/public/css/nsIDOMCSSStyleRule.h index df747dfce55..43581142b57 100644 --- a/mozilla/dom/public/css/nsIDOMCSSStyleRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSStyleRule.h @@ -33,6 +33,7 @@ class nsIDOMCSSStyleDeclaration; class nsIDOMCSSStyleRule : public nsIDOMCSSRule { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLERULE_IID; return iid; } NS_IMETHOD GetSelectorText(nsString& aSelectorText)=0; NS_IMETHOD SetSelectorText(const nsString& aSelectorText)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h b/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h index 18e5b27aec3..9b61b1a8dd8 100644 --- a/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h +++ b/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h @@ -32,6 +32,7 @@ class nsIDOMCSSStyleRule; class nsIDOMCSSStyleRuleCollection : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLERULECOLLECTION_IID; return iid; } NS_IMETHOD GetLength(PRUint32* aLength)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h b/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h index c042c5a4322..d9cf83f9a56 100644 --- a/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h +++ b/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h @@ -35,6 +35,7 @@ class nsIDOMCSSStyleRuleCollection; class nsIDOMCSSStyleSheet : public nsIDOMStyleSheet { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLESHEET_IID; return iid; } NS_IMETHOD GetOwningNode(nsIDOMNode** aOwningNode)=0; diff --git a/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h b/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h index 23cd58f1c05..7f300d4cc0e 100644 --- a/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h +++ b/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h @@ -32,6 +32,7 @@ class nsIDOMCSSUnknownRule : public nsIDOMCSSRule { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMCSSUNKNOWNRULE_IID; return iid; } }; diff --git a/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h b/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h index 5e140ee5667..89a8d7fb34f 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLAnchorElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLANCHORELEMENT_IID; return iid; } NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h b/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h index d658d9721cb..140c4c5c724 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLAppletElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLAPPLETELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h b/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h index e02136f240b..cf4fb47999c 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLAreaElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLAREAELEMENT_IID; return iid; } NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLBRElement.h b/mozilla/dom/public/html/nsIDOMHTMLBRElement.h index 80a54d86a81..5eff48e28c9 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLBRElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLBRElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLBRElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBRELEMENT_IID; return iid; } NS_IMETHOD GetClear(nsString& aClear)=0; NS_IMETHOD SetClear(const nsString& aClear)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h b/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h index 80e0b3e7ebc..b85e3a4e1e1 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLBaseElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBASEELEMENT_IID; return iid; } NS_IMETHOD GetHref(nsString& aHref)=0; NS_IMETHOD SetHref(const nsString& aHref)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h b/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h index 668886f103b..b27c5fa5e4a 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLBaseFontElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBASEFONTELEMENT_IID; return iid; } NS_IMETHOD GetColor(nsString& aColor)=0; NS_IMETHOD SetColor(const nsString& aColor)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h b/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h index cf44bb08172..bf16b9791a8 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLBlockquoteElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBLOCKQUOTEELEMENT_IID; return iid; } NS_IMETHOD GetCite(nsString& aCite)=0; NS_IMETHOD SetCite(const nsString& aCite)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h b/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h index 37496405343..b3b8a26a984 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLBodyElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBODYELEMENT_IID; return iid; } NS_IMETHOD GetALink(nsString& aALink)=0; NS_IMETHOD SetALink(const nsString& aALink)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h b/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h index f2406a60ed7..b1c087152b2 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLButtonElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBUTTONELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLCollection.h b/mozilla/dom/public/html/nsIDOMHTMLCollection.h index b91a00c9937..1755db4d6e3 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLCollection.h +++ b/mozilla/dom/public/html/nsIDOMHTMLCollection.h @@ -32,6 +32,7 @@ class nsIDOMNode; class nsIDOMHTMLCollection : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLCOLLECTION_IID; return iid; } NS_IMETHOD GetLength(PRUint32* aLength)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLDListElement.h b/mozilla/dom/public/html/nsIDOMHTMLDListElement.h index cfb4d11ac74..ad7676adbf7 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLDListElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLDListElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLDListElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDLISTELEMENT_IID; return iid; } NS_IMETHOD GetCompact(PRBool* aCompact)=0; NS_IMETHOD SetCompact(PRBool aCompact)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h b/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h index 5b9967a9e6a..7eb3b9416a1 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLDirectoryElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDIRECTORYELEMENT_IID; return iid; } NS_IMETHOD GetCompact(PRBool* aCompact)=0; NS_IMETHOD SetCompact(PRBool aCompact)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLDivElement.h b/mozilla/dom/public/html/nsIDOMHTMLDivElement.h index 7911b504381..0d94ae12c09 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLDivElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLDivElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLDivElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDIVELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLDocument.h b/mozilla/dom/public/html/nsIDOMHTMLDocument.h index f52249ae5eb..0c941041375 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLDocument.h +++ b/mozilla/dom/public/html/nsIDOMHTMLDocument.h @@ -37,6 +37,7 @@ class nsIDOMNodeList; class nsIDOMHTMLDocument : public nsIDOMDocument { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDOCUMENT_IID; return iid; } NS_IMETHOD GetTitle(nsString& aTitle)=0; NS_IMETHOD SetTitle(const nsString& aTitle)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLElement.h b/mozilla/dom/public/html/nsIDOMHTMLElement.h index 9aef3101d1a..f424c35aecf 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLElement.h @@ -33,6 +33,7 @@ class nsIDOMCSSStyleDeclaration; class nsIDOMHTMLElement : public nsIDOMElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLELEMENT_IID; return iid; } NS_IMETHOD GetId(nsString& aId)=0; NS_IMETHOD SetId(const nsString& aId)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h b/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h index 776a4777ee1..fe35d5ec946 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLFieldSetElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFIELDSETELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; }; diff --git a/mozilla/dom/public/html/nsIDOMHTMLFontElement.h b/mozilla/dom/public/html/nsIDOMHTMLFontElement.h index 30f6da799a6..f1c22b37b63 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLFontElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLFontElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLFontElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFONTELEMENT_IID; return iid; } NS_IMETHOD GetColor(nsString& aColor)=0; NS_IMETHOD SetColor(const nsString& aColor)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLFormElement.h b/mozilla/dom/public/html/nsIDOMHTMLFormElement.h index acc379ba44b..e7428c54c94 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLFormElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLFormElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLCollection; class nsIDOMHTMLFormElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFORMELEMENT_IID; return iid; } NS_IMETHOD GetElements(nsIDOMHTMLCollection** aElements)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h b/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h index da66070bbd0..fccf98c1817 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLFrameElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFRAMEELEMENT_IID; return iid; } NS_IMETHOD GetFrameBorder(nsString& aFrameBorder)=0; NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h b/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h index edd556da0fa..bc34ef03a42 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLFrameSetElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFRAMESETELEMENT_IID; return iid; } NS_IMETHOD GetCols(nsString& aCols)=0; NS_IMETHOD SetCols(const nsString& aCols)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLHRElement.h b/mozilla/dom/public/html/nsIDOMHTMLHRElement.h index 2d1b81f97b5..3ef4519457c 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLHRElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLHRElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLHRElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHRELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h b/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h index 743da108bcf..40cc5c22c90 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLHeadElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHEADELEMENT_IID; return iid; } NS_IMETHOD GetProfile(nsString& aProfile)=0; NS_IMETHOD SetProfile(const nsString& aProfile)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h b/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h index 6a8d8c6e85f..565554dea5f 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLHeadingElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHEADINGELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h b/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h index 312a51483e0..8d8af0dd117 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLHtmlElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHTMLELEMENT_IID; return iid; } NS_IMETHOD GetVersion(nsString& aVersion)=0; NS_IMETHOD SetVersion(const nsString& aVersion)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h b/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h index f879fc7d89c..9647ab1c083 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLIFrameElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLIFRAMEELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLImageElement.h b/mozilla/dom/public/html/nsIDOMHTMLImageElement.h index 027149a6275..e78cb952a8e 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLImageElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLImageElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLImageElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLIMAGEELEMENT_IID; return iid; } NS_IMETHOD GetLowSrc(nsString& aLowSrc)=0; NS_IMETHOD SetLowSrc(const nsString& aLowSrc)=0; @@ -133,16 +134,6 @@ public: NS_IMETHOD SetWidth(const nsString& aWidth) { return _to##SetWidth(aWidth); } \ -#define NS_IDOMHTMLIMAGEELEMENTFACTORY_IID \ - { 0xa6cf90c8, 0x15b3, 0x11d2, \ - { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } - -class nsIDOMHTMLImageElementFactory : public nsISupports { -public: - NS_IMETHOD CreateInstance(nsIDOMHTMLImageElement **aReturn)=0; - -}; - extern nsresult NS_InitHTMLImageElementClass(nsIScriptContext *aContext, void **aPrototype); extern "C" NS_DOM nsresult NS_NewScriptHTMLImageElement(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn); diff --git a/mozilla/dom/public/html/nsIDOMHTMLInputElement.h b/mozilla/dom/public/html/nsIDOMHTMLInputElement.h index d9f07b7f8cd..1b17f836bfb 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLInputElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLInputElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLInputElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLINPUTELEMENT_IID; return iid; } NS_IMETHOD GetDefaultValue(nsString& aDefaultValue)=0; NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h b/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h index 5f2226bf338..efa2e5ba141 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLIsIndexElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLISINDEXELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLLIElement.h b/mozilla/dom/public/html/nsIDOMHTMLLIElement.h index f91001a1b9a..ed35d87d34f 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLLIElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLLIElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLLIElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLIELEMENT_IID; return iid; } NS_IMETHOD GetType(nsString& aType)=0; NS_IMETHOD SetType(const nsString& aType)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h b/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h index 57d1c8ccefd..bf4f7aa0b39 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLLabelElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLABELELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h b/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h index c366717bc97..cd8a7fff5a5 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLLegendElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLEGENDELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h b/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h index 03e3bd580f5..891800fa466 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLLinkElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLINKELEMENT_IID; return iid; } NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLMapElement.h b/mozilla/dom/public/html/nsIDOMHTMLMapElement.h index 6c5cd0136a1..0369e95ac11 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLMapElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLMapElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLCollection; class nsIDOMHTMLMapElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMAPELEMENT_IID; return iid; } NS_IMETHOD GetAreas(nsIDOMHTMLCollection** aAreas)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h b/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h index 8fd0963c66a..a4039100eae 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLMenuElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMENUELEMENT_IID; return iid; } NS_IMETHOD GetCompact(PRBool* aCompact)=0; NS_IMETHOD SetCompact(PRBool aCompact)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h b/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h index 78e205be0a9..7dc31447f16 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLMetaElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMETAELEMENT_IID; return iid; } NS_IMETHOD GetContent(nsString& aContent)=0; NS_IMETHOD SetContent(const nsString& aContent)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLModElement.h b/mozilla/dom/public/html/nsIDOMHTMLModElement.h index 0ed8dc81785..d231eb5e90b 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLModElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLModElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLModElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMODELEMENT_IID; return iid; } NS_IMETHOD GetCite(nsString& aCite)=0; NS_IMETHOD SetCite(const nsString& aCite)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLOListElement.h b/mozilla/dom/public/html/nsIDOMHTMLOListElement.h index 90b61d57780..44deb69ba41 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLOListElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLOListElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLOListElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOLISTELEMENT_IID; return iid; } NS_IMETHOD GetCompact(PRBool* aCompact)=0; NS_IMETHOD SetCompact(PRBool aCompact)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h b/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h index e30f212facc..7bc119a0e67 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLObjectElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOBJECTELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h b/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h index 95f22831c1f..96b2334ab9a 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLOptGroupElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOPTGROUPELEMENT_IID; return iid; } NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h b/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h index 8c3d20256b1..e96d8bb5776 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLOptionElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOPTIONELEMENT_IID; return iid; } NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h b/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h index 5a3356e1fbd..1e42342961d 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLParagraphElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLPARAGRAPHELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLParamElement.h b/mozilla/dom/public/html/nsIDOMHTMLParamElement.h index 1b420d9c836..d44113fdd6c 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLParamElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLParamElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLParamElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLPARAMELEMENT_IID; return iid; } NS_IMETHOD GetName(nsString& aName)=0; NS_IMETHOD SetName(const nsString& aName)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLPreElement.h b/mozilla/dom/public/html/nsIDOMHTMLPreElement.h index bcc0170de36..40a1688c3b1 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLPreElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLPreElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLPreElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLPREELEMENT_IID; return iid; } NS_IMETHOD GetWidth(PRInt32* aWidth)=0; NS_IMETHOD SetWidth(PRInt32 aWidth)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h b/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h index 8f8880c06ea..64c30d0b876 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLQuoteElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLQUOTEELEMENT_IID; return iid; } NS_IMETHOD GetCite(nsString& aCite)=0; NS_IMETHOD SetCite(const nsString& aCite)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h b/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h index 97ee11a34e5..3490f0c1b85 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLScriptElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLSCRIPTELEMENT_IID; return iid; } NS_IMETHOD GetText(nsString& aText)=0; NS_IMETHOD SetText(const nsString& aText)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h b/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h index de4b6eb6ae2..144d411752c 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h @@ -35,6 +35,7 @@ class nsIDOMHTMLCollection; class nsIDOMHTMLSelectElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLSELECTELEMENT_IID; return iid; } NS_IMETHOD GetType(nsString& aType)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h b/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h index 6ea73960b62..a05afe8a41d 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLStyleElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLSTYLEELEMENT_IID; return iid; } NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h index ab4a6bb9827..292a67a7e86 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLTableCaptionElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLECAPTIONELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h index a030b220dba..1d5a9126aa6 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLTableCellElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLECELLELEMENT_IID; return iid; } NS_IMETHOD GetCellIndex(PRInt32* aCellIndex)=0; NS_IMETHOD SetCellIndex(PRInt32 aCellIndex)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h index 7931649de43..a6f6bde1024 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLTableColElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLECOLELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableElement.h index 84dc9dc98dc..f02fed76266 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTableElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTableElement.h @@ -36,6 +36,7 @@ class nsIDOMHTMLCollection; class nsIDOMHTMLTableElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLEELEMENT_IID; return iid; } NS_IMETHOD GetCaption(nsIDOMHTMLTableCaptionElement** aCaption)=0; NS_IMETHOD SetCaption(nsIDOMHTMLTableCaptionElement* aCaption)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h index bfc3dadbd9a..3969bf2eb5e 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h @@ -34,6 +34,7 @@ class nsIDOMHTMLCollection; class nsIDOMHTMLTableRowElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLEROWELEMENT_IID; return iid; } NS_IMETHOD GetRowIndex(PRInt32* aRowIndex)=0; NS_IMETHOD SetRowIndex(PRInt32 aRowIndex)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h index e980993602d..f03446cd327 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h @@ -34,6 +34,7 @@ class nsIDOMHTMLCollection; class nsIDOMHTMLTableSectionElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLESECTIONELEMENT_IID; return iid; } NS_IMETHOD GetAlign(nsString& aAlign)=0; NS_IMETHOD SetAlign(const nsString& aAlign)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h b/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h index 710e98dfdcf..6bf47d0b2ee 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h @@ -33,6 +33,7 @@ class nsIDOMHTMLFormElement; class nsIDOMHTMLTextAreaElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTEXTAREAELEMENT_IID; return iid; } NS_IMETHOD GetDefaultValue(nsString& aDefaultValue)=0; NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h b/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h index 860828f5c35..4341f6831e4 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLTitleElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTITLEELEMENT_IID; return iid; } NS_IMETHOD GetText(nsString& aText)=0; NS_IMETHOD SetText(const nsString& aText)=0; diff --git a/mozilla/dom/public/html/nsIDOMHTMLUListElement.h b/mozilla/dom/public/html/nsIDOMHTMLUListElement.h index 90599c999a6..f75517e2094 100644 --- a/mozilla/dom/public/html/nsIDOMHTMLUListElement.h +++ b/mozilla/dom/public/html/nsIDOMHTMLUListElement.h @@ -32,6 +32,7 @@ class nsIDOMHTMLUListElement : public nsIDOMHTMLElement { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLULISTELEMENT_IID; return iid; } NS_IMETHOD GetCompact(PRBool* aCompact)=0; NS_IMETHOD SetCompact(PRBool aCompact)=0; diff --git a/mozilla/dom/public/html/nsIDOMImage.h b/mozilla/dom/public/html/nsIDOMImage.h index e28dc5db0f3..cfa57d2fdf5 100644 --- a/mozilla/dom/public/html/nsIDOMImage.h +++ b/mozilla/dom/public/html/nsIDOMImage.h @@ -31,6 +31,7 @@ class nsIDOMImage : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMIMAGE_IID; return iid; } }; diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h b/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h index f2fff613360..199d4bd17ca 100644 --- a/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h +++ b/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h @@ -31,6 +31,7 @@ class nsIDOMNSHTMLButtonElement : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNSHTMLBUTTONELEMENT_IID; return iid; } NS_IMETHOD Blur()=0; diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h index e8c8847ab18..fd6c2833173 100644 --- a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h +++ b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h @@ -33,6 +33,7 @@ class nsIDOMHTMLCollection; class nsIDOMNSHTMLDocument : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNSHTMLDOCUMENT_IID; return iid; } NS_IMETHOD GetAlinkColor(nsString& aAlinkColor)=0; NS_IMETHOD SetAlinkColor(const nsString& aAlinkColor)=0; diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h b/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h index 8ec3fc851b4..5421a16e192 100644 --- a/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h +++ b/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h @@ -32,6 +32,7 @@ class nsIDOMElement; class nsIDOMNSHTMLFormElement : public nsISupports { public: + static const nsIID& IID() { static nsIID iid = NS_IDOMNSHTMLFORMELEMENT_IID; return iid; } NS_IMETHOD GetEncoding(nsString& aEncoding)=0; diff --git a/mozilla/dom/public/nsDOMCID.h b/mozilla/dom/public/nsDOMCID.h index 377705964e0..35c840dfd5c 100644 --- a/mozilla/dom/public/nsDOMCID.h +++ b/mozilla/dom/public/nsDOMCID.h @@ -33,7 +33,7 @@ 0x651074a0, 0x4cd4, 0x11d2, \ {0xb3, 0x28, 0x00, 0x80, 0x5f, 0x8a, 0x38, 0x59 } } -#define NS_DOM_SCRIPT_NAMESET_REGISTRY_CID \ +#define NS_SCRIPT_NAMESET_REGISTRY_CID \ { /* 45f27d10-987b-11d2-bd40-00105aa45e89 */ \ 0x45f27d10, 0x987b, 0x11d2, \ {0xbd, 0x40, 0x00, 0x10, 0x5a, 0xa4, 0x5e, 0x89} } diff --git a/mozilla/dom/public/nsIScriptNameSetRegistry.h b/mozilla/dom/public/nsIScriptNameSetRegistry.h index 8531ad8f779..d3242c555cf 100644 --- a/mozilla/dom/public/nsIScriptNameSetRegistry.h +++ b/mozilla/dom/public/nsIScriptNameSetRegistry.h @@ -28,6 +28,7 @@ {0xa6cf90d9, 0x15b3, 0x11d2, \ {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}} +class nsIScriptContext; class nsIScriptExternalNameSet; /** @@ -47,13 +48,23 @@ public: */ NS_IMETHOD AddExternalNameSet(nsIScriptExternalNameSet* aNameSet) = 0; - /* + /** * Remove a name set from the manager's list. * * @param aNameSet the name set to unregister. * @result NS_OK if successful */ NS_IMETHOD RemoveExternalNameSet(nsIScriptExternalNameSet* aNameSet) = 0; + + /** + * Populate the specified script context with all of the + * name sets in the registry. Will generally be called when the + * script context first needs to create a name space manager. + * + * @param aScriptContext the script context to populate + * @result NS_OK if successful + */ + NS_IMETHOD PopulateNameSpace(nsIScriptContext* aContext) = 0; }; #endif /* nsIScriptNameSetRegistry_h__ */ diff --git a/mozilla/dom/public/nsIScriptNameSpaceManager.h b/mozilla/dom/public/nsIScriptNameSpaceManager.h index bf609db25a3..2200acb8f4e 100644 --- a/mozilla/dom/public/nsIScriptNameSpaceManager.h +++ b/mozilla/dom/public/nsIScriptNameSpaceManager.h @@ -79,4 +79,6 @@ public: nsIID& aCID) = 0; }; +extern "C" NS_DOM nsresult NS_NewScriptNameSpaceManager(nsIScriptNameSpaceManager** aInstancePtr); + #endif /* nsIScriptNameSpaceManager_h__ */ diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 03193008e0a..97ad09534f3 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -29,6 +29,10 @@ #include "nsIDOMNodeList.h" #include "nsIDOMHTMLImageElement.h" #include "nsIScriptSecurityManager.h" +#include "nsIScriptNameSetRegistry.h" +#include "nsIScriptNameSpaceManager.h" +#include "nsDOMCID.h" +#include "nsIServiceManager.h" const uint32 gGCSize = 4L * 1024L * 1024L; const size_t gStackSize = 8192; @@ -36,6 +40,8 @@ const size_t gStackSize = 8192; static NS_DEFINE_IID(kIScriptContextIID, NS_ISCRIPTCONTEXT_IID); static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID); +static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID); +static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID); void PR_CALLBACK NS_ScriptErrorReporter(JSContext *cx, const char *message, JSErrorReport *report) @@ -54,6 +60,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) mRefCnt = 0; mContext = JS_NewContext(aRuntime, gStackSize); JS_SetContextPrivate(mContext, (void *)this); + mNameSpaceManager = nsnull; } nsJSContext::~nsJSContext() @@ -204,7 +211,27 @@ nsJSContext::GC() NS_IMETHODIMP nsJSContext::GetNameSpaceManager(nsIScriptNameSpaceManager** aInstancePtr) { - return NS_OK; + nsresult result = NS_OK; + + if (nsnull == mNameSpaceManager) { + result = NS_NewScriptNameSpaceManager(&mNameSpaceManager); + if (NS_OK == result) { + nsIScriptNameSetRegistry* registry; + result = nsServiceManager::GetService(kCScriptNameSetRegistryCID, + kIScriptNameSetRegistryIID, + (nsISupports **)®istry); + if (NS_OK == result) { + result = registry->PopulateNameSpace(this); + nsServiceManager::ReleaseService(kCScriptNameSetRegistryCID, + registry); + } + } + } + + *aInstancePtr = mNameSpaceManager; + NS_ADDREF(mNameSpaceManager); + + return result; } NS_IMETHODIMP diff --git a/mozilla/dom/src/base/nsJSEnvironment.h b/mozilla/dom/src/base/nsJSEnvironment.h index c6bec9882b9..385a9af109e 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.h +++ b/mozilla/dom/src/base/nsJSEnvironment.h @@ -22,10 +22,12 @@ #include "jsapi.h" class nsIScriptSecurityManager; +class nsIScriptNameSpaceManager; class nsJSContext : public nsIScriptContext { private: JSContext *mContext; + nsIScriptNameSpaceManager* mNameSpaceManager; public: nsJSContext(JSRuntime *aRuntime); diff --git a/mozilla/dom/src/base/nsJSLocation.cpp b/mozilla/dom/src/base/nsJSLocation.cpp index df24467f4d9..9c7fdbaad6b 100644 --- a/mozilla/dom/src/base/nsJSLocation.cpp +++ b/mozilla/dom/src/base/nsJSLocation.cpp @@ -70,7 +70,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHash(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -81,7 +81,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHost(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -92,7 +92,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHostname(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -103,7 +103,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -114,7 +114,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPathname(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -125,7 +125,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPort(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -136,7 +136,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetProtocol(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -147,7 +147,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSearch(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -155,11 +155,11 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -184,7 +184,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_HASH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHash(prop); @@ -193,7 +193,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_HOST: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHost(prop); @@ -202,7 +202,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_HOSTNAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHostname(prop); @@ -211,7 +211,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_HREF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHref(prop); @@ -220,7 +220,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_PATHNAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPathname(prop); @@ -229,7 +229,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_PORT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPort(prop); @@ -238,7 +238,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_PROTOCOL: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetProtocol(prop); @@ -247,18 +247,18 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case LOCATION_SEARCH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSearch(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -271,7 +271,7 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeLocation(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -281,7 +281,7 @@ FinalizeLocation(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateLocation(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -291,7 +291,7 @@ EnumerateLocation(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveLocation(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -347,7 +347,7 @@ LocationReplace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->Replace(b0)) { return JS_FALSE; diff --git a/mozilla/dom/src/base/nsJSNavigator.cpp b/mozilla/dom/src/base/nsJSNavigator.cpp index 25b0b128d01..e8e33764a33 100644 --- a/mozilla/dom/src/base/nsJSNavigator.cpp +++ b/mozilla/dom/src/base/nsJSNavigator.cpp @@ -69,7 +69,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetUserAgent(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -80,7 +80,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAppCodeName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -91,7 +91,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAppVersion(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -102,7 +102,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAppName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -113,7 +113,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLanguage(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -124,7 +124,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPlatform(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -135,7 +135,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSecurityPolicy(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -143,11 +143,11 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -171,11 +171,11 @@ SetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -188,7 +188,7 @@ SetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeNavigator(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -198,7 +198,7 @@ FinalizeNavigator(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateNavigator(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -208,7 +208,7 @@ EnumerateNavigator(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveNavigator(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/base/nsJSUtils.cpp b/mozilla/dom/src/base/nsJSUtils.cpp index 88fe3a2f917..c4e15a66541 100644 --- a/mozilla/dom/src/base/nsJSUtils.cpp +++ b/mozilla/dom/src/base/nsJSUtils.cpp @@ -23,6 +23,7 @@ * the generated code itself. */ +#include "nsJSUtils.h" #include "jsapi.h" #include "nscore.h" #include "nsIScriptContext.h" @@ -30,20 +31,23 @@ #include "nsIScriptObjectOwner.h" #include "nsIScriptGlobalObject.h" #include "nsString.h" +#include "nsIScriptNameSpaceManager.h" +#include "nsRepository.h" +static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID); static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); PRBool -nsCallJSScriptObjectGetProperty(nsISupports* aSupports, - JSContext* aContext, - jsval aId, - jsval* aReturn) +nsJSUtils::nsCallJSScriptObjectGetProperty(nsISupports* aSupports, + JSContext* aContext, + jsval aId, + jsval* aReturn) { nsIJSScriptObject *object; if (NS_OK == aSupports->QueryInterface(kIJSScriptObjectIID, - (void**)&object)) { + (void**)&object)) { PRBool rval; rval = object->GetProperty(aContext, aId, aReturn); NS_RELEASE(object); @@ -54,15 +58,57 @@ nsCallJSScriptObjectGetProperty(nsISupports* aSupports, } PRBool -nsCallJSScriptObjectSetProperty(nsISupports* aSupports, - JSContext* aContext, - jsval aId, - jsval* aReturn) +nsJSUtils::nsLookupGlobalName(nsISupports* aSupports, + JSContext* aContext, + jsval aId, + jsval* aReturn) +{ + nsresult result; + + if (JSVAL_IS_STRING(aId)) { + JSString* jsstring = JS_ValueToString(aContext, aId); + nsAutoString name(JS_GetStringChars(jsstring)); + nsIScriptNameSpaceManager* manager; + nsIScriptContext* scriptContext = (nsIScriptContext*)JS_GetContextPrivate(aContext); + nsIID classID; + nsISupports* native; + + result = scriptContext->GetNameSpaceManager(&manager); + if (NS_OK == result) { + result = manager->LookupName(name, PR_FALSE, classID); + NS_RELEASE(manager); + if (NS_OK == result) { + result = nsRepository::CreateInstance(classID, + nsnull, + kISupportsIID, + (void **)&native); + if (NS_OK == result) { + nsConvertObjectToJSVal(native, aContext, aReturn); + return PR_TRUE; + } + else { + return PR_FALSE; + } + } + } + else { + return PR_FALSE; + } + } + + return nsCallJSScriptObjectGetProperty(aSupports, aContext, aId, aReturn); +} + +PRBool +nsJSUtils::nsCallJSScriptObjectSetProperty(nsISupports* aSupports, + JSContext* aContext, + jsval aId, + jsval* aReturn) { nsIJSScriptObject *object; if (NS_OK == aSupports->QueryInterface(kIJSScriptObjectIID, - (void**)&object)) { + (void**)&object)) { PRBool rval; rval = object->SetProperty(aContext, aId, aReturn); NS_RELEASE(object); @@ -73,9 +119,9 @@ nsCallJSScriptObjectSetProperty(nsISupports* aSupports, } void -nsConvertObjectToJSVal(nsISupports* aSupports, - JSContext* aContext, - jsval* aReturn) +nsJSUtils::nsConvertObjectToJSVal(nsISupports* aSupports, + JSContext* aContext, + jsval* aReturn) { // get the js object\n" if (aSupports != nsnull) { @@ -84,8 +130,8 @@ nsConvertObjectToJSVal(nsISupports* aSupports, JSObject *object = nsnull; nsIScriptContext *script_cx = (nsIScriptContext *)JS_GetContextPrivate(aContext); if (NS_OK == owner->GetScriptObject(script_cx, (void**)&object)) { - // set the return value - *aReturn = OBJECT_TO_JSVAL(object); + // set the return value + *aReturn = OBJECT_TO_JSVAL(object); } NS_RELEASE(owner); } @@ -97,9 +143,9 @@ nsConvertObjectToJSVal(nsISupports* aSupports, } void -nsConvertStringToJSVal(const nsString& aProp, - JSContext* aContext, - jsval* aReturn) +nsJSUtils::nsConvertStringToJSVal(const nsString& aProp, + JSContext* aContext, + jsval* aReturn) { JSString *jsstring = JS_NewUCStringCopyN(aContext, aProp, aProp.Length()); // set the return value @@ -108,11 +154,11 @@ nsConvertStringToJSVal(const nsString& aProp, PRBool -nsConvertJSValToObject(nsISupports** aSupports, - REFNSIID aIID, - const nsString& aTypeName, - JSContext* aContext, - jsval aValue) +nsJSUtils::nsConvertJSValToObject(nsISupports** aSupports, + REFNSIID aIID, + const nsString& aTypeName, + JSContext* aContext, + jsval aValue) { if (JSVAL_IS_NULL(aValue)) { *aSupports = nsnull; @@ -138,9 +184,9 @@ nsConvertJSValToObject(nsISupports** aSupports, } void -nsConvertJSValToString(nsString& aString, - JSContext* aContext, - jsval aValue) +nsJSUtils::nsConvertJSValToString(nsString& aString, + JSContext* aContext, + jsval aValue) { JSString *jsstring; if ((jsstring = JS_ValueToString(aContext, aValue)) != nsnull) { @@ -152,9 +198,9 @@ nsConvertJSValToString(nsString& aString, } PRBool -nsConvertJSValToBool(PRBool* aProp, - JSContext* aContext, - jsval aValue) +nsJSUtils::nsConvertJSValToBool(PRBool* aProp, + JSContext* aContext, + jsval aValue) { JSBool temp; if (JSVAL_IS_BOOLEAN(aValue) && JS_ValueToBoolean(aContext, aValue, &temp)) { @@ -169,17 +215,17 @@ nsConvertJSValToBool(PRBool* aProp, } void -nsGenericFinalize(JSContext* aContext, - JSObject* aObj) +nsJSUtils::nsGenericFinalize(JSContext* aContext, + JSObject* aObj) { nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(aContext, - aObj); + aObj); if (nsnull != nativeThis) { // get the js object nsIScriptObjectOwner *owner = nsnull; if (NS_OK == nativeThis->QueryInterface(kIScriptObjectOwnerIID, - (void**)&owner)) { + (void**)&owner)) { owner->SetScriptObject(nsnull); NS_RELEASE(owner); } @@ -189,11 +235,11 @@ nsGenericFinalize(JSContext* aContext, } JSBool -nsGenericEnumerate(JSContext* aContext, - JSObject* aObj) +nsJSUtils::nsGenericEnumerate(JSContext* aContext, + JSObject* aObj) { nsISupports* nativeThis = (nsISupports*)JS_GetPrivate(aContext, - aObj); + aObj); if (nsnull != nativeThis) { // get the js object @@ -206,13 +252,62 @@ nsGenericEnumerate(JSContext* aContext, return JS_TRUE; } +JSBool +nsJSUtils::nsGlobalResolve(JSContext* aContext, + JSObject* aObj, + jsval aId) +{ + nsresult result; + jsval val; + + if (JSVAL_IS_STRING(aId)) { + JSString* jsstring = JS_ValueToString(aContext, aId); + nsAutoString name(JS_GetStringChars(jsstring)); + nsIScriptNameSpaceManager* manager; + nsIScriptContext* scriptContext = (nsIScriptContext*)JS_GetContextPrivate(aContext); + nsIID classID; + nsISupports* native; + + result = scriptContext->GetNameSpaceManager(&manager); + if (NS_OK == result) { + result = manager->LookupName(name, PR_FALSE, classID); + NS_RELEASE(manager); + if (NS_OK == result) { + result = nsRepository::CreateInstance(classID, + nsnull, + kISupportsIID, + (void **)&native); + if (NS_OK == result) { + nsConvertObjectToJSVal(native, aContext, &val); + if (JS_DefineProperty(aContext, aObj, JS_GetStringBytes(jsstring), + val, nsnull, nsnull, + JSPROP_ENUMERATE | JSPROP_READONLY)) { + return PR_TRUE; + } + else { + return PR_FALSE; + } + } + else { + return PR_FALSE; + } + } + } + else { + return PR_FALSE; + } + } + + return PR_TRUE; +} + JSBool -nsGenericResolve(JSContext* aContext, - JSObject* aObj, - jsval aId) +nsJSUtils::nsGenericResolve(JSContext* aContext, + JSObject* aObj, + jsval aId) { nsISupports* nativeThis = (nsISupports*)JS_GetPrivate(aContext, - aObj); + aObj); if (nsnull != nativeThis) { // get the js object @@ -224,3 +319,4 @@ nsGenericResolve(JSContext* aContext, } return JS_TRUE; } + diff --git a/mozilla/dom/src/base/nsJSUtils.h b/mozilla/dom/src/base/nsJSUtils.h index 3c8060b0e3b..2e68d3b1e40 100644 --- a/mozilla/dom/src/base/nsJSUtils.h +++ b/mozilla/dom/src/base/nsJSUtils.h @@ -16,6 +16,9 @@ * Reserved. */ +#ifndef nsJSUtils_h__ +#define nsJSUtils_h__ + /** * This is not a generated file. It contains common utility functions * invoked from the JavaScript code generated from IDL interfaces. @@ -27,44 +30,58 @@ #include "jsapi.h" #include "nsString.h" -PRBool nsCallJSScriptObjectGetProperty(nsISupports* aSupports, - JSContext* aContext, - jsval aId, - jsval* aReturn); +class nsJSUtils { +public: + static PRBool nsCallJSScriptObjectGetProperty(nsISupports* aSupports, + JSContext* aContext, + jsval aId, + jsval* aReturn); -PRBool nsCallJSScriptObjectSetProperty(nsISupports* aSupports, - JSContext* aContext, - jsval aId, - jsval* aReturn); + static PRBool nsLookupGlobalName(nsISupports* aSupports, + JSContext* aContext, + jsval aId, + jsval* aReturn); -void nsConvertObjectToJSVal(nsISupports* aSupports, - JSContext* aContext, - jsval* aReturn); + static PRBool nsCallJSScriptObjectSetProperty(nsISupports* aSupports, + JSContext* aContext, + jsval aId, + jsval* aReturn); -void nsConvertStringToJSVal(const nsString& aProp, - JSContext* aContext, - jsval* aReturn); + static void nsConvertObjectToJSVal(nsISupports* aSupports, + JSContext* aContext, + jsval* aReturn); -PRBool nsConvertJSValToObject(nsISupports** aSupports, - REFNSIID aIID, - const nsString& aTypeName, - JSContext* aContext, - jsval aValue); + static void nsConvertStringToJSVal(const nsString& aProp, + JSContext* aContext, + jsval* aReturn); -void nsConvertJSValToString(nsString& aString, - JSContext* aContext, - jsval aValue); + static PRBool nsConvertJSValToObject(nsISupports** aSupports, + REFNSIID aIID, + const nsString& aTypeName, + JSContext* aContext, + jsval aValue); -PRBool nsConvertJSValToBool(PRBool* aProp, - JSContext* aContext, - jsval aValue); + static void nsConvertJSValToString(nsString& aString, + JSContext* aContext, + jsval aValue); -void nsGenericFinalize(JSContext* aContext, - JSObject* aObj); + static PRBool nsConvertJSValToBool(PRBool* aProp, + JSContext* aContext, + jsval aValue); + + static void nsGenericFinalize(JSContext* aContext, + JSObject* aObj); -JSBool nsGenericEnumerate(JSContext* aContext, - JSObject* aObj); + static JSBool nsGenericEnumerate(JSContext* aContext, + JSObject* aObj); -JSBool nsGenericResolve(JSContext* aContext, - JSObject* aObj, - jsval aId); + static JSBool nsGlobalResolve(JSContext* aContext, + JSObject* aObj, + jsval aId); + + static JSBool nsGenericResolve(JSContext* aContext, + JSObject* aObj, + jsval aId); +}; + +#endif /* nsJSUtils_h__ */ diff --git a/mozilla/dom/src/base/nsJSWindow.cpp b/mozilla/dom/src/base/nsJSWindow.cpp index 12d79adbea3..6eb2efa3978 100644 --- a/mozilla/dom/src/base/nsJSWindow.cpp +++ b/mozilla/dom/src/base/nsJSWindow.cpp @@ -95,7 +95,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindow* prop; if (NS_OK == a->GetWindow(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -107,7 +107,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindow* prop; if (NS_OK == a->GetSelf(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -119,7 +119,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMDocument* prop; if (NS_OK == a->GetDocument(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -131,7 +131,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNavigator* prop; if (NS_OK == a->GetNavigator(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -143,7 +143,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindow* prop; if (NS_OK == a->GetParent(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -155,7 +155,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindow* prop; if (NS_OK == a->GetTop(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -178,7 +178,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindowCollection* prop; if (NS_OK == a->GetFrames(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -190,7 +190,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindow* prop; if (NS_OK == a->GetOpener(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -201,7 +201,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetStatus(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -212,7 +212,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDefaultStatus(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -223,7 +223,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -319,11 +319,11 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -348,7 +348,7 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case WINDOW_OPENER: { nsIDOMWindow* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kIWindowIID, "Window", cx, *vp)) { return JS_FALSE; @@ -361,7 +361,7 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case WINDOW_STATUS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetStatus(prop); @@ -370,7 +370,7 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case WINDOW_DEFAULTSTATUS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDefaultStatus(prop); @@ -379,7 +379,7 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case WINDOW_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -514,11 +514,11 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -540,7 +540,7 @@ FinalizeWindow(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateWindow(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -550,7 +550,7 @@ EnumerateWindow(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveWindow(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGlobalResolve(cx, obj, id); } @@ -573,7 +573,7 @@ WindowDump(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->Dump(b0)) { return JS_FALSE; @@ -609,7 +609,7 @@ WindowAlert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->Alert(b0)) { return JS_FALSE; @@ -1296,7 +1296,7 @@ WindowOpen(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function open requires 0 parameters"); @@ -1332,7 +1332,7 @@ EventCapturerCaptureEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CaptureEvent(b0)) { return JS_FALSE; @@ -1374,7 +1374,7 @@ EventCapturerReleaseEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->ReleaseEvent(b0)) { return JS_FALSE; diff --git a/mozilla/dom/src/base/nsJSWindowCollection.cpp b/mozilla/dom/src/base/nsJSWindowCollection.cpp index e93fdfc494a..baf919ee323 100644 --- a/mozilla/dom/src/base/nsJSWindowCollection.cpp +++ b/mozilla/dom/src/base/nsJSWindowCollection.cpp @@ -78,7 +78,7 @@ GetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMWindow* prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), &prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -101,10 +101,10 @@ GetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->NamedItem(name, &prop)) { if (NULL != prop) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { @@ -112,7 +112,7 @@ GetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,11 +136,11 @@ SetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -153,7 +153,7 @@ SetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeWindowCollection(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -163,7 +163,7 @@ FinalizeWindowCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateWindowCollection(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -173,7 +173,7 @@ EnumerateWindowCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveWindowCollection(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -206,7 +206,7 @@ WindowCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); @@ -237,13 +237,13 @@ WindowCollectionNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->NamedItem(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function namedItem requires 1 parameters"); diff --git a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp index ef6af37c3df..71efb4b7a52 100644 --- a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp @@ -52,9 +52,9 @@ nsScriptNameSpaceManager::~nsScriptNameSpaceManager() } } -static NS_DEFINE_IID(kIScriptNameSpaceManager, NS_ISCRIPTNAMESPACEMANAGER_IID); +static NS_DEFINE_IID(kIScriptNameSpaceManagerIID, NS_ISCRIPTNAMESPACEMANAGER_IID); -NS_IMPL_ISUPPORTS(nsScriptNameSpaceManager, kIScriptNameSpaceManager); +NS_IMPL_ISUPPORTS(nsScriptNameSpaceManager, kIScriptNameSpaceManagerIID); NS_IMETHODIMP nsScriptNameSpaceManager::RegisterGlobalName(const nsString& aName, @@ -123,3 +123,22 @@ nsScriptNameSpaceManager::LookupName(const nsString& aName, return NS_COMFALSE; } + +extern "C" NS_DOM nsresult +NS_NewScriptNameSpaceManager(nsIScriptNameSpaceManager** aInstancePtr) +{ + if (nsnull == aInstancePtr) { + return NS_ERROR_NULL_POINTER; + } + + *aInstancePtr = NULL; + + nsScriptNameSpaceManager *manager = new nsScriptNameSpaceManager(); + if (nsnull == manager) { + return NS_ERROR_OUT_OF_MEMORY; + } + + return manager->QueryInterface(kIScriptNameSpaceManagerIID, (void **)aInstancePtr); + +} + diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp index fa78e575bfd..7f379f516ab 100644 --- a/mozilla/dom/src/build/nsDOMFactory.cpp +++ b/mozilla/dom/src/build/nsDOMFactory.cpp @@ -24,6 +24,7 @@ #include "nsDOMCID.h" #include "nsIDOMScriptObjectFactory.h" #include "nsIDOMNativeObjectRegistry.h" +#include "nsScriptNameSetRegistry.h" #include "nsIScriptEventListener.h" #include "jsurl.h" #include "nsIScriptContext.h" @@ -541,6 +542,7 @@ nsDOMScriptObjectFactory::NewScriptProcessingInstruction(nsIScriptContext *aCont static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); static NS_DEFINE_IID(kCDOMNativeObjectRegistry, NS_DOM_NATIVE_OBJECT_REGISTRY_CID); +static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); @@ -635,9 +637,12 @@ nsresult nsDOMFactory::CreateInstance(nsISupports *aOuter, if (mClassID.Equals(kCDOMScriptObjectFactory)) { inst = (nsISupports *)new nsDOMScriptObjectFactory(); } - if (mClassID.Equals(kCDOMNativeObjectRegistry)) { + else if (mClassID.Equals(kCDOMNativeObjectRegistry)) { inst = (nsISupports *)new nsDOMNativeObjectRegistry(); } + else if (mClassID.Equals(kCScriptNameSetRegistry)) { + inst = (nsISupports *)new nsScriptNameSetRegistry(); + } if (inst == NULL) { return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/dom/src/build/nsScriptNameSetRegistry.cpp b/mozilla/dom/src/build/nsScriptNameSetRegistry.cpp index 9052584f362..1ef4ac8060d 100644 --- a/mozilla/dom/src/build/nsScriptNameSetRegistry.cpp +++ b/mozilla/dom/src/build/nsScriptNameSetRegistry.cpp @@ -64,3 +64,23 @@ nsScriptNameSetRegistry::RemoveExternalNameSet(nsIScriptExternalNameSet* aNameSe return NS_ERROR_INVALID_ARG; } } + +NS_IMETHODIMP +nsScriptNameSetRegistry::PopulateNameSpace(nsIScriptContext* aContext) +{ + nsresult result = NS_OK; + if (nsnull != aContext) { + PRInt32 i, count = mNameSets.Count(); + + for (i = 0; i < count; i++) { + nsIScriptExternalNameSet* ns = (nsIScriptExternalNameSet*)mNameSets.ElementAt(i); + if (nsnull != ns) { + result = ns->AddNameSet(aContext); + if (NS_OK != result) { + break; + } + } + } + } + return result; +} diff --git a/mozilla/dom/src/build/nsScriptNameSetRegistry.h b/mozilla/dom/src/build/nsScriptNameSetRegistry.h index 8f640dcdbfe..07827a662cf 100644 --- a/mozilla/dom/src/build/nsScriptNameSetRegistry.h +++ b/mozilla/dom/src/build/nsScriptNameSetRegistry.h @@ -21,6 +21,7 @@ #define nsScriptNameSetRegistry_h__ #include "nsIScriptNameSetRegistry.h" +#include "nsIScriptContext.h" #include "nsVoidArray.h" class nsScriptNameSetRegistry : public nsIScriptNameSetRegistry { @@ -32,6 +33,7 @@ class nsScriptNameSetRegistry : public nsIScriptNameSetRegistry { NS_IMETHOD AddExternalNameSet(nsIScriptExternalNameSet* aNameSet); NS_IMETHOD RemoveExternalNameSet(nsIScriptExternalNameSet* aNameSet); + NS_IMETHOD PopulateNameSpace(nsIScriptContext* aScriptContext); protected: nsVoidArray mNameSets; diff --git a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp index ef6af37c3df..71efb4b7a52 100644 --- a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp @@ -52,9 +52,9 @@ nsScriptNameSpaceManager::~nsScriptNameSpaceManager() } } -static NS_DEFINE_IID(kIScriptNameSpaceManager, NS_ISCRIPTNAMESPACEMANAGER_IID); +static NS_DEFINE_IID(kIScriptNameSpaceManagerIID, NS_ISCRIPTNAMESPACEMANAGER_IID); -NS_IMPL_ISUPPORTS(nsScriptNameSpaceManager, kIScriptNameSpaceManager); +NS_IMPL_ISUPPORTS(nsScriptNameSpaceManager, kIScriptNameSpaceManagerIID); NS_IMETHODIMP nsScriptNameSpaceManager::RegisterGlobalName(const nsString& aName, @@ -123,3 +123,22 @@ nsScriptNameSpaceManager::LookupName(const nsString& aName, return NS_COMFALSE; } + +extern "C" NS_DOM nsresult +NS_NewScriptNameSpaceManager(nsIScriptNameSpaceManager** aInstancePtr) +{ + if (nsnull == aInstancePtr) { + return NS_ERROR_NULL_POINTER; + } + + *aInstancePtr = NULL; + + nsScriptNameSpaceManager *manager = new nsScriptNameSpaceManager(); + if (nsnull == manager) { + return NS_ERROR_OUT_OF_MEMORY; + } + + return manager->QueryInterface(kIScriptNameSpaceManagerIID, (void **)aInstancePtr); + +} + diff --git a/mozilla/dom/src/coreDOM/nsJSAttr.cpp b/mozilla/dom/src/coreDOM/nsJSAttr.cpp index b0b65aca1ea..438387b39de 100644 --- a/mozilla/dom/src/coreDOM/nsJSAttr.cpp +++ b/mozilla/dom/src/coreDOM/nsJSAttr.cpp @@ -65,7 +65,7 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,18 +124,18 @@ SetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case ATTR_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -148,7 +148,7 @@ SetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeAttr(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -158,7 +158,7 @@ FinalizeAttr(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateAttr(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -168,7 +168,7 @@ EnumerateAttr(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveAttr(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp b/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp index ea5e4b21d8b..eb4151a039d 100644 --- a/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp +++ b/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp @@ -55,11 +55,11 @@ GetCDATASectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetCDATASectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetCDATASectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCDATASection(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeCDATASection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCDATASection(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateCDATASection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCDATASection(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp b/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp index 20fd498e3d5..c14ba2d2f39 100644 --- a/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp +++ b/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp @@ -64,7 +64,7 @@ GetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetData(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,18 +112,18 @@ SetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CHARACTERDATA_DATA: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetData(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,7 +136,7 @@ SetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCharacterData(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -146,7 +146,7 @@ FinalizeCharacterData(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCharacterData(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -156,7 +156,7 @@ EnumerateCharacterData(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCharacterData(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -195,7 +195,7 @@ CharacterDataSubstringData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function substringData requires 2 parameters"); @@ -225,7 +225,7 @@ CharacterDataAppendData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->AppendData(b0)) { return JS_FALSE; @@ -267,7 +267,7 @@ CharacterDataInsertData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j return JS_FALSE; } - nsConvertJSValToString(b1, cx, argv[1]); + nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]); if (NS_OK != nativeThis->InsertData(b0, b1)) { return JS_FALSE; @@ -360,7 +360,7 @@ CharacterDataReplaceData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, return JS_FALSE; } - nsConvertJSValToString(b2, cx, argv[2]); + nsJSUtils::nsConvertJSValToString(b2, cx, argv[2]); if (NS_OK != nativeThis->ReplaceData(b0, b1, b2)) { return JS_FALSE; diff --git a/mozilla/dom/src/coreDOM/nsJSComment.cpp b/mozilla/dom/src/coreDOM/nsJSComment.cpp index e664fff5b61..814c71ce044 100644 --- a/mozilla/dom/src/coreDOM/nsJSComment.cpp +++ b/mozilla/dom/src/coreDOM/nsJSComment.cpp @@ -55,11 +55,11 @@ GetCommentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetCommentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetCommentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeComment(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeComment(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateComment(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateComment(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveComment(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp b/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp index e8edee407ea..9c3628e2654 100644 --- a/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp @@ -55,11 +55,11 @@ GetDOMImplementationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetDOMImplementationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetDOMImplementationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeDOMImplementation(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeDOMImplementation(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateDOMImplementation(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateDOMImplementation(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveDOMImplementation(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -145,9 +145,9 @@ DOMImplementationHasFeature(JSContext *cx, JSObject *obj, uintN argc, jsval *arg if (argc >= 2) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); - nsConvertJSValToString(b1, cx, argv[1]); + nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]); if (NS_OK != nativeThis->HasFeature(b0, b1, &nativeRet)) { return JS_FALSE; diff --git a/mozilla/dom/src/coreDOM/nsJSDocument.cpp b/mozilla/dom/src/coreDOM/nsJSDocument.cpp index 83d320156c9..d5dcef6ac2d 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocument.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocument.cpp @@ -109,7 +109,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMDocumentType* prop; if (NS_OK == a->GetDoctype(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -121,7 +121,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMDOMImplementation* prop; if (NS_OK == a->GetImplementation(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -133,7 +133,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMElement* prop; if (NS_OK == a->GetDocumentElement(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -147,7 +147,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->QueryInterface(kINSDocumentIID, (void **)&b)) { if(NS_OK == b->GetStyleSheets(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); } else { @@ -162,11 +162,11 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -190,11 +190,11 @@ SetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -207,7 +207,7 @@ SetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeDocument(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -217,7 +217,7 @@ FinalizeDocument(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateDocument(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -227,7 +227,7 @@ EnumerateDocument(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveDocument(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -251,13 +251,13 @@ DocumentCreateElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CreateElement(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createElement requires 1 parameters"); @@ -291,7 +291,7 @@ DocumentCreateDocumentFragment(JSContext *cx, JSObject *obj, uintN argc, jsval * return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createDocumentFragment requires 0 parameters"); @@ -322,13 +322,13 @@ DocumentCreateTextNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CreateTextNode(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createTextNode requires 1 parameters"); @@ -359,13 +359,13 @@ DocumentCreateComment(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CreateComment(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createComment requires 1 parameters"); @@ -396,13 +396,13 @@ DocumentCreateCDATASection(JSContext *cx, JSObject *obj, uintN argc, jsval *argv if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CreateCDATASection(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createCDATASection requires 1 parameters"); @@ -434,15 +434,15 @@ DocumentCreateProcessingInstruction(JSContext *cx, JSObject *obj, uintN argc, js if (argc >= 2) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); - nsConvertJSValToString(b1, cx, argv[1]); + nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]); if (NS_OK != nativeThis->CreateProcessingInstruction(b0, b1, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createProcessingInstruction requires 2 parameters"); @@ -473,13 +473,13 @@ DocumentCreateAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CreateAttribute(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createAttribute requires 1 parameters"); @@ -510,13 +510,13 @@ DocumentCreateEntityReference(JSContext *cx, JSObject *obj, uintN argc, jsval *a if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CreateEntityReference(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createEntityReference requires 1 parameters"); @@ -547,13 +547,13 @@ DocumentGetElementsByTagName(JSContext *cx, JSObject *obj, uintN argc, jsval *ar if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetElementsByTagName(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getElementsByTagName requires 1 parameters"); @@ -589,7 +589,7 @@ EventCapturerCaptureEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->CaptureEvent(b0)) { return JS_FALSE; @@ -631,7 +631,7 @@ EventCapturerReleaseEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->ReleaseEvent(b0)) { return JS_FALSE; diff --git a/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp b/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp index 3811d2ca4f2..4d19bf81ceb 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp @@ -55,11 +55,11 @@ GetDocumentFragmentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetDocumentFragmentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetDocumentFragmentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeDocumentFragment(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeDocumentFragment(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateDocumentFragment(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateDocumentFragment(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveDocumentFragment(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp b/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp index 9fe0d1adc3a..e95b2a05b39 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp @@ -68,7 +68,7 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -80,7 +80,7 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNamedNodeMap* prop; if (NS_OK == a->GetEntities(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -92,7 +92,7 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNamedNodeMap* prop; if (NS_OK == a->GetNotations(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -100,11 +100,11 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,11 +128,11 @@ SetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -145,7 +145,7 @@ SetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeDocumentType(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -155,7 +155,7 @@ FinalizeDocumentType(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateDocumentType(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -165,7 +165,7 @@ EnumerateDocumentType(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveDocumentType(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSElement.cpp b/mozilla/dom/src/coreDOM/nsJSElement.cpp index f7056324763..9e256d9cd2c 100644 --- a/mozilla/dom/src/coreDOM/nsJSElement.cpp +++ b/mozilla/dom/src/coreDOM/nsJSElement.cpp @@ -69,7 +69,7 @@ GetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTagName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -77,11 +77,11 @@ GetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -105,11 +105,11 @@ SetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -122,7 +122,7 @@ SetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -132,7 +132,7 @@ FinalizeElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -142,7 +142,7 @@ EnumerateElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -166,13 +166,13 @@ ElementGetDOMAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetDOMAttribute(b0, nativeRet)) { return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getDOMAttribute requires 1 parameters"); @@ -203,9 +203,9 @@ ElementSetDOMAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js if (argc >= 2) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); - nsConvertJSValToString(b1, cx, argv[1]); + nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]); if (NS_OK != nativeThis->SetDOMAttribute(b0, b1)) { return JS_FALSE; @@ -241,7 +241,7 @@ ElementRemoveAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->RemoveAttribute(b0)) { return JS_FALSE; @@ -278,13 +278,13 @@ ElementGetAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetAttributeNode(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getAttributeNode requires 1 parameters"); @@ -315,7 +315,7 @@ ElementSetAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kIAttrIID, "Attr", cx, @@ -327,7 +327,7 @@ ElementSetAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function setAttributeNode requires 1 parameters"); @@ -358,7 +358,7 @@ ElementRemoveAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kIAttrIID, "Attr", cx, @@ -370,7 +370,7 @@ ElementRemoveAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function removeAttributeNode requires 1 parameters"); @@ -401,13 +401,13 @@ ElementGetElementsByTagName(JSContext *cx, JSObject *obj, uintN argc, jsval *arg if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetElementsByTagName(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getElementsByTagName requires 1 parameters"); @@ -484,8 +484,8 @@ static JSPropertySpec ElementProperties[] = // static JSFunctionSpec ElementMethods[] = { - {"getAttribute", ElementGetDOMAttribute, 1}, - {"setAttribute", ElementSetDOMAttribute, 2}, + {"getDOMAttribute", ElementGetDOMAttribute, 1}, + {"setDOMAttribute", ElementSetDOMAttribute, 2}, {"removeAttribute", ElementRemoveAttribute, 1}, {"getAttributeNode", ElementGetAttributeNode, 1}, {"setAttributeNode", ElementSetAttributeNode, 1}, diff --git a/mozilla/dom/src/coreDOM/nsJSEntity.cpp b/mozilla/dom/src/coreDOM/nsJSEntity.cpp index 42a1785309d..265ffc122fd 100644 --- a/mozilla/dom/src/coreDOM/nsJSEntity.cpp +++ b/mozilla/dom/src/coreDOM/nsJSEntity.cpp @@ -65,7 +65,7 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPublicId(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -76,7 +76,7 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSystemId(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetNotationName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -123,11 +123,11 @@ SetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -140,7 +140,7 @@ SetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeEntity(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -150,7 +150,7 @@ FinalizeEntity(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateEntity(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -160,7 +160,7 @@ EnumerateEntity(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveEntity(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp b/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp index 4a4608b0e23..0627a31151f 100644 --- a/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp +++ b/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp @@ -55,11 +55,11 @@ GetEntityReferenceProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetEntityReferenceProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetEntityReferenceProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeEntityReference(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeEntityReference(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateEntityReference(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateEntityReference(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveEntityReference(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp b/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp index 05920a94bcd..6bb77c203f1 100644 --- a/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp @@ -78,7 +78,7 @@ GetNamedNodeMapProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), &prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetNamedNodeMapProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -111,11 +111,11 @@ SetNamedNodeMapProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetNamedNodeMapProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeNamedNodeMap(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -138,7 +138,7 @@ FinalizeNamedNodeMap(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateNamedNodeMap(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -148,7 +148,7 @@ EnumerateNamedNodeMap(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveNamedNodeMap(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -172,13 +172,13 @@ NamedNodeMapGetNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetNamedItem(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getNamedItem requires 1 parameters"); @@ -209,7 +209,7 @@ NamedNodeMapSetNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -221,7 +221,7 @@ NamedNodeMapSetNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function setNamedItem requires 1 parameters"); @@ -252,13 +252,13 @@ NamedNodeMapRemoveNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *arg if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->RemoveNamedItem(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function removeNamedItem requires 1 parameters"); @@ -298,7 +298,7 @@ NamedNodeMapItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); diff --git a/mozilla/dom/src/coreDOM/nsJSNode.cpp b/mozilla/dom/src/coreDOM/nsJSNode.cpp index e125d3c5d71..1dcf2853588 100644 --- a/mozilla/dom/src/coreDOM/nsJSNode.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNode.cpp @@ -82,7 +82,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetNodeName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -93,7 +93,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetNodeValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -116,7 +116,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetParentNode(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -128,7 +128,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNodeList* prop; if (NS_OK == a->GetChildNodes(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -140,7 +140,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetFirstChild(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -152,7 +152,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetLastChild(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -164,7 +164,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetPreviousSibling(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -176,7 +176,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetNextSibling(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -188,7 +188,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNamedNodeMap* prop; if (NS_OK == a->GetAttributes(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -200,7 +200,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMDocument* prop; if (NS_OK == a->GetOwnerDocument(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -208,11 +208,11 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -237,18 +237,18 @@ SetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case NODE_NODEVALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetNodeValue(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -261,7 +261,7 @@ SetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeNode(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -271,7 +271,7 @@ FinalizeNode(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateNode(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -281,7 +281,7 @@ EnumerateNode(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveNode(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -306,7 +306,7 @@ NodeInsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r if (argc >= 2) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -314,7 +314,7 @@ NodeInsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r return JS_FALSE; } - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b1, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1, kINodeIID, "Node", cx, @@ -326,7 +326,7 @@ NodeInsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function insertBefore requires 2 parameters"); @@ -358,7 +358,7 @@ NodeReplaceChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r if (argc >= 2) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -366,7 +366,7 @@ NodeReplaceChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r return JS_FALSE; } - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b1, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1, kINodeIID, "Node", cx, @@ -378,7 +378,7 @@ NodeReplaceChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function replaceChild requires 2 parameters"); @@ -409,7 +409,7 @@ NodeRemoveChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -421,7 +421,7 @@ NodeRemoveChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function removeChild requires 1 parameters"); @@ -452,7 +452,7 @@ NodeAppendChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -464,7 +464,7 @@ NodeAppendChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function appendChild requires 1 parameters"); @@ -529,7 +529,7 @@ NodeCloneNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval if (argc >= 1) { - if (!nsConvertJSValToBool(&b0, cx, argv[0])) { + if (!nsJSUtils::nsConvertJSValToBool(&b0, cx, argv[0])) { return JS_FALSE; } @@ -537,7 +537,7 @@ NodeCloneNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function cloneNode requires 1 parameters"); diff --git a/mozilla/dom/src/coreDOM/nsJSNodeList.cpp b/mozilla/dom/src/coreDOM/nsJSNodeList.cpp index 47222619764..85cb43cff26 100644 --- a/mozilla/dom/src/coreDOM/nsJSNodeList.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNodeList.cpp @@ -78,7 +78,7 @@ GetNodeListProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), &prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetNodeListProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -111,11 +111,11 @@ SetNodeListProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetNodeListProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeNodeList(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -138,7 +138,7 @@ FinalizeNodeList(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateNodeList(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -148,7 +148,7 @@ EnumerateNodeList(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveNodeList(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -181,7 +181,7 @@ NodeListItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); diff --git a/mozilla/dom/src/coreDOM/nsJSNotation.cpp b/mozilla/dom/src/coreDOM/nsJSNotation.cpp index 576eb000081..893610d4257 100644 --- a/mozilla/dom/src/coreDOM/nsJSNotation.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNotation.cpp @@ -64,7 +64,7 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPublicId(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -75,7 +75,7 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSystemId(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -111,11 +111,11 @@ SetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeNotation(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -138,7 +138,7 @@ FinalizeNotation(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateNotation(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -148,7 +148,7 @@ EnumerateNotation(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveNotation(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp b/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp index 43fc3fe763f..810ad2a871c 100644 --- a/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp +++ b/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp @@ -64,7 +64,7 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * { nsAutoString prop; if (NS_OK == a->GetTarget(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -75,7 +75,7 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * { nsAutoString prop; if (NS_OK == a->GetData(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,18 +112,18 @@ SetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * case PROCESSINGINSTRUCTION_DATA: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetData(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,7 +136,7 @@ SetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * PR_STATIC_CALLBACK(void) FinalizeProcessingInstruction(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -146,7 +146,7 @@ FinalizeProcessingInstruction(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateProcessingInstruction(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -156,7 +156,7 @@ EnumerateProcessingInstruction(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveProcessingInstruction(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSRange.cpp b/mozilla/dom/src/coreDOM/nsJSRange.cpp index 18428715006..436b1053212 100644 --- a/mozilla/dom/src/coreDOM/nsJSRange.cpp +++ b/mozilla/dom/src/coreDOM/nsJSRange.cpp @@ -75,7 +75,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetStartParent(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -98,7 +98,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetEndParent(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -132,7 +132,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetCommonParent(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -140,11 +140,11 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -168,11 +168,11 @@ SetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -185,7 +185,7 @@ SetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeRange(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -195,7 +195,7 @@ FinalizeRange(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateRange(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -205,7 +205,7 @@ EnumerateRange(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveRange(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -229,7 +229,7 @@ RangeSetStart(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval if (argc >= 2) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -276,7 +276,7 @@ RangeSetStartBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -318,7 +318,7 @@ RangeSetStartAfter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -361,7 +361,7 @@ RangeSetEnd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) if (argc >= 2) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -408,7 +408,7 @@ RangeSetEndBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -450,7 +450,7 @@ RangeSetEndAfter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -492,7 +492,7 @@ RangeCollapse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval if (argc >= 1) { - if (!nsConvertJSValToBool(&b0, cx, argv[0])) { + if (!nsJSUtils::nsConvertJSValToBool(&b0, cx, argv[0])) { return JS_FALSE; } @@ -530,7 +530,7 @@ RangeSelectNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -572,7 +572,7 @@ RangeSelectNodeContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -621,7 +621,7 @@ RangeCompareEndPoints(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv return JS_FALSE; } - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b1, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1, kIRangeIID, "Range", cx, @@ -700,7 +700,7 @@ RangeExtractContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function extractContents requires 0 parameters"); @@ -734,7 +734,7 @@ RangeCloneContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function cloneContents requires 0 parameters"); @@ -764,7 +764,7 @@ RangeInsertNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -806,7 +806,7 @@ RangeSurroundContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv if (argc >= 1) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kINodeIID, "Node", cx, @@ -852,7 +852,7 @@ RangeClone(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function clone requires 0 parameters"); @@ -886,7 +886,7 @@ RangeToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function toString requires 0 parameters"); diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp index d636e60fa4d..c072571b8f3 100644 --- a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp +++ b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp @@ -65,7 +65,7 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case STYLESHEET_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -133,11 +133,11 @@ SetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -150,7 +150,7 @@ SetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeStyleSheet(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -160,7 +160,7 @@ FinalizeStyleSheet(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateStyleSheet(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -170,7 +170,7 @@ EnumerateStyleSheet(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveStyleSheet(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp index 837740f715e..db723b250d1 100644 --- a/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp +++ b/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp @@ -78,7 +78,7 @@ GetStyleSheetCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v nsIDOMStyleSheet* prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), &prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetStyleSheetCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -111,11 +111,11 @@ SetStyleSheetCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetStyleSheetCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v PR_STATIC_CALLBACK(void) FinalizeStyleSheetCollection(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -138,7 +138,7 @@ FinalizeStyleSheetCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateStyleSheetCollection(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -148,7 +148,7 @@ EnumerateStyleSheetCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveStyleSheetCollection(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -181,7 +181,7 @@ StyleSheetCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); diff --git a/mozilla/dom/src/coreDOM/nsJSText.cpp b/mozilla/dom/src/coreDOM/nsJSText.cpp index dd90a5f2215..7de72f7c3b6 100644 --- a/mozilla/dom/src/coreDOM/nsJSText.cpp +++ b/mozilla/dom/src/coreDOM/nsJSText.cpp @@ -55,11 +55,11 @@ GetTextProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetTextProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetTextProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeText(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeText(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateText(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateText(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveText(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -153,7 +153,7 @@ TextSplitText(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function splitText requires 1 parameters"); diff --git a/mozilla/dom/src/css/nsJSCSS2Properties.cpp b/mozilla/dom/src/css/nsJSCSS2Properties.cpp index 71e21e826ce..35d3cffb6e4 100644 --- a/mozilla/dom/src/css/nsJSCSS2Properties.cpp +++ b/mozilla/dom/src/css/nsJSCSS2Properties.cpp @@ -185,7 +185,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAzimuth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -196,7 +196,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackground(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -207,7 +207,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackgroundAttachment(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -218,7 +218,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackgroundColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -229,7 +229,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackgroundImage(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -240,7 +240,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackgroundPosition(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -251,7 +251,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackgroundRepeat(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -262,7 +262,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorder(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -273,7 +273,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderCollapse(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -284,7 +284,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -295,7 +295,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderSpacing(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -306,7 +306,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -317,7 +317,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderTop(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -328,7 +328,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderRight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -339,7 +339,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderBottom(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -350,7 +350,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderLeft(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -361,7 +361,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderTopColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -372,7 +372,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderRightColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -383,7 +383,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderBottomColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -394,7 +394,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderLeftColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -405,7 +405,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderTopStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -416,7 +416,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderRightStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -427,7 +427,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderBottomStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -438,7 +438,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderLeftStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -449,7 +449,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderTopWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -460,7 +460,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderRightWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -471,7 +471,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderBottomWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -482,7 +482,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderLeftWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -493,7 +493,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorderWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -504,7 +504,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBottom(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -515,7 +515,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCaptionSide(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -526,7 +526,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetClear(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -537,7 +537,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetClip(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -548,7 +548,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -559,7 +559,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetContent(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -570,7 +570,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCounterIncrement(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -581,7 +581,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCounterReset(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -592,7 +592,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -603,7 +603,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCueAfter(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -614,7 +614,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCueBefore(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -625,7 +625,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCursor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -636,7 +636,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDirection(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -647,7 +647,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDisplay(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -658,7 +658,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetElevation(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -669,7 +669,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetEmptyCells(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -680,7 +680,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCssFloat(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -691,7 +691,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFont(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -702,7 +702,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontFamily(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -713,7 +713,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontSize(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -724,7 +724,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontSizeAdjust(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -735,7 +735,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontStretch(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -746,7 +746,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -757,7 +757,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontVariant(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -768,7 +768,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFontWeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -779,7 +779,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -790,7 +790,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLeft(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -801,7 +801,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLetterSpacing(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -812,7 +812,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLineHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -823,7 +823,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetListStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -834,7 +834,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetListStyleImage(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -845,7 +845,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetListStylePosition(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -856,7 +856,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetListStyleType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -867,7 +867,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMargin(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -878,7 +878,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginTop(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -889,7 +889,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginRight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -900,7 +900,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginBottom(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -911,7 +911,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginLeft(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -922,7 +922,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarkerOffset(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -933,7 +933,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarks(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -944,7 +944,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMaxHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -955,7 +955,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMaxWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -966,7 +966,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMinHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -977,7 +977,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMinWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -988,7 +988,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOrphans(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -999,7 +999,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOutline(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1010,7 +1010,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOutlineColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1021,7 +1021,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOutlineStyle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1032,7 +1032,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOutlineWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1043,7 +1043,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOverflow(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1054,7 +1054,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPadding(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1065,7 +1065,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPaddingTop(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1076,7 +1076,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPaddingRight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1087,7 +1087,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPaddingBottom(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1098,7 +1098,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPaddingLeft(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1109,7 +1109,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPage(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1120,7 +1120,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPageBreakAfter(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1131,7 +1131,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPageBreakBefore(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1142,7 +1142,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPageBreakInside(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1153,7 +1153,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPause(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1164,7 +1164,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPauseAfter(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1175,7 +1175,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPauseBefore(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1186,7 +1186,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPitch(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1197,7 +1197,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPitchRange(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1208,7 +1208,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPlayDuring(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1219,7 +1219,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPosition(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1230,7 +1230,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetQuotes(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1241,7 +1241,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRichness(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1252,7 +1252,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1263,7 +1263,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSize(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1274,7 +1274,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSpeak(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1285,7 +1285,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSpeakHeader(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1296,7 +1296,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSpeakNumeral(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1307,7 +1307,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSpeakPunctuation(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1318,7 +1318,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSpeechRate(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1329,7 +1329,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetStress(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1340,7 +1340,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTableLayout(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1351,7 +1351,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTextAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1362,7 +1362,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTextDecoration(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1373,7 +1373,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTextIndent(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1384,7 +1384,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTextShadow(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1395,7 +1395,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTextTransform(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1406,7 +1406,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTop(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1417,7 +1417,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetUnicodeBidi(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1428,7 +1428,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVerticalAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1439,7 +1439,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVisibility(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1450,7 +1450,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVoiceFamily(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1461,7 +1461,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVolume(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1472,7 +1472,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWhiteSpace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1483,7 +1483,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidows(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1494,7 +1494,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1505,7 +1505,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWordSpacing(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1516,7 +1516,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetZIndex(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1527,7 +1527,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetOpacity(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -1535,11 +1535,11 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -1564,7 +1564,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_AZIMUTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAzimuth(prop); @@ -1573,7 +1573,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BACKGROUND: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackground(prop); @@ -1582,7 +1582,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BACKGROUNDATTACHMENT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackgroundAttachment(prop); @@ -1591,7 +1591,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BACKGROUNDCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackgroundColor(prop); @@ -1600,7 +1600,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BACKGROUNDIMAGE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackgroundImage(prop); @@ -1609,7 +1609,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BACKGROUNDPOSITION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackgroundPosition(prop); @@ -1618,7 +1618,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BACKGROUNDREPEAT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackgroundRepeat(prop); @@ -1627,7 +1627,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorder(prop); @@ -1636,7 +1636,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERCOLLAPSE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderCollapse(prop); @@ -1645,7 +1645,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderColor(prop); @@ -1654,7 +1654,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERSPACING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderSpacing(prop); @@ -1663,7 +1663,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderStyle(prop); @@ -1672,7 +1672,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERTOP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderTop(prop); @@ -1681,7 +1681,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERRIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderRight(prop); @@ -1690,7 +1690,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERBOTTOM: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderBottom(prop); @@ -1699,7 +1699,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERLEFT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderLeft(prop); @@ -1708,7 +1708,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERTOPCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderTopColor(prop); @@ -1717,7 +1717,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERRIGHTCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderRightColor(prop); @@ -1726,7 +1726,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERBOTTOMCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderBottomColor(prop); @@ -1735,7 +1735,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERLEFTCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderLeftColor(prop); @@ -1744,7 +1744,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERTOPSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderTopStyle(prop); @@ -1753,7 +1753,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERRIGHTSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderRightStyle(prop); @@ -1762,7 +1762,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERBOTTOMSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderBottomStyle(prop); @@ -1771,7 +1771,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERLEFTSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderLeftStyle(prop); @@ -1780,7 +1780,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERTOPWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderTopWidth(prop); @@ -1789,7 +1789,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERRIGHTWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderRightWidth(prop); @@ -1798,7 +1798,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERBOTTOMWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderBottomWidth(prop); @@ -1807,7 +1807,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERLEFTWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderLeftWidth(prop); @@ -1816,7 +1816,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BORDERWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorderWidth(prop); @@ -1825,7 +1825,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_BOTTOM: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBottom(prop); @@ -1834,7 +1834,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CAPTIONSIDE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCaptionSide(prop); @@ -1843,7 +1843,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CLEAR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetClear(prop); @@ -1852,7 +1852,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CLIP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetClip(prop); @@ -1861,7 +1861,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_COLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetColor(prop); @@ -1870,7 +1870,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CONTENT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetContent(prop); @@ -1879,7 +1879,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_COUNTERINCREMENT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCounterIncrement(prop); @@ -1888,7 +1888,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_COUNTERRESET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCounterReset(prop); @@ -1897,7 +1897,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCue(prop); @@ -1906,7 +1906,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CUEAFTER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCueAfter(prop); @@ -1915,7 +1915,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CUEBEFORE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCueBefore(prop); @@ -1924,7 +1924,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CURSOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCursor(prop); @@ -1933,7 +1933,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_DIRECTION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDirection(prop); @@ -1942,7 +1942,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_DISPLAY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDisplay(prop); @@ -1951,7 +1951,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_ELEVATION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetElevation(prop); @@ -1960,7 +1960,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_EMPTYCELLS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetEmptyCells(prop); @@ -1969,7 +1969,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_CSSFLOAT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCssFloat(prop); @@ -1978,7 +1978,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFont(prop); @@ -1987,7 +1987,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTFAMILY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontFamily(prop); @@ -1996,7 +1996,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTSIZE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontSize(prop); @@ -2005,7 +2005,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTSIZEADJUST: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontSizeAdjust(prop); @@ -2014,7 +2014,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTSTRETCH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontStretch(prop); @@ -2023,7 +2023,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontStyle(prop); @@ -2032,7 +2032,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTVARIANT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontVariant(prop); @@ -2041,7 +2041,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_FONTWEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFontWeight(prop); @@ -2050,7 +2050,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_HEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeight(prop); @@ -2059,7 +2059,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LEFT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLeft(prop); @@ -2068,7 +2068,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LETTERSPACING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLetterSpacing(prop); @@ -2077,7 +2077,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LINEHEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLineHeight(prop); @@ -2086,7 +2086,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LISTSTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetListStyle(prop); @@ -2095,7 +2095,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LISTSTYLEIMAGE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetListStyleImage(prop); @@ -2104,7 +2104,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LISTSTYLEPOSITION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetListStylePosition(prop); @@ -2113,7 +2113,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_LISTSTYLETYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetListStyleType(prop); @@ -2122,7 +2122,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARGIN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMargin(prop); @@ -2131,7 +2131,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARGINTOP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginTop(prop); @@ -2140,7 +2140,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARGINRIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginRight(prop); @@ -2149,7 +2149,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARGINBOTTOM: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginBottom(prop); @@ -2158,7 +2158,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARGINLEFT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginLeft(prop); @@ -2167,7 +2167,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARKEROFFSET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarkerOffset(prop); @@ -2176,7 +2176,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MARKS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarks(prop); @@ -2185,7 +2185,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MAXHEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMaxHeight(prop); @@ -2194,7 +2194,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MAXWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMaxWidth(prop); @@ -2203,7 +2203,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MINHEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMinHeight(prop); @@ -2212,7 +2212,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_MINWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMinWidth(prop); @@ -2221,7 +2221,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_ORPHANS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOrphans(prop); @@ -2230,7 +2230,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_OUTLINE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOutline(prop); @@ -2239,7 +2239,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_OUTLINECOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOutlineColor(prop); @@ -2248,7 +2248,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_OUTLINESTYLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOutlineStyle(prop); @@ -2257,7 +2257,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_OUTLINEWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOutlineWidth(prop); @@ -2266,7 +2266,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_OVERFLOW: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOverflow(prop); @@ -2275,7 +2275,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PADDING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPadding(prop); @@ -2284,7 +2284,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PADDINGTOP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPaddingTop(prop); @@ -2293,7 +2293,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PADDINGRIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPaddingRight(prop); @@ -2302,7 +2302,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PADDINGBOTTOM: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPaddingBottom(prop); @@ -2311,7 +2311,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PADDINGLEFT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPaddingLeft(prop); @@ -2320,7 +2320,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAGE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPage(prop); @@ -2329,7 +2329,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAGEBREAKAFTER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPageBreakAfter(prop); @@ -2338,7 +2338,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAGEBREAKBEFORE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPageBreakBefore(prop); @@ -2347,7 +2347,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAGEBREAKINSIDE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPageBreakInside(prop); @@ -2356,7 +2356,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAUSE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPause(prop); @@ -2365,7 +2365,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAUSEAFTER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPauseAfter(prop); @@ -2374,7 +2374,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PAUSEBEFORE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPauseBefore(prop); @@ -2383,7 +2383,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PITCH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPitch(prop); @@ -2392,7 +2392,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PITCHRANGE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPitchRange(prop); @@ -2401,7 +2401,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_PLAYDURING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPlayDuring(prop); @@ -2410,7 +2410,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_POSITION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPosition(prop); @@ -2419,7 +2419,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_QUOTES: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetQuotes(prop); @@ -2428,7 +2428,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_RICHNESS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRichness(prop); @@ -2437,7 +2437,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_RIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRight(prop); @@ -2446,7 +2446,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_SIZE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSize(prop); @@ -2455,7 +2455,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_SPEAK: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSpeak(prop); @@ -2464,7 +2464,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_SPEAKHEADER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSpeakHeader(prop); @@ -2473,7 +2473,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_SPEAKNUMERAL: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSpeakNumeral(prop); @@ -2482,7 +2482,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_SPEAKPUNCTUATION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSpeakPunctuation(prop); @@ -2491,7 +2491,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_SPEECHRATE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSpeechRate(prop); @@ -2500,7 +2500,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_STRESS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetStress(prop); @@ -2509,7 +2509,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TABLELAYOUT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTableLayout(prop); @@ -2518,7 +2518,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TEXTALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTextAlign(prop); @@ -2527,7 +2527,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TEXTDECORATION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTextDecoration(prop); @@ -2536,7 +2536,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TEXTINDENT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTextIndent(prop); @@ -2545,7 +2545,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TEXTSHADOW: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTextShadow(prop); @@ -2554,7 +2554,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TEXTTRANSFORM: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTextTransform(prop); @@ -2563,7 +2563,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_TOP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTop(prop); @@ -2572,7 +2572,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_UNICODEBIDI: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetUnicodeBidi(prop); @@ -2581,7 +2581,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_VERTICALALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVerticalAlign(prop); @@ -2590,7 +2590,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_VISIBILITY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVisibility(prop); @@ -2599,7 +2599,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_VOICEFAMILY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVoiceFamily(prop); @@ -2608,7 +2608,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_VOLUME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVolume(prop); @@ -2617,7 +2617,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_WHITESPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWhiteSpace(prop); @@ -2626,7 +2626,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_WIDOWS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidows(prop); @@ -2635,7 +2635,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); @@ -2644,7 +2644,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_WORDSPACING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWordSpacing(prop); @@ -2653,7 +2653,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_ZINDEX: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetZIndex(prop); @@ -2662,18 +2662,18 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSS2PROPERTIES_OPACITY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetOpacity(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -2686,7 +2686,7 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSS2Properties(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -2696,7 +2696,7 @@ FinalizeCSS2Properties(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSS2Properties(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -2706,7 +2706,7 @@ EnumerateCSS2Properties(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSS2Properties(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp index 61f73d60245..0e745daa404 100644 --- a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp @@ -67,7 +67,7 @@ GetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleDeclaration* prop; if (NS_OK == a->GetStyle(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -75,11 +75,11 @@ GetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -104,7 +104,7 @@ SetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSFONTFACERULE_STYLE: { nsIDOMCSSStyleDeclaration* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kICSSStyleDeclarationIID, "CSSStyleDeclaration", cx, *vp)) { return JS_FALSE; @@ -115,11 +115,11 @@ SetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -132,7 +132,7 @@ SetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSFontFaceRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -142,7 +142,7 @@ FinalizeCSSFontFaceRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSFontFaceRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -152,7 +152,7 @@ EnumerateCSSFontFaceRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSFontFaceRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/css/nsJSCSSImportRule.cpp b/mozilla/dom/src/css/nsJSCSSImportRule.cpp index 738f338ebe6..a4a1c22398b 100644 --- a/mozilla/dom/src/css/nsJSCSSImportRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSImportRule.cpp @@ -68,7 +68,7 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMedia(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -91,7 +91,7 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleSheet* prop; if (NS_OK == a->GetStyleSheet(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -99,11 +99,11 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSIMPORTRULE_HREF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHref(prop); @@ -137,18 +137,18 @@ SetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSIMPORTRULE_MEDIA: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMedia(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -161,7 +161,7 @@ SetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSImportRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -171,7 +171,7 @@ FinalizeCSSImportRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSImportRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -181,7 +181,7 @@ EnumerateCSSImportRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSImportRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp index cfec699a444..97732a43e3c 100644 --- a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp @@ -67,7 +67,7 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMediaTypes(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleRuleCollection* prop; if (NS_OK == a->GetCssRules(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,11 +87,11 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -116,18 +116,18 @@ SetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSMEDIARULE_MEDIATYPES: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMediaTypes(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -140,7 +140,7 @@ SetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSMediaRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -150,7 +150,7 @@ FinalizeCSSMediaRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSMediaRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -160,7 +160,7 @@ EnumerateCSSMediaRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSMediaRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -185,7 +185,7 @@ CSSMediaRuleInsertRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js if (argc >= 2) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (!JS_ValueToInt32(cx, argv[1], (int32 *)&b1)) { JS_ReportError(cx, "Parameter must be a number"); diff --git a/mozilla/dom/src/css/nsJSCSSPageRule.cpp b/mozilla/dom/src/css/nsJSCSSPageRule.cpp index 21e837f5703..d42f2b29bca 100644 --- a/mozilla/dom/src/css/nsJSCSSPageRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSPageRule.cpp @@ -67,7 +67,7 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleDeclaration* prop; if (NS_OK == a->GetStyle(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,11 +87,11 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -116,7 +116,7 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSPAGERULE_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -125,7 +125,7 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSPAGERULE_STYLE: { nsIDOMCSSStyleDeclaration* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kICSSStyleDeclarationIID, "CSSStyleDeclaration", cx, *vp)) { return JS_FALSE; @@ -136,11 +136,11 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -153,7 +153,7 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSPageRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -163,7 +163,7 @@ FinalizeCSSPageRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSPageRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -173,7 +173,7 @@ EnumerateCSSPageRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSPageRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/css/nsJSCSSRule.cpp b/mozilla/dom/src/css/nsJSCSSRule.cpp index 4557bd091b7..2bdfaea4fd4 100644 --- a/mozilla/dom/src/css/nsJSCSSRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSRule.cpp @@ -79,7 +79,7 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCssText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -91,7 +91,7 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleSheet* prop; if (NS_OK == a->GetSheet(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -99,11 +99,11 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,18 +128,18 @@ SetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSRULE_CSSTEXT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCssText(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -152,7 +152,7 @@ SetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -162,7 +162,7 @@ FinalizeCSSRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -172,7 +172,7 @@ EnumerateCSSRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp index e77d4d4a90a..333a9d32b9e 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp @@ -64,7 +64,7 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetCssText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -86,7 +86,7 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,7 +95,7 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -120,18 +120,18 @@ SetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case CSSSTYLEDECLARATION_CSSTEXT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCssText(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -144,7 +144,7 @@ SetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeCSSStyleDeclaration(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -154,7 +154,7 @@ FinalizeCSSStyleDeclaration(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSStyleDeclaration(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -164,7 +164,7 @@ EnumerateCSSStyleDeclaration(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSStyleDeclaration(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -188,13 +188,13 @@ CSSStyleDeclarationGetPropertyValue(JSContext *cx, JSObject *obj, uintN argc, js if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetPropertyValue(b0, nativeRet)) { return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getPropertyValue requires 1 parameters"); @@ -225,13 +225,13 @@ CSSStyleDeclarationGetPropertyPriority(JSContext *cx, JSObject *obj, uintN argc, if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetPropertyPriority(b0, nativeRet)) { return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getPropertyPriority requires 1 parameters"); @@ -263,11 +263,11 @@ CSSStyleDeclarationSetProperty(JSContext *cx, JSObject *obj, uintN argc, jsval * if (argc >= 3) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); - nsConvertJSValToString(b1, cx, argv[1]); + nsJSUtils::nsConvertJSValToString(b1, cx, argv[1]); - nsConvertJSValToString(b2, cx, argv[2]); + nsJSUtils::nsConvertJSValToString(b2, cx, argv[2]); if (NS_OK != nativeThis->SetProperty(b0, b1, b2)) { return JS_FALSE; @@ -313,7 +313,7 @@ CSSStyleDeclarationItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); diff --git a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp index c20eb30e77c..4c24f32c035 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp @@ -67,7 +67,7 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSelectorText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleDeclaration* prop; if (NS_OK == a->GetStyle(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,11 +87,11 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -116,7 +116,7 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSSTYLERULE_SELECTORTEXT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSelectorText(prop); @@ -125,7 +125,7 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case CSSSTYLERULE_STYLE: { nsIDOMCSSStyleDeclaration* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kICSSStyleDeclarationIID, "CSSStyleDeclaration", cx, *vp)) { return JS_FALSE; @@ -136,11 +136,11 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -153,7 +153,7 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSStyleRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -163,7 +163,7 @@ FinalizeCSSStyleRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSStyleRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -173,7 +173,7 @@ EnumerateCSSStyleRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSStyleRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp b/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp index fb1a70492c8..66c61829f5e 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp @@ -78,7 +78,7 @@ GetCSSStyleRuleCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval nsIDOMCSSStyleRule* prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), &prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetCSSStyleRuleCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -111,11 +111,11 @@ SetCSSStyleRuleCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetCSSStyleRuleCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval PR_STATIC_CALLBACK(void) FinalizeCSSStyleRuleCollection(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -138,7 +138,7 @@ FinalizeCSSStyleRuleCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSStyleRuleCollection(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -148,7 +148,7 @@ EnumerateCSSStyleRuleCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSStyleRuleCollection(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -181,7 +181,7 @@ CSSStyleRuleCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); diff --git a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp index 288e5636e35..547beb26631 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp @@ -78,7 +78,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetOwningNode(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -90,7 +90,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMStyleSheet* prop; if (NS_OK == a->GetParentStyleSheet(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -101,7 +101,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -112,7 +112,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTitle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -123,7 +123,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMedia(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -135,7 +135,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleRuleCollection* prop; if (NS_OK == a->GetCssRules(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -143,11 +143,11 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -171,11 +171,11 @@ SetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -188,7 +188,7 @@ SetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSStyleSheet(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -198,7 +198,7 @@ FinalizeCSSStyleSheet(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSStyleSheet(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -208,7 +208,7 @@ EnumerateCSSStyleSheet(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSStyleSheet(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -233,7 +233,7 @@ CSSStyleSheetInsertRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 2) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (!JS_ValueToInt32(cx, argv[1], (int32 *)&b1)) { JS_ReportError(cx, "Parameter must be a number"); diff --git a/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp b/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp index 265f57a3199..31994fe7720 100644 --- a/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp @@ -55,11 +55,11 @@ GetCSSUnknownRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -83,11 +83,11 @@ SetCSSUnknownRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetCSSUnknownRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeCSSUnknownRule(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -110,7 +110,7 @@ FinalizeCSSUnknownRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateCSSUnknownRule(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -120,7 +120,7 @@ EnumerateCSSUnknownRule(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveCSSUnknownRule(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/events/nsJSEvent.cpp b/mozilla/dom/src/events/nsJSEvent.cpp index d048bc93b59..1e77dfda42c 100644 --- a/mozilla/dom/src/events/nsJSEvent.cpp +++ b/mozilla/dom/src/events/nsJSEvent.cpp @@ -91,7 +91,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -103,7 +103,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->GetTarget(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -349,7 +349,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->QueryInterface(kINSEventIID, (void **)&b)) { if(NS_OK == b->GetRc(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); } else { @@ -364,11 +364,11 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -393,7 +393,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); @@ -402,7 +402,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_TARGET: { nsIDOMNode* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kINodeIID, "Node", cx, *vp)) { return JS_FALSE; @@ -479,7 +479,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_ALTKEY: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -490,7 +490,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_CTRLKEY: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -501,7 +501,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_SHIFTKEY: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -512,7 +512,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_METAKEY: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -523,7 +523,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case EVENT_CANCELBUBBLE: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -705,11 +705,11 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -722,7 +722,7 @@ SetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeEvent(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -732,7 +732,7 @@ FinalizeEvent(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateEvent(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -742,7 +742,7 @@ EnumerateEvent(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveEvent(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp b/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp index 377396e53c9..3c833a527d1 100644 --- a/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp @@ -74,7 +74,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -85,7 +85,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCharset(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -96,7 +96,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCoords(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -107,7 +107,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -118,7 +118,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHreflang(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -129,7 +129,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -140,7 +140,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRel(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -151,7 +151,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRev(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -162,7 +162,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetShape(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -184,7 +184,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTarget(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -195,7 +195,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -203,11 +203,11 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -232,7 +232,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -241,7 +241,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_CHARSET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCharset(prop); @@ -250,7 +250,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_COORDS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCoords(prop); @@ -259,7 +259,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_HREF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHref(prop); @@ -268,7 +268,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_HREFLANG: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHreflang(prop); @@ -277,7 +277,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -286,7 +286,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_REL: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRel(prop); @@ -295,7 +295,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_REV: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRev(prop); @@ -304,7 +304,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_SHAPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetShape(prop); @@ -329,7 +329,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_TARGET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTarget(prop); @@ -338,18 +338,18 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLANCHORELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -362,7 +362,7 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLAnchorElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -372,7 +372,7 @@ FinalizeHTMLAnchorElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLAnchorElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -382,7 +382,7 @@ EnumerateHTMLAnchorElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLAnchorElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp b/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp index 63778502306..ed0a26aa108 100644 --- a/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp @@ -73,7 +73,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -84,7 +84,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlt(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,7 +95,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetArchive(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -106,7 +106,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCode(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -117,7 +117,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCodeBase(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -128,7 +128,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -139,7 +139,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHspace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -150,7 +150,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -161,7 +161,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetObject(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -172,7 +172,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVspace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -183,7 +183,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -191,11 +191,11 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -220,7 +220,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -229,7 +229,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_ALT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlt(prop); @@ -238,7 +238,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_ARCHIVE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetArchive(prop); @@ -247,7 +247,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_CODE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCode(prop); @@ -256,7 +256,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_CODEBASE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCodeBase(prop); @@ -265,7 +265,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_HEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeight(prop); @@ -274,7 +274,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_HSPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHspace(prop); @@ -283,7 +283,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -292,7 +292,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_OBJECT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetObject(prop); @@ -301,7 +301,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_VSPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVspace(prop); @@ -310,18 +310,18 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAPPLETELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -334,7 +334,7 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLAppletElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -344,7 +344,7 @@ FinalizeHTMLAppletElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLAppletElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -354,7 +354,7 @@ EnumerateHTMLAppletElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLAppletElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp index 2193add7c0c..9e4b053ad00 100644 --- a/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp @@ -70,7 +70,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -81,7 +81,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlt(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -92,7 +92,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCoords(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -103,7 +103,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -125,7 +125,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetShape(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -147,7 +147,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTarget(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -155,11 +155,11 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -184,7 +184,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -193,7 +193,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_ALT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlt(prop); @@ -202,7 +202,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_COORDS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCoords(prop); @@ -211,7 +211,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_HREF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHref(prop); @@ -220,7 +220,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_NOHREF: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -231,7 +231,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_SHAPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetShape(prop); @@ -256,18 +256,18 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLAREAELEMENT_TARGET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTarget(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -280,7 +280,7 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLAreaElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -290,7 +290,7 @@ FinalizeHTMLAreaElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLAreaElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -300,7 +300,7 @@ EnumerateHTMLAreaElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLAreaElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLBRElement.cpp b/mozilla/dom/src/html/nsJSHTMLBRElement.cpp index b80ceb6aad4..c3b9a5bd525 100644 --- a/mozilla/dom/src/html/nsJSHTMLBRElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBRElement.cpp @@ -63,7 +63,7 @@ GetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetClear(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBRELEMENT_CLEAR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetClear(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLBRElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLBRElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLBRElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLBRElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLBRElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp b/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp index 46f0cfa0eba..8eb5547632c 100644 --- a/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp @@ -64,7 +64,7 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -75,7 +75,7 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTarget(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,7 +112,7 @@ SetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBASEELEMENT_HREF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHref(prop); @@ -121,18 +121,18 @@ SetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBASEELEMENT_TARGET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTarget(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -145,7 +145,7 @@ SetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLBaseElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -155,7 +155,7 @@ FinalizeHTMLBaseElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLBaseElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -165,7 +165,7 @@ EnumerateHTMLBaseElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLBaseElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp b/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp index 188b3868945..2f35efea74e 100644 --- a/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp @@ -65,7 +65,7 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -76,7 +76,7 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetFace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetSize(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLBASEFONTELEMENT_COLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetColor(prop); @@ -133,7 +133,7 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLBASEFONTELEMENT_FACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFace(prop); @@ -142,18 +142,18 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLBASEFONTELEMENT_SIZE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSize(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -166,7 +166,7 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLBaseFontElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -176,7 +176,7 @@ FinalizeHTMLBaseFontElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLBaseFontElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -186,7 +186,7 @@ EnumerateHTMLBaseFontElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLBaseFontElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp b/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp index 124641bc49d..45f862abc48 100644 --- a/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp @@ -63,7 +63,7 @@ GetHTMLBlockquoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval * { nsAutoString prop; if (NS_OK == a->GetCite(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLBlockquoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval * break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLBlockquoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval * case HTMLBLOCKQUOTEELEMENT_CITE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCite(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLBlockquoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval * PR_STATIC_CALLBACK(void) FinalizeHTMLBlockquoteElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLBlockquoteElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLBlockquoteElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLBlockquoteElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLBlockquoteElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp b/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp index 33cd88cf4ea..6d867e98d0e 100644 --- a/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp @@ -68,7 +68,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetALink(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBackground(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -90,7 +90,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBgColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -101,7 +101,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLink(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -112,7 +112,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -123,7 +123,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVLink(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -131,11 +131,11 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -160,7 +160,7 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBODYELEMENT_ALINK: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetALink(prop); @@ -169,7 +169,7 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBODYELEMENT_BACKGROUND: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBackground(prop); @@ -178,7 +178,7 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBODYELEMENT_BGCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBgColor(prop); @@ -187,7 +187,7 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBODYELEMENT_LINK: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLink(prop); @@ -196,7 +196,7 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBODYELEMENT_TEXT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetText(prop); @@ -205,18 +205,18 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBODYELEMENT_VLINK: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVLink(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -229,7 +229,7 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLBodyElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -239,7 +239,7 @@ FinalizeHTMLBodyElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLBodyElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -249,7 +249,7 @@ EnumerateHTMLBodyElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLBodyElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp b/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp index 852d2aca88f..0b9bfb4e00b 100644 --- a/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp @@ -76,7 +76,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -109,7 +109,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -131,7 +131,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -142,7 +142,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -150,11 +150,11 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -179,7 +179,7 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBUTTONELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -188,7 +188,7 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBUTTONELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -199,7 +199,7 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBUTTONELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -224,18 +224,18 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLBUTTONELEMENT_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -248,7 +248,7 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLButtonElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -258,7 +258,7 @@ FinalizeHTMLButtonElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLButtonElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -268,7 +268,7 @@ EnumerateHTMLButtonElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLButtonElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLCollection.cpp b/mozilla/dom/src/html/nsJSHTMLCollection.cpp index 82596854bca..94bc947a262 100644 --- a/mozilla/dom/src/html/nsJSHTMLCollection.cpp +++ b/mozilla/dom/src/html/nsJSHTMLCollection.cpp @@ -78,7 +78,7 @@ GetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; if (NS_OK == a->Item(JSVAL_TO_INT(id), &prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -101,10 +101,10 @@ GetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->NamedItem(name, &prop)) { if (NULL != prop) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { @@ -112,7 +112,7 @@ GetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,11 +136,11 @@ SetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -153,7 +153,7 @@ SetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLCollection(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -163,7 +163,7 @@ FinalizeHTMLCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLCollection(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -173,7 +173,7 @@ EnumerateHTMLCollection(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLCollection(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -206,7 +206,7 @@ HTMLCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function item requires 1 parameters"); @@ -237,13 +237,13 @@ HTMLCollectionNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->NamedItem(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function namedItem requires 1 parameters"); diff --git a/mozilla/dom/src/html/nsJSHTMLDListElement.cpp b/mozilla/dom/src/html/nsJSHTMLDListElement.cpp index 2bd886d2cf5..a3988b157e3 100644 --- a/mozilla/dom/src/html/nsJSHTMLDListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDListElement.cpp @@ -71,11 +71,11 @@ GetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLDLISTELEMENT_COMPACT: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -109,11 +109,11 @@ SetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -126,7 +126,7 @@ SetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLDListElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -136,7 +136,7 @@ FinalizeHTMLDListElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLDListElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -146,7 +146,7 @@ EnumerateHTMLDListElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLDListElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp b/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp index 7ca8f3e420a..2c26424f965 100644 --- a/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp @@ -71,11 +71,11 @@ GetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLDIRECTORYELEMENT_COMPACT: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -109,11 +109,11 @@ SetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -126,7 +126,7 @@ SetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v PR_STATIC_CALLBACK(void) FinalizeHTMLDirectoryElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -136,7 +136,7 @@ FinalizeHTMLDirectoryElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLDirectoryElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -146,7 +146,7 @@ EnumerateHTMLDirectoryElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLDirectoryElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLDivElement.cpp b/mozilla/dom/src/html/nsJSHTMLDivElement.cpp index 1c3ffc1104d..a002ed57a24 100644 --- a/mozilla/dom/src/html/nsJSHTMLDivElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDivElement.cpp @@ -63,7 +63,7 @@ GetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLDIVELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLDivElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLDivElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLDivElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLDivElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLDivElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLDocument.cpp b/mozilla/dom/src/html/nsJSHTMLDocument.cpp index 84393383210..9d56fee403b 100644 --- a/mozilla/dom/src/html/nsJSHTMLDocument.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDocument.cpp @@ -97,7 +97,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTitle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -108,7 +108,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetReferrer(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -119,7 +119,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDomain(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -130,7 +130,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetURL(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -142,7 +142,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLElement* prop; if (NS_OK == a->GetBody(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -154,7 +154,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetImages(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -166,7 +166,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetApplets(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -178,7 +178,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetLinks(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -190,7 +190,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetForms(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -202,7 +202,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetAnchors(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -213,7 +213,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCookie(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -226,7 +226,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetAlinkColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -246,7 +246,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetLinkColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -266,7 +266,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetVlinkColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -286,7 +286,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetBgColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -306,7 +306,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetFgColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -326,7 +326,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetLastModified(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -347,7 +347,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetEmbeds(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); } else { @@ -368,7 +368,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetLayers(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); } else { @@ -389,7 +389,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { if(NS_OK == b->GetPlugins(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); } else { @@ -404,7 +404,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else if (JSVAL_IS_STRING(id)) { @@ -425,10 +425,10 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) NS_RELEASE(b); if (NULL != prop) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { @@ -442,7 +442,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -467,7 +467,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLDOCUMENT_TITLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTitle(prop); @@ -476,7 +476,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLDOCUMENT_BODY: { nsIDOMHTMLElement* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kIHTMLElementIID, "HTMLElement", cx, *vp)) { return JS_FALSE; @@ -489,7 +489,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLDOCUMENT_COOKIE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCookie(prop); @@ -498,7 +498,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case NSHTMLDOCUMENT_ALINKCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); nsIDOMNSHTMLDocument *b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { @@ -516,7 +516,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case NSHTMLDOCUMENT_LINKCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); nsIDOMNSHTMLDocument *b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { @@ -534,7 +534,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case NSHTMLDOCUMENT_VLINKCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); nsIDOMNSHTMLDocument *b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { @@ -552,7 +552,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case NSHTMLDOCUMENT_BGCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); nsIDOMNSHTMLDocument *b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { @@ -570,7 +570,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case NSHTMLDOCUMENT_FGCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); nsIDOMNSHTMLDocument *b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { @@ -586,11 +586,11 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -603,7 +603,7 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLDocument(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -613,7 +613,7 @@ FinalizeHTMLDocument(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLDocument(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -623,7 +623,7 @@ EnumerateHTMLDocument(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLDocument(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -779,13 +779,13 @@ HTMLDocumentGetElementById(JSContext *cx, JSObject *obj, uintN argc, jsval *argv if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetElementById(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getElementById requires 1 parameters"); @@ -816,13 +816,13 @@ HTMLDocumentGetElementsByName(JSContext *cx, JSObject *obj, uintN argc, jsval *a if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->GetElementsByName(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getElementsByName requires 1 parameters"); @@ -862,7 +862,7 @@ NSHTMLDocumentGetSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *argv return JS_FALSE; } - nsConvertStringToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function getSelection requires 0 parameters"); @@ -899,13 +899,13 @@ NSHTMLDocumentNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->NamedItem(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function namedItem requires 1 parameters"); diff --git a/mozilla/dom/src/html/nsJSHTMLElement.cpp b/mozilla/dom/src/html/nsJSHTMLElement.cpp index 33335bf0e08..35480014ab0 100644 --- a/mozilla/dom/src/html/nsJSHTMLElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLElement.cpp @@ -71,7 +71,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetId(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -82,7 +82,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTitle(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -93,7 +93,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLang(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -104,7 +104,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDir(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -115,7 +115,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetClassName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -127,7 +127,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMCSSStyleDeclaration* prop; if (NS_OK == a->GetStyle(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -135,11 +135,11 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -164,7 +164,7 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLELEMENT_ID: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetId(prop); @@ -173,7 +173,7 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLELEMENT_TITLE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTitle(prop); @@ -182,7 +182,7 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLELEMENT_LANG: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLang(prop); @@ -191,7 +191,7 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLELEMENT_DIR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDir(prop); @@ -200,18 +200,18 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLELEMENT_CLASSNAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetClassName(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -224,7 +224,7 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -234,7 +234,7 @@ FinalizeHTMLElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -244,7 +244,7 @@ EnumerateHTMLElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp b/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp index c501cfbbb19..3720431530f 100644 --- a/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp @@ -67,7 +67,7 @@ GetHTMLFieldSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -75,11 +75,11 @@ GetHTMLFieldSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -103,11 +103,11 @@ SetHTMLFieldSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case 0: default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -120,7 +120,7 @@ SetHTMLFieldSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLFieldSetElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -130,7 +130,7 @@ FinalizeHTMLFieldSetElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLFieldSetElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -140,7 +140,7 @@ EnumerateHTMLFieldSetElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLFieldSetElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLFontElement.cpp b/mozilla/dom/src/html/nsJSHTMLFontElement.cpp index 0554b8b91a2..49a9d983fc6 100644 --- a/mozilla/dom/src/html/nsJSHTMLFontElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFontElement.cpp @@ -65,7 +65,7 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -76,7 +76,7 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSize(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFONTELEMENT_COLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetColor(prop); @@ -133,7 +133,7 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFONTELEMENT_FACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFace(prop); @@ -142,18 +142,18 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFONTELEMENT_SIZE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSize(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -166,7 +166,7 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLFontElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -176,7 +176,7 @@ FinalizeHTMLFontElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLFontElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -186,7 +186,7 @@ EnumerateHTMLFontElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLFontElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLFormElement.cpp b/mozilla/dom/src/html/nsJSHTMLFormElement.cpp index a302f950509..24418a3d3ab 100644 --- a/mozilla/dom/src/html/nsJSHTMLFormElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFormElement.cpp @@ -81,7 +81,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetElements(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -103,7 +103,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -114,7 +114,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAcceptCharset(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -125,7 +125,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAction(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -136,7 +136,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetEnctype(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -147,7 +147,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMethod(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -158,7 +158,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTarget(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -171,7 +171,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNSHTMLFormElement* b; if (NS_OK == a->QueryInterface(kINSHTMLFormElementIID, (void **)&b)) { if(NS_OK == b->GetEncoding(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } else { @@ -186,7 +186,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else if (JSVAL_IS_STRING(id)) { @@ -207,10 +207,10 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) NS_RELEASE(b); if (NULL != prop) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { @@ -224,7 +224,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -249,7 +249,7 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFORMELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -258,7 +258,7 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFORMELEMENT_ACCEPTCHARSET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAcceptCharset(prop); @@ -267,7 +267,7 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFORMELEMENT_ACTION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAction(prop); @@ -276,7 +276,7 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFORMELEMENT_ENCTYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetEnctype(prop); @@ -285,7 +285,7 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFORMELEMENT_METHOD: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMethod(prop); @@ -294,18 +294,18 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFORMELEMENT_TARGET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTarget(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -318,7 +318,7 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLFormElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -328,7 +328,7 @@ FinalizeHTMLFormElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLFormElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -338,7 +338,7 @@ EnumerateHTMLFormElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLFormElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -434,13 +434,13 @@ NSHTMLFormElementNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv if (argc >= 1) { - nsConvertJSValToString(b0, cx, argv[0]); + nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); if (NS_OK != nativeThis->NamedItem(b0, &nativeRet)) { return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function namedItem requires 1 parameters"); diff --git a/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp b/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp index 8e85460adb5..54780928062 100644 --- a/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp @@ -70,7 +70,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFrameBorder(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -81,7 +81,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLongDesc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -92,7 +92,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -103,7 +103,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -114,7 +114,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -136,7 +136,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetScrolling(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -147,7 +147,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSrc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -155,11 +155,11 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -184,7 +184,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_FRAMEBORDER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFrameBorder(prop); @@ -193,7 +193,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_LONGDESC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLongDesc(prop); @@ -202,7 +202,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_MARGINHEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginHeight(prop); @@ -211,7 +211,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_MARGINWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginWidth(prop); @@ -220,7 +220,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -229,7 +229,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_NORESIZE: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -240,7 +240,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_SCROLLING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetScrolling(prop); @@ -249,18 +249,18 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLFRAMEELEMENT_SRC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSrc(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -273,7 +273,7 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLFrameElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -283,7 +283,7 @@ FinalizeHTMLFrameElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLFrameElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -293,7 +293,7 @@ EnumerateHTMLFrameElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLFrameElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp b/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp index 14cc2f57c0c..df1c6e20980 100644 --- a/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp @@ -64,7 +64,7 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetCols(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -75,7 +75,7 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetRows(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,7 +112,7 @@ SetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLFRAMESETELEMENT_COLS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCols(prop); @@ -121,18 +121,18 @@ SetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLFRAMESETELEMENT_ROWS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRows(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -145,7 +145,7 @@ SetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLFrameSetElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -155,7 +155,7 @@ FinalizeHTMLFrameSetElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLFrameSetElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -165,7 +165,7 @@ EnumerateHTMLFrameSetElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLFrameSetElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLHRElement.cpp b/mozilla/dom/src/html/nsJSHTMLHRElement.cpp index 1ba8b762df5..951c07e25c3 100644 --- a/mozilla/dom/src/html/nsJSHTMLHRElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHRElement.cpp @@ -66,7 +66,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -88,7 +88,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSize(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -99,7 +99,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -107,11 +107,11 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,7 +136,7 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHRELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -145,7 +145,7 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHRELEMENT_NOSHADE: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -156,7 +156,7 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHRELEMENT_SIZE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSize(prop); @@ -165,18 +165,18 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHRELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -189,7 +189,7 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLHRElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -199,7 +199,7 @@ FinalizeHTMLHRElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLHRElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -209,7 +209,7 @@ EnumerateHTMLHRElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLHRElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp b/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp index 25147b5d637..873ab51a55a 100644 --- a/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp @@ -63,7 +63,7 @@ GetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetProfile(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHEADELEMENT_PROFILE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetProfile(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLHeadElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLHeadElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLHeadElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLHeadElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLHeadElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp b/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp index afc60c73726..3ecaa9d64db 100644 --- a/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp @@ -63,7 +63,7 @@ GetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHEADINGELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLHeadingElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLHeadingElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLHeadingElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLHeadingElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLHeadingElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp b/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp index 50e777ae34e..ca12b9d66f6 100644 --- a/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp @@ -63,7 +63,7 @@ GetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVersion(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLHTMLELEMENT_VERSION: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVersion(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLHtmlElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLHtmlElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLHtmlElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLHtmlElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLHtmlElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp b/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp index 3eecc116737..ac15bee75f1 100644 --- a/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp @@ -72,7 +72,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,7 +83,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFrameBorder(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -94,7 +94,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -105,7 +105,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLongDesc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -116,7 +116,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -127,7 +127,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMarginWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -138,7 +138,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -149,7 +149,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetScrolling(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -160,7 +160,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSrc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -171,7 +171,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -179,11 +179,11 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -208,7 +208,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -217,7 +217,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_FRAMEBORDER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFrameBorder(prop); @@ -226,7 +226,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_HEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeight(prop); @@ -235,7 +235,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_LONGDESC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLongDesc(prop); @@ -244,7 +244,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_MARGINHEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginHeight(prop); @@ -253,7 +253,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_MARGINWIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMarginWidth(prop); @@ -262,7 +262,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -271,7 +271,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_SCROLLING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetScrolling(prop); @@ -280,7 +280,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_SRC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSrc(prop); @@ -289,18 +289,18 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIFRAMEELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -313,7 +313,7 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLIFrameElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -323,7 +323,7 @@ FinalizeHTMLIFrameElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLIFrameElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -333,7 +333,7 @@ EnumerateHTMLIFrameElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLIFrameElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLImageElement.cpp b/mozilla/dom/src/html/nsJSHTMLImageElement.cpp index 41b3e11e541..9803649f135 100644 --- a/mozilla/dom/src/html/nsJSHTMLImageElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLImageElement.cpp @@ -28,8 +28,7 @@ #include "nsString.h" #include "nsIDOMImage.h" #include "nsIDOMHTMLImageElement.h" -#include "nsIDOMNativeObjectRegistry.h" -#include "nsIServiceManager.h" +#include "nsIScriptNameSpaceManager.h" #include "nsRepository.h" #include "nsDOMCID.h" @@ -82,7 +81,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLowSrc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -93,7 +92,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -104,7 +103,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -115,7 +114,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlt(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -126,7 +125,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorder(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -137,7 +136,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -148,7 +147,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHspace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -170,7 +169,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLongDesc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -181,7 +180,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSrc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -192,7 +191,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetUseMap(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -203,7 +202,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVspace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -214,7 +213,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -222,11 +221,11 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -251,7 +250,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_LOWSRC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLowSrc(prop); @@ -260,7 +259,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -269,7 +268,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -278,7 +277,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_ALT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlt(prop); @@ -287,7 +286,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_BORDER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorder(prop); @@ -296,7 +295,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_HEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeight(prop); @@ -305,7 +304,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_HSPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHspace(prop); @@ -314,7 +313,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_ISMAP: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -325,7 +324,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_LONGDESC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLongDesc(prop); @@ -334,7 +333,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_SRC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSrc(prop); @@ -343,7 +342,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_USEMAP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetUseMap(prop); @@ -352,7 +351,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_VSPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVspace(prop); @@ -361,18 +360,18 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLIMAGEELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -385,7 +384,7 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLImageElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -395,7 +394,7 @@ FinalizeHTMLImageElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLImageElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -405,7 +404,7 @@ EnumerateHTMLImageElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLImageElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -465,43 +464,34 @@ PR_STATIC_CALLBACK(JSBool) HTMLImageElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { nsresult result; - nsIID factoryCID; - nsIDOMNativeObjectRegistry *registry; - nsIDOMHTMLImageElementFactory *factory; + nsIID classID; + nsIScriptContext* context = (nsIScriptContext*)JS_GetContextPrivate(cx); + nsIScriptNameSpaceManager* manager; nsIDOMHTMLImageElement *nativeThis; nsIScriptObjectOwner *owner = nsnull; - static NS_DEFINE_IID(kDOMNativeObjectRegistryCID, NS_DOM_NATIVE_OBJECT_REGISTRY_CID); - static NS_DEFINE_IID(kIDOMNativeObjectRegistryIID, NS_IDOM_NATIVE_OBJECT_REGISTRY_IID); - static NS_DEFINE_IID(kIDOMHTMLImageElementFactoryIID, NS_IDOMHTMLIMAGEELEMENTFACTORY_IID); + static NS_DEFINE_IID(kIDOMHTMLImageElementIID, NS_IDOMHTMLIMAGEELEMENT_IID); - result = nsServiceManager::GetService(kDOMNativeObjectRegistryCID, - kIDOMNativeObjectRegistryIID, - (nsISupports **)®istry); + result = context->GetNameSpaceManager(&manager); if (NS_OK != result) { return JS_FALSE; } - result = registry->GetFactoryCID("HTMLImageElement", factoryCID); - nsServiceManager::ReleaseService(kDOMNativeObjectRegistryCID, - registry); + result = manager->LookupName("HTMLImageElement", PR_TRUE, classID); + NS_RELEASE(manager); if (NS_OK != result) { return JS_FALSE; } - result = nsRepository::CreateInstance(factoryCID, + result = nsRepository::CreateInstance(classID, nsnull, - kIDOMHTMLImageElementFactoryIID, - (void **)&factory); + kIDOMHTMLImageElementIID, + (void **)&nativeThis); if (NS_OK != result) { return JS_FALSE; } - result = factory->CreateInstance(&nativeThis); - NS_RELEASE(factory); - if (NS_OK != result) { - return JS_FALSE; - } + // XXX We should be calling Init() on the instance result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner); if (NS_OK != result) { diff --git a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp index 251ff48dab5..55a1a024d26 100644 --- a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp @@ -83,7 +83,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDefaultValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -106,7 +106,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -117,7 +117,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccept(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -128,7 +128,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -139,7 +139,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -150,7 +150,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlt(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -194,7 +194,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -216,7 +216,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSize(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -227,7 +227,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSrc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -249,7 +249,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -260,7 +260,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetUseMap(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -271,7 +271,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -279,11 +279,11 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -308,7 +308,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_DEFAULTVALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDefaultValue(prop); @@ -317,7 +317,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_DEFAULTCHECKED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -328,7 +328,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_ACCEPT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccept(prop); @@ -337,7 +337,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -346,7 +346,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -355,7 +355,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_ALT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlt(prop); @@ -364,7 +364,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_CHECKED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -375,7 +375,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -402,7 +402,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -411,7 +411,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_READONLY: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -422,7 +422,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_SIZE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSize(prop); @@ -431,7 +431,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_SRC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSrc(prop); @@ -456,7 +456,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_USEMAP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetUseMap(prop); @@ -465,18 +465,18 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLINPUTELEMENT_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -489,7 +489,7 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLInputElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -499,7 +499,7 @@ FinalizeHTMLInputElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLInputElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -509,7 +509,7 @@ EnumerateHTMLInputElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLInputElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp b/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp index 898795c8f6c..1e7055686df 100644 --- a/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp @@ -68,7 +68,7 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetPrompt(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,11 +87,11 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -116,18 +116,18 @@ SetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLISINDEXELEMENT_PROMPT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetPrompt(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -140,7 +140,7 @@ SetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLIsIndexElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -150,7 +150,7 @@ FinalizeHTMLIsIndexElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLIsIndexElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -160,7 +160,7 @@ EnumerateHTMLIsIndexElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLIsIndexElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLLIElement.cpp b/mozilla/dom/src/html/nsJSHTMLLIElement.cpp index 41eb941c538..f36d4ca5345 100644 --- a/mozilla/dom/src/html/nsJSHTMLLIElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLIElement.cpp @@ -64,7 +64,7 @@ GetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,7 +112,7 @@ SetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLIELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); @@ -135,11 +135,11 @@ SetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -152,7 +152,7 @@ SetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLLIElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -162,7 +162,7 @@ FinalizeHTMLLIElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLLIElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -172,7 +172,7 @@ EnumerateHTMLLIElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLLIElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp b/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp index 09dd205a41f..b709c97ab13 100644 --- a/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp @@ -69,7 +69,7 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -80,7 +80,7 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -91,7 +91,7 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHtmlFor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -99,11 +99,11 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLABELELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -137,18 +137,18 @@ SetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLABELELEMENT_HTMLFOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHtmlFor(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -161,7 +161,7 @@ SetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLLabelElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -171,7 +171,7 @@ FinalizeHTMLLabelElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLLabelElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -181,7 +181,7 @@ EnumerateHTMLLabelElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLLabelElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp b/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp index bb85f7fd605..569dbbb3b06 100644 --- a/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp @@ -69,7 +69,7 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -80,7 +80,7 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -91,7 +91,7 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -99,11 +99,11 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -128,7 +128,7 @@ SetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLEGENDELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -137,18 +137,18 @@ SetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLEGENDELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -161,7 +161,7 @@ SetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLLegendElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -171,7 +171,7 @@ FinalizeHTMLLegendElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLLegendElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -181,7 +181,7 @@ EnumerateHTMLLegendElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLLegendElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp b/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp index 764d8ea2a3b..0c1ceefbf09 100644 --- a/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp @@ -82,7 +82,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCharset(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -93,7 +93,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHref(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -104,7 +104,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHreflang(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -115,7 +115,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMedia(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -126,7 +126,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRel(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -137,7 +137,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRev(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -148,7 +148,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetTarget(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -159,7 +159,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -167,11 +167,11 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -196,7 +196,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -207,7 +207,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_CHARSET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCharset(prop); @@ -216,7 +216,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_HREF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHref(prop); @@ -225,7 +225,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_HREFLANG: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHreflang(prop); @@ -234,7 +234,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_MEDIA: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMedia(prop); @@ -243,7 +243,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_REL: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRel(prop); @@ -252,7 +252,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_REV: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRev(prop); @@ -261,7 +261,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_TARGET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetTarget(prop); @@ -270,18 +270,18 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLLINKELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -294,7 +294,7 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLLinkElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -304,7 +304,7 @@ FinalizeHTMLLinkElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLLinkElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -314,7 +314,7 @@ EnumerateHTMLLinkElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLLinkElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLMapElement.cpp b/mozilla/dom/src/html/nsJSHTMLMapElement.cpp index 4e1038ab8ab..5c67f55416b 100644 --- a/mozilla/dom/src/html/nsJSHTMLMapElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMapElement.cpp @@ -68,7 +68,7 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetAreas(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,11 +87,11 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -116,18 +116,18 @@ SetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMAPELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -140,7 +140,7 @@ SetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLMapElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -150,7 +150,7 @@ FinalizeHTMLMapElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLMapElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -160,7 +160,7 @@ EnumerateHTMLMapElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLMapElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp b/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp index d41e8639d9d..7fb4b8ddafc 100644 --- a/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp @@ -71,11 +71,11 @@ GetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,7 +100,7 @@ SetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMENUELEMENT_COMPACT: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -109,11 +109,11 @@ SetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -126,7 +126,7 @@ SetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLMenuElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -136,7 +136,7 @@ FinalizeHTMLMenuElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLMenuElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -146,7 +146,7 @@ EnumerateHTMLMenuElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLMenuElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp b/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp index c997b7eb00d..dad9107adb6 100644 --- a/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp @@ -66,7 +66,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetContent(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -77,7 +77,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHttpEquiv(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -88,7 +88,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -99,7 +99,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetScheme(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -107,11 +107,11 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,7 +136,7 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMETAELEMENT_CONTENT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetContent(prop); @@ -145,7 +145,7 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMETAELEMENT_HTTPEQUIV: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHttpEquiv(prop); @@ -154,7 +154,7 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMETAELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -163,18 +163,18 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMETAELEMENT_SCHEME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetScheme(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -187,7 +187,7 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLMetaElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -197,7 +197,7 @@ FinalizeHTMLMetaElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLMetaElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -207,7 +207,7 @@ EnumerateHTMLMetaElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLMetaElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLModElement.cpp b/mozilla/dom/src/html/nsJSHTMLModElement.cpp index 24bd5981724..af068513fb4 100644 --- a/mozilla/dom/src/html/nsJSHTMLModElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLModElement.cpp @@ -64,7 +64,7 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCite(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -75,7 +75,7 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetDateTime(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,7 +112,7 @@ SetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMODELEMENT_CITE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCite(prop); @@ -121,18 +121,18 @@ SetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLMODELEMENT_DATETIME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDateTime(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -145,7 +145,7 @@ SetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLModElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -155,7 +155,7 @@ FinalizeHTMLModElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLModElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -165,7 +165,7 @@ EnumerateHTMLModElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLModElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLOListElement.cpp b/mozilla/dom/src/html/nsJSHTMLOListElement.cpp index a10898726cf..3af64194fa4 100644 --- a/mozilla/dom/src/html/nsJSHTMLOListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOListElement.cpp @@ -87,7 +87,7 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOLISTELEMENT_COMPACT: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -151,18 +151,18 @@ SetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOLISTELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -175,7 +175,7 @@ SetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLOListElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -185,7 +185,7 @@ FinalizeHTMLOListElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLOListElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -195,7 +195,7 @@ EnumerateHTMLOListElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLOListElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp index 3458b4ff48e..088e9c92a03 100644 --- a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp @@ -84,7 +84,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -95,7 +95,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCode(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -106,7 +106,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -117,7 +117,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetArchive(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -128,7 +128,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorder(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -139,7 +139,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCodeBase(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -150,7 +150,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCodeType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -161,7 +161,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetData(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -183,7 +183,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -194,7 +194,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHspace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -205,7 +205,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -216,7 +216,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetStandby(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -238,7 +238,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -249,7 +249,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetUseMap(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -260,7 +260,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetVspace(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -271,7 +271,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -279,11 +279,11 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -308,7 +308,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_CODE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCode(prop); @@ -317,7 +317,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -326,7 +326,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_ARCHIVE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetArchive(prop); @@ -335,7 +335,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_BORDER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorder(prop); @@ -344,7 +344,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_CODEBASE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCodeBase(prop); @@ -353,7 +353,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_CODETYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCodeType(prop); @@ -362,7 +362,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_DATA: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetData(prop); @@ -371,7 +371,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_DECLARE: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -382,7 +382,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_HEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeight(prop); @@ -391,7 +391,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_HSPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHspace(prop); @@ -400,7 +400,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -409,7 +409,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_STANDBY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetStandby(prop); @@ -434,7 +434,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); @@ -443,7 +443,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_USEMAP: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetUseMap(prop); @@ -452,7 +452,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_VSPACE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVspace(prop); @@ -461,18 +461,18 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOBJECTELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -485,7 +485,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLObjectElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -495,7 +495,7 @@ FinalizeHTMLObjectElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLObjectElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -505,7 +505,7 @@ EnumerateHTMLObjectElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLObjectElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp index 1d68cdae60d..9c51cac034e 100644 --- a/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp @@ -75,7 +75,7 @@ GetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetLabel(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,7 +112,7 @@ SetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLOPTGROUPELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -123,18 +123,18 @@ SetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLOPTGROUPELEMENT_LABEL: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLabel(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -147,7 +147,7 @@ SetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLOptGroupElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -157,7 +157,7 @@ FinalizeHTMLOptGroupElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLOptGroupElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -167,7 +167,7 @@ EnumerateHTMLOptGroupElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLOptGroupElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp index 5ef26aded59..4fba39ae94a 100644 --- a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp @@ -74,7 +74,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -96,7 +96,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -129,7 +129,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetLabel(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -151,7 +151,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -159,11 +159,11 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -188,7 +188,7 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOPTIONELEMENT_DEFAULTSELECTED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -215,7 +215,7 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOPTIONELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -226,7 +226,7 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOPTIONELEMENT_LABEL: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetLabel(prop); @@ -235,18 +235,18 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLOPTIONELEMENT_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -259,7 +259,7 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLOptionElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -269,7 +269,7 @@ FinalizeHTMLOptionElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLOptionElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -279,7 +279,7 @@ EnumerateHTMLOptionElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLOptionElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp b/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp index 2aa9fe032f8..ede267cbbc9 100644 --- a/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp @@ -63,7 +63,7 @@ GetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLPARAGRAPHELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v PR_STATIC_CALLBACK(void) FinalizeHTMLParagraphElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLParagraphElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLParagraphElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLParagraphElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLParagraphElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLParamElement.cpp b/mozilla/dom/src/html/nsJSHTMLParamElement.cpp index 9f30dd48161..c8732b55e38 100644 --- a/mozilla/dom/src/html/nsJSHTMLParamElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLParamElement.cpp @@ -66,7 +66,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -77,7 +77,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -88,7 +88,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -99,7 +99,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValueType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -107,11 +107,11 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -136,7 +136,7 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLPARAMELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -145,7 +145,7 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLPARAMELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); @@ -154,7 +154,7 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLPARAMELEMENT_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); @@ -163,18 +163,18 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLPARAMELEMENT_VALUETYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValueType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -187,7 +187,7 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLParamElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -197,7 +197,7 @@ FinalizeHTMLParamElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLParamElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -207,7 +207,7 @@ EnumerateHTMLParamElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLParamElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLPreElement.cpp b/mozilla/dom/src/html/nsJSHTMLPreElement.cpp index e9881911176..62c669af656 100644 --- a/mozilla/dom/src/html/nsJSHTMLPreElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLPreElement.cpp @@ -71,11 +71,11 @@ GetHTMLPreElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -114,11 +114,11 @@ SetHTMLPreElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -131,7 +131,7 @@ SetHTMLPreElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLPreElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -141,7 +141,7 @@ FinalizeHTMLPreElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLPreElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -151,7 +151,7 @@ EnumerateHTMLPreElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLPreElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp b/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp index 5897bef31d3..4e1fe6af4ad 100644 --- a/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp @@ -63,7 +63,7 @@ GetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCite(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLQUOTEELEMENT_CITE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCite(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLQuoteElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLQuoteElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLQuoteElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLQuoteElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLQuoteElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp b/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp index 6303f597126..e77558ddc46 100644 --- a/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp @@ -69,7 +69,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -80,7 +80,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetHtmlFor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -91,7 +91,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetEvent(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -102,7 +102,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCharset(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -124,7 +124,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSrc(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -135,7 +135,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -143,11 +143,11 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -172,7 +172,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_TEXT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetText(prop); @@ -181,7 +181,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_HTMLFOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHtmlFor(prop); @@ -190,7 +190,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_EVENT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetEvent(prop); @@ -199,7 +199,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_CHARSET: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCharset(prop); @@ -208,7 +208,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_DEFER: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -219,7 +219,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_SRC: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSrc(prop); @@ -228,18 +228,18 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSCRIPTELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -252,7 +252,7 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLScriptElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -262,7 +262,7 @@ FinalizeHTMLScriptElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLScriptElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -272,7 +272,7 @@ EnumerateHTMLScriptElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLScriptElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp index 5e25eb50267..f25bf68ee68 100644 --- a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp @@ -82,7 +82,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -104,7 +104,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -127,7 +127,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -139,7 +139,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetOptions(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -172,7 +172,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -202,11 +202,11 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -247,7 +247,7 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSELECTELEMENT_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); @@ -256,7 +256,7 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSELECTELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -267,7 +267,7 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSELECTELEMENT_MULTIPLE: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -278,7 +278,7 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSELECTELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -317,11 +317,11 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -334,7 +334,7 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLSelectElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -344,7 +344,7 @@ FinalizeHTMLSelectElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLSelectElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -354,7 +354,7 @@ EnumerateHTMLSelectElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLSelectElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -378,7 +378,7 @@ HTMLSelectElementAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva if (argc >= 2) { - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b0, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b0, kIHTMLElementIID, "HTMLElement", cx, @@ -386,7 +386,7 @@ HTMLSelectElementAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva return JS_FALSE; } - if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b1, + if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b1, kIHTMLElementIID, "HTMLElement", cx, diff --git a/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp b/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp index 8e7b67196e4..1a4686f8786 100644 --- a/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp @@ -76,7 +76,7 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetMedia(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -87,7 +87,7 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,11 +95,11 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSTYLEELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -135,7 +135,7 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSTYLEELEMENT_MEDIA: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetMedia(prop); @@ -144,18 +144,18 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLSTYLEELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -168,7 +168,7 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLStyleElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -178,7 +178,7 @@ FinalizeHTMLStyleElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLStyleElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -188,7 +188,7 @@ EnumerateHTMLStyleElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLStyleElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp index f804bfa762a..14be712e269 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp @@ -63,7 +63,7 @@ GetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval case HTMLTABLECAPTIONELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval PR_STATIC_CALLBACK(void) FinalizeHTMLTableCaptionElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLTableCaptionElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTableCaptionElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLTableCaptionElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTableCaptionElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp index bec4849cd4b..3d6c05d83c4 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp @@ -88,7 +88,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetAbbr(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -99,7 +99,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -110,7 +110,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetAxis(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -121,7 +121,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetBgColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -132,7 +132,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetCh(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -143,7 +143,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetChOff(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -165,7 +165,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetHeaders(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -176,7 +176,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetHeight(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -209,7 +209,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetScope(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -220,7 +220,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetVAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -231,7 +231,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -239,11 +239,11 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -284,7 +284,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_ABBR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAbbr(prop); @@ -293,7 +293,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -302,7 +302,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_AXIS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAxis(prop); @@ -311,7 +311,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_BGCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBgColor(prop); @@ -320,7 +320,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_CH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCh(prop); @@ -329,7 +329,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_CHOFF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetChOff(prop); @@ -354,7 +354,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_HEADERS: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeaders(prop); @@ -363,7 +363,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_HEIGHT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetHeight(prop); @@ -372,7 +372,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_NOWRAP: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -399,7 +399,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_SCOPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetScope(prop); @@ -408,7 +408,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_VALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVAlign(prop); @@ -417,18 +417,18 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v case HTMLTABLECELLELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -441,7 +441,7 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v PR_STATIC_CALLBACK(void) FinalizeHTMLTableCellElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -451,7 +451,7 @@ FinalizeHTMLTableCellElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTableCellElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -461,7 +461,7 @@ EnumerateHTMLTableCellElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTableCellElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp index ce75e946cfa..1209070f66c 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp @@ -68,7 +68,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -79,7 +79,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetCh(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -90,7 +90,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetChOff(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -112,7 +112,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetVAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -123,7 +123,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -131,11 +131,11 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -160,7 +160,7 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLECOLELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -169,7 +169,7 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLECOLELEMENT_CH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCh(prop); @@ -178,7 +178,7 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLECOLELEMENT_CHOFF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetChOff(prop); @@ -203,7 +203,7 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLECOLELEMENT_VALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVAlign(prop); @@ -212,18 +212,18 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLECOLELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -236,7 +236,7 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLTableColElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -246,7 +246,7 @@ FinalizeHTMLTableColElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTableColElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -256,7 +256,7 @@ EnumerateHTMLTableColElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTableColElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLTableElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableElement.cpp index 922b106793b..6a166d22a9b 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableElement.cpp @@ -89,7 +89,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLTableCaptionElement* prop; if (NS_OK == a->GetCaption(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -101,7 +101,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLTableSectionElement* prop; if (NS_OK == a->GetTHead(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -113,7 +113,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLTableSectionElement* prop; if (NS_OK == a->GetTFoot(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -125,7 +125,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetRows(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -137,7 +137,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; if (NS_OK == a->GetTBodies(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -148,7 +148,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -159,7 +159,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBgColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -170,7 +170,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetBorder(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -181,7 +181,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCellPadding(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -192,7 +192,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetCellSpacing(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -203,7 +203,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetFrame(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -214,7 +214,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetRules(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -225,7 +225,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetSummary(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -236,7 +236,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetWidth(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -244,11 +244,11 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -273,7 +273,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_CAPTION: { nsIDOMHTMLTableCaptionElement* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kIHTMLTableCaptionElementIID, "HTMLTableCaptionElement", cx, *vp)) { return JS_FALSE; @@ -286,7 +286,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_THEAD: { nsIDOMHTMLTableSectionElement* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kIHTMLTableSectionElementIID, "HTMLTableSectionElement", cx, *vp)) { return JS_FALSE; @@ -299,7 +299,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_TFOOT: { nsIDOMHTMLTableSectionElement* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kIHTMLTableSectionElementIID, "HTMLTableSectionElement", cx, *vp)) { return JS_FALSE; @@ -312,7 +312,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -321,7 +321,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_BGCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBgColor(prop); @@ -330,7 +330,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_BORDER: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBorder(prop); @@ -339,7 +339,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_CELLPADDING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCellPadding(prop); @@ -348,7 +348,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_CELLSPACING: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCellSpacing(prop); @@ -357,7 +357,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_FRAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetFrame(prop); @@ -366,7 +366,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_RULES: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetRules(prop); @@ -375,7 +375,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_SUMMARY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetSummary(prop); @@ -384,18 +384,18 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTABLEELEMENT_WIDTH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetWidth(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -408,7 +408,7 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLTableElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -418,7 +418,7 @@ FinalizeHTMLTableElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTableElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -428,7 +428,7 @@ EnumerateHTMLTableElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTableElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -455,7 +455,7 @@ HTMLTableElementCreateTHead(JSContext *cx, JSObject *obj, uintN argc, jsval *arg return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createTHead requires 0 parameters"); @@ -522,7 +522,7 @@ HTMLTableElementCreateTFoot(JSContext *cx, JSObject *obj, uintN argc, jsval *arg return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createTFoot requires 0 parameters"); @@ -589,7 +589,7 @@ HTMLTableElementCreateCaption(JSContext *cx, JSObject *obj, uintN argc, jsval *a return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function createCaption requires 0 parameters"); @@ -662,7 +662,7 @@ HTMLTableElementInsertRow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function insertRow requires 1 parameters"); diff --git a/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp index d419822e8f0..494e8922148 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp @@ -99,7 +99,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp nsIDOMHTMLCollection* prop; if (NS_OK == a->GetCells(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -110,7 +110,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -121,7 +121,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetBgColor(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -132,7 +132,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetCh(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -143,7 +143,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetChOff(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -154,7 +154,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetVAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -162,11 +162,11 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -223,7 +223,7 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLEROWELEMENT_CELLS: { nsIDOMHTMLCollection* prop; - if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop, + if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, kIHTMLCollectionIID, "HTMLCollection", cx, *vp)) { return JS_FALSE; @@ -236,7 +236,7 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLEROWELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -245,7 +245,7 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLEROWELEMENT_BGCOLOR: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetBgColor(prop); @@ -254,7 +254,7 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLEROWELEMENT_CH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCh(prop); @@ -263,7 +263,7 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLEROWELEMENT_CHOFF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetChOff(prop); @@ -272,18 +272,18 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTABLEROWELEMENT_VALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -296,7 +296,7 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLTableRowElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -306,7 +306,7 @@ FinalizeHTMLTableRowElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTableRowElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -316,7 +316,7 @@ EnumerateHTMLTableRowElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTableRowElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -349,7 +349,7 @@ HTMLTableRowElementInsertCell(JSContext *cx, JSObject *obj, uintN argc, jsval *a return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function insertCell requires 1 parameters"); diff --git a/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp index 3936e08122e..75b2b70dd7e 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp @@ -73,7 +73,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval { nsAutoString prop; if (NS_OK == a->GetAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -84,7 +84,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval { nsAutoString prop; if (NS_OK == a->GetCh(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -95,7 +95,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval { nsAutoString prop; if (NS_OK == a->GetChOff(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -106,7 +106,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval { nsAutoString prop; if (NS_OK == a->GetVAlign(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -118,7 +118,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval nsIDOMHTMLCollection* prop; if (NS_OK == a->GetRows(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -126,11 +126,11 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -155,7 +155,7 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval case HTMLTABLESECTIONELEMENT_ALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAlign(prop); @@ -164,7 +164,7 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval case HTMLTABLESECTIONELEMENT_CH: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetCh(prop); @@ -173,7 +173,7 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval case HTMLTABLESECTIONELEMENT_CHOFF: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetChOff(prop); @@ -182,18 +182,18 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval case HTMLTABLESECTIONELEMENT_VALIGN: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetVAlign(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -206,7 +206,7 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval PR_STATIC_CALLBACK(void) FinalizeHTMLTableSectionElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -216,7 +216,7 @@ FinalizeHTMLTableSectionElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTableSectionElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -226,7 +226,7 @@ EnumerateHTMLTableSectionElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTableSectionElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } @@ -259,7 +259,7 @@ HTMLTableSectionElementInsertRow(JSContext *cx, JSObject *obj, uintN argc, jsval return JS_FALSE; } - nsConvertObjectToJSVal(nativeRet, cx, rval); + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); } else { JS_ReportError(cx, "Function insertRow requires 1 parameters"); diff --git a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp index 0091a57acd9..a07d1341a5e 100644 --- a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp @@ -76,7 +76,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetDefaultValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -88,7 +88,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp nsIDOMHTMLFormElement* prop; if (NS_OK == a->GetForm(&prop)) { // get the js object - nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); + nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } else { return JS_FALSE; @@ -99,7 +99,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetAccessKey(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -132,7 +132,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetName(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -176,7 +176,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -187,7 +187,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp { nsAutoString prop; if (NS_OK == a->GetValue(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -195,11 +195,11 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -224,7 +224,7 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTEXTAREAELEMENT_DEFAULTVALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetDefaultValue(prop); @@ -233,7 +233,7 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTEXTAREAELEMENT_ACCESSKEY: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetAccessKey(prop); @@ -258,7 +258,7 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTEXTAREAELEMENT_DISABLED: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -269,7 +269,7 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTEXTAREAELEMENT_NAME: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetName(prop); @@ -278,7 +278,7 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTEXTAREAELEMENT_READONLY: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -321,18 +321,18 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp case HTMLTEXTAREAELEMENT_VALUE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetValue(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -345,7 +345,7 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp PR_STATIC_CALLBACK(void) FinalizeHTMLTextAreaElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -355,7 +355,7 @@ FinalizeHTMLTextAreaElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTextAreaElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -365,7 +365,7 @@ EnumerateHTMLTextAreaElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTextAreaElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp b/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp index 88906098624..0e5b21896f7 100644 --- a/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp @@ -63,7 +63,7 @@ GetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetText(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -71,11 +71,11 @@ GetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -100,18 +100,18 @@ SetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLTITLEELEMENT_TEXT: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetText(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -124,7 +124,7 @@ SetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLTitleElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -134,7 +134,7 @@ FinalizeHTMLTitleElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLTitleElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -144,7 +144,7 @@ EnumerateHTMLTitleElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLTitleElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/src/html/nsJSHTMLUListElement.cpp b/mozilla/dom/src/html/nsJSHTMLUListElement.cpp index 39acd8d2f10..a28d6c44e05 100644 --- a/mozilla/dom/src/html/nsJSHTMLUListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLUListElement.cpp @@ -75,7 +75,7 @@ GetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) { nsAutoString prop; if (NS_OK == a->GetType(prop)) { - nsConvertStringToJSVal(prop, cx, vp); + nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { return JS_FALSE; @@ -83,11 +83,11 @@ GetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) break; } default: - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectGetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); } return PR_TRUE; @@ -112,7 +112,7 @@ SetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLULISTELEMENT_COMPACT: { PRBool prop; - if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) { + if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { return JS_FALSE; } @@ -123,18 +123,18 @@ SetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case HTMLULISTELEMENT_TYPE: { nsAutoString prop; - nsConvertJSValToString(prop, cx, *vp); + nsJSUtils::nsConvertJSValToString(prop, cx, *vp); a->SetType(prop); break; } default: - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } } else { - return nsCallJSScriptObjectSetProperty(a, cx, id, vp); + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); } return PR_TRUE; @@ -147,7 +147,7 @@ SetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PR_STATIC_CALLBACK(void) FinalizeHTMLUListElement(JSContext *cx, JSObject *obj) { - nsGenericFinalize(cx, obj); + nsJSUtils::nsGenericFinalize(cx, obj); } @@ -157,7 +157,7 @@ FinalizeHTMLUListElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) EnumerateHTMLUListElement(JSContext *cx, JSObject *obj) { - return nsGenericEnumerate(cx, obj); + return nsJSUtils::nsGenericEnumerate(cx, obj); } @@ -167,7 +167,7 @@ EnumerateHTMLUListElement(JSContext *cx, JSObject *obj) PR_STATIC_CALLBACK(JSBool) ResolveHTMLUListElement(JSContext *cx, JSObject *obj, jsval id) { - return nsGenericResolve(cx, obj, id); + return nsJSUtils::nsGenericResolve(cx, obj, id); } diff --git a/mozilla/dom/tools/JSStubGen.cpp b/mozilla/dom/tools/JSStubGen.cpp index a0a635e0277..3b3a58b9998 100644 --- a/mozilla/dom/tools/JSStubGen.cpp +++ b/mozilla/dom/tools/JSStubGen.cpp @@ -91,8 +91,7 @@ static const char *kIncludeDefaultsStr = "\n" "#include \"nsString.h\"\n"; static const char *kIncludeStr = "#include \"nsIDOM%s.h\"\n"; static const char *kIncludeConstructorStr = -"#include \"nsIDOMNativeObjectRegistry.h\"\n" -"#include \"nsIServiceManager.h\"\n" +"#include \"nsIScriptNameSpaceManager.h\"\n" "#include \"nsRepository.h\"\n" "#include \"nsDOMCID.h\"\n"; @@ -253,7 +252,7 @@ static const char *kPropFuncBeginStr = "\n" static const char *kPropFuncDefaultStr = " default:\n" -" return nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" +" return nsJSUtils::nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" " }\n" " }\n"; @@ -296,7 +295,7 @@ static const char *kPropFuncDefaultItemNonPrimaryStr = static const char *kPropFuncEndStr = " else {\n" -" return nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" +" return nsJSUtils::nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" " }\n" "\n" " return PR_TRUE;\n" @@ -320,7 +319,7 @@ static const char *kPropFuncNamedItemStr = "%s" " }\n" " else {\n" -" return nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" +" return nsJSUtils::nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" " }\n" " }\n" " else {\n" @@ -349,7 +348,7 @@ static const char *kPropFuncNamedItemNonPrimaryStr = "%s" " }\n" " else {\n" -" return nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" +" return nsJSUtils::nsCallJSScriptObject%sProperty(a, cx, id, vp);\n" " }\n" " }\n" " else {\n" @@ -483,7 +482,12 @@ JSStubGen::GeneratePropertyFunc(IdlSpecification &aSpec, PRBool aIsGetter) JSSTUBGEN_NAMED_ITEM : JSSTUBGEN_NAMED_ITEM_NONPRIMARY); } - JSGEN_GENERATE_PROPFUNCEND(buf, aIsGetter ? "Get" : "Set"); + if (aIsGetter) { + JSGEN_GENERATE_PROPFUNCEND(buf, "Get"); + } + else { + JSGEN_GENERATE_PROPFUNCEND(buf, "Set"); + } *file << buf; } @@ -516,10 +520,10 @@ static const char *kGetCaseNonPrimaryStr = static const char *kObjectGetCaseStr = " // get the js object\n" -" nsConvertObjectToJSVal((nsISupports *)prop, cx, vp);\n"; +" nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp);\n"; static const char *kStringGetCaseStr = -" nsConvertStringToJSVal(prop, cx, vp);\n"; +" nsJSUtils::nsConvertStringToJSVal(prop, cx, vp);\n"; static const char *kIntGetCaseStr = " *vp = INT_TO_JSVAL(prop);\n"; @@ -630,7 +634,7 @@ static const char *kSetCaseNonPrimaryStr = static const char *kObjectSetCaseStr = -" if (PR_FALSE == nsConvertJSValToObject((nsISupports **)&prop,\n" +" if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop,\n" " kI%sIID, \"%s\",\n" " cx, *vp)) {\n" " return JS_FALSE;\n" @@ -639,7 +643,7 @@ static const char *kObjectSetCaseStr = static const char *kObjectSetCaseEndStr = "NS_IF_RELEASE(prop);"; static const char *kStringSetCaseStr = -" nsConvertJSValToString(prop, cx, *vp);\n"; +" nsJSUtils::nsConvertJSValToString(prop, cx, *vp);\n"; static const char *kIntSetCaseStr = " int32 temp;\n" @@ -652,7 +656,7 @@ static const char *kIntSetCaseStr = " }\n"; static const char *kBoolSetCaseStr = -" if (PR_FALSE == nsConvertJSValToBool(&prop, cx, *vp)) {\n" +" if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) {\n" " return JS_FALSE;\n" " }\n"; @@ -715,7 +719,7 @@ static const char *kFinalizeStr = "PR_STATIC_CALLBACK(void)\n" "Finalize%s(JSContext *cx, JSObject *obj)\n" "{\n" -" nsGenericFinalize(cx, obj);\n" +" nsJSUtils::nsGenericFinalize(cx, obj);\n" "}\n"; static const char *kGlobalFinalizeStr = @@ -751,7 +755,7 @@ static const char *kEnumerateStr = "PR_STATIC_CALLBACK(JSBool)\n" "Enumerate%s(JSContext *cx, JSObject *obj)\n" "{\n" -" return nsGenericEnumerate(cx, obj);\n" +" return nsJSUtils::nsGenericEnumerate(cx, obj);\n" "}\n"; #define JSGEN_GENERATE_ENUMERATE(buf, className) \ @@ -777,11 +781,17 @@ static const char *kResolveStr = "PR_STATIC_CALLBACK(JSBool)\n" "Resolve%s(JSContext *cx, JSObject *obj, jsval id)\n" "{\n" -" return nsGenericResolve(cx, obj, id);\n" +"%s" "}\n"; -#define JSGEN_GENERATE_RESOLVE(buf, className) \ - sprintf(buf, kResolveStr, className, className); +static const char* kGenericResolveStr = +" return nsJSUtils::nsGenericResolve(cx, obj, id);\n"; + +static const char* kGlobalResolveStr = +" return nsJSUtils::nsGlobalResolve(cx, obj, id);\n"; + +#define JSGEN_GENERATE_RESOLVE(buf, className, str) \ + sprintf(buf, kResolveStr, className, className, str); void JSStubGen::GenerateResolve(IdlSpecification &aSpec) @@ -791,7 +801,12 @@ JSStubGen::GenerateResolve(IdlSpecification &aSpec) IdlInterface *iface = aSpec.GetInterfaceAt(0); char *name = iface->GetName(); - JSGEN_GENERATE_RESOLVE(buf, name); + if (mIsGlobal) { + JSGEN_GENERATE_RESOLVE(buf, name, kGlobalResolveStr); + } + else { + JSGEN_GENERATE_RESOLVE(buf, name, kGenericResolveStr); + } *file << buf; } @@ -837,7 +852,7 @@ static const char *kMethodBodyBeginStr = "\n" " if (argc >= %d) {\n"; static const char *kMethodObjectParamStr = "\n" -" if (JS_FALSE == nsConvertJSValToObject((nsISupports **)&b%d,\n" +" if (JS_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&b%d,\n" " kI%sIID,\n" " \"%s\",\n" " cx,\n" @@ -851,13 +866,13 @@ static const char *kMethodObjectParamStr = "\n" static const char *kMethodStringParamStr = "\n" -" nsConvertJSValToString(b%d, cx, argv[%d]);\n"; +" nsJSUtils::nsConvertJSValToString(b%d, cx, argv[%d]);\n"; #define JSGEN_GENERATE_STRINGPARAM(buffer, paramNum) \ sprintf(buffer, kMethodStringParamStr, paramNum, paramNum) static const char *kMethodBoolParamStr = "\n" -" if (!nsConvertJSValToBool(&b%d, cx, argv[%d])) {\n" +" if (!nsJSUtils::nsConvertJSValToBool(&b%d, cx, argv[%d])) {\n" " return JS_FALSE;\n" " }\n"; @@ -892,10 +907,10 @@ static const char *kMethodBodyMiddleNoReturnStr = "\n"; static const char *kMethodObjectRetStr = -" nsConvertObjectToJSVal(nativeRet, cx, rval);\n"; +" nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval);\n"; static const char *kMethodStringRetStr = -" nsConvertStringToJSVal(nativeRet, cx, rval);\n"; +" nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval);\n"; static const char *kMethodIntRetStr = " *rval = INT_TO_JSVAL(nativeRet);\n"; @@ -1228,50 +1243,35 @@ static const char *kConstructorBeginStr = "%s(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)\n" "{\n" " nsresult result;\n" -" nsIID factoryCID;\n" -" nsIDOMNativeObjectRegistry *registry;\n" -" nsIDOM%sFactory *factory;\n" +" nsIID classID;\n" +" nsIScriptContext* context = (nsIScriptContext*)JS_GetContextPrivate(cx);\n" +" nsIScriptNameSpaceManager* manager;\n" " nsIDOM%s *nativeThis;\n" " nsIScriptObjectOwner *owner = nsnull;\n" "\n" -" static NS_DEFINE_IID(kDOMNativeObjectRegistryCID, NS_DOM_NATIVE_OBJECT_REGISTRY_CID);\n" -" static NS_DEFINE_IID(kIDOMNativeObjectRegistryIID, NS_IDOM_NATIVE_OBJECT_REGISTRY_IID);\n" -" static NS_DEFINE_IID(kIDOM%sFactoryIID, NS_IDOM%sFACTORY_IID);\n" +" static NS_DEFINE_IID(kIDOM%sIID, NS_IDOM%s_IID);\n" "\n" -" result = nsServiceManager::GetService(kDOMNativeObjectRegistryCID,\n" -" kIDOMNativeObjectRegistryIID,\n" -" (nsISupports **)®istry);\n" +" result = context->GetNameSpaceManager(&manager);\n" " if (NS_OK != result) {\n" " return JS_FALSE;\n" " }\n" "\n" -" result = registry->GetFactoryCID(\"%s\", factoryCID);\n" -" nsServiceManager::ReleaseService(kDOMNativeObjectRegistryCID,\n" -" registry);\n" +" result = manager->LookupName(\"%s\", PR_TRUE, classID);\n" +" NS_RELEASE(manager);\n" " if (NS_OK != result) {\n" " return JS_FALSE;\n" " }\n" "\n" -" result = nsRepository::CreateInstance(factoryCID,\n" +" result = nsRepository::CreateInstance(classID,\n" " nsnull,\n" -" kIDOM%sFactoryIID,\n" -" (void **)&factory);\n" -" if (NS_OK != result) {\n" -" return JS_FALSE;\n" -" }\n" -"\n"; - -#define JSGEN_GENERATE_CONSTRUCTORBEGIN(buf, className, caps) \ - sprintf(buf, kConstructorBeginStr, className, className, className, \ - className, className, caps, className, className); - -static const char *kConstructorEndStr = -" result = factory->CreateInstance(%s&nativeThis);\n" -" NS_RELEASE(factory);\n" +" kIDOM%sIID,\n" +" (void **)&nativeThis);\n" " if (NS_OK != result) {\n" " return JS_FALSE;\n" " }\n" "\n" +" // XXX We should be calling Init() on the instance\n" +"\n" " result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);\n" " if (NS_OK != result) {\n" " NS_RELEASE(nativeThis);\n" @@ -1284,7 +1284,11 @@ static const char *kConstructorEndStr = " NS_RELEASE(owner);\n" " return JS_TRUE;\n" "}"; - + +#define JSGEN_GENERATE_CONSTRUCTOR(buf, className, caps) \ + sprintf(buf, kConstructorBeginStr, className, className, className, \ + className, caps, className, className); + void JSStubGen::GenerateConstructor(IdlSpecification &aSpec) { @@ -1299,9 +1303,7 @@ JSStubGen::GenerateConstructor(IdlSpecification &aSpec) StrUpr(caps_name); if (HasConstructor(*primary_iface, &constructor)) { - JSGEN_GENERATE_CONSTRUCTORBEGIN(buf, name, caps_name); - *file << buf; - sprintf(buf, kConstructorEndStr, ""); + JSGEN_GENERATE_CONSTRUCTOR(buf, name, caps_name); *file << buf; } else { diff --git a/mozilla/dom/tools/XPCOMGen.cpp b/mozilla/dom/tools/XPCOMGen.cpp index 2eb51bb6124..c8e92888a51 100644 --- a/mozilla/dom/tools/XPCOMGen.cpp +++ b/mozilla/dom/tools/XPCOMGen.cpp @@ -54,6 +54,7 @@ static const char *kClassDeclStr = "class nsIDOM%s : "; static const char *kBaseClassStr = "public nsIDOM%s"; static const char *kNoBaseClassStr = "public nsISupports"; static const char *kClassPrologStr = " {\npublic:\n"; +static const char *kStaticIIDStr = " static const nsIID& IID() { static nsIID iid = %s; return iid; }\n"; static const char *kEnumDeclBeginStr = " enum {\n"; static const char *kEnumEntryStr = " %s = %d%s\n"; static const char *kEnumDeclEndStr = " };\n"; @@ -122,13 +123,13 @@ XPCOMGen::Generate(char *aFileName, GenerateGuid(*iface); GenerateClassDecl(*iface); + GenerateStatic(*iface); GenerateEnums(*iface); GenerateMethods(*iface); GenerateEndClassDecl(); GenerateDeclMacro(*iface); GenerateForwardMacro(*iface); if (i == 0) { - GenerateFactory(*iface); GenerateEpilog(*iface, PR_TRUE); } else { @@ -243,6 +244,18 @@ XPCOMGen::GenerateClassDecl(IdlInterface &aInterface) *file << kClassPrologStr; } +void +XPCOMGen::GenerateStatic(IdlInterface &aInterface) +{ + char buf[512]; + char uuid_buf[256]; + ofstream *file = GetFile(); + + GetInterfaceIID(uuid_buf, aInterface); + sprintf(buf, kStaticIIDStr, uuid_buf); + *file << buf; +} + void XPCOMGen::GenerateEnums(IdlInterface &aInterface) { diff --git a/mozilla/dom/tools/XPCOMGen.h b/mozilla/dom/tools/XPCOMGen.h index 6cc2f2010f5..191bc2c66ad 100644 --- a/mozilla/dom/tools/XPCOMGen.h +++ b/mozilla/dom/tools/XPCOMGen.h @@ -41,6 +41,7 @@ protected: void GenerateForwardDecls(IdlInterface &aInterface); void GenerateGuid(IdlInterface &aInterface); void GenerateClassDecl(IdlInterface &aInterface); + void GenerateStatic(IdlInterface &aInterface); void GenerateEnums(IdlInterface &aInterface); void GenerateMethods(IdlInterface &aInterface); void GenerateEndClassDecl(); diff --git a/mozilla/layout/build/nsLayoutCID.h b/mozilla/layout/build/nsLayoutCID.h index c9ac6b5930a..dc27d3afaa0 100644 --- a/mozilla/layout/build/nsLayoutCID.h +++ b/mozilla/layout/build/nsLayoutCID.h @@ -38,7 +38,7 @@ 0xe11a6080, 0x4daa, 0x11d2, \ {0xb3, 0x28, 0x00, 0x80, 0x5f, 0x8a, 0x38, 0x59}} -#define NS_HTMLIMAGEELEMENTFACTORY_CID \ +#define NS_HTMLIMAGEELEMENT_CID \ { /* d6008c40-4dad-11d2-b328-00805f8a3859 */ \ 0xd6008c40, 0x4dad, 0x11d2, \ {0xb3, 0x28, 0x00, 0x80, 0x5f, 0x8a, 0x38, 0x59}} diff --git a/mozilla/layout/build/nsLayoutFactory.cpp b/mozilla/layout/build/nsLayoutFactory.cpp index 9eb8566175c..2990d55dc75 100644 --- a/mozilla/layout/build/nsLayoutFactory.cpp +++ b/mozilla/layout/build/nsLayoutFactory.cpp @@ -29,25 +29,23 @@ #include "nsHTMLAtoms.h" #include "nsHTMLParts.h" -#include "nsIDOMHTMLImageElement.h" #include "nsDOMCID.h" -#include "nsIDOMNativeObjectRegistry.h" #include "nsIServiceManager.h" #include "nsICSSParser.h" #include "nsIHTMLStyleSheet.h" #include "nsICollection.h" #include "nsIDOMRange.h" #include "nsINameSpaceManager.h" - +#include "nsIScriptNameSetRegistry.h" +#include "nsIScriptNameSpaceManager.h" +#include "nsIScriptExternalNameSet.h" static NS_DEFINE_IID(kCHTMLDocumentCID, NS_HTMLDOCUMENT_CID); static NS_DEFINE_IID(kCXMLDocumentCID, NS_XMLDOCUMENT_CID); static NS_DEFINE_IID(kCImageDocumentCID, NS_IMAGEDOCUMENT_CID); static NS_DEFINE_IID(kCCSSParserCID, NS_CSSPARSER_CID); static NS_DEFINE_CID(kHTMLStyleSheetCID, NS_HTMLSTYLESHEET_CID); -static NS_DEFINE_IID(kCHTMLImageElementFactoryCID, NS_HTMLIMAGEELEMENTFACTORY_CID); -static NS_DEFINE_IID(kIDOMHTMLImageElementFactoryIID, NS_IDOMHTMLIMAGEELEMENTFACTORY_IID); -static NS_DEFINE_IID(kIDOMHTMLImageElementIID, NS_IDOMHTMLIMAGEELEMENT_IID); +static NS_DEFINE_IID(kCHTMLImageElementCID, NS_HTMLIMAGEELEMENT_CID); static NS_DEFINE_IID(kCRangeListCID, NS_RANGELIST_CID); static NS_DEFINE_IID(kCRangeCID, NS_RANGE_CID); static NS_DEFINE_CID(kPresShellCID, NS_PRESSHELL_CID); @@ -61,48 +59,11 @@ nsresult NS_NewRangeList(nsICollection **); nsresult NS_NewRange(nsIDOMRange **); extern nsresult NS_NewFrameUtil(nsIFrameUtil** aResult); -class HTMLImageElementFactory : public nsIDOMHTMLImageElementFactory { -public: - HTMLImageElementFactory(); - ~HTMLImageElementFactory(); - - NS_DECL_ISUPPORTS - - NS_IMETHOD CreateInstance(nsIDOMHTMLImageElement **aReturn); -}; - -HTMLImageElementFactory::HTMLImageElementFactory() -{ - NS_INIT_REFCNT(); -} - -HTMLImageElementFactory::~HTMLImageElementFactory() -{ -} - -NS_IMPL_ISUPPORTS(HTMLImageElementFactory, kIDOMHTMLImageElementFactoryIID); - -NS_IMETHODIMP -HTMLImageElementFactory::CreateInstance(nsIDOMHTMLImageElement **aReturn) -{ - nsIHTMLContent *content; - - nsresult rv = NS_NewHTMLImageElement(&content, nsHTMLAtoms::img); - if (NS_OK != rv) { - return rv; - } - rv = content->QueryInterface(kIDOMHTMLImageElementIID, (void **)aReturn); - NS_RELEASE(content); - return rv; -} //////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////// -static NS_DEFINE_IID(kDOMNativeObjectRegistryCID, NS_DOM_NATIVE_OBJECT_REGISTRY_CID); -static NS_DEFINE_IID(kIDOMNativeObjectRegistryIID, NS_IDOM_NATIVE_OBJECT_REGISTRY_IID); - static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); @@ -218,9 +179,12 @@ nsresult nsLayoutFactory::CreateInstance(nsISupports *aOuter, } refCounted = PR_TRUE; } - else if (mClassID.Equals(kCHTMLImageElementFactoryCID)) { - inst = new HTMLImageElementFactory(); - refCounted = PR_FALSE; + else if (mClassID.Equals(kCHTMLImageElementCID)) { + res = NS_NewHTMLImageElement((nsIHTMLContent**)&inst, nsHTMLAtoms::img); + if (NS_FAILED(res)) { + return res; + } + refCounted = PR_TRUE; } else if (mClassID.Equals(kPresShellCID)) { res = NS_NewPresShell((nsIPresShell**) &inst); @@ -307,22 +271,80 @@ nsresult nsLayoutFactory::LockFactory(PRBool aLock) return NS_OK; } -class NativeObjectRegistryManager { +//////////////////////////////////////////////////////////// +// +//////////////////////////////////////////////////////////// + + +static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID); +static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID); +static NS_DEFINE_IID(kIScriptNameSpaceManagerIID, NS_ISCRIPTNAMESPACEMANAGER_IID); +static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID); + +class LayoutScriptNameSet : public nsIScriptExternalNameSet { public: - static nsIDOMNativeObjectRegistry *gRegistry; + LayoutScriptNameSet(); + ~LayoutScriptNameSet(); + + NS_DECL_ISUPPORTS - NativeObjectRegistryManager() {}; - ~NativeObjectRegistryManager() { + NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext); +}; + +LayoutScriptNameSet::LayoutScriptNameSet() +{ + NS_INIT_REFCNT(); +} + +LayoutScriptNameSet::~LayoutScriptNameSet() +{ +} + +NS_IMPL_ISUPPORTS(LayoutScriptNameSet, kIScriptExternalNameSetIID); + +NS_IMETHODIMP +LayoutScriptNameSet::AddNameSet(nsIScriptContext* aScriptContext) +{ + nsresult result = NS_OK; + nsIScriptNameSpaceManager* manager; + + result = aScriptContext->GetNameSpaceManager(&manager); + if (NS_OK == result) { + result = manager->RegisterGlobalName("HTMLImageElement", + kCHTMLImageElementCID, + PR_TRUE); + NS_RELEASE(manager); + } + + return result; +} + +//////////////////////////////////////////////////////////// +// +//////////////////////////////////////////////////////////// + +// The goal of this class is to hold onto the specified service +// until DLL unload time. +class ScriptNameSetRegistryHolder { +public: + static nsIScriptNameSetRegistry *gRegistry; + + ScriptNameSetRegistryHolder() {}; + ~ScriptNameSetRegistryHolder() { if (gRegistry) { - nsServiceManager::ReleaseService(kDOMNativeObjectRegistryCID, + nsServiceManager::ReleaseService(kCScriptNameSetRegistryCID, gRegistry); gRegistry = nsnull; } } }; -nsIDOMNativeObjectRegistry *NativeObjectRegistryManager::gRegistry = nsnull; -static NativeObjectRegistryManager gManager; +nsIScriptNameSetRegistry* ScriptNameSetRegistryHolder::gRegistry = nsnull; +static ScriptNameSetRegistryHolder gManager; + +//////////////////////////////////////////////////////////// +// +//////////////////////////////////////////////////////////// // return the proper factory to the caller #if defined(XP_MAC) && defined(MAC_STATIC) @@ -331,12 +353,13 @@ extern "C" NS_LAYOUT nsresult NSGetFactory_LAYOUT_DLL(const nsCID &aClass, nsIFa extern "C" NS_LAYOUT nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) #endif { - if (nsnull == NativeObjectRegistryManager::gRegistry) { - nsresult result = nsServiceManager::GetService(kDOMNativeObjectRegistryCID, - kIDOMNativeObjectRegistryIID, - (nsISupports **)&NativeObjectRegistryManager::gRegistry); + if (nsnull == ScriptNameSetRegistryHolder::gRegistry) { + nsresult result = nsServiceManager::GetService(kCScriptNameSetRegistryCID, + kIScriptNameSetRegistryIID, + (nsISupports **)&ScriptNameSetRegistryHolder::gRegistry); if (NS_OK == result) { - NativeObjectRegistryManager::gRegistry->RegisterFactory("HTMLImageElement", kCHTMLImageElementFactoryCID); + LayoutScriptNameSet* nameSet = new LayoutScriptNameSet(); + ScriptNameSetRegistryHolder::gRegistry->AddExternalNameSet(nameSet); } } diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp index 8923355382d..8085e9ab338 100644 --- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp +++ b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp @@ -123,11 +123,11 @@ static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); static NS_DEFINE_CID(kWellFormedDTDCID, NS_WELLFORMEDDTD_CID); static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); -static NS_DEFINE_IID(kCDOMNativeObjectRegistry, NS_DOM_NATIVE_OBJECT_REGISTRY_CID); +static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID); static NS_DEFINE_IID(kCHTMLDocument, NS_HTMLDOCUMENT_CID); static NS_DEFINE_IID(kCXMLDocument, NS_XMLDOCUMENT_CID); static NS_DEFINE_IID(kCImageDocument, NS_IMAGEDOCUMENT_CID); -static NS_DEFINE_IID(kCHTMLImageElementFactory, NS_HTMLIMAGEELEMENTFACTORY_CID); +static NS_DEFINE_IID(kCHTMLImageElement, NS_HTMLIMAGEELEMENT_CID); static NS_DEFINE_CID(kNameSpaceManagerCID, NS_NAMESPACEMANAGER_CID); static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID); @@ -188,11 +188,11 @@ NS_SetupRegistry() nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kWellFormedDTDCID, PARSER_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCDOMScriptObjectFactory, DOM_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kCDOMNativeObjectRegistry, DOM_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kCScriptNameSetRegistry, DOM_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCHTMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCXMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCImageDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kCHTMLImageElementFactory, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kCHTMLImageElement, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kNameSpaceManagerCID, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE); #ifndef XP_MAC // temporary diff --git a/mozilla/xpcom/base/IIDS.h b/mozilla/xpcom/base/IIDS.h index fe7990aa266..8556eb8638c 100644 --- a/mozilla/xpcom/base/IIDS.h +++ b/mozilla/xpcom/base/IIDS.h @@ -845,19 +845,19 @@ nsIUnicharStreamLoader = { /* a6cf90d8-15b3-11d2-932e-00805f8add32 */ 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }; -INTERFACENAME = { /* a6cf90d9-15b3-11d2-932e-00805f8add32 */ +nsIScriptNameSetRegistry = { /* a6cf90d9-15b3-11d2-932e-00805f8add32 */ 0xa6cf90d9, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }; -INTERFACENAME = { /* a6cf90da-15b3-11d2-932e-00805f8add32 */ +nsIScriptExternalNameSet = { /* a6cf90da-15b3-11d2-932e-00805f8add32 */ 0xa6cf90da, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }; -INTERFACENAME = { /* a6cf90db-15b3-11d2-932e-00805f8add32 */ +nsIScriptNameSpaceManager = { /* a6cf90db-15b3-11d2-932e-00805f8add32 */ 0xa6cf90db, 0x15b3, 0x11d2, diff --git a/mozilla/xpcom/src/IIDS.h b/mozilla/xpcom/src/IIDS.h index fe7990aa266..8556eb8638c 100644 --- a/mozilla/xpcom/src/IIDS.h +++ b/mozilla/xpcom/src/IIDS.h @@ -845,19 +845,19 @@ nsIUnicharStreamLoader = { /* a6cf90d8-15b3-11d2-932e-00805f8add32 */ 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }; -INTERFACENAME = { /* a6cf90d9-15b3-11d2-932e-00805f8add32 */ +nsIScriptNameSetRegistry = { /* a6cf90d9-15b3-11d2-932e-00805f8add32 */ 0xa6cf90d9, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }; -INTERFACENAME = { /* a6cf90da-15b3-11d2-932e-00805f8add32 */ +nsIScriptExternalNameSet = { /* a6cf90da-15b3-11d2-932e-00805f8add32 */ 0xa6cf90da, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }; -INTERFACENAME = { /* a6cf90db-15b3-11d2-932e-00805f8add32 */ +nsIScriptNameSpaceManager = { /* a6cf90db-15b3-11d2-932e-00805f8add32 */ 0xa6cf90db, 0x15b3, 0x11d2, diff --git a/mozilla/xpfe/bootstrap/nsSetupRegistry.cpp b/mozilla/xpfe/bootstrap/nsSetupRegistry.cpp index f9be7e2f254..918b62ac42b 100644 --- a/mozilla/xpfe/bootstrap/nsSetupRegistry.cpp +++ b/mozilla/xpfe/bootstrap/nsSetupRegistry.cpp @@ -128,11 +128,11 @@ static NS_DEFINE_IID(kCPluginHostCID, NS_PLUGIN_HOST_CID); static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID); static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID); -static NS_DEFINE_IID(kCDOMNativeObjectRegistry, NS_DOM_NATIVE_OBJECT_REGISTRY_CID); +static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID); static NS_DEFINE_IID(kCHTMLDocument, NS_HTMLDOCUMENT_CID); static NS_DEFINE_IID(kCXMLDocument, NS_XMLDOCUMENT_CID); static NS_DEFINE_IID(kCImageDocument, NS_IMAGEDOCUMENT_CID); -static NS_DEFINE_IID(kCHTMLImageElementFactory, NS_HTMLIMAGEELEMENTFACTORY_CID); +static NS_DEFINE_IID(kCHTMLImageElement, NS_HTMLIMAGEELEMENT_CID); static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID); static NS_DEFINE_IID(kCImageButtonCID, NS_IMAGEBUTTON_CID); @@ -186,11 +186,11 @@ NS_SetupRegistry() nsRepository::RegisterFactory(kCPluginHostCID, PLUGIN_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCParserCID, PARSER_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCDOMScriptObjectFactory, DOM_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kCDOMNativeObjectRegistry, DOM_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kCScriptNameSetRegistry, DOM_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCHTMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCXMLDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCImageDocument, LAYOUT_DLL, PR_FALSE, PR_FALSE); - nsRepository::RegisterFactory(kCHTMLImageElementFactory, LAYOUT_DLL, PR_FALSE, PR_FALSE); + nsRepository::RegisterFactory(kCHTMLImageElement, LAYOUT_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kNetServiceCID, NETLIB_DLL, PR_FALSE, PR_FALSE); nsRepository::RegisterFactory(kCImageButtonCID, WIDGET_DLL, PR_FALSE, PR_FALSE);