Follow-up to bug 1019836 to replace tabs with spaces. r=me and DONTBUILD because whitespace changes only.
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 05 Aug 2014 15:52:43 -0400
changeset 198034 725c4b03406484847dd666071076d480beae1046
parent 198033 572d27aad366f744642d0b1455e1d5880cfa008b
child 198035 36a1a86a132340dfe3bcd6cbfed6e58df17f2a3a
push id27258
push useremorley@mozilla.com
push dateWed, 06 Aug 2014 12:34:50 +0000
treeherdermozilla-central@35f922bff321 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1019836
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Follow-up to bug 1019836 to replace tabs with spaces. r=me and DONTBUILD because whitespace changes only.
build/annotationProcessors/AnnotationInfo.java
build/annotationProcessors/CodeGenerator.java
build/annotationProcessors/utils/GeneratableElementIterator.java
build/annotationProcessors/utils/Utils.java
--- a/build/annotationProcessors/AnnotationInfo.java
+++ b/build/annotationProcessors/AnnotationInfo.java
@@ -15,11 +15,11 @@ public class AnnotationInfo {
     public final boolean narrowChars;
 
     public AnnotationInfo(String aWrapperName, boolean aIsStatic, boolean aIsMultithreaded,
                           boolean aNoThrow, boolean aNarrowChars) {
         wrapperName = aWrapperName;
         isStatic = aIsStatic;
         isMultithreaded = aIsMultithreaded;
         noThrow = aNoThrow;
-	narrowChars = aNarrowChars;
+        narrowChars = aNarrowChars;
     }
 }
--- a/build/annotationProcessors/CodeGenerator.java
+++ b/build/annotationProcessors/CodeGenerator.java
@@ -422,17 +422,17 @@ public class CodeGenerator {
      * @param methodSignature The previously-generated C++ method signature for the method to be
      *                        generated.
      * @param aCMethodName    The C++ method name for the method to be generated.
      * @param aMethod         The Java method to be wrapped by the C++ method being generated.
      * @param aClass          The Java class to which the method belongs.
      */
     private void writeMethodBody(String methodSignature, String aCMethodName, Method aMethod,
             Class<?> aClass, boolean aIsStaticBridgeMethod, boolean aIsMultithreaded,
-				 boolean aNoThrow, boolean aNarrowChars) {
+            boolean aNoThrow, boolean aNarrowChars) {
         Class<?>[] argumentTypes = aMethod.getParameterTypes();
         Class<?> returnType = aMethod.getReturnType();
 
         writeFunctionStartupBoilerPlate(methodSignature, returnType, aIsStaticBridgeMethod, aIsMultithreaded);
 
         boolean isObjectReturningMethod = !returnType.getCanonicalName().equals("void") && Utils.isObjectType(returnType);
 
         writeFramePushBoilerplate(aMethod, isObjectReturningMethod, aNoThrow);
@@ -490,18 +490,18 @@ public class CodeGenerator {
         if (!aNoThrow) {
             wrapperMethodBodies.append("    AndroidBridge::HandleUncaughtException(env);\n");
         }
 
         // If we're returning an object, pop the callee's stack frame extracting our ref as the return
         // value.
         if (isObjectReturningMethod) {
             wrapperMethodBodies.append("    ")
-		.append(Utils.getCReturnType(returnType, aNarrowChars))
-		.append(" ret = static_cast<").append(Utils.getCReturnType(returnType, aNarrowChars)).append(">(env->PopLocalFrame(temp));\n" +
+                               .append(Utils.getCReturnType(returnType, aNarrowChars))
+                               .append(" ret = static_cast<").append(Utils.getCReturnType(returnType, aNarrowChars)).append(">(env->PopLocalFrame(temp));\n" +
                                        "    return ret;\n");
         } else if (!returnType.getCanonicalName().equals("void")) {
             // If we're a primitive-returning function, just return the directly-obtained primative
             // from the call to Java.
             wrapperMethodBodies.append("    env->PopLocalFrame(nullptr);\n" +
                                        "    return temp;\n");
         } else {
             // If we don't return anything, just pop the stack frame and move on with life.
--- a/build/annotationProcessors/utils/GeneratableElementIterator.java
+++ b/build/annotationProcessors/utils/GeneratableElementIterator.java
@@ -71,17 +71,17 @@ public class GeneratableElementIterator 
                 // WrappedJNIMethod has parameters. Use Reflection to obtain them.
                 Class<? extends Annotation> annotationType = annotation.annotationType();
                 final String annotationTypeName = annotationType.getName();
                 if (annotationTypeName.equals("org.mozilla.gecko.mozglue.generatorannotations.WrapElementForJNI")) {
                     String stubName = null;
                     boolean isStaticStub = false;
                     boolean isMultithreadedStub = false;
                     boolean noThrow = false;
-		    boolean narrowChars = false;
+                    boolean narrowChars = false;
                     try {
                         // Determine the explicitly-given name of the stub to generate, if any.
                         final Method stubNameMethod = annotationType.getDeclaredMethod("stubName");
                         stubNameMethod.setAccessible(true);
                         stubName = (String) stubNameMethod.invoke(annotation);
 
                         // Detemine if the generated stub should be static.
                         final Method staticStubMethod = annotationType.getDeclaredMethod("generateStatic");
@@ -119,27 +119,27 @@ public class GeneratableElementIterator 
 
                     // If the method name was not explicitly given in the annotation generate one...
                     if (stubName.isEmpty()) {
                         String aMethodName = candidateElement.getName();
                         stubName = aMethodName.substring(0, 1).toUpperCase() + aMethodName.substring(1);
                     }
 
                     AnnotationInfo annotationInfo = new AnnotationInfo(
-		        stubName, isStaticStub, isMultithreadedStub, noThrow, narrowChars);
+                        stubName, isStaticStub, isMultithreadedStub, noThrow, narrowChars);
                     mNextReturnValue = new AnnotatableEntity(candidateElement, annotationInfo);
                     return;
                 }
             }
 
             // If no annotation found, we might be expected to generate anyway using default arguments,
             // thanks to the "Generate everything" annotation.
             if (mIterateEveryEntry) {
                 AnnotationInfo annotationInfo = new AnnotationInfo(
-		    candidateElement.getName(), false, false, false, false);
+                    candidateElement.getName(), false, false, false, false);
                 mNextReturnValue = new AnnotatableEntity(candidateElement, annotationInfo);
                 return;
             }
         }
         mNextReturnValue = null;
     }
 
     @Override
--- a/build/annotationProcessors/utils/Utils.java
+++ b/build/annotationProcessors/utils/Utils.java
@@ -156,19 +156,19 @@ public class Utils {
                 }
                 return "jobjectArray";
             }
         }
         // Not an array type, check the remaining possibilities before we fall back to jobject
 
         // Check for CharSequences (Strings and things that are string-like)
         if (isCharSequence(type)) {
-	    if (aNarrowChars) {
-		return "const nsACString&";
-	    }
+            if (aNarrowChars) {
+                return "const nsACString&";
+            }
             return "const nsAString&";
         }
 
         if (name.equals("java.lang.Class")) {
             // You're doing reflection on Java objects from inside C, returning Class objects
             // to C, generating the corresponding code using this Java program. Really?!
             return "jclass";
         }