Removes LongLib dependency from GWT-RPC.

Change-Id: I180101b1543d18ef586e57f6539273db5769ffc6

Author: gkdn

user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStream.java

@@ -110,4 +110,90 @@ public final void setFlags(int flags) {
   protected final void setVersion(int version) {
     this.version = version;
   }
+
+  /**
+   * Parse a string containing a base-64 encoded version of a long value.
+   *
+   * Keep this synchronized with the version in Base64Utils.
+   */
+  public static long longFromBase64(String value) {
+    int pos = 0;
+    long longVal = base64Value(value.charAt(pos++));
+    int len = value.length();
+    while (pos < len) {
+      longVal <<= 6;
+      longVal |= base64Value(value.charAt(pos++));
+    }
+    return longVal;
+  }
+
+  /**
+   * Return an optionally single-quoted string containing a base-64 encoded
+   * version of the given long value.
+   *
+   * Keep this synchronized with the version in Base64Utils.
+   */
+  public static String longToBase64(long value) {
+    // Convert to ints early to avoid need for long ops
+    int low = (int) (value & 0xffffffff);
+    int high = (int) (value >> 32);
+
+    StringBuilder sb = new StringBuilder();
+    boolean haveNonZero = base64Append(sb, (high >> 28) & 0xf, false);
+    haveNonZero = base64Append(sb, (high >> 22) & 0x3f, haveNonZero);
+    haveNonZero = base64Append(sb, (high >> 16) & 0x3f, haveNonZero);
+    haveNonZero = base64Append(sb, (high >> 10) & 0x3f, haveNonZero);
+    haveNonZero = base64Append(sb, (high >> 4) & 0x3f, haveNonZero);
+    int v = ((high & 0xf) << 2) | ((low >> 30) & 0x3);
+    haveNonZero = base64Append(sb, v, haveNonZero);
+    haveNonZero = base64Append(sb, (low >> 24) & 0x3f, haveNonZero);
+    haveNonZero = base64Append(sb, (low >> 18) & 0x3f, haveNonZero);
+    haveNonZero = base64Append(sb, (low >> 12) & 0x3f, haveNonZero);
+    base64Append(sb, (low >> 6) & 0x3f, haveNonZero);
+    base64Append(sb, low & 0x3f, true);
+
+    return sb.toString();
+  }
+
+  private static boolean base64Append(StringBuilder sb, int digit, boolean haveNonZero) {
+    if (digit > 0) {
+      haveNonZero = true;
+    }
+    if (haveNonZero) {
+      int c;
+      if (digit < 26) {
+        c = 'A' + digit;
+      } else if (digit < 52) {
+        c = 'a' + digit - 26;
+      } else if (digit < 62) {
+        c = '0' + digit - 52;
+      } else if (digit == 62) {
+        c = '$';
+      } else {
+        c = '_';
+      }
+      sb.append((char) c);
+    }
+    return haveNonZero;
+  }
+
+  // Assume digit is one of [A-Za-z0-9$_]
+  private static int base64Value(char digit) {
+    if (digit >= 'A' && digit <= 'Z') {
+      return digit - 'A';
+    }
+    // No need to check digit <= 'z'
+    if (digit >= 'a') {
+      return digit - 'a' + 26;
+    }
+    if (digit >= '0' && digit <= '9') {
+      return digit - '0' + 52;
+    }
+    if (digit == '$') {
+      return 62;
+    }
+    // digit == '_'
+    return 63;
+  }
+
 }

user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java

@@ -35,7 +35,6 @@
 import com.google.gwt.dev.js.ast.JsUnaryOperator;
 import com.google.gwt.dev.js.ast.JsValueLiteral;
 import com.google.gwt.dev.js.ast.JsVisitor;
-import com.google.gwt.lang.LongLib;
 import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
 import com.google.gwt.user.client.rpc.SerializationException;
 
@@ -383,7 +382,7 @@ public int readInt() {
 
   @Override
   public long readLong() {    
-    return LongLib.longFromBase64(((JsStringLiteral) decoder.getValues().get(--index)).getValue());
+    return longFromBase64(((JsStringLiteral) decoder.getValues().get(--index)).getValue());
   }
 
   @Override

user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamWriter.java

@@ -16,7 +16,6 @@
 package com.google.gwt.user.client.rpc.impl;
 
 import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.lang.LongLib;
 import com.google.gwt.user.client.rpc.SerializationException;
 
 import java.util.List;
@@ -154,7 +153,7 @@ public String toString() {
 
   @Override
   public void writeLong(long value) {
-    append(LongLib.toBase64(value));
+    append(longToBase64(value));
   }
 
   /**

user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java

@@ -111,7 +111,7 @@ public native int readInt() /*-{
   @UnsafeNativeLong
   public native long readLong() /*-{
     var s = this.@com.google.gwt.user.client.rpc.impl.ClientSerializationStreamReader::results[--this.@com.google.gwt.user.client.rpc.impl.ClientSerializationStreamReader::index];
-    return @com.google.gwt.lang.LongLib::longFromBase64(Ljava/lang/String;)(s);
+    return @ClientSerializationStreamReader::longFromBase64(Ljava/lang/String;)(s);
   }-*/;
 
   public native short readShort() /*-{