Bug 692342 - Reindentation from previous patch (no other changes). r=mrbkap
authorBobby Holley <bobbyholley@gmail.com>
Fri, 25 Nov 2011 17:09:07 -0800
changeset 81589 a03dd8e80c34d8ae160128641cb7062d05811857
parent 81588 4d417032d8878ed97c1093544e9ae13aa964999d
child 81590 a8300adcea7242fe1c652eb9745624e8b435f309
push id628
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 14:41:57 +0000
treeherdermozilla-aurora@24a61ad789e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs692342
milestone11.0a1
Bug 692342 - Reindentation from previous patch (no other changes). r=mrbkap
js/xpconnect/src/XPCWrappedNative.cpp
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -2702,113 +2702,113 @@ CallMethodHelper::ConvertDependentParams
     }
 
     return JS_TRUE;
 }
 
 JSBool
 CallMethodHelper::ConvertDependentParam(uint8 i)
 {
-        const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
-        const nsXPTType& type = paramInfo.GetType();
-        nsXPTType datum_type;
-        JSUint32 array_count = 0;
-        bool isArray = type.IsArray();
-
-        bool isSizedString = isArray ?
-            JS_FALSE :
-            type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
-            type.TagPart() == nsXPTType::T_PWSTRING_SIZE_IS;
-
-        nsXPTCVariant* dp = GetDispatchParam(i);
-        dp->type = type;
-
-        // Specify the correct storage/calling semantics.
-        if (paramInfo.IsIndirect())
-            dp->SetIndirect();
-
-        if (isArray) {
-            if (NS_FAILED(mIFaceInfo->GetTypeForParam(mVTableIndex, &paramInfo, 1,
-                                                      &datum_type))) {
-                Throw(NS_ERROR_XPC_CANT_GET_ARRAY_INFO, mCallContext);
-                return JS_FALSE;
-            }
-        } else
-            datum_type = type;
-
-        if (datum_type.IsInterfacePointer()) {
+    const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
+    const nsXPTType& type = paramInfo.GetType();
+    nsXPTType datum_type;
+    JSUint32 array_count = 0;
+    bool isArray = type.IsArray();
+
+    bool isSizedString = isArray ?
+        JS_FALSE :
+        type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
+        type.TagPart() == nsXPTType::T_PWSTRING_SIZE_IS;
+
+    nsXPTCVariant* dp = GetDispatchParam(i);
+    dp->type = type;
+
+    // Specify the correct storage/calling semantics.
+    if (paramInfo.IsIndirect())
+        dp->SetIndirect();
+
+    if (isArray) {
+        if (NS_FAILED(mIFaceInfo->GetTypeForParam(mVTableIndex, &paramInfo, 1,
+                                                  &datum_type))) {
+            Throw(NS_ERROR_XPC_CANT_GET_ARRAY_INFO, mCallContext);
+            return JS_FALSE;
+        }
+    } else
+        datum_type = type;
+
+    if (datum_type.IsInterfacePointer()) {
+        dp->SetValNeedsCleanup();
+    }
+
+    jsval src;
+
+    if (!GetOutParamSource(i, &src))
+        return JS_FALSE;
+
+    if (paramInfo.IsOut()) {
+        if (datum_type.IsPointer() &&
+            !datum_type.IsInterfacePointer() &&
+            isArray) {
             dp->SetValNeedsCleanup();
         }
 
-        jsval src;
-
-        if (!GetOutParamSource(i, &src))
-            return JS_FALSE;
-
-        if (paramInfo.IsOut()) {
-            if (datum_type.IsPointer() &&
-                !datum_type.IsInterfacePointer() &&
-                isArray) {
-                dp->SetValNeedsCleanup();
-            }
-
-            if (!paramInfo.IsIn())
-                return JS_TRUE;
-        } else {
-            NS_ASSERTION(i < mArgc || paramInfo.IsOptional(),
-                         "Expected either enough arguments or an optional argument");
-            src = i < mArgc ? mArgv[i] : JSVAL_NULL;
-
-            if (datum_type.TagPart() == nsXPTType::T_IID ||
-                datum_type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
-                datum_type.TagPart() == nsXPTType::T_PWSTRING_SIZE_IS ||
-                (isArray && datum_type.TagPart() == nsXPTType::T_CHAR_STR)) {
-                dp->SetValNeedsCleanup();
-            }
+        if (!paramInfo.IsIn())
+            return JS_TRUE;
+    } else {
+        NS_ASSERTION(i < mArgc || paramInfo.IsOptional(),
+                     "Expected either enough arguments or an optional argument");
+        src = i < mArgc ? mArgv[i] : JSVAL_NULL;
+
+        if (datum_type.TagPart() == nsXPTType::T_IID ||
+            datum_type.TagPart() == nsXPTType::T_PSTRING_SIZE_IS ||
+            datum_type.TagPart() == nsXPTType::T_PWSTRING_SIZE_IS ||
+            (isArray && datum_type.TagPart() == nsXPTType::T_CHAR_STR)) {
+            dp->SetValNeedsCleanup();
         }
-
-        nsID param_iid;
-        if (datum_type.IsInterfacePointer() &&
-            !GetInterfaceTypeFromParam(i, datum_type, &param_iid))
+    }
+
+    nsID param_iid;
+    if (datum_type.IsInterfacePointer() &&
+        !GetInterfaceTypeFromParam(i, datum_type, &param_iid))
+        return JS_FALSE;
+
+    uintN err;
+
+    if (isArray || isSizedString) {
+        if (!GetArraySizeFromParam(i, &array_count))
             return JS_FALSE;
 
-        uintN err;
-
-        if (isArray || isSizedString) {
-            if (!GetArraySizeFromParam(i, &array_count))
+        if (isArray) {
+            if (array_count &&
+                !XPCConvert::JSArray2Native(mCallContext, (void**)&dp->val, src,
+                                            array_count, datum_type, &param_iid,
+                                            &err)) {
+                // XXX need exception scheme for arrays to indicate bad element
+                ThrowBadParam(err, i, mCallContext);
                 return JS_FALSE;
-
-            if (isArray) {
-                if (array_count &&
-                    !XPCConvert::JSArray2Native(mCallContext, (void**)&dp->val, src,
-                                                array_count, datum_type, &param_iid,
-                                                &err)) {
-                    // XXX need exception scheme for arrays to indicate bad element
-                    ThrowBadParam(err, i, mCallContext);
-                    return JS_FALSE;
-                }
-            } else // if (isSizedString)
-            {
-                if (!XPCConvert::JSStringWithSize2Native(mCallContext,
-                                                         (void*)&dp->val,
-                                                         src, array_count,
-                                                         datum_type, &err)) {
-                    ThrowBadParam(err, i, mCallContext);
-                    return JS_FALSE;
-                }
             }
-        } else {
-            if (!XPCConvert::JSData2Native(mCallContext, &dp->val, src, type,
-                                           JS_TRUE, &param_iid, &err)) {
+        } else // if (isSizedString)
+        {
+            if (!XPCConvert::JSStringWithSize2Native(mCallContext,
+                                                     (void*)&dp->val,
+                                                     src, array_count,
+                                                     datum_type, &err)) {
                 ThrowBadParam(err, i, mCallContext);
                 return JS_FALSE;
             }
         }
-
-        return JS_TRUE;
+    } else {
+        if (!XPCConvert::JSData2Native(mCallContext, &dp->val, src, type,
+                                       JS_TRUE, &param_iid, &err)) {
+            ThrowBadParam(err, i, mCallContext);
+            return JS_FALSE;
+        }
+    }
+
+    return JS_TRUE;
 }
 
 // Performs all necessary teardown on a parameter after method invocation.
 //
 // This method should only be called if the value in question was flagged
 // for cleanup (ie, if dp->DoesValNeedCleanup()).
 void
 CallMethodHelper::CleanupParam(nsXPTCMiniVariant& param, nsXPTType& type)