From 294ecfb965a0c6520e35199f01c65662cc92e4c0 Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Mon, 9 Aug 1999 19:19:49 +0000 Subject: [PATCH] Changed attribute getter glue to use NS_SUCCESS macro instead of comparing to NS_OK git-svn-id: svn://10.0.0.236/trunk@42783 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/public/idl/base/Location.idl | 2 +- mozilla/dom/src/base/nsJSBarProp.cpp | 2 +- mozilla/dom/src/base/nsJSHistory.cpp | 8 +- mozilla/dom/src/base/nsJSLocation.cpp | 65 +-- mozilla/dom/src/base/nsJSMimeType.cpp | 8 +- mozilla/dom/src/base/nsJSMimeTypeArray.cpp | 2 +- mozilla/dom/src/base/nsJSNavigator.cpp | 18 +- mozilla/dom/src/base/nsJSPlugin.cpp | 8 +- mozilla/dom/src/base/nsJSPluginArray.cpp | 2 +- mozilla/dom/src/base/nsJSScreen.cpp | 16 +- mozilla/dom/src/base/nsJSWindow.cpp | 60 +- mozilla/dom/src/base/nsJSWindowCollection.cpp | 2 +- mozilla/dom/src/coreDOM/nsJSAttr.cpp | 6 +- mozilla/dom/src/coreDOM/nsJSCharacterData.cpp | 4 +- mozilla/dom/src/coreDOM/nsJSDocument.cpp | 8 +- mozilla/dom/src/coreDOM/nsJSDocumentType.cpp | 6 +- mozilla/dom/src/coreDOM/nsJSElement.cpp | 2 +- mozilla/dom/src/coreDOM/nsJSEntity.cpp | 6 +- mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp | 2 +- mozilla/dom/src/coreDOM/nsJSNode.cpp | 22 +- mozilla/dom/src/coreDOM/nsJSNodeList.cpp | 2 +- mozilla/dom/src/coreDOM/nsJSNotation.cpp | 4 +- .../src/coreDOM/nsJSProcessingInstruction.cpp | 4 +- mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp | 6 +- .../src/coreDOM/nsJSStyleSheetCollection.cpp | 2 +- mozilla/dom/src/css/nsJSCSS2Properties.cpp | 246 ++++----- mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp | 2 +- mozilla/dom/src/css/nsJSCSSImportRule.cpp | 6 +- mozilla/dom/src/css/nsJSCSSMediaRule.cpp | 4 +- mozilla/dom/src/css/nsJSCSSPageRule.cpp | 4 +- mozilla/dom/src/css/nsJSCSSRule.cpp | 6 +- .../dom/src/css/nsJSCSSStyleDeclaration.cpp | 4 +- mozilla/dom/src/css/nsJSCSSStyleRule.cpp | 4 +- .../src/css/nsJSCSSStyleRuleCollection.cpp | 2 +- mozilla/dom/src/css/nsJSCSSStyleSheet.cpp | 12 +- mozilla/dom/src/events/nsJSEvent.cpp | 8 +- mozilla/dom/src/events/nsJSTextRange.cpp | 514 ++++++++++++++++++ mozilla/dom/src/events/nsJSUIEvent.cpp | 40 +- .../dom/src/html/nsJSHTMLAnchorElement.cpp | 24 +- .../dom/src/html/nsJSHTMLAppletElement.cpp | 22 +- mozilla/dom/src/html/nsJSHTMLAreaElement.cpp | 16 +- mozilla/dom/src/html/nsJSHTMLBRElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLBaseElement.cpp | 4 +- .../dom/src/html/nsJSHTMLBaseFontElement.cpp | 6 +- .../src/html/nsJSHTMLBlockquoteElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLBodyElement.cpp | 12 +- .../dom/src/html/nsJSHTMLButtonElement.cpp | 14 +- mozilla/dom/src/html/nsJSHTMLCollection.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLDListElement.cpp | 2 +- .../dom/src/html/nsJSHTMLDirectoryElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLDivElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLDocument.cpp | 40 +- mozilla/dom/src/html/nsJSHTMLElement.cpp | 12 +- .../dom/src/html/nsJSHTMLFieldSetElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLFontElement.cpp | 6 +- mozilla/dom/src/html/nsJSHTMLFormElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLFrameElement.cpp | 16 +- .../dom/src/html/nsJSHTMLFrameSetElement.cpp | 4 +- mozilla/dom/src/html/nsJSHTMLHRElement.cpp | 8 +- mozilla/dom/src/html/nsJSHTMLHeadElement.cpp | 2 +- .../dom/src/html/nsJSHTMLHeadingElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp | 2 +- .../dom/src/html/nsJSHTMLIFrameElement.cpp | 20 +- mozilla/dom/src/html/nsJSHTMLImageElement.cpp | 26 +- mozilla/dom/src/html/nsJSHTMLInputElement.cpp | 36 +- .../dom/src/html/nsJSHTMLIsIndexElement.cpp | 4 +- mozilla/dom/src/html/nsJSHTMLLIElement.cpp | 4 +- mozilla/dom/src/html/nsJSHTMLLabelElement.cpp | 6 +- mozilla/dom/src/html/nsJSHTMLLayerElement.cpp | 16 +- .../dom/src/html/nsJSHTMLLegendElement.cpp | 6 +- mozilla/dom/src/html/nsJSHTMLLinkElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLMapElement.cpp | 4 +- mozilla/dom/src/html/nsJSHTMLMenuElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLMetaElement.cpp | 8 +- mozilla/dom/src/html/nsJSHTMLModElement.cpp | 4 +- mozilla/dom/src/html/nsJSHTMLOListElement.cpp | 6 +- .../dom/src/html/nsJSHTMLObjectElement.cpp | 36 +- .../dom/src/html/nsJSHTMLOptGroupElement.cpp | 4 +- .../dom/src/html/nsJSHTMLOptionElement.cpp | 16 +- .../dom/src/html/nsJSHTMLParagraphElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLParamElement.cpp | 8 +- mozilla/dom/src/html/nsJSHTMLPreElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp | 2 +- .../dom/src/html/nsJSHTMLScriptElement.cpp | 14 +- .../dom/src/html/nsJSHTMLSelectElement.cpp | 22 +- mozilla/dom/src/html/nsJSHTMLStyleElement.cpp | 6 +- .../src/html/nsJSHTMLTableCaptionElement.cpp | 2 +- .../dom/src/html/nsJSHTMLTableCellElement.cpp | 30 +- .../dom/src/html/nsJSHTMLTableColElement.cpp | 12 +- mozilla/dom/src/html/nsJSHTMLTableElement.cpp | 28 +- .../dom/src/html/nsJSHTMLTableRowElement.cpp | 16 +- .../src/html/nsJSHTMLTableSectionElement.cpp | 10 +- .../dom/src/html/nsJSHTMLTextAreaElement.cpp | 22 +- mozilla/dom/src/html/nsJSHTMLTitleElement.cpp | 2 +- mozilla/dom/src/html/nsJSHTMLUListElement.cpp | 4 +- mozilla/dom/src/range/nsJSRange.cpp | 12 +- mozilla/dom/tools/JSStubGen.cpp | 4 +- 97 files changed, 1109 insertions(+), 646 deletions(-) create mode 100644 mozilla/dom/src/events/nsJSTextRange.cpp diff --git a/mozilla/dom/public/idl/base/Location.idl b/mozilla/dom/public/idl/base/Location.idl index 83d70cc50bf..c076a00dd1e 100644 --- a/mozilla/dom/public/idl/base/Location.idl +++ b/mozilla/dom/public/idl/base/Location.idl @@ -12,7 +12,7 @@ attribute wstring search; noscript void reload(in boolean forceget); - void replace(in wstring url); + noscript void replace(in wstring url); wstring toString(); }; diff --git a/mozilla/dom/src/base/nsJSBarProp.cpp b/mozilla/dom/src/base/nsJSBarProp.cpp index 8d548231b4d..3302f5da2ea 100644 --- a/mozilla/dom/src/base/nsJSBarProp.cpp +++ b/mozilla/dom/src/base/nsJSBarProp.cpp @@ -74,7 +74,7 @@ GetBarPropProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetVisible(&prop)) { + if (NS_SUCCEEDED(a->GetVisible(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/base/nsJSHistory.cpp b/mozilla/dom/src/base/nsJSHistory.cpp index 5d24a9fe22e..ed1669485a1 100644 --- a/mozilla/dom/src/base/nsJSHistory.cpp +++ b/mozilla/dom/src/base/nsJSHistory.cpp @@ -77,7 +77,7 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -93,7 +93,7 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCurrent(prop)) { + if (NS_SUCCEEDED(a->GetCurrent(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -109,7 +109,7 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPrevious(prop)) { + if (NS_SUCCEEDED(a->GetPrevious(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -125,7 +125,7 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetNext(prop)) { + if (NS_SUCCEEDED(a->GetNext(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/base/nsJSLocation.cpp b/mozilla/dom/src/base/nsJSLocation.cpp index 2ecbf997cfb..fe19f2fafc2 100644 --- a/mozilla/dom/src/base/nsJSLocation.cpp +++ b/mozilla/dom/src/base/nsJSLocation.cpp @@ -83,7 +83,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHash(prop)) { + if (NS_SUCCEEDED(a->GetHash(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -99,7 +99,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHost(prop)) { + if (NS_SUCCEEDED(a->GetHost(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -115,7 +115,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHostname(prop)) { + if (NS_SUCCEEDED(a->GetHostname(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -131,7 +131,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPathname(prop)) { + if (NS_SUCCEEDED(a->GetPathname(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -147,7 +147,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPort(prop)) { + if (NS_SUCCEEDED(a->GetPort(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -163,7 +163,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetProtocol(prop)) { + if (NS_SUCCEEDED(a->GetProtocol(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -179,7 +179,7 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSearch(prop)) { + if (NS_SUCCEEDED(a->GetSearch(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -362,56 +362,6 @@ ResolveLocation(JSContext *cx, JSObject *obj, jsval id) } -// -// Native method Replace -// -PR_STATIC_CALLBACK(JSBool) -LocationReplace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -{ - nsIDOMLocation *nativeThis = (nsIDOMLocation*)nsJSUtils::nsGetNativeThis(cx, obj); - nsAutoString b0; - - *rval = JSVAL_NULL; - - nsIScriptContext *scriptCX = (nsIScriptContext *)JS_GetContextPrivate(cx); - nsIScriptSecurityManager *secMan; - if (NS_OK == scriptCX->GetSecurityManager(&secMan)) { - PRBool ok; - secMan->CheckScriptAccess(scriptCX, obj, "location.replace", &ok); - if (!ok) { - //Need to throw error here - return JS_FALSE; - } - NS_RELEASE(secMan); - } - else { - return JS_FALSE; - } - - // If there's no private data, this must be the prototype, so ignore - if (nsnull == nativeThis) { - return JS_TRUE; - } - - if (argc >= 1) { - - nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]); - - if (NS_OK != nativeThis->Replace(b0)) { - return JS_FALSE; - } - - *rval = JSVAL_VOID; - } - else { - JS_ReportError(cx, "Function replace requires 1 parameters"); - return JS_FALSE; - } - - return JS_TRUE; -} - - // // Native method ToString // @@ -605,7 +555,6 @@ static JSPropertySpec LocationProperties[] = // static JSFunctionSpec LocationMethods[] = { - {"replace", LocationReplace, 1}, {"toString", LocationToString, 0}, {"reload", NSLocationReload, 0}, {"replace", NSLocationReplace, 0}, diff --git a/mozilla/dom/src/base/nsJSMimeType.cpp b/mozilla/dom/src/base/nsJSMimeType.cpp index bd9d0280ee3..5d8d06cd9da 100644 --- a/mozilla/dom/src/base/nsJSMimeType.cpp +++ b/mozilla/dom/src/base/nsJSMimeType.cpp @@ -80,7 +80,7 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDescription(prop)) { + if (NS_SUCCEEDED(a->GetDescription(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -96,7 +96,7 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMPlugin* prop; - if (NS_OK == a->GetEnabledPlugin(&prop)) { + if (NS_SUCCEEDED(a->GetEnabledPlugin(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -113,7 +113,7 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSuffixes(prop)) { + if (NS_SUCCEEDED(a->GetSuffixes(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -129,7 +129,7 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/base/nsJSMimeTypeArray.cpp b/mozilla/dom/src/base/nsJSMimeTypeArray.cpp index ab66f7f687f..603f774fb3b 100644 --- a/mozilla/dom/src/base/nsJSMimeTypeArray.cpp +++ b/mozilla/dom/src/base/nsJSMimeTypeArray.cpp @@ -79,7 +79,7 @@ GetMimeTypeArrayProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/base/nsJSNavigator.cpp b/mozilla/dom/src/base/nsJSNavigator.cpp index d5b10d54c5c..6e61e56754e 100644 --- a/mozilla/dom/src/base/nsJSNavigator.cpp +++ b/mozilla/dom/src/base/nsJSNavigator.cpp @@ -88,7 +88,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAppCodeName(prop)) { + if (NS_SUCCEEDED(a->GetAppCodeName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -104,7 +104,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAppName(prop)) { + if (NS_SUCCEEDED(a->GetAppName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -120,7 +120,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAppVersion(prop)) { + if (NS_SUCCEEDED(a->GetAppVersion(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -136,7 +136,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLanguage(prop)) { + if (NS_SUCCEEDED(a->GetLanguage(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -152,7 +152,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMMimeTypeArray* prop; - if (NS_OK == a->GetMimeTypes(&prop)) { + if (NS_SUCCEEDED(a->GetMimeTypes(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -169,7 +169,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPlatform(prop)) { + if (NS_SUCCEEDED(a->GetPlatform(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -185,7 +185,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMPluginArray* prop; - if (NS_OK == a->GetPlugins(&prop)) { + if (NS_SUCCEEDED(a->GetPlugins(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -202,7 +202,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSecurityPolicy(prop)) { + if (NS_SUCCEEDED(a->GetSecurityPolicy(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -218,7 +218,7 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetUserAgent(prop)) { + if (NS_SUCCEEDED(a->GetUserAgent(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/base/nsJSPlugin.cpp b/mozilla/dom/src/base/nsJSPlugin.cpp index 118cf68c8a3..6bb06dafe3c 100644 --- a/mozilla/dom/src/base/nsJSPlugin.cpp +++ b/mozilla/dom/src/base/nsJSPlugin.cpp @@ -82,7 +82,7 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDescription(prop)) { + if (NS_SUCCEEDED(a->GetDescription(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -98,7 +98,7 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFilename(prop)) { + if (NS_SUCCEEDED(a->GetFilename(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -114,7 +114,7 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -130,7 +130,7 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/base/nsJSPluginArray.cpp b/mozilla/dom/src/base/nsJSPluginArray.cpp index 1761f08cd3b..0a61b9b130b 100644 --- a/mozilla/dom/src/base/nsJSPluginArray.cpp +++ b/mozilla/dom/src/base/nsJSPluginArray.cpp @@ -79,7 +79,7 @@ GetPluginArrayProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/base/nsJSScreen.cpp b/mozilla/dom/src/base/nsJSScreen.cpp index 78327b59234..c5825e44bf4 100644 --- a/mozilla/dom/src/base/nsJSScreen.cpp +++ b/mozilla/dom/src/base/nsJSScreen.cpp @@ -81,7 +81,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetWidth(&prop)) { + if (NS_SUCCEEDED(a->GetWidth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -97,7 +97,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetHeight(&prop)) { + if (NS_SUCCEEDED(a->GetHeight(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -113,7 +113,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetPixelDepth(&prop)) { + if (NS_SUCCEEDED(a->GetPixelDepth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -129,7 +129,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetColorDepth(&prop)) { + if (NS_SUCCEEDED(a->GetColorDepth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -145,7 +145,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetAvailWidth(&prop)) { + if (NS_SUCCEEDED(a->GetAvailWidth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -161,7 +161,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetAvailHeight(&prop)) { + if (NS_SUCCEEDED(a->GetAvailHeight(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -177,7 +177,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetAvailLeft(&prop)) { + if (NS_SUCCEEDED(a->GetAvailLeft(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -193,7 +193,7 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetAvailTop(&prop)) { + if (NS_SUCCEEDED(a->GetAvailTop(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/base/nsJSWindow.cpp b/mozilla/dom/src/base/nsJSWindow.cpp index 95d5a2527c5..65767137724 100644 --- a/mozilla/dom/src/base/nsJSWindow.cpp +++ b/mozilla/dom/src/base/nsJSWindow.cpp @@ -133,7 +133,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindow* prop; - if (NS_OK == a->GetWindow(&prop)) { + if (NS_SUCCEEDED(a->GetWindow(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -150,7 +150,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindow* prop; - if (NS_OK == a->GetSelf(&prop)) { + if (NS_SUCCEEDED(a->GetSelf(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -167,7 +167,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMDocument* prop; - if (NS_OK == a->GetDocument(&prop)) { + if (NS_SUCCEEDED(a->GetDocument(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -184,7 +184,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNavigator* prop; - if (NS_OK == a->GetNavigator(&prop)) { + if (NS_SUCCEEDED(a->GetNavigator(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -201,7 +201,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMScreen* prop; - if (NS_OK == a->GetScreen(&prop)) { + if (NS_SUCCEEDED(a->GetScreen(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -218,7 +218,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHistory* prop; - if (NS_OK == a->GetHistory(&prop)) { + if (NS_SUCCEEDED(a->GetHistory(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -235,7 +235,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindow* prop; - if (NS_OK == a->GetParent(&prop)) { + if (NS_SUCCEEDED(a->GetParent(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -252,7 +252,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindow* prop; - if (NS_OK == a->GetTop(&prop)) { + if (NS_SUCCEEDED(a->GetTop(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -269,7 +269,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindow* prop; - if (NS_OK == a->GetContent(&prop)) { + if (NS_SUCCEEDED(a->GetContent(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -286,7 +286,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetMenubar(&prop)) { + if (NS_SUCCEEDED(a->GetMenubar(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -303,7 +303,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetToolbar(&prop)) { + if (NS_SUCCEEDED(a->GetToolbar(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -320,7 +320,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetLocationbar(&prop)) { + if (NS_SUCCEEDED(a->GetLocationbar(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -337,7 +337,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetPersonalbar(&prop)) { + if (NS_SUCCEEDED(a->GetPersonalbar(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -354,7 +354,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetStatusbar(&prop)) { + if (NS_SUCCEEDED(a->GetStatusbar(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -371,7 +371,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetScrollbars(&prop)) { + if (NS_SUCCEEDED(a->GetScrollbars(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -388,7 +388,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMBarProp* prop; - if (NS_OK == a->GetDirectories(&prop)) { + if (NS_SUCCEEDED(a->GetDirectories(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -405,7 +405,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetClosed(&prop)) { + if (NS_SUCCEEDED(a->GetClosed(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -421,7 +421,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindowCollection* prop; - if (NS_OK == a->GetFrames(&prop)) { + if (NS_SUCCEEDED(a->GetFrames(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -438,7 +438,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMWindow* prop; - if (NS_OK == a->GetOpener(&prop)) { + if (NS_SUCCEEDED(a->GetOpener(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -455,7 +455,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetStatus(prop)) { + if (NS_SUCCEEDED(a->GetStatus(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -471,7 +471,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDefaultStatus(prop)) { + if (NS_SUCCEEDED(a->GetDefaultStatus(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -487,7 +487,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -503,7 +503,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetInnerWidth(&prop)) { + if (NS_SUCCEEDED(a->GetInnerWidth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -519,7 +519,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetInnerHeight(&prop)) { + if (NS_SUCCEEDED(a->GetInnerHeight(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -535,7 +535,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetOuterWidth(&prop)) { + if (NS_SUCCEEDED(a->GetOuterWidth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -551,7 +551,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetOuterHeight(&prop)) { + if (NS_SUCCEEDED(a->GetOuterHeight(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -567,7 +567,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetScreenX(&prop)) { + if (NS_SUCCEEDED(a->GetScreenX(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -583,7 +583,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetScreenY(&prop)) { + if (NS_SUCCEEDED(a->GetScreenY(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -599,7 +599,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetPageXOffset(&prop)) { + if (NS_SUCCEEDED(a->GetPageXOffset(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -615,7 +615,7 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetPageYOffset(&prop)) { + if (NS_SUCCEEDED(a->GetPageYOffset(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/base/nsJSWindowCollection.cpp b/mozilla/dom/src/base/nsJSWindowCollection.cpp index 270a8764b01..24251d13449 100644 --- a/mozilla/dom/src/base/nsJSWindowCollection.cpp +++ b/mozilla/dom/src/base/nsJSWindowCollection.cpp @@ -79,7 +79,7 @@ GetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSAttr.cpp b/mozilla/dom/src/coreDOM/nsJSAttr.cpp index 2440d99f389..b444dcf7158 100644 --- a/mozilla/dom/src/coreDOM/nsJSAttr.cpp +++ b/mozilla/dom/src/coreDOM/nsJSAttr.cpp @@ -76,7 +76,7 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -92,7 +92,7 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetSpecified(&prop)) { + if (NS_SUCCEEDED(a->GetSpecified(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -108,7 +108,7 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp b/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp index 9fcff347abd..735468c8610 100644 --- a/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp +++ b/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp @@ -75,7 +75,7 @@ GetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetData(prop)) { + if (NS_SUCCEEDED(a->GetData(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSDocument.cpp b/mozilla/dom/src/coreDOM/nsJSDocument.cpp index ea57e22439e..29c7e51cbed 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocument.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocument.cpp @@ -122,7 +122,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMDocumentType* prop; - if (NS_OK == a->GetDoctype(&prop)) { + if (NS_SUCCEEDED(a->GetDoctype(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -139,7 +139,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMDOMImplementation* prop; - if (NS_OK == a->GetImplementation(&prop)) { + if (NS_SUCCEEDED(a->GetImplementation(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -156,7 +156,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMElement* prop; - if (NS_OK == a->GetDocumentElement(&prop)) { + if (NS_SUCCEEDED(a->GetDocumentElement(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -175,7 +175,7 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMStyleSheetCollection* prop; nsIDOMNSDocument* b; if (NS_OK == a->QueryInterface(kINSDocumentIID, (void **)&b)) { - if(NS_OK == b->GetStyleSheets(&prop)) { + if(NS_SUCCEEDED(b->GetStyleSheets(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); diff --git a/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp b/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp index 72031c1e212..3f1098dc311 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp @@ -79,7 +79,7 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -95,7 +95,7 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNamedNodeMap* prop; - if (NS_OK == a->GetEntities(&prop)) { + if (NS_SUCCEEDED(a->GetEntities(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -112,7 +112,7 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNamedNodeMap* prop; - if (NS_OK == a->GetNotations(&prop)) { + if (NS_SUCCEEDED(a->GetNotations(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/coreDOM/nsJSElement.cpp b/mozilla/dom/src/coreDOM/nsJSElement.cpp index 42f13985f9d..4a991b8442a 100644 --- a/mozilla/dom/src/coreDOM/nsJSElement.cpp +++ b/mozilla/dom/src/coreDOM/nsJSElement.cpp @@ -80,7 +80,7 @@ GetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTagName(prop)) { + if (NS_SUCCEEDED(a->GetTagName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSEntity.cpp b/mozilla/dom/src/coreDOM/nsJSEntity.cpp index 5082b4dce7a..d692e9b3482 100644 --- a/mozilla/dom/src/coreDOM/nsJSEntity.cpp +++ b/mozilla/dom/src/coreDOM/nsJSEntity.cpp @@ -76,7 +76,7 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPublicId(prop)) { + if (NS_SUCCEEDED(a->GetPublicId(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -92,7 +92,7 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSystemId(prop)) { + if (NS_SUCCEEDED(a->GetSystemId(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -108,7 +108,7 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetNotationName(prop)) { + if (NS_SUCCEEDED(a->GetNotationName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp b/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp index 131c1750bd1..5b59097e648 100644 --- a/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp @@ -77,7 +77,7 @@ GetNamedNodeMapProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSNode.cpp b/mozilla/dom/src/coreDOM/nsJSNode.cpp index 97895d143ef..69fe0c9ae0f 100644 --- a/mozilla/dom/src/coreDOM/nsJSNode.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNode.cpp @@ -99,7 +99,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetNodeName(prop)) { + if (NS_SUCCEEDED(a->GetNodeName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -115,7 +115,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetNodeValue(prop)) { + if (NS_SUCCEEDED(a->GetNodeValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -131,7 +131,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint16 prop; - if (NS_OK == a->GetNodeType(&prop)) { + if (NS_SUCCEEDED(a->GetNodeType(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -147,7 +147,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetParentNode(&prop)) { + if (NS_SUCCEEDED(a->GetParentNode(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -164,7 +164,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNodeList* prop; - if (NS_OK == a->GetChildNodes(&prop)) { + if (NS_SUCCEEDED(a->GetChildNodes(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -181,7 +181,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetFirstChild(&prop)) { + if (NS_SUCCEEDED(a->GetFirstChild(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -198,7 +198,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetLastChild(&prop)) { + if (NS_SUCCEEDED(a->GetLastChild(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -215,7 +215,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetPreviousSibling(&prop)) { + if (NS_SUCCEEDED(a->GetPreviousSibling(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -232,7 +232,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetNextSibling(&prop)) { + if (NS_SUCCEEDED(a->GetNextSibling(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -249,7 +249,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNamedNodeMap* prop; - if (NS_OK == a->GetAttributes(&prop)) { + if (NS_SUCCEEDED(a->GetAttributes(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -266,7 +266,7 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMDocument* prop; - if (NS_OK == a->GetOwnerDocument(&prop)) { + if (NS_SUCCEEDED(a->GetOwnerDocument(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/coreDOM/nsJSNodeList.cpp b/mozilla/dom/src/coreDOM/nsJSNodeList.cpp index a4c5b6b8d83..b6f900f2c97 100644 --- a/mozilla/dom/src/coreDOM/nsJSNodeList.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNodeList.cpp @@ -77,7 +77,7 @@ GetNodeListProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSNotation.cpp b/mozilla/dom/src/coreDOM/nsJSNotation.cpp index 6ec3ad66141..4cf35af1da5 100644 --- a/mozilla/dom/src/coreDOM/nsJSNotation.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNotation.cpp @@ -75,7 +75,7 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPublicId(prop)) { + if (NS_SUCCEEDED(a->GetPublicId(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSystemId(prop)) { + if (NS_SUCCEEDED(a->GetSystemId(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp b/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp index 1cbcfb8af7c..d767f0e5174 100644 --- a/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp +++ b/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp @@ -75,7 +75,7 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTarget(prop)) { + if (NS_SUCCEEDED(a->GetTarget(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetData(prop)) { + if (NS_SUCCEEDED(a->GetData(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp index 5731ccbefbc..d9cd94eb587 100644 --- a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp +++ b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp @@ -76,7 +76,7 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -92,7 +92,7 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -108,7 +108,7 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetReadOnly(&prop)) { + if (NS_SUCCEEDED(a->GetReadOnly(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp index 55ba5f76a17..9cac3dd1bd2 100644 --- a/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp +++ b/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp @@ -77,7 +77,7 @@ GetStyleSheetCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/css/nsJSCSS2Properties.cpp b/mozilla/dom/src/css/nsJSCSS2Properties.cpp index 7f4241473b7..123ceb58a61 100644 --- a/mozilla/dom/src/css/nsJSCSS2Properties.cpp +++ b/mozilla/dom/src/css/nsJSCSS2Properties.cpp @@ -196,7 +196,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAzimuth(prop)) { + if (NS_SUCCEEDED(a->GetAzimuth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -212,7 +212,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackground(prop)) { + if (NS_SUCCEEDED(a->GetBackground(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -228,7 +228,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackgroundAttachment(prop)) { + if (NS_SUCCEEDED(a->GetBackgroundAttachment(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -244,7 +244,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackgroundColor(prop)) { + if (NS_SUCCEEDED(a->GetBackgroundColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -260,7 +260,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackgroundImage(prop)) { + if (NS_SUCCEEDED(a->GetBackgroundImage(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -276,7 +276,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackgroundPosition(prop)) { + if (NS_SUCCEEDED(a->GetBackgroundPosition(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -292,7 +292,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackgroundRepeat(prop)) { + if (NS_SUCCEEDED(a->GetBackgroundRepeat(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -308,7 +308,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorder(prop)) { + if (NS_SUCCEEDED(a->GetBorder(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -324,7 +324,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderCollapse(prop)) { + if (NS_SUCCEEDED(a->GetBorderCollapse(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -340,7 +340,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderColor(prop)) { + if (NS_SUCCEEDED(a->GetBorderColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -356,7 +356,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderSpacing(prop)) { + if (NS_SUCCEEDED(a->GetBorderSpacing(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -372,7 +372,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderStyle(prop)) { + if (NS_SUCCEEDED(a->GetBorderStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -388,7 +388,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderTop(prop)) { + if (NS_SUCCEEDED(a->GetBorderTop(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -404,7 +404,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderRight(prop)) { + if (NS_SUCCEEDED(a->GetBorderRight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -420,7 +420,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderBottom(prop)) { + if (NS_SUCCEEDED(a->GetBorderBottom(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -436,7 +436,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderLeft(prop)) { + if (NS_SUCCEEDED(a->GetBorderLeft(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -452,7 +452,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderTopColor(prop)) { + if (NS_SUCCEEDED(a->GetBorderTopColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -468,7 +468,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderRightColor(prop)) { + if (NS_SUCCEEDED(a->GetBorderRightColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -484,7 +484,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderBottomColor(prop)) { + if (NS_SUCCEEDED(a->GetBorderBottomColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -500,7 +500,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderLeftColor(prop)) { + if (NS_SUCCEEDED(a->GetBorderLeftColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -516,7 +516,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderTopStyle(prop)) { + if (NS_SUCCEEDED(a->GetBorderTopStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -532,7 +532,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderRightStyle(prop)) { + if (NS_SUCCEEDED(a->GetBorderRightStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -548,7 +548,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderBottomStyle(prop)) { + if (NS_SUCCEEDED(a->GetBorderBottomStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -564,7 +564,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderLeftStyle(prop)) { + if (NS_SUCCEEDED(a->GetBorderLeftStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -580,7 +580,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderTopWidth(prop)) { + if (NS_SUCCEEDED(a->GetBorderTopWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -596,7 +596,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderRightWidth(prop)) { + if (NS_SUCCEEDED(a->GetBorderRightWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -612,7 +612,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderBottomWidth(prop)) { + if (NS_SUCCEEDED(a->GetBorderBottomWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -628,7 +628,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderLeftWidth(prop)) { + if (NS_SUCCEEDED(a->GetBorderLeftWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -644,7 +644,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorderWidth(prop)) { + if (NS_SUCCEEDED(a->GetBorderWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -660,7 +660,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBottom(prop)) { + if (NS_SUCCEEDED(a->GetBottom(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -676,7 +676,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCaptionSide(prop)) { + if (NS_SUCCEEDED(a->GetCaptionSide(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -692,7 +692,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetClear(prop)) { + if (NS_SUCCEEDED(a->GetClear(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -708,7 +708,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetClip(prop)) { + if (NS_SUCCEEDED(a->GetClip(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -724,7 +724,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetColor(prop)) { + if (NS_SUCCEEDED(a->GetColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -740,7 +740,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetContent(prop)) { + if (NS_SUCCEEDED(a->GetContent(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -756,7 +756,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCounterIncrement(prop)) { + if (NS_SUCCEEDED(a->GetCounterIncrement(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -772,7 +772,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCounterReset(prop)) { + if (NS_SUCCEEDED(a->GetCounterReset(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -788,7 +788,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCue(prop)) { + if (NS_SUCCEEDED(a->GetCue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -804,7 +804,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCueAfter(prop)) { + if (NS_SUCCEEDED(a->GetCueAfter(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -820,7 +820,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCueBefore(prop)) { + if (NS_SUCCEEDED(a->GetCueBefore(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -836,7 +836,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCursor(prop)) { + if (NS_SUCCEEDED(a->GetCursor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -852,7 +852,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDirection(prop)) { + if (NS_SUCCEEDED(a->GetDirection(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -868,7 +868,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDisplay(prop)) { + if (NS_SUCCEEDED(a->GetDisplay(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -884,7 +884,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetElevation(prop)) { + if (NS_SUCCEEDED(a->GetElevation(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -900,7 +900,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetEmptyCells(prop)) { + if (NS_SUCCEEDED(a->GetEmptyCells(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -916,7 +916,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCssFloat(prop)) { + if (NS_SUCCEEDED(a->GetCssFloat(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -932,7 +932,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFont(prop)) { + if (NS_SUCCEEDED(a->GetFont(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -948,7 +948,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontFamily(prop)) { + if (NS_SUCCEEDED(a->GetFontFamily(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -964,7 +964,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontSize(prop)) { + if (NS_SUCCEEDED(a->GetFontSize(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -980,7 +980,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontSizeAdjust(prop)) { + if (NS_SUCCEEDED(a->GetFontSizeAdjust(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -996,7 +996,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontStretch(prop)) { + if (NS_SUCCEEDED(a->GetFontStretch(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1012,7 +1012,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontStyle(prop)) { + if (NS_SUCCEEDED(a->GetFontStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1028,7 +1028,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontVariant(prop)) { + if (NS_SUCCEEDED(a->GetFontVariant(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1044,7 +1044,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFontWeight(prop)) { + if (NS_SUCCEEDED(a->GetFontWeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1060,7 +1060,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeight(prop)) { + if (NS_SUCCEEDED(a->GetHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1076,7 +1076,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLeft(prop)) { + if (NS_SUCCEEDED(a->GetLeft(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1092,7 +1092,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLetterSpacing(prop)) { + if (NS_SUCCEEDED(a->GetLetterSpacing(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1108,7 +1108,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLineHeight(prop)) { + if (NS_SUCCEEDED(a->GetLineHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1124,7 +1124,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetListStyle(prop)) { + if (NS_SUCCEEDED(a->GetListStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1140,7 +1140,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetListStyleImage(prop)) { + if (NS_SUCCEEDED(a->GetListStyleImage(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1156,7 +1156,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetListStylePosition(prop)) { + if (NS_SUCCEEDED(a->GetListStylePosition(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1172,7 +1172,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetListStyleType(prop)) { + if (NS_SUCCEEDED(a->GetListStyleType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1188,7 +1188,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMargin(prop)) { + if (NS_SUCCEEDED(a->GetMargin(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1204,7 +1204,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginTop(prop)) { + if (NS_SUCCEEDED(a->GetMarginTop(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1220,7 +1220,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginRight(prop)) { + if (NS_SUCCEEDED(a->GetMarginRight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1236,7 +1236,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginBottom(prop)) { + if (NS_SUCCEEDED(a->GetMarginBottom(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1252,7 +1252,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginLeft(prop)) { + if (NS_SUCCEEDED(a->GetMarginLeft(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1268,7 +1268,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarkerOffset(prop)) { + if (NS_SUCCEEDED(a->GetMarkerOffset(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1284,7 +1284,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarks(prop)) { + if (NS_SUCCEEDED(a->GetMarks(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1300,7 +1300,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMaxHeight(prop)) { + if (NS_SUCCEEDED(a->GetMaxHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1316,7 +1316,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMaxWidth(prop)) { + if (NS_SUCCEEDED(a->GetMaxWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1332,7 +1332,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMinHeight(prop)) { + if (NS_SUCCEEDED(a->GetMinHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1348,7 +1348,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMinWidth(prop)) { + if (NS_SUCCEEDED(a->GetMinWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1364,7 +1364,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOrphans(prop)) { + if (NS_SUCCEEDED(a->GetOrphans(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1380,7 +1380,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOutline(prop)) { + if (NS_SUCCEEDED(a->GetOutline(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1396,7 +1396,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOutlineColor(prop)) { + if (NS_SUCCEEDED(a->GetOutlineColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1412,7 +1412,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOutlineStyle(prop)) { + if (NS_SUCCEEDED(a->GetOutlineStyle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1428,7 +1428,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOutlineWidth(prop)) { + if (NS_SUCCEEDED(a->GetOutlineWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1444,7 +1444,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOverflow(prop)) { + if (NS_SUCCEEDED(a->GetOverflow(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1460,7 +1460,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPadding(prop)) { + if (NS_SUCCEEDED(a->GetPadding(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1476,7 +1476,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPaddingTop(prop)) { + if (NS_SUCCEEDED(a->GetPaddingTop(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1492,7 +1492,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPaddingRight(prop)) { + if (NS_SUCCEEDED(a->GetPaddingRight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1508,7 +1508,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPaddingBottom(prop)) { + if (NS_SUCCEEDED(a->GetPaddingBottom(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1524,7 +1524,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPaddingLeft(prop)) { + if (NS_SUCCEEDED(a->GetPaddingLeft(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1540,7 +1540,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPage(prop)) { + if (NS_SUCCEEDED(a->GetPage(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1556,7 +1556,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPageBreakAfter(prop)) { + if (NS_SUCCEEDED(a->GetPageBreakAfter(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1572,7 +1572,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPageBreakBefore(prop)) { + if (NS_SUCCEEDED(a->GetPageBreakBefore(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1588,7 +1588,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPageBreakInside(prop)) { + if (NS_SUCCEEDED(a->GetPageBreakInside(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1604,7 +1604,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPause(prop)) { + if (NS_SUCCEEDED(a->GetPause(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1620,7 +1620,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPauseAfter(prop)) { + if (NS_SUCCEEDED(a->GetPauseAfter(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1636,7 +1636,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPauseBefore(prop)) { + if (NS_SUCCEEDED(a->GetPauseBefore(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1652,7 +1652,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPitch(prop)) { + if (NS_SUCCEEDED(a->GetPitch(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1668,7 +1668,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPitchRange(prop)) { + if (NS_SUCCEEDED(a->GetPitchRange(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1684,7 +1684,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPlayDuring(prop)) { + if (NS_SUCCEEDED(a->GetPlayDuring(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1700,7 +1700,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPosition(prop)) { + if (NS_SUCCEEDED(a->GetPosition(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1716,7 +1716,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetQuotes(prop)) { + if (NS_SUCCEEDED(a->GetQuotes(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1732,7 +1732,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRichness(prop)) { + if (NS_SUCCEEDED(a->GetRichness(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1748,7 +1748,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRight(prop)) { + if (NS_SUCCEEDED(a->GetRight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1764,7 +1764,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSize(prop)) { + if (NS_SUCCEEDED(a->GetSize(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1780,7 +1780,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSpeak(prop)) { + if (NS_SUCCEEDED(a->GetSpeak(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1796,7 +1796,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSpeakHeader(prop)) { + if (NS_SUCCEEDED(a->GetSpeakHeader(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1812,7 +1812,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSpeakNumeral(prop)) { + if (NS_SUCCEEDED(a->GetSpeakNumeral(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1828,7 +1828,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSpeakPunctuation(prop)) { + if (NS_SUCCEEDED(a->GetSpeakPunctuation(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1844,7 +1844,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSpeechRate(prop)) { + if (NS_SUCCEEDED(a->GetSpeechRate(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1860,7 +1860,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetStress(prop)) { + if (NS_SUCCEEDED(a->GetStress(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1876,7 +1876,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTableLayout(prop)) { + if (NS_SUCCEEDED(a->GetTableLayout(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1892,7 +1892,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTextAlign(prop)) { + if (NS_SUCCEEDED(a->GetTextAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1908,7 +1908,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTextDecoration(prop)) { + if (NS_SUCCEEDED(a->GetTextDecoration(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1924,7 +1924,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTextIndent(prop)) { + if (NS_SUCCEEDED(a->GetTextIndent(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1940,7 +1940,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTextShadow(prop)) { + if (NS_SUCCEEDED(a->GetTextShadow(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1956,7 +1956,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTextTransform(prop)) { + if (NS_SUCCEEDED(a->GetTextTransform(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1972,7 +1972,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTop(prop)) { + if (NS_SUCCEEDED(a->GetTop(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -1988,7 +1988,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetUnicodeBidi(prop)) { + if (NS_SUCCEEDED(a->GetUnicodeBidi(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2004,7 +2004,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVerticalAlign(prop)) { + if (NS_SUCCEEDED(a->GetVerticalAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2020,7 +2020,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVisibility(prop)) { + if (NS_SUCCEEDED(a->GetVisibility(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2036,7 +2036,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVoiceFamily(prop)) { + if (NS_SUCCEEDED(a->GetVoiceFamily(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2052,7 +2052,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVolume(prop)) { + if (NS_SUCCEEDED(a->GetVolume(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2068,7 +2068,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWhiteSpace(prop)) { + if (NS_SUCCEEDED(a->GetWhiteSpace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2084,7 +2084,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidows(prop)) { + if (NS_SUCCEEDED(a->GetWidows(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2100,7 +2100,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2116,7 +2116,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWordSpacing(prop)) { + if (NS_SUCCEEDED(a->GetWordSpacing(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2132,7 +2132,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetZIndex(prop)) { + if (NS_SUCCEEDED(a->GetZIndex(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -2148,7 +2148,7 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetOpacity(prop)) { + if (NS_SUCCEEDED(a->GetOpacity(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp index b426a4dff0b..3ec4e6ea371 100644 --- a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp @@ -77,7 +77,7 @@ GetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleDeclaration* prop; - if (NS_OK == a->GetStyle(&prop)) { + if (NS_SUCCEEDED(a->GetStyle(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/css/nsJSCSSImportRule.cpp b/mozilla/dom/src/css/nsJSCSSImportRule.cpp index 32d70b4fd96..5aa7f9d99e8 100644 --- a/mozilla/dom/src/css/nsJSCSSImportRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSImportRule.cpp @@ -79,7 +79,7 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHref(prop)) { + if (NS_SUCCEEDED(a->GetHref(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -95,7 +95,7 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMedia(prop)) { + if (NS_SUCCEEDED(a->GetMedia(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -111,7 +111,7 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleSheet* prop; - if (NS_OK == a->GetStyleSheet(&prop)) { + if (NS_SUCCEEDED(a->GetStyleSheet(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp index b9276b9d62c..3f59089e6c7 100644 --- a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp @@ -78,7 +78,7 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMediaTypes(prop)) { + if (NS_SUCCEEDED(a->GetMediaTypes(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -94,7 +94,7 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleRuleCollection* prop; - if (NS_OK == a->GetCssRules(&prop)) { + if (NS_SUCCEEDED(a->GetCssRules(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/css/nsJSCSSPageRule.cpp b/mozilla/dom/src/css/nsJSCSSPageRule.cpp index 6fffbfbbd5a..e927c535b59 100644 --- a/mozilla/dom/src/css/nsJSCSSPageRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSPageRule.cpp @@ -78,7 +78,7 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -94,7 +94,7 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleDeclaration* prop; - if (NS_OK == a->GetStyle(&prop)) { + if (NS_SUCCEEDED(a->GetStyle(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/css/nsJSCSSRule.cpp b/mozilla/dom/src/css/nsJSCSSRule.cpp index 60ab088a15e..32992d98113 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) return JS_FALSE; } PRUint16 prop; - if (NS_OK == a->GetType(&prop)) { + if (NS_SUCCEEDED(a->GetType(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -95,7 +95,7 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCssText(prop)) { + if (NS_SUCCEEDED(a->GetCssText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -111,7 +111,7 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleSheet* prop; - if (NS_OK == a->GetSheet(&prop)) { + if (NS_SUCCEEDED(a->GetSheet(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp index e8966401a3b..26dbb97d81b 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp @@ -75,7 +75,7 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCssText(prop)) { + if (NS_SUCCEEDED(a->GetCssText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp index 3be24672402..8f5ba5adac5 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp @@ -78,7 +78,7 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSelectorText(prop)) { + if (NS_SUCCEEDED(a->GetSelectorText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -94,7 +94,7 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleDeclaration* prop; - if (NS_OK == a->GetStyle(&prop)) { + if (NS_SUCCEEDED(a->GetStyle(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp b/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp index f308755cdf8..ceb846e526b 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp @@ -77,7 +77,7 @@ GetCSSStyleRuleCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp index 8f0597828c1..4c9b84e9bee 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp @@ -88,7 +88,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetOwningNode(&prop)) { + if (NS_SUCCEEDED(a->GetOwningNode(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -105,7 +105,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMStyleSheet* prop; - if (NS_OK == a->GetParentStyleSheet(&prop)) { + if (NS_SUCCEEDED(a->GetParentStyleSheet(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -122,7 +122,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHref(prop)) { + if (NS_SUCCEEDED(a->GetHref(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -138,7 +138,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTitle(prop)) { + if (NS_SUCCEEDED(a->GetTitle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -154,7 +154,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMedia(prop)) { + if (NS_SUCCEEDED(a->GetMedia(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -170,7 +170,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleRuleCollection* prop; - if (NS_OK == a->GetCssRules(&prop)) { + if (NS_SUCCEEDED(a->GetCssRules(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/events/nsJSEvent.cpp b/mozilla/dom/src/events/nsJSEvent.cpp index ecf32431284..29327a2e75a 100644 --- a/mozilla/dom/src/events/nsJSEvent.cpp +++ b/mozilla/dom/src/events/nsJSEvent.cpp @@ -80,7 +80,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -96,7 +96,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetTarget(&prop)) { + if (NS_SUCCEEDED(a->GetTarget(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -113,7 +113,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetCurrentNode(&prop)) { + if (NS_SUCCEEDED(a->GetCurrentNode(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -130,7 +130,7 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint16 prop; - if (NS_OK == a->GetEventPhase(&prop)) { + if (NS_SUCCEEDED(a->GetEventPhase(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/events/nsJSTextRange.cpp b/mozilla/dom/src/events/nsJSTextRange.cpp new file mode 100644 index 00000000000..7009b4943c3 --- /dev/null +++ b/mozilla/dom/src/events/nsJSTextRange.cpp @@ -0,0 +1,514 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ +/* AUTO-GENERATED. DO NOT EDIT!!! */ + +#include "jsapi.h" +#include "nsJSUtils.h" +#include "nscore.h" +#include "nsIScriptContext.h" +#include "nsIScriptSecurityManager.h" +#include "nsIJSScriptObject.h" +#include "nsIScriptObjectOwner.h" +#include "nsIScriptGlobalObject.h" +#include "nsIPtr.h" +#include "nsString.h" +#include "nsIDOMTextRange.h" +#include "nsIDOMTextRangeList.h" + + +static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); +static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID); +static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID); +static NS_DEFINE_IID(kITextRangeIID, NS_IDOMTEXTRANGE_IID); +static NS_DEFINE_IID(kITextRangeListIID, NS_IDOMTEXTRANGELIST_IID); + +NS_DEF_PTR(nsIDOMTextRange); +NS_DEF_PTR(nsIDOMTextRangeList); + +// +// TextRange property ids +// +enum TextRange_slots { + TEXTRANGE_RANGESTART = -1, + TEXTRANGE_RANGEEND = -2, + TEXTRANGE_RANGETYPE = -3, + TEXTRANGELIST_LENGTH = -4 +}; + +/***********************************************************************/ +// +// TextRange Properties Getter +// +PR_STATIC_CALLBACK(JSBool) +GetTextRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) +{ + nsIDOMTextRange *a = (nsIDOMTextRange*)nsJSUtils::nsGetNativeThis(cx, obj); + + // If there's no private data, this must be the prototype, so ignore + if (nsnull == a) { + return JS_TRUE; + } + + if (JSVAL_IS_INT(id)) { + nsIScriptContext *scriptCX = (nsIScriptContext *)JS_GetContextPrivate(cx); + nsIScriptSecurityManager *secMan; + PRBool ok = PR_FALSE; + if (NS_OK != scriptCX->GetSecurityManager(&secMan)) { + return JS_FALSE; + } + switch(JSVAL_TO_INT(id)) { + case TEXTRANGE_RANGESTART: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrange.rangestart", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + if (NS_SUCCEEDED(a->GetRangeStart(&prop))) { + *vp = INT_TO_JSVAL(prop); + } + else { + return JS_FALSE; + } + break; + } + case TEXTRANGE_RANGEEND: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrange.rangeend", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + if (NS_SUCCEEDED(a->GetRangeEnd(&prop))) { + *vp = INT_TO_JSVAL(prop); + } + else { + return JS_FALSE; + } + break; + } + case TEXTRANGE_RANGETYPE: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrange.rangetype", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + if (NS_SUCCEEDED(a->GetRangeType(&prop))) { + *vp = INT_TO_JSVAL(prop); + } + else { + return JS_FALSE; + } + break; + } + case TEXTRANGELIST_LENGTH: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrangelist.length", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + nsIDOMTextRangeList* b; + if (NS_OK == a->QueryInterface(kITextRangeListIID, (void **)&b)) { + if(NS_SUCCEEDED(b->GetLength(&prop))) { + *vp = INT_TO_JSVAL(prop); + NS_RELEASE(b); + } + else { + NS_RELEASE(b); + return JS_FALSE; + } + } + else { + JS_ReportError(cx, "Object must be of type TextRangeList"); + return JS_FALSE; + } + break; + } + default: + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); + } + NS_RELEASE(secMan); + } + else { + return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp); + } + + return PR_TRUE; +} + +/***********************************************************************/ +// +// TextRange Properties Setter +// +PR_STATIC_CALLBACK(JSBool) +SetTextRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) +{ + nsIDOMTextRange *a = (nsIDOMTextRange*)nsJSUtils::nsGetNativeThis(cx, obj); + + // If there's no private data, this must be the prototype, so ignore + if (nsnull == a) { + return JS_TRUE; + } + + if (JSVAL_IS_INT(id)) { + nsIScriptContext *scriptCX = (nsIScriptContext *)JS_GetContextPrivate(cx); + nsIScriptSecurityManager *secMan; + PRBool ok = PR_FALSE; + if (NS_OK != scriptCX->GetSecurityManager(&secMan)) { + return JS_FALSE; + } + switch(JSVAL_TO_INT(id)) { + case TEXTRANGE_RANGESTART: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrange.rangestart", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + int32 temp; + if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) { + prop = (PRUint16)temp; + } + else { + JS_ReportError(cx, "Parameter must be a number"); + return JS_FALSE; + } + + a->SetRangeStart(prop); + + break; + } + case TEXTRANGE_RANGEEND: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrange.rangeend", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + int32 temp; + if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) { + prop = (PRUint16)temp; + } + else { + JS_ReportError(cx, "Parameter must be a number"); + return JS_FALSE; + } + + a->SetRangeEnd(prop); + + break; + } + case TEXTRANGE_RANGETYPE: + { + secMan->CheckScriptAccess(scriptCX, obj, "textrange.rangetype", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + PRUint16 prop; + int32 temp; + if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) { + prop = (PRUint16)temp; + } + else { + JS_ReportError(cx, "Parameter must be a number"); + return JS_FALSE; + } + + a->SetRangeType(prop); + + break; + } + default: + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); + } + NS_RELEASE(secMan); + } + else { + return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp); + } + + return PR_TRUE; +} + + +// +// TextRange finalizer +// +PR_STATIC_CALLBACK(void) +FinalizeTextRange(JSContext *cx, JSObject *obj) +{ + nsJSUtils::nsGenericFinalize(cx, obj); +} + + +// +// TextRange enumerate +// +PR_STATIC_CALLBACK(JSBool) +EnumerateTextRange(JSContext *cx, JSObject *obj) +{ + return nsJSUtils::nsGenericEnumerate(cx, obj); +} + + +// +// TextRange resolve +// +PR_STATIC_CALLBACK(JSBool) +ResolveTextRange(JSContext *cx, JSObject *obj, jsval id) +{ + return nsJSUtils::nsGenericResolve(cx, obj, id); +} + + +// +// Native method Item +// +PR_STATIC_CALLBACK(JSBool) +TextRangeListItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + nsIDOMTextRange *privateThis = (nsIDOMTextRange*)nsJSUtils::nsGetNativeThis(cx, obj); + nsIDOMTextRangeList *nativeThis = nsnull; + if (NS_OK != privateThis->QueryInterface(kITextRangeListIID, (void **)&nativeThis)) { + JS_ReportError(cx, "Object must be of type TextRangeList"); + return JS_FALSE; + } + + nsIDOMTextRange* nativeRet; + PRUint32 b0; + + *rval = JSVAL_NULL; + + nsIScriptContext *scriptCX = (nsIScriptContext *)JS_GetContextPrivate(cx); + nsIScriptSecurityManager *secMan; + if (NS_OK == scriptCX->GetSecurityManager(&secMan)) { + PRBool ok; + secMan->CheckScriptAccess(scriptCX, obj, "textrangelist.item", &ok); + if (!ok) { + //Need to throw error here + return JS_FALSE; + } + NS_RELEASE(secMan); + } + else { + return JS_FALSE; + } + + // If there's no private data, this must be the prototype, so ignore + if (nsnull == nativeThis) { + return JS_TRUE; + } + + if (argc >= 1) { + + if (!JS_ValueToInt32(cx, argv[0], (int32 *)&b0)) { + JS_ReportError(cx, "Parameter must be a number"); + return JS_FALSE; + } + + if (NS_OK != nativeThis->Item(b0, &nativeRet)) { + return JS_FALSE; + } + + nsJSUtils::nsConvertObjectToJSVal(nativeRet, cx, rval); + } + else { + JS_ReportError(cx, "Function Item requires 1 parameters"); + return JS_FALSE; + } + + return JS_TRUE; +} + + +/***********************************************************************/ +// +// class for TextRange +// +JSClass TextRangeClass = { + "TextRange", + JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS, + JS_PropertyStub, + JS_PropertyStub, + GetTextRangeProperty, + SetTextRangeProperty, + EnumerateTextRange, + ResolveTextRange, + JS_ConvertStub, + FinalizeTextRange +}; + + +// +// TextRange class properties +// +static JSPropertySpec TextRangeProperties[] = +{ + {"rangeStart", TEXTRANGE_RANGESTART, JSPROP_ENUMERATE}, + {"rangeEnd", TEXTRANGE_RANGEEND, JSPROP_ENUMERATE}, + {"rangeType", TEXTRANGE_RANGETYPE, JSPROP_ENUMERATE}, + {"length", TEXTRANGELIST_LENGTH, JSPROP_ENUMERATE | JSPROP_READONLY}, + {0} +}; + + +// +// TextRange class methods +// +static JSFunctionSpec TextRangeMethods[] = +{ + {"Item", TextRangeListItem, 1}, + {0} +}; + + +// +// TextRange constructor +// +PR_STATIC_CALLBACK(JSBool) +TextRange(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + return JS_FALSE; +} + + +// +// TextRange class initialization +// +extern "C" NS_DOM nsresult NS_InitTextRangeClass(nsIScriptContext *aContext, void **aPrototype) +{ + JSContext *jscontext = (JSContext *)aContext->GetNativeContext(); + JSObject *proto = nsnull; + JSObject *constructor = nsnull; + JSObject *parent_proto = nsnull; + JSObject *global = JS_GetGlobalObject(jscontext); + jsval vp; + + if ((PR_TRUE != JS_LookupProperty(jscontext, global, "TextRange", &vp)) || + !JSVAL_IS_OBJECT(vp) || + ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) || + (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || + !JSVAL_IS_OBJECT(vp)) { + + proto = JS_InitClass(jscontext, // context + global, // global object + parent_proto, // parent proto + &TextRangeClass, // JSClass + TextRange, // JSNative ctor + 0, // ctor args + TextRangeProperties, // proto props + TextRangeMethods, // proto funcs + nsnull, // ctor props (static) + nsnull); // ctor funcs (static) + if (nsnull == proto) { + return NS_ERROR_FAILURE; + } + + if ((PR_TRUE == JS_LookupProperty(jscontext, global, "TextRange", &vp)) && + JSVAL_IS_OBJECT(vp) && + ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) { + vp = INT_TO_JSVAL(nsIDOMTextRange::TEXTRANGE_CARETPOSITION); + JS_SetProperty(jscontext, constructor, "TEXTRANGE_CARETPOSITION", &vp); + + vp = INT_TO_JSVAL(nsIDOMTextRange::TEXTRANGE_RAWINPUT); + JS_SetProperty(jscontext, constructor, "TEXTRANGE_RAWINPUT", &vp); + + vp = INT_TO_JSVAL(nsIDOMTextRange::TEXTRANGE_SELECTEDRAWTEXT); + JS_SetProperty(jscontext, constructor, "TEXTRANGE_SELECTEDRAWTEXT", &vp); + + vp = INT_TO_JSVAL(nsIDOMTextRange::TEXTRANGE_CONVERTEDTEXT); + JS_SetProperty(jscontext, constructor, "TEXTRANGE_CONVERTEDTEXT", &vp); + + vp = INT_TO_JSVAL(nsIDOMTextRange::TEXTRANGE_SELECTEDCONVERTEDTEXT); + JS_SetProperty(jscontext, constructor, "TEXTRANGE_SELECTEDCONVERTEDTEXT", &vp); + + } + + } + else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) { + proto = JSVAL_TO_OBJECT(vp); + } + else { + return NS_ERROR_FAILURE; + } + + if (aPrototype) { + *aPrototype = proto; + } + return NS_OK; +} + + +// +// Method for creating a new TextRange JavaScript object +// +extern "C" NS_DOM nsresult NS_NewScriptTextRange(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn) +{ + NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptTextRange"); + JSObject *proto; + JSObject *parent; + nsIScriptObjectOwner *owner; + JSContext *jscontext = (JSContext *)aContext->GetNativeContext(); + nsresult result = NS_OK; + nsIDOMTextRange *aTextRange; + + if (nsnull == aParent) { + parent = nsnull; + } + else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) { + if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) { + NS_RELEASE(owner); + return NS_ERROR_FAILURE; + } + NS_RELEASE(owner); + } + else { + return NS_ERROR_FAILURE; + } + + if (NS_OK != NS_InitTextRangeClass(aContext, (void **)&proto)) { + return NS_ERROR_FAILURE; + } + + result = aSupports->QueryInterface(kITextRangeIID, (void **)&aTextRange); + if (NS_OK != result) { + return result; + } + + // create a js object for this class + *aReturn = JS_NewObject(jscontext, &TextRangeClass, proto, parent); + if (nsnull != *aReturn) { + // connect the native object to the js object + JS_SetPrivate(jscontext, (JSObject *)*aReturn, aTextRange); + } + else { + NS_RELEASE(aTextRange); + return NS_ERROR_FAILURE; + } + + return NS_OK; +} diff --git a/mozilla/dom/src/events/nsJSUIEvent.cpp b/mozilla/dom/src/events/nsJSUIEvent.cpp index 5f92cca9a22..1b39a908bee 100644 --- a/mozilla/dom/src/events/nsJSUIEvent.cpp +++ b/mozilla/dom/src/events/nsJSUIEvent.cpp @@ -102,7 +102,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetScreenX(&prop)) { + if (NS_SUCCEEDED(a->GetScreenX(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -118,7 +118,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetScreenY(&prop)) { + if (NS_SUCCEEDED(a->GetScreenY(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -134,7 +134,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetClientX(&prop)) { + if (NS_SUCCEEDED(a->GetClientX(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -150,7 +150,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetClientY(&prop)) { + if (NS_SUCCEEDED(a->GetClientY(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -166,7 +166,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetAltKey(&prop)) { + if (NS_SUCCEEDED(a->GetAltKey(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -182,7 +182,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetCtrlKey(&prop)) { + if (NS_SUCCEEDED(a->GetCtrlKey(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -198,7 +198,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetShiftKey(&prop)) { + if (NS_SUCCEEDED(a->GetShiftKey(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -214,7 +214,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetMetaKey(&prop)) { + if (NS_SUCCEEDED(a->GetMetaKey(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -230,7 +230,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetCharCode(&prop)) { + if (NS_SUCCEEDED(a->GetCharCode(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -246,7 +246,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetKeyCode(&prop)) { + if (NS_SUCCEEDED(a->GetKeyCode(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -262,7 +262,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint16 prop; - if (NS_OK == a->GetButton(&prop)) { + if (NS_SUCCEEDED(a->GetButton(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -278,7 +278,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint16 prop; - if (NS_OK == a->GetClickcount(&prop)) { + if (NS_SUCCEEDED(a->GetClickcount(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -296,7 +296,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PRInt32 prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetLayerX(&prop)) { + if(NS_SUCCEEDED(b->GetLayerX(&prop))) { *vp = INT_TO_JSVAL(prop); NS_RELEASE(b); } @@ -321,7 +321,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PRInt32 prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetLayerY(&prop)) { + if(NS_SUCCEEDED(b->GetLayerY(&prop))) { *vp = INT_TO_JSVAL(prop); NS_RELEASE(b); } @@ -346,7 +346,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PRInt32 prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetPageX(&prop)) { + if(NS_SUCCEEDED(b->GetPageX(&prop))) { *vp = INT_TO_JSVAL(prop); NS_RELEASE(b); } @@ -371,7 +371,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PRInt32 prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetPageY(&prop)) { + if(NS_SUCCEEDED(b->GetPageY(&prop))) { *vp = INT_TO_JSVAL(prop); NS_RELEASE(b); } @@ -396,7 +396,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PRUint32 prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetWhich(&prop)) { + if(NS_SUCCEEDED(b->GetWhich(&prop))) { *vp = INT_TO_JSVAL(prop); NS_RELEASE(b); } @@ -421,7 +421,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMNode* prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetRangeParent(&prop)) { + if(NS_SUCCEEDED(b->GetRangeParent(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); @@ -447,7 +447,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) PRInt32 prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetRangeOffset(&prop)) { + if(NS_SUCCEEDED(b->GetRangeOffset(&prop))) { *vp = INT_TO_JSVAL(prop); NS_RELEASE(b); } @@ -472,7 +472,7 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMRenderingContext* prop; nsIDOMNSUIEvent* b; if (NS_OK == a->QueryInterface(kINSUIEventIID, (void **)&b)) { - if(NS_OK == b->GetRc(&prop)) { + if(NS_SUCCEEDED(b->GetRc(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); diff --git a/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp b/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp index 29470353ae2..8f389249189 100644 --- a/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp @@ -85,7 +85,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -101,7 +101,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCharset(prop)) { + if (NS_SUCCEEDED(a->GetCharset(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -117,7 +117,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCoords(prop)) { + if (NS_SUCCEEDED(a->GetCoords(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -133,7 +133,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHref(prop)) { + if (NS_SUCCEEDED(a->GetHref(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -149,7 +149,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHreflang(prop)) { + if (NS_SUCCEEDED(a->GetHreflang(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -165,7 +165,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -181,7 +181,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRel(prop)) { + if (NS_SUCCEEDED(a->GetRel(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -197,7 +197,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRev(prop)) { + if (NS_SUCCEEDED(a->GetRev(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -213,7 +213,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetShape(prop)) { + if (NS_SUCCEEDED(a->GetShape(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -229,7 +229,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -245,7 +245,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTarget(prop)) { + if (NS_SUCCEEDED(a->GetTarget(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -261,7 +261,7 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp b/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp index 4ced579dd08..f59bb44166b 100644 --- a/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp @@ -84,7 +84,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -100,7 +100,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlt(prop)) { + if (NS_SUCCEEDED(a->GetAlt(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -116,7 +116,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetArchive(prop)) { + if (NS_SUCCEEDED(a->GetArchive(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -132,7 +132,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCode(prop)) { + if (NS_SUCCEEDED(a->GetCode(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -148,7 +148,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCodeBase(prop)) { + if (NS_SUCCEEDED(a->GetCodeBase(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -164,7 +164,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeight(prop)) { + if (NS_SUCCEEDED(a->GetHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -180,7 +180,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHspace(prop)) { + if (NS_SUCCEEDED(a->GetHspace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -196,7 +196,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -212,7 +212,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetObject(prop)) { + if (NS_SUCCEEDED(a->GetObject(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -228,7 +228,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVspace(prop)) { + if (NS_SUCCEEDED(a->GetVspace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -244,7 +244,7 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp index cc2cf092d2b..cb0e642358d 100644 --- a/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp @@ -81,7 +81,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -97,7 +97,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlt(prop)) { + if (NS_SUCCEEDED(a->GetAlt(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -113,7 +113,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCoords(prop)) { + if (NS_SUCCEEDED(a->GetCoords(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -129,7 +129,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHref(prop)) { + if (NS_SUCCEEDED(a->GetHref(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -145,7 +145,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetNoHref(&prop)) { + if (NS_SUCCEEDED(a->GetNoHref(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -161,7 +161,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetShape(prop)) { + if (NS_SUCCEEDED(a->GetShape(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -177,7 +177,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -193,7 +193,7 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTarget(prop)) { + if (NS_SUCCEEDED(a->GetTarget(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLBRElement.cpp b/mozilla/dom/src/html/nsJSHTMLBRElement.cpp index d955b12ae7c..71ebaa003e3 100644 --- a/mozilla/dom/src/html/nsJSHTMLBRElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBRElement.cpp @@ -74,7 +74,7 @@ GetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetClear(prop)) { + if (NS_SUCCEEDED(a->GetClear(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp b/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp index dccafaec81f..4677ad39b1c 100644 --- a/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp @@ -75,7 +75,7 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHref(prop)) { + if (NS_SUCCEEDED(a->GetHref(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTarget(prop)) { + if (NS_SUCCEEDED(a->GetTarget(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp b/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp index 4472d831214..414a6b70f8b 100644 --- a/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp @@ -76,7 +76,7 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetColor(prop)) { + if (NS_SUCCEEDED(a->GetColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -92,7 +92,7 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFace(prop)) { + if (NS_SUCCEEDED(a->GetFace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -108,7 +108,7 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSize(prop)) { + if (NS_SUCCEEDED(a->GetSize(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp b/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp index 36defa6ee90..f80c1d80154 100644 --- a/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBlockquoteElement.cpp @@ -74,7 +74,7 @@ GetHTMLBlockquoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval * return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCite(prop)) { + if (NS_SUCCEEDED(a->GetCite(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp b/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp index 0db4662f003..9d36d5144ac 100644 --- a/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp @@ -79,7 +79,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetALink(prop)) { + if (NS_SUCCEEDED(a->GetALink(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -95,7 +95,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackground(prop)) { + if (NS_SUCCEEDED(a->GetBackground(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -111,7 +111,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBgColor(prop)) { + if (NS_SUCCEEDED(a->GetBgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -127,7 +127,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLink(prop)) { + if (NS_SUCCEEDED(a->GetLink(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -143,7 +143,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetText(prop)) { + if (NS_SUCCEEDED(a->GetText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -159,7 +159,7 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVLink(prop)) { + if (NS_SUCCEEDED(a->GetVLink(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp b/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp index ddd2d511957..adae91a0aa2 100644 --- a/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp @@ -86,7 +86,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -103,7 +103,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -119,7 +119,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -135,7 +135,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -151,7 +151,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -167,7 +167,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -183,7 +183,7 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLCollection.cpp b/mozilla/dom/src/html/nsJSHTMLCollection.cpp index b38a10237f1..d887986253e 100644 --- a/mozilla/dom/src/html/nsJSHTMLCollection.cpp +++ b/mozilla/dom/src/html/nsJSHTMLCollection.cpp @@ -79,7 +79,7 @@ GetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLDListElement.cpp b/mozilla/dom/src/html/nsJSHTMLDListElement.cpp index cbfa2161061..4f24d6785ae 100644 --- a/mozilla/dom/src/html/nsJSHTMLDListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDListElement.cpp @@ -74,7 +74,7 @@ GetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetCompact(&prop)) { + if (NS_SUCCEEDED(a->GetCompact(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp b/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp index 6ff9413a9fa..10edd4412c2 100644 --- a/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp @@ -74,7 +74,7 @@ GetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetCompact(&prop)) { + if (NS_SUCCEEDED(a->GetCompact(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLDivElement.cpp b/mozilla/dom/src/html/nsJSHTMLDivElement.cpp index 2cf7f2de664..212c1c86782 100644 --- a/mozilla/dom/src/html/nsJSHTMLDivElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDivElement.cpp @@ -74,7 +74,7 @@ GetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLDocument.cpp b/mozilla/dom/src/html/nsJSHTMLDocument.cpp index b341c3071e4..588c73c02de 100644 --- a/mozilla/dom/src/html/nsJSHTMLDocument.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDocument.cpp @@ -110,7 +110,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTitle(prop)) { + if (NS_SUCCEEDED(a->GetTitle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -126,7 +126,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetReferrer(prop)) { + if (NS_SUCCEEDED(a->GetReferrer(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -142,7 +142,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDomain(prop)) { + if (NS_SUCCEEDED(a->GetDomain(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -158,7 +158,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetURL(prop)) { + if (NS_SUCCEEDED(a->GetURL(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -174,7 +174,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLElement* prop; - if (NS_OK == a->GetBody(&prop)) { + if (NS_SUCCEEDED(a->GetBody(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -191,7 +191,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetImages(&prop)) { + if (NS_SUCCEEDED(a->GetImages(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -208,7 +208,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetApplets(&prop)) { + if (NS_SUCCEEDED(a->GetApplets(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -225,7 +225,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetLinks(&prop)) { + if (NS_SUCCEEDED(a->GetLinks(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -242,7 +242,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetForms(&prop)) { + if (NS_SUCCEEDED(a->GetForms(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -259,7 +259,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetAnchors(&prop)) { + if (NS_SUCCEEDED(a->GetAnchors(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -276,7 +276,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCookie(prop)) { + if (NS_SUCCEEDED(a->GetCookie(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -294,7 +294,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetAlinkColor(prop)) { + if(NS_SUCCEEDED(b->GetAlinkColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } @@ -319,7 +319,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetLinkColor(prop)) { + if(NS_SUCCEEDED(b->GetLinkColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } @@ -344,7 +344,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetVlinkColor(prop)) { + if(NS_SUCCEEDED(b->GetVlinkColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } @@ -369,7 +369,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetBgColor(prop)) { + if(NS_SUCCEEDED(b->GetBgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } @@ -394,7 +394,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetFgColor(prop)) { + if(NS_SUCCEEDED(b->GetFgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } @@ -419,7 +419,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetLastModified(prop)) { + if(NS_SUCCEEDED(b->GetLastModified(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } @@ -444,7 +444,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetEmbeds(&prop)) { + if(NS_SUCCEEDED(b->GetEmbeds(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); @@ -470,7 +470,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetLayers(&prop)) { + if(NS_SUCCEEDED(b->GetLayers(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); @@ -496,7 +496,7 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsIDOMHTMLCollection* prop; nsIDOMNSHTMLDocument* b; if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { - if(NS_OK == b->GetPlugins(&prop)) { + if(NS_SUCCEEDED(b->GetPlugins(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); NS_RELEASE(b); diff --git a/mozilla/dom/src/html/nsJSHTMLElement.cpp b/mozilla/dom/src/html/nsJSHTMLElement.cpp index 2a6ee42ca03..7a0cf1ef4b0 100644 --- a/mozilla/dom/src/html/nsJSHTMLElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLElement.cpp @@ -82,7 +82,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetId(prop)) { + if (NS_SUCCEEDED(a->GetId(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -98,7 +98,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTitle(prop)) { + if (NS_SUCCEEDED(a->GetTitle(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -114,7 +114,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLang(prop)) { + if (NS_SUCCEEDED(a->GetLang(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -130,7 +130,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDir(prop)) { + if (NS_SUCCEEDED(a->GetDir(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -146,7 +146,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetClassName(prop)) { + if (NS_SUCCEEDED(a->GetClassName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -162,7 +162,7 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMCSSStyleDeclaration* prop; - if (NS_OK == a->GetStyle(&prop)) { + if (NS_SUCCEEDED(a->GetStyle(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp b/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp index a6e4e2d35ce..4d0c701df23 100644 --- a/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp @@ -77,7 +77,7 @@ GetHTMLFieldSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/html/nsJSHTMLFontElement.cpp b/mozilla/dom/src/html/nsJSHTMLFontElement.cpp index 460df6475a2..625bae78f8c 100644 --- a/mozilla/dom/src/html/nsJSHTMLFontElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFontElement.cpp @@ -76,7 +76,7 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetColor(prop)) { + if (NS_SUCCEEDED(a->GetColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -92,7 +92,7 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFace(prop)) { + if (NS_SUCCEEDED(a->GetFace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -108,7 +108,7 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSize(prop)) { + if (NS_SUCCEEDED(a->GetSize(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLFormElement.cpp b/mozilla/dom/src/html/nsJSHTMLFormElement.cpp index 573dfb0c479..8617a2b27b2 100644 --- a/mozilla/dom/src/html/nsJSHTMLFormElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFormElement.cpp @@ -93,7 +93,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetElements(&prop)) { + if (NS_SUCCEEDED(a->GetElements(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -110,7 +110,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -126,7 +126,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -142,7 +142,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAcceptCharset(prop)) { + if (NS_SUCCEEDED(a->GetAcceptCharset(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -158,7 +158,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAction(prop)) { + if (NS_SUCCEEDED(a->GetAction(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -174,7 +174,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetEnctype(prop)) { + if (NS_SUCCEEDED(a->GetEnctype(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -190,7 +190,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMethod(prop)) { + if (NS_SUCCEEDED(a->GetMethod(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -206,7 +206,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTarget(prop)) { + if (NS_SUCCEEDED(a->GetTarget(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -224,7 +224,7 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) nsAutoString prop; nsIDOMNSHTMLFormElement* b; if (NS_OK == a->QueryInterface(kINSHTMLFormElementIID, (void **)&b)) { - if(NS_OK == b->GetEncoding(prop)) { + if(NS_SUCCEEDED(b->GetEncoding(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); NS_RELEASE(b); } diff --git a/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp b/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp index 41d5ef833eb..453befb7c4e 100644 --- a/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp @@ -81,7 +81,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFrameBorder(prop)) { + if (NS_SUCCEEDED(a->GetFrameBorder(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -97,7 +97,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLongDesc(prop)) { + if (NS_SUCCEEDED(a->GetLongDesc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -113,7 +113,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginHeight(prop)) { + if (NS_SUCCEEDED(a->GetMarginHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -129,7 +129,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginWidth(prop)) { + if (NS_SUCCEEDED(a->GetMarginWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -145,7 +145,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -161,7 +161,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetNoResize(&prop)) { + if (NS_SUCCEEDED(a->GetNoResize(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -177,7 +177,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetScrolling(prop)) { + if (NS_SUCCEEDED(a->GetScrolling(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -193,7 +193,7 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSrc(prop)) { + if (NS_SUCCEEDED(a->GetSrc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp b/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp index ca790f4adb6..b17a6755dc8 100644 --- a/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp @@ -75,7 +75,7 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCols(prop)) { + if (NS_SUCCEEDED(a->GetCols(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRows(prop)) { + if (NS_SUCCEEDED(a->GetRows(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLHRElement.cpp b/mozilla/dom/src/html/nsJSHTMLHRElement.cpp index 37c13f0aa79..eebdc6aaaf4 100644 --- a/mozilla/dom/src/html/nsJSHTMLHRElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHRElement.cpp @@ -77,7 +77,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -93,7 +93,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetNoShade(&prop)) { + if (NS_SUCCEEDED(a->GetNoShade(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -109,7 +109,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSize(prop)) { + if (NS_SUCCEEDED(a->GetSize(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -125,7 +125,7 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp b/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp index 99b11a93bb4..42c4a7f29cc 100644 --- a/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp @@ -74,7 +74,7 @@ GetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetProfile(prop)) { + if (NS_SUCCEEDED(a->GetProfile(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp b/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp index d556caef073..d02289de965 100644 --- a/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp @@ -74,7 +74,7 @@ GetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp b/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp index b19e3924b8d..0f68a905321 100644 --- a/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp @@ -74,7 +74,7 @@ GetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVersion(prop)) { + if (NS_SUCCEEDED(a->GetVersion(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp b/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp index 3b439a6abf3..b96e8c9a21c 100644 --- a/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp @@ -83,7 +83,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -99,7 +99,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFrameBorder(prop)) { + if (NS_SUCCEEDED(a->GetFrameBorder(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -115,7 +115,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeight(prop)) { + if (NS_SUCCEEDED(a->GetHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -131,7 +131,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLongDesc(prop)) { + if (NS_SUCCEEDED(a->GetLongDesc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -147,7 +147,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginHeight(prop)) { + if (NS_SUCCEEDED(a->GetMarginHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -163,7 +163,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMarginWidth(prop)) { + if (NS_SUCCEEDED(a->GetMarginWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -179,7 +179,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -195,7 +195,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetScrolling(prop)) { + if (NS_SUCCEEDED(a->GetScrolling(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -211,7 +211,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSrc(prop)) { + if (NS_SUCCEEDED(a->GetSrc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -227,7 +227,7 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLImageElement.cpp b/mozilla/dom/src/html/nsJSHTMLImageElement.cpp index 303abc487f5..1bbceeb83be 100644 --- a/mozilla/dom/src/html/nsJSHTMLImageElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLImageElement.cpp @@ -93,7 +93,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLowSrc(prop)) { + if (NS_SUCCEEDED(a->GetLowSrc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -109,7 +109,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -125,7 +125,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -141,7 +141,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlt(prop)) { + if (NS_SUCCEEDED(a->GetAlt(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -157,7 +157,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorder(prop)) { + if (NS_SUCCEEDED(a->GetBorder(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -173,7 +173,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeight(prop)) { + if (NS_SUCCEEDED(a->GetHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -189,7 +189,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHspace(prop)) { + if (NS_SUCCEEDED(a->GetHspace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -205,7 +205,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetIsMap(&prop)) { + if (NS_SUCCEEDED(a->GetIsMap(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -221,7 +221,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLongDesc(prop)) { + if (NS_SUCCEEDED(a->GetLongDesc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -237,7 +237,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSrc(prop)) { + if (NS_SUCCEEDED(a->GetSrc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -253,7 +253,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetUseMap(prop)) { + if (NS_SUCCEEDED(a->GetUseMap(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -269,7 +269,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVspace(prop)) { + if (NS_SUCCEEDED(a->GetVspace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -285,7 +285,7 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp index 9fcdde466db..118014579da 100644 --- a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp @@ -94,7 +94,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDefaultValue(prop)) { + if (NS_SUCCEEDED(a->GetDefaultValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -110,7 +110,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDefaultChecked(&prop)) { + if (NS_SUCCEEDED(a->GetDefaultChecked(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -126,7 +126,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -143,7 +143,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccept(prop)) { + if (NS_SUCCEEDED(a->GetAccept(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -159,7 +159,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -175,7 +175,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -191,7 +191,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlt(prop)) { + if (NS_SUCCEEDED(a->GetAlt(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -207,7 +207,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetChecked(&prop)) { + if (NS_SUCCEEDED(a->GetChecked(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -223,7 +223,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -239,7 +239,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetMaxLength(&prop)) { + if (NS_SUCCEEDED(a->GetMaxLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -255,7 +255,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -271,7 +271,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetReadOnly(&prop)) { + if (NS_SUCCEEDED(a->GetReadOnly(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -287,7 +287,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSize(prop)) { + if (NS_SUCCEEDED(a->GetSize(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -303,7 +303,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSrc(prop)) { + if (NS_SUCCEEDED(a->GetSrc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -319,7 +319,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -335,7 +335,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -351,7 +351,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetUseMap(prop)) { + if (NS_SUCCEEDED(a->GetUseMap(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -367,7 +367,7 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp b/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp index bbd0330dc31..1be6397d8ca 100644 --- a/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp @@ -78,7 +78,7 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -95,7 +95,7 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetPrompt(prop)) { + if (NS_SUCCEEDED(a->GetPrompt(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLLIElement.cpp b/mozilla/dom/src/html/nsJSHTMLLIElement.cpp index 781047d91ae..c49e5a3ce66 100644 --- a/mozilla/dom/src/html/nsJSHTMLLIElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLIElement.cpp @@ -75,7 +75,7 @@ GetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetValue(&prop)) { + if (NS_SUCCEEDED(a->GetValue(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp b/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp index c6071c260b9..4e1893ef2c0 100644 --- a/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp @@ -79,7 +79,7 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -96,7 +96,7 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -112,7 +112,7 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHtmlFor(prop)) { + if (NS_SUCCEEDED(a->GetHtmlFor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp b/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp index 9e4b88eddf3..f60a7fa1ad1 100644 --- a/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp @@ -84,7 +84,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTop(&prop)) { + if (NS_SUCCEEDED(a->GetTop(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -100,7 +100,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetLeft(&prop)) { + if (NS_SUCCEEDED(a->GetLeft(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -116,7 +116,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVisibility(prop)) { + if (NS_SUCCEEDED(a->GetVisibility(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -132,7 +132,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBackground(prop)) { + if (NS_SUCCEEDED(a->GetBackground(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -148,7 +148,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBgColor(prop)) { + if (NS_SUCCEEDED(a->GetBgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -164,7 +164,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -180,7 +180,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetZIndex(&prop)) { + if (NS_SUCCEEDED(a->GetZIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -196,7 +196,7 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMDocument* prop; - if (NS_OK == a->GetDocument(&prop)) { + if (NS_SUCCEEDED(a->GetDocument(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp b/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp index 755e7cc2d0c..77ea2598bcc 100644 --- a/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp @@ -79,7 +79,7 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -96,7 +96,7 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -112,7 +112,7 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp b/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp index 0d49b076c58..1ff290ae135 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) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -98,7 +98,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCharset(prop)) { + if (NS_SUCCEEDED(a->GetCharset(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -114,7 +114,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHref(prop)) { + if (NS_SUCCEEDED(a->GetHref(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -130,7 +130,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHreflang(prop)) { + if (NS_SUCCEEDED(a->GetHreflang(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -146,7 +146,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMedia(prop)) { + if (NS_SUCCEEDED(a->GetMedia(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -162,7 +162,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRel(prop)) { + if (NS_SUCCEEDED(a->GetRel(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -178,7 +178,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRev(prop)) { + if (NS_SUCCEEDED(a->GetRev(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -194,7 +194,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetTarget(prop)) { + if (NS_SUCCEEDED(a->GetTarget(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -210,7 +210,7 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLMapElement.cpp b/mozilla/dom/src/html/nsJSHTMLMapElement.cpp index 46be26eeb4d..d41ee22c4cf 100644 --- a/mozilla/dom/src/html/nsJSHTMLMapElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMapElement.cpp @@ -78,7 +78,7 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetAreas(&prop)) { + if (NS_SUCCEEDED(a->GetAreas(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -95,7 +95,7 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp b/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp index 6d97f087b87..9538314e7f3 100644 --- a/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp @@ -74,7 +74,7 @@ GetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetCompact(&prop)) { + if (NS_SUCCEEDED(a->GetCompact(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp b/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp index 2ad6c70a24c..4111f71027c 100644 --- a/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp @@ -77,7 +77,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetContent(prop)) { + if (NS_SUCCEEDED(a->GetContent(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -93,7 +93,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHttpEquiv(prop)) { + if (NS_SUCCEEDED(a->GetHttpEquiv(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -109,7 +109,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -125,7 +125,7 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetScheme(prop)) { + if (NS_SUCCEEDED(a->GetScheme(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLModElement.cpp b/mozilla/dom/src/html/nsJSHTMLModElement.cpp index 60aca5e4186..896893e8d44 100644 --- a/mozilla/dom/src/html/nsJSHTMLModElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLModElement.cpp @@ -75,7 +75,7 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCite(prop)) { + if (NS_SUCCEEDED(a->GetCite(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -91,7 +91,7 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDateTime(prop)) { + if (NS_SUCCEEDED(a->GetDateTime(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLOListElement.cpp b/mozilla/dom/src/html/nsJSHTMLOListElement.cpp index 637d3218efa..b3abbb8345a 100644 --- a/mozilla/dom/src/html/nsJSHTMLOListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOListElement.cpp @@ -76,7 +76,7 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetCompact(&prop)) { + if (NS_SUCCEEDED(a->GetCompact(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -92,7 +92,7 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetStart(&prop)) { + if (NS_SUCCEEDED(a->GetStart(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -108,7 +108,7 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp index d72e86ee16b..fad4956eacc 100644 --- a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp @@ -94,7 +94,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -111,7 +111,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCode(prop)) { + if (NS_SUCCEEDED(a->GetCode(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -127,7 +127,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -143,7 +143,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetArchive(prop)) { + if (NS_SUCCEEDED(a->GetArchive(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -159,7 +159,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorder(prop)) { + if (NS_SUCCEEDED(a->GetBorder(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -175,7 +175,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCodeBase(prop)) { + if (NS_SUCCEEDED(a->GetCodeBase(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -191,7 +191,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCodeType(prop)) { + if (NS_SUCCEEDED(a->GetCodeType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -207,7 +207,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetData(prop)) { + if (NS_SUCCEEDED(a->GetData(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -223,7 +223,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDeclare(&prop)) { + if (NS_SUCCEEDED(a->GetDeclare(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -239,7 +239,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeight(prop)) { + if (NS_SUCCEEDED(a->GetHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -255,7 +255,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHspace(prop)) { + if (NS_SUCCEEDED(a->GetHspace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -271,7 +271,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -287,7 +287,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetStandby(prop)) { + if (NS_SUCCEEDED(a->GetStandby(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -303,7 +303,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -319,7 +319,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -335,7 +335,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetUseMap(prop)) { + if (NS_SUCCEEDED(a->GetUseMap(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -351,7 +351,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVspace(prop)) { + if (NS_SUCCEEDED(a->GetVspace(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -367,7 +367,7 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp index de58c50c8d5..5192e5541a6 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 return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -91,7 +91,7 @@ GetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLabel(prop)) { + if (NS_SUCCEEDED(a->GetLabel(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp index 23472f72d3e..529c730a4e6 100644 --- a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp @@ -91,7 +91,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -108,7 +108,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDefaultSelected(&prop)) { + if (NS_SUCCEEDED(a->GetDefaultSelected(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -124,7 +124,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetText(prop)) { + if (NS_SUCCEEDED(a->GetText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -140,7 +140,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetIndex(&prop)) { + if (NS_SUCCEEDED(a->GetIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -156,7 +156,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -172,7 +172,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetLabel(prop)) { + if (NS_SUCCEEDED(a->GetLabel(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -188,7 +188,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetSelected(&prop)) { + if (NS_SUCCEEDED(a->GetSelected(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -204,7 +204,7 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp b/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp index 60988a0d523..fab87b906d0 100644 --- a/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp @@ -74,7 +74,7 @@ GetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLParamElement.cpp b/mozilla/dom/src/html/nsJSHTMLParamElement.cpp index d7c397a6828..59ed52ceda6 100644 --- a/mozilla/dom/src/html/nsJSHTMLParamElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLParamElement.cpp @@ -77,7 +77,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -93,7 +93,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -109,7 +109,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -125,7 +125,7 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValueType(prop)) { + if (NS_SUCCEEDED(a->GetValueType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLPreElement.cpp b/mozilla/dom/src/html/nsJSHTMLPreElement.cpp index bfa017d03ea..a1e2c6a5c57 100644 --- a/mozilla/dom/src/html/nsJSHTMLPreElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLPreElement.cpp @@ -74,7 +74,7 @@ GetHTMLPreElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetWidth(&prop)) { + if (NS_SUCCEEDED(a->GetWidth(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp b/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp index 23f60f2ce32..a1548b4f857 100644 --- a/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp @@ -74,7 +74,7 @@ GetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCite(prop)) { + if (NS_SUCCEEDED(a->GetCite(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp b/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp index 7f991d12e54..fb647bcc3d3 100644 --- a/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp @@ -80,7 +80,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetText(prop)) { + if (NS_SUCCEEDED(a->GetText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -96,7 +96,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHtmlFor(prop)) { + if (NS_SUCCEEDED(a->GetHtmlFor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -112,7 +112,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetEvent(prop)) { + if (NS_SUCCEEDED(a->GetEvent(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -128,7 +128,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCharset(prop)) { + if (NS_SUCCEEDED(a->GetCharset(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -144,7 +144,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDefer(&prop)) { + if (NS_SUCCEEDED(a->GetDefer(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -160,7 +160,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSrc(prop)) { + if (NS_SUCCEEDED(a->GetSrc(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -176,7 +176,7 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp index 58e789f1385..bcc35099bfc 100644 --- a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp @@ -99,7 +99,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -115,7 +115,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetSelectedIndex(&prop)) { + if (NS_SUCCEEDED(a->GetSelectedIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -131,7 +131,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -147,7 +147,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRUint32 prop; - if (NS_OK == a->GetLength(&prop)) { + if (NS_SUCCEEDED(a->GetLength(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -163,7 +163,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -180,7 +180,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetOptions(&prop)) { + if (NS_SUCCEEDED(a->GetOptions(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -197,7 +197,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -213,7 +213,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetMultiple(&prop)) { + if (NS_SUCCEEDED(a->GetMultiple(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -229,7 +229,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -245,7 +245,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetSize(&prop)) { + if (NS_SUCCEEDED(a->GetSize(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -261,7 +261,7 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp b/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp index 7aa1ce6a20b..b3d450c17a4 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) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -92,7 +92,7 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetMedia(prop)) { + if (NS_SUCCEEDED(a->GetMedia(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -108,7 +108,7 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp index 6c852cc332a..e1f0dcdc710 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp @@ -74,7 +74,7 @@ GetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp index 7be22205ea5..767688daccc 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 return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetCellIndex(&prop)) { + if (NS_SUCCEEDED(a->GetCellIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -104,7 +104,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAbbr(prop)) { + if (NS_SUCCEEDED(a->GetAbbr(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -120,7 +120,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -136,7 +136,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAxis(prop)) { + if (NS_SUCCEEDED(a->GetAxis(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -152,7 +152,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBgColor(prop)) { + if (NS_SUCCEEDED(a->GetBgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -168,7 +168,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCh(prop)) { + if (NS_SUCCEEDED(a->GetCh(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -184,7 +184,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetChOff(prop)) { + if (NS_SUCCEEDED(a->GetChOff(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -200,7 +200,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetColSpan(&prop)) { + if (NS_SUCCEEDED(a->GetColSpan(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -216,7 +216,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeaders(prop)) { + if (NS_SUCCEEDED(a->GetHeaders(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -232,7 +232,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetHeight(prop)) { + if (NS_SUCCEEDED(a->GetHeight(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -248,7 +248,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetNoWrap(&prop)) { + if (NS_SUCCEEDED(a->GetNoWrap(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -264,7 +264,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetRowSpan(&prop)) { + if (NS_SUCCEEDED(a->GetRowSpan(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -280,7 +280,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetScope(prop)) { + if (NS_SUCCEEDED(a->GetScope(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -296,7 +296,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVAlign(prop)) { + if (NS_SUCCEEDED(a->GetVAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -312,7 +312,7 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp index 6db4041b494..c1d3c7b11eb 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp @@ -79,7 +79,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -95,7 +95,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCh(prop)) { + if (NS_SUCCEEDED(a->GetCh(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -111,7 +111,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetChOff(prop)) { + if (NS_SUCCEEDED(a->GetChOff(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -127,7 +127,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetSpan(&prop)) { + if (NS_SUCCEEDED(a->GetSpan(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -143,7 +143,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVAlign(prop)) { + if (NS_SUCCEEDED(a->GetVAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -159,7 +159,7 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTableElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableElement.cpp index ac7f1be3c86..fe391156f2a 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableElement.cpp @@ -99,7 +99,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLTableCaptionElement* prop; - if (NS_OK == a->GetCaption(&prop)) { + if (NS_SUCCEEDED(a->GetCaption(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -116,7 +116,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLTableSectionElement* prop; - if (NS_OK == a->GetTHead(&prop)) { + if (NS_SUCCEEDED(a->GetTHead(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -133,7 +133,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLTableSectionElement* prop; - if (NS_OK == a->GetTFoot(&prop)) { + if (NS_SUCCEEDED(a->GetTFoot(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -150,7 +150,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetRows(&prop)) { + if (NS_SUCCEEDED(a->GetRows(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -167,7 +167,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetTBodies(&prop)) { + if (NS_SUCCEEDED(a->GetTBodies(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -184,7 +184,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -200,7 +200,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBgColor(prop)) { + if (NS_SUCCEEDED(a->GetBgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -216,7 +216,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBorder(prop)) { + if (NS_SUCCEEDED(a->GetBorder(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -232,7 +232,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCellPadding(prop)) { + if (NS_SUCCEEDED(a->GetCellPadding(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -248,7 +248,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCellSpacing(prop)) { + if (NS_SUCCEEDED(a->GetCellSpacing(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -264,7 +264,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetFrame(prop)) { + if (NS_SUCCEEDED(a->GetFrame(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -280,7 +280,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetRules(prop)) { + if (NS_SUCCEEDED(a->GetRules(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -296,7 +296,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetSummary(prop)) { + if (NS_SUCCEEDED(a->GetSummary(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -312,7 +312,7 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetWidth(prop)) { + if (NS_SUCCEEDED(a->GetWidth(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp index f100ae384c7..bafe980ebd2 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp @@ -87,7 +87,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetRowIndex(&prop)) { + if (NS_SUCCEEDED(a->GetRowIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -103,7 +103,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetSectionRowIndex(&prop)) { + if (NS_SUCCEEDED(a->GetSectionRowIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -119,7 +119,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetCells(&prop)) { + if (NS_SUCCEEDED(a->GetCells(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -136,7 +136,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -152,7 +152,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetBgColor(prop)) { + if (NS_SUCCEEDED(a->GetBgColor(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -168,7 +168,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCh(prop)) { + if (NS_SUCCEEDED(a->GetCh(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -184,7 +184,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetChOff(prop)) { + if (NS_SUCCEEDED(a->GetChOff(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -200,7 +200,7 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVAlign(prop)) { + if (NS_SUCCEEDED(a->GetVAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp index b3cbb4f9e1e..0434af70ea7 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp @@ -84,7 +84,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAlign(prop)) { + if (NS_SUCCEEDED(a->GetAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -100,7 +100,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetCh(prop)) { + if (NS_SUCCEEDED(a->GetCh(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -116,7 +116,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetChOff(prop)) { + if (NS_SUCCEEDED(a->GetChOff(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -132,7 +132,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetVAlign(prop)) { + if (NS_SUCCEEDED(a->GetVAlign(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -148,7 +148,7 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval return JS_FALSE; } nsIDOMHTMLCollection* prop; - if (NS_OK == a->GetRows(&prop)) { + if (NS_SUCCEEDED(a->GetRows(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp index 21b34a89a55..70a6134f84d 100644 --- a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp @@ -87,7 +87,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetDefaultValue(prop)) { + if (NS_SUCCEEDED(a->GetDefaultValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -103,7 +103,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsIDOMHTMLFormElement* prop; - if (NS_OK == a->GetForm(&prop)) { + if (NS_SUCCEEDED(a->GetForm(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -120,7 +120,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetAccessKey(prop)) { + if (NS_SUCCEEDED(a->GetAccessKey(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -136,7 +136,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetCols(&prop)) { + if (NS_SUCCEEDED(a->GetCols(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -152,7 +152,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetDisabled(&prop)) { + if (NS_SUCCEEDED(a->GetDisabled(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -168,7 +168,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetName(prop)) { + if (NS_SUCCEEDED(a->GetName(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -184,7 +184,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetReadOnly(&prop)) { + if (NS_SUCCEEDED(a->GetReadOnly(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -200,7 +200,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetRows(&prop)) { + if (NS_SUCCEEDED(a->GetRows(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -216,7 +216,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetTabIndex(&prop)) { + if (NS_SUCCEEDED(a->GetTabIndex(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -232,7 +232,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { @@ -248,7 +248,7 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetValue(prop)) { + if (NS_SUCCEEDED(a->GetValue(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp b/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp index a27a80200f0..3d1a0385cea 100644 --- a/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp @@ -74,7 +74,7 @@ GetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetText(prop)) { + if (NS_SUCCEEDED(a->GetText(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/html/nsJSHTMLUListElement.cpp b/mozilla/dom/src/html/nsJSHTMLUListElement.cpp index c030bcd06a6..e7e88fd4dc3 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) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetCompact(&prop)) { + if (NS_SUCCEEDED(a->GetCompact(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -91,7 +91,7 @@ GetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsAutoString prop; - if (NS_OK == a->GetType(prop)) { + if (NS_SUCCEEDED(a->GetType(prop))) { nsJSUtils::nsConvertStringToJSVal(prop, cx, vp); } else { diff --git a/mozilla/dom/src/range/nsJSRange.cpp b/mozilla/dom/src/range/nsJSRange.cpp index e1b4c9ac411..9f5ac17f65f 100644 --- a/mozilla/dom/src/range/nsJSRange.cpp +++ b/mozilla/dom/src/range/nsJSRange.cpp @@ -88,7 +88,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetStartParent(&prop)) { + if (NS_SUCCEEDED(a->GetStartParent(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -105,7 +105,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetStartOffset(&prop)) { + if (NS_SUCCEEDED(a->GetStartOffset(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -121,7 +121,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetEndParent(&prop)) { + if (NS_SUCCEEDED(a->GetEndParent(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } @@ -138,7 +138,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRInt32 prop; - if (NS_OK == a->GetEndOffset(&prop)) { + if (NS_SUCCEEDED(a->GetEndOffset(&prop))) { *vp = INT_TO_JSVAL(prop); } else { @@ -154,7 +154,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } PRBool prop; - if (NS_OK == a->GetIsCollapsed(&prop)) { + if (NS_SUCCEEDED(a->GetIsCollapsed(&prop))) { *vp = BOOLEAN_TO_JSVAL(prop); } else { @@ -170,7 +170,7 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) return JS_FALSE; } nsIDOMNode* prop; - if (NS_OK == a->GetCommonParent(&prop)) { + if (NS_SUCCEEDED(a->GetCommonParent(&prop))) { // get the js object nsJSUtils::nsConvertObjectToJSVal((nsISupports *)prop, cx, vp); } diff --git a/mozilla/dom/tools/JSStubGen.cpp b/mozilla/dom/tools/JSStubGen.cpp index 4757ed1ed48..dc3f76d3c66 100644 --- a/mozilla/dom/tools/JSStubGen.cpp +++ b/mozilla/dom/tools/JSStubGen.cpp @@ -611,7 +611,7 @@ JSStubGen::GeneratePropertyFunc(IdlSpecification &aSpec, PRBool aIsGetter) static const char *kGetCaseStr = " %s prop;\n" -" if (NS_OK == a->Get%s(%sprop)) {\n" +" if (NS_SUCCEEDED(a->Get%s(%sprop))) {\n" "%s" " }\n" " else {\n" @@ -622,7 +622,7 @@ static const char *kGetCaseNonPrimaryStr = " %s prop;\n" " nsIDOM%s* b;\n" " if (NS_OK == a->QueryInterface(kI%sIID, (void **)&b)) {\n" -" if(NS_OK == b->Get%s(%sprop)) {\n" +" if(NS_SUCCEEDED(b->Get%s(%sprop))) {\n" "%s" " NS_RELEASE(b);\n" " }\n"