diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 5e41e12f234..e69ebb9fe86 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -463,36 +463,28 @@ public: // XXX These belong somewhere else -extern NS_EXPORT nsresult - NS_NewHTMLDocument(nsIDocument** aInstancePtrResult); +nsresult +NS_NewHTMLDocument(nsIDocument** aInstancePtrResult); -extern NS_EXPORT nsresult - NS_NewXMLDocument(nsIDocument** aInstancePtrResult); +nsresult +NS_NewXMLDocument(nsIDocument** aInstancePtrResult); #ifdef MOZ_SVG -extern NS_EXPORT nsresult - NS_NewSVGDocument(nsIDocument** aInstancePtrResult); +nsresult +NS_NewSVGDocument(nsIDocument** aInstancePtrResult); #endif -extern NS_EXPORT nsresult - NS_NewImageDocument(nsIDocument** aInstancePtrResult); +nsresult +NS_NewImageDocument(nsIDocument** aInstancePtrResult); -extern NS_EXPORT nsresult - NS_NewDocumentFragment(nsIDOMDocumentFragment** aInstancePtrResult, - nsIDocument* aOwnerDocument); -extern NS_EXPORT nsresult - NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult, - const nsAString& aNamespaceURI, - const nsAString& aQualifiedName, - nsIDOMDocumentType* aDoctype, - nsIURI* aBaseURI); - -// Note: The buffer passed into NewPostData(...) becomes owned by the IPostData -// instance and is freed when the instance is destroyed... -// -#if 0 -extern NS_EXPORT nsresult - NS_NewPostData(PRBool aIsFile, char *aData, nsIPostData** aInstancePtrResult); -#endif +nsresult +NS_NewDocumentFragment(nsIDOMDocumentFragment** aInstancePtrResult, + nsIDocument* aOwnerDocument); +nsresult +NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult, + const nsAString& aNamespaceURI, + const nsAString& aQualifiedName, + nsIDOMDocumentType* aDoctype, + nsIURI* aBaseURI); #endif /* nsIDocument_h___ */ diff --git a/mozilla/content/base/public/nsINodeInfo.h b/mozilla/content/base/public/nsINodeInfo.h index a492776c9c9..c6b7c4de475 100644 --- a/mozilla/content/base/public/nsINodeInfo.h +++ b/mozilla/content/base/public/nsINodeInfo.h @@ -383,6 +383,7 @@ public: NS_IMETHOD GetNodeInfoArray(nsISupportsArray** aArray) = 0; }; -extern nsresult NS_NewNodeInfoManager(nsINodeInfoManager** aResult); +nsresult +NS_NewNodeInfoManager(nsINodeInfoManager** aResult); #endif /* nsINodeInfo_h___ */ diff --git a/mozilla/content/base/public/nsIPrivateDOMImplementation.h b/mozilla/content/base/public/nsIPrivateDOMImplementation.h index 216a3a0c990..1c122404acd 100644 --- a/mozilla/content/base/public/nsIPrivateDOMImplementation.h +++ b/mozilla/content/base/public/nsIPrivateDOMImplementation.h @@ -59,7 +59,7 @@ public: NS_IMETHOD Init(nsIURI* aBaseURI) = 0; }; -NS_EXPORT nsresult +nsresult NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult); #endif // nsIPrivateDOMImplementation_h__ diff --git a/mozilla/content/base/public/nsITextContent.h b/mozilla/content/base/public/nsITextContent.h index 3c8a9a7f4d3..3f7302c1993 100644 --- a/mozilla/content/base/public/nsITextContent.h +++ b/mozilla/content/base/public/nsITextContent.h @@ -140,10 +140,10 @@ public: }; // XXX These belong elsewhere -extern nsresult +nsresult NS_NewTextNode(nsITextContent** aResult); -extern nsresult +nsresult NS_NewCommentNode(nsIContent** aResult); diff --git a/mozilla/content/base/src/mozSanitizingSerializer.h b/mozilla/content/base/src/mozSanitizingSerializer.h index 164bd45b8a8..44cc338f6cb 100644 --- a/mozilla/content/base/src/mozSanitizingSerializer.h +++ b/mozilla/content/base/src/mozSanitizingSerializer.h @@ -164,7 +164,7 @@ protected: nsCOMPtr mParserService; }; -extern nsresult NS_NewSanitizingHTMLSerializer( - nsIContentSerializer** aSerializer); +nsresult +NS_NewSanitizingHTMLSerializer(nsIContentSerializer** aSerializer); #endif diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h index a6aba66588a..c2a0d2cba15 100644 --- a/mozilla/content/base/src/nsContentList.h +++ b/mozilla/content/base/src/nsContentList.h @@ -321,7 +321,7 @@ protected: */ #define LIST_LAZY 2 -extern nsresult +nsresult NS_GetContentList(nsIDocument* aDocument, nsIAtom* aMatchAtom, PRInt32 aMatchNameSpaceId, nsIContent* aRootContent, nsIContentList** aInstancePtrResult); diff --git a/mozilla/content/base/src/nsDOMBuilder.h b/mozilla/content/base/src/nsDOMBuilder.h index 0e5c0cbc711..02e077ae31c 100644 --- a/mozilla/content/base/src/nsDOMBuilder.h +++ b/mozilla/content/base/src/nsDOMBuilder.h @@ -68,7 +68,7 @@ private: nsCOMPtr mDOMImplementation; }; -extern nsresult +nsresult NS_NewDOMBuilder(nsIDOMDOMBuilder** aResult, PRUint16 aMode, const nsAString & aSchemaType, diff --git a/mozilla/content/base/src/nsDOMDocumentType.h b/mozilla/content/base/src/nsDOMDocumentType.h index 123537fde0c..672f21b7174 100644 --- a/mozilla/content/base/src/nsDOMDocumentType.h +++ b/mozilla/content/base/src/nsDOMDocumentType.h @@ -83,7 +83,7 @@ protected: nsString mInternalSubset; }; -extern nsresult +nsresult NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType, const nsAString& aName, nsIDOMNamedNodeMap *aEntities, diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index ced475e65c6..9f1f855341b 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -313,7 +313,7 @@ protected: }; -NS_EXPORT nsresult +nsresult NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult) { nsDOMImplementation* domImpl = new nsDOMImplementation(); diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.h b/mozilla/content/base/src/nsHTMLContentSerializer.h index 744c18ca3a8..42b556f4a53 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.h +++ b/mozilla/content/base/src/nsHTMLContentSerializer.h @@ -154,6 +154,7 @@ class nsHTMLContentSerializer : public nsXMLContentSerializer { nsAutoVoidArray mOLStateStack;// Stack to store one olState struct per
    . }; -extern nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer); +nsresult +NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer); #endif diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp index e568e2a89b5..926404a7c27 100644 --- a/mozilla/content/base/src/nsNameSpaceManager.cpp +++ b/mozilla/content/base/src/nsNameSpaceManager.cpp @@ -50,7 +50,7 @@ static nsINameSpaceManager* gNameSpaceManager = nsnull; -extern nsresult NS_NewXMLElementFactory(nsIElementFactory** aResult); +nsresult NS_NewXMLElementFactory(nsIElementFactory** aResult); #define kXMLNSNameSpaceURI "http://www.w3.org/2000/xmlns/" #define kXMLNameSpaceURI "http://www.w3.org/XML/1998/namespace" diff --git a/mozilla/content/base/src/nsPagePrintTimer.h b/mozilla/content/base/src/nsPagePrintTimer.h index 713d2768f52..1ef4f3213fb 100644 --- a/mozilla/content/base/src/nsPagePrintTimer.h +++ b/mozilla/content/base/src/nsPagePrintTimer.h @@ -96,6 +96,7 @@ private: }; -extern nsresult NS_NewPagePrintTimer(nsPagePrintTimer **aResult); +nsresult +NS_NewPagePrintTimer(nsPagePrintTimer **aResult); #endif /* nsPagePrintTimer_h___ */ diff --git a/mozilla/content/base/src/nsPlainTextSerializer.h b/mozilla/content/base/src/nsPlainTextSerializer.h index 668680970d0..fd1229820cc 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.h +++ b/mozilla/content/base/src/nsPlainTextSerializer.h @@ -273,6 +273,7 @@ protected: const nsString kSpace; }; -extern nsresult NS_NewPlainTextSerializer(nsIContentSerializer** aSerializer); +nsresult +NS_NewPlainTextSerializer(nsIContentSerializer** aSerializer); #endif diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp index 860121e179a..c70b97619f8 100644 --- a/mozilla/content/base/src/nsStyleSet.cpp +++ b/mozilla/content/base/src/nsStyleSet.cpp @@ -1842,7 +1842,7 @@ void StyleSetImpl::ListContexts(nsIFrame* aRootFrame, FILE* out, PRInt32 aIndent #endif -NS_EXPORT nsresult +nsresult NS_NewStyleSet(nsIStyleSet** aInstancePtrResult) { if (!aInstancePtrResult) { diff --git a/mozilla/content/base/src/nsSyncLoadService.cpp b/mozilla/content/base/src/nsSyncLoadService.cpp index b38ffa1e8fd..f5716c6c785 100644 --- a/mozilla/content/base/src/nsSyncLoadService.cpp +++ b/mozilla/content/base/src/nsSyncLoadService.cpp @@ -72,7 +72,6 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); // This is ugly, but nsXBLContentSink.h isn't exported -extern nsresult NS_NewXBLContentSink(nsIXMLContentSink** aResult, nsIDocument* aDoc, diff --git a/mozilla/content/base/src/nsTextContentChangeData.h b/mozilla/content/base/src/nsTextContentChangeData.h index cbd0d98e3ff..2fe7a7613d3 100644 --- a/mozilla/content/base/src/nsTextContentChangeData.h +++ b/mozilla/content/base/src/nsTextContentChangeData.h @@ -82,7 +82,7 @@ protected: }; // Create a new instance of nsTextContentChangeData with a refcnt of 1 -extern nsresult +nsresult NS_NewTextContentChangeData(nsTextContentChangeData** aResult); #endif /* nsTextContentChangeData_h___ */ diff --git a/mozilla/content/base/src/nsXMLContentSerializer.h b/mozilla/content/base/src/nsXMLContentSerializer.h index 54727b3e054..5b10f85625c 100644 --- a/mozilla/content/base/src/nsXMLContentSerializer.h +++ b/mozilla/content/base/src/nsXMLContentSerializer.h @@ -121,6 +121,7 @@ class nsXMLContentSerializer : public nsIContentSerializer { PRBool mInAttribute; }; -extern nsresult NS_NewXMLContentSerializer(nsIContentSerializer** aSerializer); +nsresult +NS_NewXMLContentSerializer(nsIContentSerializer** aSerializer); #endif diff --git a/mozilla/content/events/public/nsIEventListenerManager.h b/mozilla/content/events/public/nsIEventListenerManager.h index 08488c97deb..bacc35721ea 100644 --- a/mozilla/content/events/public/nsIEventListenerManager.h +++ b/mozilla/content/events/public/nsIEventListenerManager.h @@ -185,7 +185,7 @@ public: NS_IMETHOD GetSystemEventGroupLM(nsIDOMEventGroup** aGroup) = 0; }; -extern nsresult +nsresult NS_NewEventListenerManager(nsIEventListenerManager** aInstancePtrResult); #endif // nsIEventListenerManager_h__ diff --git a/mozilla/content/events/public/nsIPrivateDOMEvent.h b/mozilla/content/events/public/nsIPrivateDOMEvent.h index ca2c0d3a7ad..543b7098c3f 100644 --- a/mozilla/content/events/public/nsIPrivateDOMEvent.h +++ b/mozilla/content/events/public/nsIPrivateDOMEvent.h @@ -71,12 +71,15 @@ public: NS_IMETHOD SetTrusted(PRBool aTrusted)=0; }; -extern nsresult NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext* aPresContext, nsEvent *aEvent); -extern nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, - nsIPresContext* aPresContext, - const nsAString& aEventType, - nsEvent *aEvent); -extern nsresult NS_NewDOMMutationEvent(nsIDOMEvent** aResult, nsIPresContext* aPresContext, - nsEvent* aEvent); +nsresult +NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext* aPresContext, + nsEvent *aEvent); +nsresult +NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, + nsIPresContext* aPresContext, const nsAString& aEventType, + nsEvent *aEvent); +nsresult +NS_NewDOMMutationEvent(nsIDOMEvent** aResult, nsIPresContext* aPresContext, + nsEvent* aEvent); #endif // nsIPrivateDOMEvent_h__ diff --git a/mozilla/content/events/src/nsEventStateManager.h b/mozilla/content/events/src/nsEventStateManager.h index 4fb3c2b9ccd..6425bdf88d0 100644 --- a/mozilla/content/events/src/nsEventStateManager.h +++ b/mozilla/content/events/src/nsEventStateManager.h @@ -337,6 +337,7 @@ protected: }; -extern nsresult NS_NewEventStateManager(nsIEventStateManager** aInstancePtrResult); +nsresult +NS_NewEventStateManager(nsIEventStateManager** aInstancePtrResult); #endif // nsEventStateManager_h__ diff --git a/mozilla/content/html/content/public/nsIRadioVisitor.h b/mozilla/content/html/content/public/nsIRadioVisitor.h index daf33c8163e..0f0124acbc8 100644 --- a/mozilla/content/html/content/public/nsIRadioVisitor.h +++ b/mozilla/content/html/content/public/nsIRadioVisitor.h @@ -77,8 +77,9 @@ public: * @param aVisitor the visitor (out param) * @param aCheckedChanged the value of CheckedChanged to set on all elements */ -extern NS_METHOD NS_GetRadioSetCheckedChangedVisitor(PRBool aCheckedChanged, - nsIRadioVisitor** aVisitor); +nsresult +NS_GetRadioSetCheckedChangedVisitor(PRBool aCheckedChanged, + nsIRadioVisitor** aVisitor); /** * This visitor will take the boolean you're pointing at and put @@ -89,8 +90,9 @@ extern NS_METHOD NS_GetRadioSetCheckedChangedVisitor(PRBool aCheckedChanged, * @param aCheckedChanged the boolean to put CheckedChanged into * @param aExcludeElement the element */ -extern NS_METHOD NS_GetRadioGetCheckedChangedVisitor(PRBool* aCheckedChanged, - nsIFormControl* aExcludeElement, - nsIRadioVisitor** aVisitor); +nsresult +NS_GetRadioGetCheckedChangedVisitor(PRBool* aCheckedChanged, + nsIFormControl* aExcludeElement, + nsIRadioVisitor** aVisitor); #endif // nsIRadioVisitor_h___ diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index ad960f507f7..ed70db74bfa 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -311,34 +311,6 @@ protected: char* mValue; }; -// -// Visitor declarations -// - -/** - * This visitor sets CheckedChanged on all elements it finds. - * - * @param aCheckedChanged the value of CheckedChanged to set on all elements - * @param aVisitor the visitor (out param) - */ -NS_METHOD NS_GetRadioSetCheckedChangedVisitor(PRBool aCheckedChanged, - nsIRadioVisitor** aVisitor); - -/** - * This visitor will take the boolean you're pointing at and put - * aCheckedChanged into it. If the visitor is never called, aCheckedChanged - * will of course not change. - * - * @param aCheckedChanged the boolean to put CheckedChanged into - * @param aExcludeElement an element to exclude--i.e. don't get checked changed - * on this element - * @param aVisitor the visitor (out param) - */ -NS_METHOD NS_GetRadioGetCheckedChangedVisitor(PRBool* aCheckedChanged, - nsIFormControl* aExcludeElement, - nsIRadioVisitor** aVisitor); - - // // construction, destruction // @@ -2815,7 +2787,7 @@ protected: nsIFormControl* mExcludeElement; }; -NS_METHOD +nsresult NS_GetRadioSetCheckedChangedVisitor(PRBool aCheckedChanged, nsIRadioVisitor** aVisitor) { @@ -2859,7 +2831,7 @@ NS_GetRadioSetCheckedChangedVisitor(PRBool aCheckedChanged, return NS_OK; } -NS_METHOD +nsresult NS_GetRadioGetCheckedChangedVisitor(PRBool* aCheckedChanged, nsIFormControl* aExcludeElement, nsIRadioVisitor** aVisitor) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index d5e7bc324c2..3059aef26a6 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -193,7 +193,7 @@ MyPrefChangedCallback(const char*aPrefName, void* instance_data) // ================================================================== // = // ================================================================== -NS_EXPORT nsresult +nsresult NS_NewHTMLDocument(nsIDocument** aInstancePtrResult) { nsHTMLDocument* doc = new nsHTMLDocument(); diff --git a/mozilla/content/html/style/public/nsICSSLoader.h b/mozilla/content/html/style/public/nsICSSLoader.h index b547727f1bc..55c13f7b9a0 100644 --- a/mozilla/content/html/style/public/nsICSSLoader.h +++ b/mozilla/content/html/style/public/nsICSSLoader.h @@ -138,10 +138,10 @@ public: NS_IMETHOD SetEnabled(PRBool aEnabled) = 0; }; -extern NS_EXPORT nsresult +nsresult NS_NewCSSLoader(nsIDocument* aDocument, nsICSSLoader** aLoader); -extern NS_EXPORT nsresult +nsresult NS_NewCSSLoader(nsICSSLoader** aLoader); #endif /* nsICSSLoader_h___ */ diff --git a/mozilla/content/html/style/public/nsICSSParser.h b/mozilla/content/html/style/public/nsICSSParser.h index 6f8dd0a33c2..8ddce6bc130 100644 --- a/mozilla/content/html/style/public/nsICSSParser.h +++ b/mozilla/content/html/style/public/nsICSSParser.h @@ -114,7 +114,7 @@ public: #define NS_CSS_GETINFO_CSS2 ((PRUint32) 0x00000004L) #define NS_CSS_GETINFO_CSS_FROSTING ((PRUint32) 0x00000008L) -extern NS_EXPORT nsresult - NS_NewCSSParser(nsICSSParser** aInstancePtrResult); +nsresult +NS_NewCSSParser(nsICSSParser** aInstancePtrResult); #endif /* nsCSS1Parser_h___ */ diff --git a/mozilla/content/html/style/public/nsICSSStyleSheet.h b/mozilla/content/html/style/public/nsICSSStyleSheet.h index a14b8608be3..6ccaa54f77d 100644 --- a/mozilla/content/html/style/public/nsICSSStyleSheet.h +++ b/mozilla/content/html/style/public/nsICSSStyleSheet.h @@ -100,10 +100,10 @@ public: }; // XXX for backwards compatibility and convenience -extern NS_EXPORT nsresult - NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult, nsIURI* aURL); +nsresult +NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult, nsIURI* aURL); -extern NS_EXPORT nsresult - NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult); +nsresult +NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult); #endif /* nsICSSStyleSheet_h___ */ diff --git a/mozilla/content/html/style/public/nsIComputedDOMStyle.h b/mozilla/content/html/style/public/nsIComputedDOMStyle.h index 18b656b557b..0dace03fdb7 100644 --- a/mozilla/content/html/style/public/nsIComputedDOMStyle.h +++ b/mozilla/content/html/style/public/nsIComputedDOMStyle.h @@ -56,7 +56,7 @@ public: nsIPresShell *aPresShell) = 0; }; -extern NS_EXPORT nsresult +nsresult NS_NewComputedDOMStyle(nsIComputedDOMStyle** aComputedStyle); #endif /* nsIComputedDOMStyle_h___ */ diff --git a/mozilla/content/html/style/public/nsIMediaList.h b/mozilla/content/html/style/public/nsIMediaList.h index 72e7713d3e1..a7c9198b99f 100644 --- a/mozilla/content/html/style/public/nsIMediaList.h +++ b/mozilla/content/html/style/public/nsIMediaList.h @@ -44,12 +44,14 @@ public: NS_IMETHOD MatchesMedium(nsIAtom* aMedium, PRBool* aMatch); \ NS_IMETHOD DropReference(void); -extern NS_EXPORT nsresult -NS_NewMediaList(const nsAString& aMediaText, nsIMediaList** aInstancePtrResult); +nsresult +NS_NewMediaList(const nsAString& aMediaText, + nsIMediaList** aInstancePtrResult); -extern NS_EXPORT nsresult +nsresult NS_NewMediaList(nsIMediaList** aInstancePtrResult); -extern NS_EXPORT nsresult -NS_NewMediaList(nsISupportsArray* aArray, nsICSSStyleSheet* aSheet, nsIMediaList** aInstancePtrResult); +nsresult +NS_NewMediaList(nsISupportsArray* aArray, nsICSSStyleSheet* aSheet, + nsIMediaList** aInstancePtrResult); #endif /* nsICSSLoader_h___ */ diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index 3846f816a8e..01d369d0655 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -6126,8 +6126,8 @@ nsCSSDeclaration::Clone() const } -NS_EXPORT nsresult - NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult) +nsresult +NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult) { if (aInstancePtrResult == nsnull) { return NS_ERROR_NULL_POINTER; diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.h b/mozilla/content/html/style/src/nsCSSDeclaration.h index 7d90322fb62..f28529555a6 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.h +++ b/mozilla/content/html/style/src/nsCSSDeclaration.h @@ -760,8 +760,8 @@ private: }; -extern NS_EXPORT nsresult - NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult); +nsresult +NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult); #endif /* nsCSSDeclaration_h___ */ diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 2064316c122..b6808f99f26 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -368,7 +368,7 @@ PR_STATIC_CALLBACK(void) AppendRuleToSheet(nsICSSRule* aRule, void* aParser) parser->AppendRule(aRule); } -NS_EXPORT nsresult +nsresult NS_NewCSSParser(nsICSSParser** aInstancePtrResult) { CSSParserImpl *it = new CSSParserImpl(); diff --git a/mozilla/content/html/style/src/nsCSSRules.cpp b/mozilla/content/html/style/src/nsCSSRules.cpp index 46b4497132c..aed43a7e994 100644 --- a/mozilla/content/html/style/src/nsCSSRules.cpp +++ b/mozilla/content/html/style/src/nsCSSRules.cpp @@ -275,7 +275,7 @@ CSSCharsetRuleImpl::SetEncoding(const nsAString& aEncoding) } -NS_EXPORT nsresult +nsresult NS_NewCSSCharsetRule(nsICSSRule** aInstancePtrResult, const nsAString& aEncoding) { if (! aInstancePtrResult) { @@ -524,7 +524,7 @@ CSSImportRuleImpl::SetSheet(nsICSSStyleSheet* aSheet) return NS_OK; } -NS_EXPORT nsresult +nsresult NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, const nsString& aURLSpec, const nsString& aMedia) diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index 3846f816a8e..01d369d0655 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/content/html/style/src/nsCSSStruct.cpp @@ -6126,8 +6126,8 @@ nsCSSDeclaration::Clone() const } -NS_EXPORT nsresult - NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult) +nsresult +NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult) { if (aInstancePtrResult == nsnull) { return NS_ERROR_NULL_POINTER; diff --git a/mozilla/content/html/style/src/nsCSSStruct.h b/mozilla/content/html/style/src/nsCSSStruct.h index 7d90322fb62..f28529555a6 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.h +++ b/mozilla/content/html/style/src/nsCSSStruct.h @@ -760,8 +760,8 @@ private: }; -extern NS_EXPORT nsresult - NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult); +nsresult +NS_NewCSSDeclaration(nsCSSDeclaration** aInstancePtrResult); #endif /* nsCSSDeclaration_h___ */ diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index 0b16fcd698e..b4a944a6835 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -2307,8 +2307,9 @@ CSSStyleRuleImpl::GetStyle(nsIDOMCSSStyleDeclaration** aStyle) return NS_OK; } -NS_EXPORT nsresult - NS_NewCSSStyleRule(nsICSSStyleRule** aInstancePtrResult, const nsCSSSelector& aSelector) +nsresult +NS_NewCSSStyleRule(nsICSSStyleRule** aInstancePtrResult, + const nsCSSSelector& aSelector) { if (aInstancePtrResult == nsnull) { return NS_ERROR_NULL_POINTER; diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp index 5fecf9be641..c932a59bf22 100644 --- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp @@ -3000,8 +3000,8 @@ CSSStyleSheetImpl::StyleSheetLoaded(nsICSSStyleSheet*aSheet, PRBool aNotify) } // XXX for backwards compatibility and convenience -NS_EXPORT nsresult - NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult, nsIURI* aURL) +nsresult +NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult, nsIURI* aURL) { nsICSSStyleSheet* sheet; nsresult rv; @@ -3017,8 +3017,8 @@ NS_EXPORT nsresult return NS_OK; } -NS_EXPORT nsresult - NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult) +nsresult +NS_NewCSSStyleSheet(nsICSSStyleSheet** aInstancePtrResult) { if (aInstancePtrResult == nsnull) { return NS_ERROR_NULL_POINTER; diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp index cf6371e352d..c31d3557fdf 100644 --- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp @@ -657,9 +657,9 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const #endif // XXX For backwards compatibility and convenience -NS_EXPORT nsresult - NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult, nsIURI* aURL, - nsIDocument* aDocument) +nsresult +NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult, + nsIURI* aURL, nsIDocument* aDocument) { nsresult rv; nsIHTMLCSSStyleSheet* sheet; @@ -675,8 +675,8 @@ NS_EXPORT nsresult return NS_OK; } -NS_EXPORT nsresult - NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult) +nsresult +NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult) { if (aInstancePtrResult == nsnull) { return NS_ERROR_NULL_POINTER; diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index 0550c538a06..cd61e9d7cd1 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -1276,7 +1276,7 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const #endif // XXX For convenience and backwards compatibility -NS_EXPORT nsresult +nsresult NS_NewHTMLStyleSheet(nsIHTMLStyleSheet** aInstancePtrResult, nsIURI* aURL, nsIDocument* aDocument) { @@ -1295,7 +1295,7 @@ NS_NewHTMLStyleSheet(nsIHTMLStyleSheet** aInstancePtrResult, nsIURI* aURL, } -NS_EXPORT nsresult +nsresult NS_NewHTMLStyleSheet(nsIHTMLStyleSheet** aInstancePtrResult) { NS_ASSERTION(aInstancePtrResult, "null out param"); diff --git a/mozilla/content/html/style/src/nsICSSImportRule.h b/mozilla/content/html/style/src/nsICSSImportRule.h index 17611bf1f85..921e2ab573d 100644 --- a/mozilla/content/html/style/src/nsICSSImportRule.h +++ b/mozilla/content/html/style/src/nsICSSImportRule.h @@ -61,9 +61,8 @@ public: NS_IMETHOD SetSheet(nsICSSStyleSheet*) = 0; }; -extern NS_EXPORT nsresult - NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, - const nsString& aURLSpec, - const nsString& aMedia); +nsresult +NS_NewCSSImportRule(nsICSSImportRule** aInstancePtrResult, + const nsString& aURLSpec, const nsString& aMedia); #endif /* nsICSSImportRule_h___ */ diff --git a/mozilla/content/html/style/src/nsICSSMediaRule.h b/mozilla/content/html/style/src/nsICSSMediaRule.h index 981581055e2..810e51621c4 100644 --- a/mozilla/content/html/style/src/nsICSSMediaRule.h +++ b/mozilla/content/html/style/src/nsICSSMediaRule.h @@ -55,7 +55,7 @@ public: NS_IMETHOD_(PRBool) UseForMedium(nsIAtom* aMedium) const = 0; }; -extern NS_EXPORT nsresult - NS_NewCSSMediaRule(nsICSSMediaRule** aInstancePtrResult); +nsresult +NS_NewCSSMediaRule(nsICSSMediaRule** aInstancePtrResult); #endif /* nsICSSMediaRule_h___ */ diff --git a/mozilla/content/html/style/src/nsICSSNameSpaceRule.h b/mozilla/content/html/style/src/nsICSSNameSpaceRule.h index 2b0ae0468e4..e07a0adb549 100644 --- a/mozilla/content/html/style/src/nsICSSNameSpaceRule.h +++ b/mozilla/content/html/style/src/nsICSSNameSpaceRule.h @@ -59,8 +59,8 @@ public: NS_IMETHOD SetURLSpec(const nsString& aURLSpec) = 0; }; -extern NS_EXPORT nsresult - NS_NewCSSNameSpaceRule(nsICSSNameSpaceRule** aInstancePtrResult, - nsIAtom* aPrefix, const nsString& aURLSpec); +nsresult +NS_NewCSSNameSpaceRule(nsICSSNameSpaceRule** aInstancePtrResult, + nsIAtom* aPrefix, const nsString& aURLSpec); #endif /* nsICSSNameSpaceRule_h___ */ diff --git a/mozilla/content/html/style/src/nsICSSRule.h b/mozilla/content/html/style/src/nsICSSRule.h index 69a6ba05166..bd8556efe91 100644 --- a/mozilla/content/html/style/src/nsICSSRule.h +++ b/mozilla/content/html/style/src/nsICSSRule.h @@ -73,7 +73,8 @@ public: /* Define global NS_New* functions for rules that don't need their own interfaces here */ -extern NS_EXPORT nsresult - NS_NewCSSCharsetRule(nsICSSRule** aInstancePtrResult, const nsAString& aEncoding); +nsresult +NS_NewCSSCharsetRule(nsICSSRule** aInstancePtrResult, + const nsAString& aEncoding); #endif /* nsICSSRule_h___ */ diff --git a/mozilla/content/html/style/src/nsICSSStyleRule.h b/mozilla/content/html/style/src/nsICSSStyleRule.h index bf140f4cf54..a18f26066ed 100644 --- a/mozilla/content/html/style/src/nsICSSStyleRule.h +++ b/mozilla/content/html/style/src/nsICSSStyleRule.h @@ -181,7 +181,8 @@ public: virtual nsresult GetValue(nsCSSProperty aProperty, nsCSSValue& aValue) = 0; }; -extern NS_EXPORT nsresult - NS_NewCSSStyleRule(nsICSSStyleRule** aInstancePtrResult, const nsCSSSelector& aSelector); +nsresult +NS_NewCSSStyleRule(nsICSSStyleRule** aInstancePtrResult, + const nsCSSSelector& aSelector); #endif /* nsICSSStyleRule_h___ */ diff --git a/mozilla/content/html/style/src/nsIHTMLCSSStyleSheet.h b/mozilla/content/html/style/src/nsIHTMLCSSStyleSheet.h index 869b8c3a029..cc6f7443446 100644 --- a/mozilla/content/html/style/src/nsIHTMLCSSStyleSheet.h +++ b/mozilla/content/html/style/src/nsIHTMLCSSStyleSheet.h @@ -53,11 +53,11 @@ public: }; // XXX for convenience and backward compatibility -extern NS_EXPORT nsresult - NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult, nsIURI* aURL, - nsIDocument* aDocument); +nsresult +NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult, + nsIURI* aURL, nsIDocument* aDocument); -extern NS_EXPORT nsresult - NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult); +nsresult +NS_NewHTMLCSSStyleSheet(nsIHTMLCSSStyleSheet** aInstancePtrResult); #endif /* nsIHTMLCSSStyleSheet_h___ */ diff --git a/mozilla/content/html/style/src/nsStyleUtil.cpp b/mozilla/content/html/style/src/nsStyleUtil.cpp index 76354029d66..08ab6fcd701 100644 --- a/mozilla/content/html/style/src/nsStyleUtil.cpp +++ b/mozilla/content/html/style/src/nsStyleUtil.cpp @@ -394,7 +394,7 @@ nscoord nsStyleUtil::CalcFontPointSize(PRInt32 aHTMLSize, PRInt32 aBasePointSize nsFontSizeType aFontSizeType) { #if DUMP_FONT_SIZES - extern void DumpFontSizes(nsIPresContext* aPresContext); + void DumpFontSizes(nsIPresContext* aPresContext); DumpFontSizes(aPresContext); #endif if (UseNewFontAlgorithm()) diff --git a/mozilla/content/svg/content/src/nsISVGValue.h b/mozilla/content/svg/content/src/nsISVGValue.h index 623171084d1..149b58dc8d6 100644 --- a/mozilla/content/svg/content/src/nsISVGValue.h +++ b/mozilla/content/svg/content/src/nsISVGValue.h @@ -74,7 +74,7 @@ public: NS_IMETHOD RemoveObserver(nsISVGValueObserver* observer)=0; }; -extern nsresult +nsresult NS_CreateSVGGenericStringValue(const nsAString& aValue, nsISVGValue** aResult); #endif // __NS_ISVGVALUE_H__ diff --git a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp index a781b5fb5d0..9cbc51fcf4b 100644 --- a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp +++ b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp @@ -43,16 +43,26 @@ #include "nsSVGAtoms.h" #include "nsIXMLContent.h" -extern nsresult NS_NewSVGPolylineElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGPolygonElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGCircleElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGEllipseElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGLineElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGRectElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGGElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGSVGElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGForeignObjectElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); -extern nsresult NS_NewSVGPathElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGPolylineElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGPolygonElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGCircleElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGEllipseElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGLineElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGRectElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGGElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGSVGElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGForeignObjectElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +nsresult +NS_NewSVGPathElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); class nsSVGElementFactory : public nsIElementFactory diff --git a/mozilla/content/svg/document/src/nsSVGDocument.cpp b/mozilla/content/svg/document/src/nsSVGDocument.cpp index a950924d4c8..f527a965d58 100644 --- a/mozilla/content/svg/document/src/nsSVGDocument.cpp +++ b/mozilla/content/svg/document/src/nsSVGDocument.cpp @@ -138,7 +138,7 @@ nsSVGDocument::GetRootElement(nsIDOMSVGSVGElement** aRootElement) { return NS_ERROR_NOT_IMPLEMENTED; } -NS_EXPORT nsresult +nsresult NS_NewSVGDocument(nsIDocument** aInstancePtrResult) { nsSVGDocument* doc = new nsSVGDocument(); diff --git a/mozilla/content/xbl/public/nsIXBLBinding.h b/mozilla/content/xbl/public/nsIXBLBinding.h index 57d6fea9cf6..3c68fee9b9e 100644 --- a/mozilla/content/xbl/public/nsIXBLBinding.h +++ b/mozilla/content/xbl/public/nsIXBLBinding.h @@ -129,7 +129,8 @@ public: NS_IMETHOD ShouldBuildChildFrames(PRBool* aResult)=0; }; -extern nsresult -NS_NewXBLBinding(nsIXBLPrototypeBinding* aProtoBinding, nsIXBLBinding** aResult); +nsresult +NS_NewXBLBinding(nsIXBLPrototypeBinding* aProtoBinding, + nsIXBLBinding** aResult); #endif // nsIXBLBinding_h__ diff --git a/mozilla/content/xbl/public/nsIXBLDocumentInfo.h b/mozilla/content/xbl/public/nsIXBLDocumentInfo.h index 90975791971..85b907fc3e4 100644 --- a/mozilla/content/xbl/public/nsIXBLDocumentInfo.h +++ b/mozilla/content/xbl/public/nsIXBLDocumentInfo.h @@ -77,7 +77,7 @@ public: NS_IMETHOD FlushSkinStylesheets()=0; }; -extern nsresult +nsresult NS_NewXBLDocumentInfo(nsIDocument* aDocument, nsIXBLDocumentInfo** aResult); #endif // nsIXBLDocumentInfo_h__ diff --git a/mozilla/content/xbl/public/nsIXBLInsertionPoint.h b/mozilla/content/xbl/public/nsIXBLInsertionPoint.h index ebd30edbea4..e5be5c87e90 100644 --- a/mozilla/content/xbl/public/nsIXBLInsertionPoint.h +++ b/mozilla/content/xbl/public/nsIXBLInsertionPoint.h @@ -71,8 +71,9 @@ public: NS_IMETHOD Matches(nsIContent* aContent, PRUint32 aIndex, PRBool* aResult)=0; }; -extern nsresult -NS_NewXBLInsertionPoint(nsIContent* aParentElement, PRUint32 aIndex, nsIContent* aDefContent, +nsresult +NS_NewXBLInsertionPoint(nsIContent* aParentElement, PRUint32 aIndex, + nsIContent* aDefContent, nsIXBLInsertionPoint** aResult); #endif // nsIXBLInsertionPoint_h__ diff --git a/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h b/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h index 0976ac7e7c4..cd22d34ce77 100644 --- a/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h +++ b/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h @@ -140,9 +140,9 @@ public: NS_IMETHOD Initialize()=0; }; -extern nsresult -NS_NewXBLPrototypeBinding(const nsACString& aRef, - nsIContent* aElement, nsIXBLDocumentInfo* aInfo, +nsresult +NS_NewXBLPrototypeBinding(const nsACString& aRef, nsIContent* aElement, + nsIXBLDocumentInfo* aInfo, nsIXBLPrototypeBinding** aResult); #endif // nsIXBLPrototypeBinding_h__ diff --git a/mozilla/content/xbl/src/nsXBLContextMenuHandler.h b/mozilla/content/xbl/src/nsXBLContextMenuHandler.h index fef0e85bbeb..c687a3c4cf5 100644 --- a/mozilla/content/xbl/src/nsXBLContextMenuHandler.h +++ b/mozilla/content/xbl/src/nsXBLContextMenuHandler.h @@ -75,9 +75,9 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLContextMenuHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLContextMenuHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLCustomHandler.h b/mozilla/content/xbl/src/nsXBLCustomHandler.h index 929ad3cf5db..5f3dd03fe57 100644 --- a/mozilla/content/xbl/src/nsXBLCustomHandler.h +++ b/mozilla/content/xbl/src/nsXBLCustomHandler.h @@ -65,9 +65,9 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLCustomHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLCustomHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLDragHandler.h b/mozilla/content/xbl/src/nsXBLDragHandler.h index 01be2cb8203..298b771ad1f 100644 --- a/mozilla/content/xbl/src/nsXBLDragHandler.h +++ b/mozilla/content/xbl/src/nsXBLDragHandler.h @@ -82,9 +82,9 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLDragHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLDragHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLEventHandler.h b/mozilla/content/xbl/src/nsXBLEventHandler.h index 8b304103c75..3d379ebcf57 100644 --- a/mozilla/content/xbl/src/nsXBLEventHandler.h +++ b/mozilla/content/xbl/src/nsXBLEventHandler.h @@ -150,8 +150,8 @@ protected: } }; -extern nsresult +nsresult NS_NewXBLEventHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLEventHandler** aResult); #endif diff --git a/mozilla/content/xbl/src/nsXBLFocusHandler.h b/mozilla/content/xbl/src/nsXBLFocusHandler.h index aa068fe34e5..c26346afde0 100644 --- a/mozilla/content/xbl/src/nsXBLFocusHandler.h +++ b/mozilla/content/xbl/src/nsXBLFocusHandler.h @@ -76,9 +76,9 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLFocusHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLFocusHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLFormHandler.h b/mozilla/content/xbl/src/nsXBLFormHandler.h index 581d77dec69..7467fcfd809 100644 --- a/mozilla/content/xbl/src/nsXBLFormHandler.h +++ b/mozilla/content/xbl/src/nsXBLFormHandler.h @@ -82,9 +82,9 @@ protected: // Members }; -extern nsresult -NS_NewXBLFormHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, +nsresult +NS_NewXBLFormHandler(nsIDOMEventReceiver* aEventReceiver, + nsXBLPrototypeHandler* aHandlerElement, nsXBLFormHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLInsertionPoint.h b/mozilla/content/xbl/src/nsXBLInsertionPoint.h index ee08f6e14ea..7296d647218 100644 --- a/mozilla/content/xbl/src/nsXBLInsertionPoint.h +++ b/mozilla/content/xbl/src/nsXBLInsertionPoint.h @@ -80,8 +80,9 @@ protected: nsCOMPtr mDefaultContent; // The cloned default content obtained by cloning mDefaultContentTemplate. }; -extern nsresult -NS_NewXBLInsertionPoint(nsIContent* aParentElement, PRUint32 aIndex, nsIContent* aDefContent, +nsresult +NS_NewXBLInsertionPoint(nsIContent* aParentElement, PRUint32 aIndex, + nsIContent* aDefContent, nsIXBLInsertionPoint** aResult); #endif diff --git a/mozilla/content/xbl/src/nsXBLKeyHandler.h b/mozilla/content/xbl/src/nsXBLKeyHandler.h index e76987d2f8b..50847e16f0d 100644 --- a/mozilla/content/xbl/src/nsXBLKeyHandler.h +++ b/mozilla/content/xbl/src/nsXBLKeyHandler.h @@ -81,9 +81,9 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLKeyHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLKeyHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLLoadHandler.h b/mozilla/content/xbl/src/nsXBLLoadHandler.h index f73a08e6df0..74cddea9b4a 100644 --- a/mozilla/content/xbl/src/nsXBLLoadHandler.h +++ b/mozilla/content/xbl/src/nsXBLLoadHandler.h @@ -80,7 +80,7 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLLoadHandler(nsIDOMEventReceiver* aEventReceiver, nsXBLPrototypeHandler* aHandlerElement, nsXBLLoadHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLMouseHandler.h b/mozilla/content/xbl/src/nsXBLMouseHandler.h index 83de7aa54e5..833c102ee43 100644 --- a/mozilla/content/xbl/src/nsXBLMouseHandler.h +++ b/mozilla/content/xbl/src/nsXBLMouseHandler.h @@ -85,9 +85,9 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLMouseHandler(nsIDOMEventReceiver* aEventReceiver, - nsXBLPrototypeHandler* aHandlerElement, + nsXBLPrototypeHandler* aHandlerElement, nsXBLMouseHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLMouseMotionHandler.h b/mozilla/content/xbl/src/nsXBLMouseMotionHandler.h index cd58c1e34f3..9413978a2b9 100644 --- a/mozilla/content/xbl/src/nsXBLMouseMotionHandler.h +++ b/mozilla/content/xbl/src/nsXBLMouseMotionHandler.h @@ -80,7 +80,7 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLMouseMotionHandler(nsIDOMEventReceiver* aEventReceiver, nsXBLPrototypeHandler* aHandlerElement, nsXBLMouseMotionHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLMutationHandler.h b/mozilla/content/xbl/src/nsXBLMutationHandler.h index f63febc9c2c..84d8e574fc1 100644 --- a/mozilla/content/xbl/src/nsXBLMutationHandler.h +++ b/mozilla/content/xbl/src/nsXBLMutationHandler.h @@ -86,7 +86,7 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLMutationHandler(nsIDOMEventReceiver* aEventReceiver, nsXBLPrototypeHandler* aHandlerElement, nsXBLMutationHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLScrollHandler.h b/mozilla/content/xbl/src/nsXBLScrollHandler.h index 2774436d233..fd65fbf9826 100644 --- a/mozilla/content/xbl/src/nsXBLScrollHandler.h +++ b/mozilla/content/xbl/src/nsXBLScrollHandler.h @@ -78,7 +78,7 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLScrollHandler(nsIDOMEventReceiver* aEventReceiver, nsXBLPrototypeHandler* aHandlerElement, nsXBLScrollHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLWindowDragHandler.h b/mozilla/content/xbl/src/nsXBLWindowDragHandler.h index 14184a7544d..3e1ed72d194 100644 --- a/mozilla/content/xbl/src/nsXBLWindowDragHandler.h +++ b/mozilla/content/xbl/src/nsXBLWindowDragHandler.h @@ -84,7 +84,7 @@ protected: }; -extern nsresult +nsresult NS_NewXBLWindowDragHandler(nsIDOMEventReceiver* aReceiver, nsXBLWindowDragHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h index 5109a5331e5..ce2110238c7 100644 --- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h +++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h @@ -85,7 +85,7 @@ protected: }; -extern nsresult +nsresult NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver, nsXBLWindowKeyHandler** aResult); diff --git a/mozilla/content/xbl/src/nsXBLXULHandler.h b/mozilla/content/xbl/src/nsXBLXULHandler.h index f9811470a79..fa5da590b99 100644 --- a/mozilla/content/xbl/src/nsXBLXULHandler.h +++ b/mozilla/content/xbl/src/nsXBLXULHandler.h @@ -89,7 +89,7 @@ protected: // Members }; -extern nsresult +nsresult NS_NewXBLXULHandler(nsIDOMEventReceiver* aEventReceiver, nsXBLPrototypeHandler* aHandlerElement, nsXBLXULHandler** aResult); diff --git a/mozilla/content/xml/content/public/nsIXMLContent.h b/mozilla/content/xml/content/public/nsIXMLContent.h index ed0c37dbc22..9105733ad01 100644 --- a/mozilla/content/xml/content/public/nsIXMLContent.h +++ b/mozilla/content/xml/content/public/nsIXMLContent.h @@ -83,27 +83,27 @@ public: NS_IMETHOD GetXMLBaseURI(nsIURI **aURI) = 0; }; -extern nsresult +nsresult NS_NewXMLElement(nsIContent** aResult, nsINodeInfo* aNodeInfo); // XXX These belongs elsewhere -extern nsresult +nsresult NS_NewXMLProcessingInstruction(nsIContent** aInstancePtrResult, const nsAString& aTarget, const nsAString& aData); -extern nsresult +nsresult NS_NewXMLStylesheetProcessingInstruction(nsIContent** aInstancePtrResult, const nsAString& aData); -extern nsresult +nsresult NS_NewXMLEntity(nsIContent** aInstancePtrResult, const nsAString& aName, const nsAString& aPublicId, const nsAString& aSystemId, const nsAString& aNotationName); -extern nsresult +nsresult NS_NewXMLNotation(nsIContent** aInstancePtrResult, const nsAString& aName, const nsAString& aPublicId, @@ -111,11 +111,11 @@ NS_NewXMLNotation(nsIContent** aInstancePtrResult, class nsIDOMNamedNodeMap; -extern nsresult +nsresult NS_NewXMLNamedNodeMap(nsIDOMNamedNodeMap** aInstancePtrResult, nsISupportsArray *aArray); -extern nsresult +nsresult NS_NewXMLCDATASection(nsIContent** aInstancePtrResult); #endif // nsIXMLContent_h___ diff --git a/mozilla/content/xml/document/public/nsILoadSaveContentSink.h b/mozilla/content/xml/document/public/nsILoadSaveContentSink.h index 4f9358d8cdb..03aebf3711d 100644 --- a/mozilla/content/xml/document/public/nsILoadSaveContentSink.h +++ b/mozilla/content/xml/document/public/nsILoadSaveContentSink.h @@ -62,7 +62,7 @@ public: * nsIExpatSink. */ -extern nsresult +nsresult NS_NewLoadSaveContentSink(nsILoadSaveContentSink** aResult, nsIXMLContentSink* aBaseSink); diff --git a/mozilla/content/xml/document/public/nsIXMLContentSink.h b/mozilla/content/xml/document/public/nsIXMLContentSink.h index eb2e70e1216..13b33d93973 100644 --- a/mozilla/content/xml/document/public/nsIXMLContentSink.h +++ b/mozilla/content/xml/document/public/nsIXMLContentSink.h @@ -81,10 +81,9 @@ public: }; -extern nsresult NS_NewXMLContentSink(nsIXMLContentSink** aInstancePtrResult, - nsIDocument* aDoc, - nsIURI* aURL, - nsIWebShell* aWebShell, - nsIChannel *aChannel); +nsresult +NS_NewXMLContentSink(nsIXMLContentSink** aInstancePtrResult, nsIDocument* aDoc, + nsIURI* aURL, nsIWebShell* aWebShell, + nsIChannel *aChannel); #endif // nsIXMLContentSink_h___ diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 2d688f5689c..968748cc94e 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -108,7 +108,7 @@ static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID); // ================================================================== -NS_EXPORT nsresult +nsresult NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult, const nsAString& aNamespaceURI, const nsAString& aQualifiedName, @@ -161,7 +161,7 @@ NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult, } -NS_EXPORT nsresult +nsresult NS_NewXMLDocument(nsIDocument** aInstancePtrResult) { nsXMLDocument* doc = new nsXMLDocument(); diff --git a/mozilla/content/xsl/public/nsITransformMediator.h b/mozilla/content/xsl/public/nsITransformMediator.h index 090d943c0cf..0dcd6236c84 100644 --- a/mozilla/content/xsl/public/nsITransformMediator.h +++ b/mozilla/content/xsl/public/nsITransformMediator.h @@ -75,7 +75,8 @@ public: NS_IMETHOD SetStyleInvalid(PRBool aInvalid) = 0; }; -extern nsresult NS_NewTransformMediator(nsITransformMediator** aInstancePtrResult, - const nsACString& aMimeType); +nsresult +NS_NewTransformMediator(nsITransformMediator** aInstancePtrResult, + const nsACString& aMimeType); #endif // nsITransformMediator_h___ diff --git a/mozilla/content/xul/content/public/nsIXULPopupListener.h b/mozilla/content/xul/content/public/nsIXULPopupListener.h index 43150c46d4a..d0906cb81f4 100644 --- a/mozilla/content/xul/content/public/nsIXULPopupListener.h +++ b/mozilla/content/xul/content/public/nsIXULPopupListener.h @@ -59,7 +59,7 @@ public: NS_IMETHOD Init(nsIDOMElement* anElement, const XULPopupType& aPopupType) = 0; }; -extern nsresult +nsresult NS_NewXULPopupListener(nsIXULPopupListener** result); #endif // nsIXULPopupListener_h__ diff --git a/mozilla/content/xul/document/public/nsIXULPrototypeCache.h b/mozilla/content/xul/document/public/nsIXULPrototypeCache.h index 407f84a1c1e..23e90e988e6 100644 --- a/mozilla/content/xul/document/public/nsIXULPrototypeCache.h +++ b/mozilla/content/xul/document/public/nsIXULPrototypeCache.h @@ -126,7 +126,7 @@ public: }; -extern NS_IMETHODIMP +NS_IMETHODIMP NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult); diff --git a/mozilla/content/xul/document/public/nsIXULPrototypeDocument.h b/mozilla/content/xul/document/public/nsIXULPrototypeDocument.h index c6ed633bcf9..a63bbbc9cbf 100644 --- a/mozilla/content/xul/document/public/nsIXULPrototypeDocument.h +++ b/mozilla/content/xul/document/public/nsIXULPrototypeDocument.h @@ -106,7 +106,7 @@ public: {0xa08101ae,0xc0e8,0x4464,{0x99,0x9e,0xe5,0xa4,0xd7,0x09,0xa9,0x28}} -extern NS_IMETHODIMP +NS_IMETHODIMP NS_NewXULPrototypeDocument(nsISupports* aOuter, REFNSIID aIID, void** aResult); #endif // nsIXULPrototypeDocument_h__ diff --git a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp index 110ef71a26d..25a381de0f2 100644 --- a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp @@ -178,7 +178,8 @@ protected: nsresult Init(); friend NS_IMETHODIMP - NS_NewXULPrototypeDocument(nsISupports* aOuter, REFNSIID aIID, void** aResult); + NS_NewXULPrototypeDocument(nsISupports* aOuter, REFNSIID aIID, + void** aResult); }; diff --git a/mozilla/content/xul/templates/public/nsIXULSortService.idl b/mozilla/content/xul/templates/public/nsIXULSortService.idl index 29a74cd32c4..9835ea403ee 100755 --- a/mozilla/content/xul/templates/public/nsIXULSortService.idl +++ b/mozilla/content/xul/templates/public/nsIXULSortService.idl @@ -91,6 +91,6 @@ interface nsIXULSortService : nsISupports }; %{C++ -extern nsresult +nsresult NS_NewXULSortService(nsIXULSortService **result); %} diff --git a/mozilla/content/xul/templates/src/nsContentTestNode.cpp b/mozilla/content/xul/templates/src/nsContentTestNode.cpp index 8f2e261dc92..47120ad57e1 100644 --- a/mozilla/content/xul/templates/src/nsContentTestNode.cpp +++ b/mozilla/content/xul/templates/src/nsContentTestNode.cpp @@ -50,7 +50,7 @@ extern PRLogModuleInfo* gXULTemplateLog; #endif -extern PRBool +PRBool IsElementInBuilder(nsIContent *aContent, nsIXULTemplateBuilder *aBuilder); nsContentTestNode::nsContentTestNode(InnerNode* aParent, diff --git a/mozilla/content/xul/templates/src/nsRuleNetwork.h b/mozilla/content/xul/templates/src/nsRuleNetwork.h index d23736102f1..7a233a5026f 100644 --- a/mozilla/content/xul/templates/src/nsRuleNetwork.h +++ b/mozilla/content/xul/templates/src/nsRuleNetwork.h @@ -159,7 +159,7 @@ public: }; #ifdef DEBUG -extern nsISupports* +nsISupports* value_to_isupports(const nsIID& aIID, const Value& aValue); # define VALUE_TO_ISUPPORTS(type, v) \ diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index 252080fae26..8102c07f486 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-file-style: "stroustrup" -*- +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2; c-file-style: "stroustrup" -*- * * The contents of this file are subject to the Netscape Public * License Version 1.1 (the "License"); you may not use this file @@ -227,12 +227,12 @@ XULSortServiceImpl::XULSortServiceImpl(void) kDescendingStr = new nsString(NS_LITERAL_STRING("descending")); nsresult rv = CallGetService(kRDFServiceCID, &gRDFService); - if (NS_FAILED(rv)) - NS_ERROR("couldn't create rdf service"); + + NS_ASSERTION(NS_SUCCEEDED(rv), "couldn't create rdf service"); rv = CallGetService(kRDFContainerUtilsCID, &gRDFC); - if (NS_FAILED(rv)) - NS_ERROR("couldn't create rdf container utils"); + + NS_ASSERTION(NS_SUCCEEDED(rv), "couldn't create rdf container utils"); // get a locale service nsCOMPtr localeService = do_GetService(NS_LOCALESERVICE_CONTRACTID, &rv); @@ -241,8 +241,9 @@ XULSortServiceImpl::XULSortServiceImpl(void) if (NS_SUCCEEDED(rv = localeService->GetApplicationLocale(getter_AddRefs(locale))) && (locale)) { nsCOMPtr colFactory = do_CreateInstance(kCollationFactoryCID); if (colFactory) { - if (NS_FAILED(rv = colFactory->CreateCollation(locale, &gCollation))) - NS_ERROR("couldn't create collation instance"); + rv = colFactory->CreateCollation(locale, &gCollation); + + NS_ASSERTION(NS_SUCCEEDED(rv), "couldn't create collation instance"); } else NS_ERROR("couldn't create instance of collation factory"); } else diff --git a/mozilla/layout/base/nsBidiPresUtils.cpp b/mozilla/layout/base/nsBidiPresUtils.cpp index 94589a11638..99dcdf0953c 100644 --- a/mozilla/layout/base/nsBidiPresUtils.cpp +++ b/mozilla/layout/base/nsBidiPresUtils.cpp @@ -66,9 +66,9 @@ static const PRUnichar ALEF = 0x05D0; #define CHAR_IS_HEBREW(c) ((0x0590 <= (c)) && ((c)<= 0x05FF)) // Note: The above code are moved from gfx/src/windows/nsRenderingContextWin.cpp -extern nsresult +nsresult NS_NewContinuingTextFrame(nsIPresShell* aPresShell, nsIFrame** aResult); -extern nsresult +nsresult NS_NewDirectionalFrame(nsIFrame** aNewFrame, PRUnichar aChar); nsBidiPresUtils::nsBidiPresUtils() : mArraySize(8), diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 3eb85fc6fbb..5723e64dc8d 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -153,27 +153,27 @@ static NS_DEFINE_CID(kAttributeContentCID, NS_ATTRIBUTECONTENT_CID); #include "nsISVGValue.h" #include "nsISVGStyleValue.h" -extern nsresult +nsresult NS_NewSVGOuterSVGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGPolylineFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGPolygonFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGCircleFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGEllipseFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGLineFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGRectFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGGFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGGenericContainerFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGForeignObjectFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); -extern nsresult +nsresult NS_NewSVGPathFrame(nsIPresShell* aPresShell, nsIContent* aContent, nsIFrame** aNewFrame); #endif diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index 9aacf1d8a25..c21496eb779 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -442,7 +442,7 @@ private: //---------------------------------------------------------------------- -NS_EXPORT nsresult +nsresult NS_NewFrameManager(nsIFrameManager** aInstancePtrResult) { NS_ENSURE_ARG_POINTER(aInstancePtrResult); diff --git a/mozilla/layout/base/nsICaret.h b/mozilla/layout/base/nsICaret.h index 17a6058aa04..3918a23f017 100644 --- a/mozilla/layout/base/nsICaret.h +++ b/mozilla/layout/base/nsICaret.h @@ -127,7 +127,8 @@ public: }; -extern nsresult NS_NewCaret(nsICaret** aInstancePtrResult); +nsresult +NS_NewCaret(nsICaret** aInstancePtrResult); // handy stack-based class for temporarily disabling the caret diff --git a/mozilla/layout/base/nsIPresShell.h b/mozilla/layout/base/nsIPresShell.h index 8e18a9ce5fb..756bb16efec 100644 --- a/mozilla/layout/base/nsIPresShell.h +++ b/mozilla/layout/base/nsIPresShell.h @@ -610,7 +610,7 @@ public: * Create a new empty presentation shell. Upon success, call Init * before attempting to use the shell. */ -extern NS_EXPORT nsresult - NS_NewPresShell(nsIPresShell** aInstancePtrResult); +nsresult +NS_NewPresShell(nsIPresShell** aInstancePtrResult); #endif /* nsIPresShell_h___ */ diff --git a/mozilla/layout/base/nsIPresState.h b/mozilla/layout/base/nsIPresState.h index 3e693446c1c..d9d2dd80a14 100644 --- a/mozilla/layout/base/nsIPresState.h +++ b/mozilla/layout/base/nsIPresState.h @@ -25,7 +25,7 @@ public: NS_IMETHOD RemoveStateProperty(const nsAString& aName) = 0; }; -extern nsresult +nsresult NS_NewPresState(nsIPresState** aResult); #endif /* _nsIPresState_h */ diff --git a/mozilla/layout/base/nsPresContext.h b/mozilla/layout/base/nsPresContext.h index 56b43d51036..d4a5a09743b 100644 --- a/mozilla/layout/base/nsPresContext.h +++ b/mozilla/layout/base/nsPresContext.h @@ -567,8 +567,8 @@ public: // Factory method to create a "galley" presentation context (galley is // a kind of view that has no limit to the size of a page) -extern NS_EXPORT nsresult - NS_NewGalleyContext(nsIPresContext** aInstancePtrResult); +nsresult +NS_NewGalleyContext(nsIPresContext** aInstancePtrResult); #ifdef MOZ_REFLOW_PERF diff --git a/mozilla/layout/base/public/nsICaret.h b/mozilla/layout/base/public/nsICaret.h index 17a6058aa04..3918a23f017 100644 --- a/mozilla/layout/base/public/nsICaret.h +++ b/mozilla/layout/base/public/nsICaret.h @@ -127,7 +127,8 @@ public: }; -extern nsresult NS_NewCaret(nsICaret** aInstancePtrResult); +nsresult +NS_NewCaret(nsICaret** aInstancePtrResult); // handy stack-based class for temporarily disabling the caret diff --git a/mozilla/layout/base/public/nsIFrameManager.h b/mozilla/layout/base/public/nsIFrameManager.h index dacee94689a..558bf27845f 100644 --- a/mozilla/layout/base/public/nsIFrameManager.h +++ b/mozilla/layout/base/public/nsIFrameManager.h @@ -260,7 +260,7 @@ public: * Create a frame manager. Upon success, call Init() before attempting to * use it. */ -extern NS_EXPORT nsresult - NS_NewFrameManager(nsIFrameManager** aInstancePtrResult); +nsresult +NS_NewFrameManager(nsIFrameManager** aInstancePtrResult); #endif /* nsIFrameManager_h___ */ diff --git a/mozilla/layout/base/public/nsIPresContext.h b/mozilla/layout/base/public/nsIPresContext.h index 56b43d51036..d4a5a09743b 100644 --- a/mozilla/layout/base/public/nsIPresContext.h +++ b/mozilla/layout/base/public/nsIPresContext.h @@ -567,8 +567,8 @@ public: // Factory method to create a "galley" presentation context (galley is // a kind of view that has no limit to the size of a page) -extern NS_EXPORT nsresult - NS_NewGalleyContext(nsIPresContext** aInstancePtrResult); +nsresult +NS_NewGalleyContext(nsIPresContext** aInstancePtrResult); #ifdef MOZ_REFLOW_PERF diff --git a/mozilla/layout/base/public/nsIPresShell.h b/mozilla/layout/base/public/nsIPresShell.h index 8e18a9ce5fb..756bb16efec 100644 --- a/mozilla/layout/base/public/nsIPresShell.h +++ b/mozilla/layout/base/public/nsIPresShell.h @@ -610,7 +610,7 @@ public: * Create a new empty presentation shell. Upon success, call Init * before attempting to use the shell. */ -extern NS_EXPORT nsresult - NS_NewPresShell(nsIPresShell** aInstancePtrResult); +nsresult +NS_NewPresShell(nsIPresShell** aInstancePtrResult); #endif /* nsIPresShell_h___ */ diff --git a/mozilla/layout/base/public/nsIPresState.h b/mozilla/layout/base/public/nsIPresState.h index 3e693446c1c..d9d2dd80a14 100644 --- a/mozilla/layout/base/public/nsIPresState.h +++ b/mozilla/layout/base/public/nsIPresState.h @@ -25,7 +25,7 @@ public: NS_IMETHOD RemoveStateProperty(const nsAString& aName) = 0; }; -extern nsresult +nsresult NS_NewPresState(nsIPresState** aResult); #endif /* _nsIPresState_h */ diff --git a/mozilla/layout/base/public/nsIPrintContext.h b/mozilla/layout/base/public/nsIPrintContext.h index 570199ef29f..a9efde49dbd 100644 --- a/mozilla/layout/base/public/nsIPrintContext.h +++ b/mozilla/layout/base/public/nsIPrintContext.h @@ -53,7 +53,7 @@ public: // Factory method to create a "paginated" presentation context for // printing -extern NS_EXPORT nsresult - NS_NewPrintContext(nsIPrintContext** aInstancePtrResult); +nsresult +NS_NewPrintContext(nsIPrintContext** aInstancePtrResult); #endif diff --git a/mozilla/layout/base/public/nsIPrintPreviewContext.h b/mozilla/layout/base/public/nsIPrintPreviewContext.h index 3e3004843b5..3bd59746950 100644 --- a/mozilla/layout/base/public/nsIPrintPreviewContext.h +++ b/mozilla/layout/base/public/nsIPrintPreviewContext.h @@ -51,7 +51,7 @@ public: // Factory method to create a "paginated" presentation context for // printing -extern NS_EXPORT nsresult - NS_NewPrintPreviewContext(nsIPrintPreviewContext** aInstancePtrResult); +nsresult +NS_NewPrintPreviewContext(nsIPrintPreviewContext** aInstancePtrResult); #endif diff --git a/mozilla/layout/base/public/nsIStyleSet.h b/mozilla/layout/base/public/nsIStyleSet.h index ab3ba5ae6ca..c5222144fdf 100644 --- a/mozilla/layout/base/public/nsIStyleSet.h +++ b/mozilla/layout/base/public/nsIStyleSet.h @@ -325,8 +325,8 @@ public: virtual void ResetUniqueStyleItems(void) = 0; }; -extern NS_EXPORT nsresult - NS_NewStyleSet(nsIStyleSet** aInstancePtrResult); +nsresult +NS_NewStyleSet(nsIStyleSet** aInstancePtrResult); class nsUniqueStyleItems : private nsVoidArray diff --git a/mozilla/layout/base/public/nsPresContext.h b/mozilla/layout/base/public/nsPresContext.h index 56b43d51036..d4a5a09743b 100644 --- a/mozilla/layout/base/public/nsPresContext.h +++ b/mozilla/layout/base/public/nsPresContext.h @@ -567,8 +567,8 @@ public: // Factory method to create a "galley" presentation context (galley is // a kind of view that has no limit to the size of a page) -extern NS_EXPORT nsresult - NS_NewGalleyContext(nsIPresContext** aInstancePtrResult); +nsresult +NS_NewGalleyContext(nsIPresContext** aInstancePtrResult); #ifdef MOZ_REFLOW_PERF diff --git a/mozilla/layout/base/src/nsBidiPresUtils.cpp b/mozilla/layout/base/src/nsBidiPresUtils.cpp index 94589a11638..99dcdf0953c 100644 --- a/mozilla/layout/base/src/nsBidiPresUtils.cpp +++ b/mozilla/layout/base/src/nsBidiPresUtils.cpp @@ -66,9 +66,9 @@ static const PRUnichar ALEF = 0x05D0; #define CHAR_IS_HEBREW(c) ((0x0590 <= (c)) && ((c)<= 0x05FF)) // Note: The above code are moved from gfx/src/windows/nsRenderingContextWin.cpp -extern nsresult +nsresult NS_NewContinuingTextFrame(nsIPresShell* aPresShell, nsIFrame** aResult); -extern nsresult +nsresult NS_NewDirectionalFrame(nsIFrame** aNewFrame, PRUnichar aChar); nsBidiPresUtils::nsBidiPresUtils() : mArraySize(8), diff --git a/mozilla/layout/base/src/nsGalleyContext.cpp b/mozilla/layout/base/src/nsGalleyContext.cpp index 2629ba76f1a..7f344c765ae 100644 --- a/mozilla/layout/base/src/nsGalleyContext.cpp +++ b/mozilla/layout/base/src/nsGalleyContext.cpp @@ -108,7 +108,7 @@ GalleyContext::SetPageDim(nsRect* aPageDim) return NS_ERROR_FAILURE; } -NS_EXPORT nsresult +nsresult NS_NewGalleyContext(nsIPresContext** aInstancePtrResult) { if (aInstancePtrResult == nsnull) { diff --git a/mozilla/layout/base/src/nsPrintContext.cpp b/mozilla/layout/base/src/nsPrintContext.cpp index cc77a80b5ea..9f8bd1b4327 100644 --- a/mozilla/layout/base/src/nsPrintContext.cpp +++ b/mozilla/layout/base/src/nsPrintContext.cpp @@ -200,7 +200,7 @@ PrintContext::GetPrintSettings(nsIPrintSettings * *aPrintSettings) } -NS_EXPORT nsresult +nsresult NS_NewPrintContext(nsIPrintContext** aInstancePtrResult) { NS_ENSURE_ARG_POINTER(aInstancePtrResult); diff --git a/mozilla/layout/base/src/nsPrintPreviewContext.cpp b/mozilla/layout/base/src/nsPrintPreviewContext.cpp index bd69b4efb48..57622b41e98 100644 --- a/mozilla/layout/base/src/nsPrintPreviewContext.cpp +++ b/mozilla/layout/base/src/nsPrintPreviewContext.cpp @@ -225,7 +225,7 @@ PrintPreviewContext::GetScaledPixelsToTwips(float* aResult) const return NS_OK; } -NS_EXPORT nsresult +nsresult NS_NewPrintPreviewContext(nsIPrintPreviewContext** aInstancePtrResult) { if (aInstancePtrResult == nsnull) { diff --git a/mozilla/layout/build/nsContentDLF.cpp b/mozilla/layout/build/nsContentDLF.cpp index 533296c2d6e..c942fb8bfbd 100644 --- a/mozilla/layout/build/nsContentDLF.cpp +++ b/mozilla/layout/build/nsContentDLF.cpp @@ -81,7 +81,8 @@ static NS_DEFINE_IID(kSVGDocumentCID, NS_SVGDOCUMENT_CID); static NS_DEFINE_IID(kImageDocumentCID, NS_IMAGEDOCUMENT_CID); static NS_DEFINE_IID(kXULDocumentCID, NS_XULDOCUMENT_CID); -extern nsresult NS_NewDocumentViewer(nsIDocumentViewer** aResult); +nsresult +NS_NewDocumentViewer(nsIDocumentViewer** aResult); static const char* const gHTMLTypes[] = { "text/html", diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 5cdf90f4b14..e9b0d8d9026 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -152,10 +152,10 @@ class nsIDocumentLoaderFactory; #include "nsXULContentUtils.h" #include "nsXULElement.h" -extern NS_IMETHODIMP +NS_IMETHODIMP NS_NewXULContentBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult); -extern NS_IMETHODIMP +NS_IMETHODIMP NS_NewXULTreeBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult); #endif @@ -318,59 +318,59 @@ Shutdown(nsIModule* aSelf) } #ifdef NS_DEBUG -extern nsresult NS_NewFrameUtil(nsIFrameUtil** aResult); -extern nsresult NS_NewLayoutDebugger(nsILayoutDebugger** aResult); +nsresult NS_NewFrameUtil(nsIFrameUtil** aResult); +nsresult NS_NewLayoutDebugger(nsILayoutDebugger** aResult); #endif -extern nsresult NS_NewBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewListBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewScrollBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewMenuBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewEditorBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewPopupBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewBrowserBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewIFrameBoxObject(nsIBoxObject** aResult); -extern nsresult NS_NewTreeBoxObject(nsIBoxObject** aResult); -extern nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult); -extern nsresult NS_CreateCSSFrameConstructor(nsICSSFrameConstructor** aResult); -extern nsresult NS_NewLayoutHistoryState(nsILayoutHistoryState** aResult); -extern nsresult NS_NewAutoCopyService(nsIAutoCopyService** aResult); -extern nsresult NS_NewSelectionImageService(nsISelectionImageService** aResult); +nsresult NS_NewBoxObject(nsIBoxObject** aResult); +nsresult NS_NewListBoxObject(nsIBoxObject** aResult); +nsresult NS_NewScrollBoxObject(nsIBoxObject** aResult); +nsresult NS_NewMenuBoxObject(nsIBoxObject** aResult); +nsresult NS_NewEditorBoxObject(nsIBoxObject** aResult); +nsresult NS_NewPopupBoxObject(nsIBoxObject** aResult); +nsresult NS_NewBrowserBoxObject(nsIBoxObject** aResult); +nsresult NS_NewIFrameBoxObject(nsIBoxObject** aResult); +nsresult NS_NewTreeBoxObject(nsIBoxObject** aResult); +nsresult NS_CreateFrameTraversal(nsIFrameTraversal** aResult); +nsresult NS_CreateCSSFrameConstructor(nsICSSFrameConstructor** aResult); +nsresult NS_NewLayoutHistoryState(nsILayoutHistoryState** aResult); +nsresult NS_NewAutoCopyService(nsIAutoCopyService** aResult); +nsresult NS_NewSelectionImageService(nsISelectionImageService** aResult); -extern nsresult NS_NewSelection(nsIFrameSelection** aResult); -extern nsresult NS_NewDomSelection(nsISelection** aResult); -extern nsresult NS_NewDocumentViewer(nsIDocumentViewer** aResult); -extern nsresult NS_NewRange(nsIDOMRange** aResult); -extern nsresult NS_NewRangeUtils(nsIRangeUtils** aResult); -extern nsresult NS_NewContentIterator(nsIContentIterator** aResult); -extern nsresult NS_NewPreContentIterator(nsIContentIterator** aResult); -extern nsresult NS_NewGenRegularIterator(nsIContentIterator** aResult); -extern nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aResult); -extern nsresult NS_NewGenSubtreeIterator(nsIContentIterator** aInstancePtrResult); -extern nsresult NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult); -extern nsresult NS_NewHTMLElementFactory(nsIElementFactory** aResult); -extern nsresult NS_NewXMLElementFactory(nsIElementFactory** aResult); -extern nsresult NS_NewHTMLCopyTextEncoder(nsIDocumentEncoder** aResult); -extern nsresult NS_NewTextEncoder(nsIDocumentEncoder** aResult); -extern nsresult NS_NewXBLService(nsIXBLService** aResult); -extern nsresult NS_NewBindingManager(nsIBindingManager** aResult); -extern nsresult NS_NewNodeInfoManager(nsINodeInfoManager** aResult); -extern nsresult NS_NewContentPolicy(nsIContentPolicy** aResult); -extern nsresult NS_NewFrameLoader(nsIFrameLoader** aResult); -extern nsresult NS_NewSyncLoadDOMService(nsISyncLoadDOMService** aResult); -extern nsresult NS_NewDOMEventGroup(nsIDOMEventGroup** aResult); +nsresult NS_NewSelection(nsIFrameSelection** aResult); +nsresult NS_NewDomSelection(nsISelection** aResult); +nsresult NS_NewDocumentViewer(nsIDocumentViewer** aResult); +nsresult NS_NewRange(nsIDOMRange** aResult); +nsresult NS_NewRangeUtils(nsIRangeUtils** aResult); +nsresult NS_NewContentIterator(nsIContentIterator** aResult); +nsresult NS_NewPreContentIterator(nsIContentIterator** aResult); +nsresult NS_NewGenRegularIterator(nsIContentIterator** aResult); +nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aResult); +nsresult NS_NewGenSubtreeIterator(nsIContentIterator** aInstancePtrResult); +nsresult NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult); +nsresult NS_NewHTMLElementFactory(nsIElementFactory** aResult); +nsresult NS_NewXMLElementFactory(nsIElementFactory** aResult); +nsresult NS_NewHTMLCopyTextEncoder(nsIDocumentEncoder** aResult); +nsresult NS_NewTextEncoder(nsIDocumentEncoder** aResult); +nsresult NS_NewXBLService(nsIXBLService** aResult); +nsresult NS_NewBindingManager(nsIBindingManager** aResult); +nsresult NS_NewNodeInfoManager(nsINodeInfoManager** aResult); +nsresult NS_NewContentPolicy(nsIContentPolicy** aResult); +nsresult NS_NewFrameLoader(nsIFrameLoader** aResult); +nsresult NS_NewSyncLoadDOMService(nsISyncLoadDOMService** aResult); +nsresult NS_NewDOMEventGroup(nsIDOMEventGroup** aResult); #ifdef MOZ_XUL -extern nsresult NS_NewXULElementFactory(nsIElementFactory** aResult); -extern NS_IMETHODIMP NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult); +nsresult NS_NewXULElementFactory(nsIElementFactory** aResult); +NS_IMETHODIMP NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult); #endif #ifdef MOZ_MATHML -extern nsresult NS_NewMathMLElementFactory(nsIElementFactory** aResult); +nsresult NS_NewMathMLElementFactory(nsIElementFactory** aResult); #endif #ifdef MOZ_SVG -extern nsresult NS_NewSVGElementFactory(nsIElementFactory** aResult); +nsresult NS_NewSVGElementFactory(nsIElementFactory** aResult); #endif #define MAKE_CTOR(ctor_, iface_, func_) \ diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index bd51c81d452..e238b1f2b35 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -112,7 +112,7 @@ #endif // handy utilities -extern void SetFontFromStyle(nsIRenderingContext* aRC, nsStyleContext* aSC); +void SetFontFromStyle(nsIRenderingContext* aRC, nsStyleContext* aSC); //---------------------------------------------------------------------- diff --git a/mozilla/layout/generic/nsHTMLParts.h b/mozilla/layout/generic/nsHTMLParts.h index c26555974f8..ee825d5e08d 100644 --- a/mozilla/layout/generic/nsHTMLParts.h +++ b/mozilla/layout/generic/nsHTMLParts.h @@ -73,7 +73,7 @@ class nsIChannel; // Factory method for creating a content iterator for generated // content -extern nsresult +nsresult NS_NewFrameContentIterator(nsIPresContext* aPresContext, nsIFrame* aFrame, nsIContentIterator** aIterator); @@ -95,125 +95,183 @@ NS_CreateHTMLElement(nsIHTMLContent** aResult, // policies. // Create a frame that supports "display: block" layout behavior -extern nsresult NS_NewBlockFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, - PRUint32 aFlags = 0); +nsresult +NS_NewBlockFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, + PRUint32 aFlags = 0); // Special Generated Content Frame -extern nsresult +nsresult NS_NewAttributeContent(nsIContent ** aResult); // Create a basic area frame but the GetFrameForPoint is overridden to always // return the option frame // By default, area frames will extend // their height to cover any children that "stick out". -extern nsresult NS_NewSelectsAreaFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, - PRUint32 aFlags); +nsresult +NS_NewSelectsAreaFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, + PRUint32 aFlags); // Create a basic area frame. -extern nsresult NS_NewAreaFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, - PRUint32 aFlags); +nsresult +NS_NewAreaFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame, + PRUint32 aFlags); // These AreaFrame's shrink wrap around their contents -inline nsresult NS_NewTableCellInnerFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { +inline nsresult +NS_NewTableCellInnerFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { return NS_NewBlockFrame(aPresShell, aNewFrame, NS_BLOCK_SPACE_MGR|NS_BLOCK_MARGIN_ROOT); } // This type of AreaFrame is the document root, a margin root, and the // initial containing block for absolutely positioned elements -inline nsresult NS_NewDocumentElementFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { +inline nsresult +NS_NewDocumentElementFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { return NS_NewAreaFrame(aPresShell, aNewFrame, NS_BLOCK_SPACE_MGR|NS_BLOCK_MARGIN_ROOT); } // This type of AreaFrame is a margin root, but does not shrink wrap -inline nsresult NS_NewAbsoluteItemWrapperFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { +inline nsresult +NS_NewAbsoluteItemWrapperFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { return NS_NewAreaFrame(aPresShell, aNewFrame, NS_BLOCK_SPACE_MGR|NS_BLOCK_MARGIN_ROOT); } // This type of AreaFrame shrink wraps -inline nsresult NS_NewFloatingItemWrapperFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { +inline nsresult +NS_NewFloatingItemWrapperFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { return NS_NewAreaFrame(aPresShell, aNewFrame, NS_BLOCK_SPACE_MGR|NS_BLOCK_SHRINK_WRAP); } // This type of AreaFrame doesn't use its own space manager and // doesn't shrink wrap. -inline nsresult NS_NewRelativeItemWrapperFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { +inline nsresult +NS_NewRelativeItemWrapperFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) { return NS_NewAreaFrame(aPresShell, aNewFrame, 0); } -extern nsresult NS_NewBRFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); +nsresult +NS_NewBRFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); -extern nsresult NS_NewCommentFrame(nsIPresShell* aPresShell, nsIFrame** aFrameResult); -extern nsresult NS_NewHRFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); +nsresult +NS_NewCommentFrame(nsIPresShell* aPresShell, nsIFrame** aFrameResult); +nsresult +NS_NewHRFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); // and