LOAndroid3: upgrade to latest CairoGLInfo, CairoUtils, FloatSize

Change-Id: I93c0761b1e76848ee8b07c5bcc524c95c036d322

3 files changed, 38 insertions, 154 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java
index bd4eedcaf951..078aa41baee7 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoGLInfo.java
@@ -1,47 +1,13 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Android code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009-2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.gfx;
 
 import javax.microedition.khronos.opengles.GL10;
 
-/**
- * Information needed to render Cairo bitmaps using OpenGL ES.
- */
+/** Information needed to render Cairo bitmaps using OpenGL ES. */
 public class CairoGLInfo {
     public final int internalFormat;
     public final int format;
@@ -50,16 +16,13 @@ public class CairoGLInfo {
     public CairoGLInfo(int cairoFormat) {
         switch (cairoFormat) {
             case CairoImage.FORMAT_ARGB32:
-                internalFormat = format = GL10.GL_RGBA;
-                type = GL10.GL_UNSIGNED_BYTE;
+                internalFormat = format = GL10.GL_RGBA; type = GL10.GL_UNSIGNED_BYTE;
                 break;
             case CairoImage.FORMAT_RGB24:
-                internalFormat = format = GL10.GL_RGB;
-                type = GL10.GL_UNSIGNED_BYTE;
+                internalFormat = format = GL10.GL_RGB; type = GL10.GL_UNSIGNED_BYTE;
                 break;
             case CairoImage.FORMAT_RGB16_565:
-                internalFormat = format = GL10.GL_RGB;
-                type = GL10.GL_UNSIGNED_SHORT_5_6_5;
+                internalFormat = format = GL10.GL_RGB; type = GL10.GL_UNSIGNED_SHORT_5_6_5;
                 break;
             case CairoImage.FORMAT_A8:
             case CairoImage.FORMAT_A1:
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java
index 00bd896e1664..e0db6530d5c8 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CairoUtils.java
@@ -1,45 +1,11 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Android code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009-2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.gfx;
 
-import org.mozilla.gecko.gfx.CairoImage;
 import android.graphics.Bitmap;
-import javax.microedition.khronos.opengles.GL10;
 
 /**
  * Utility methods useful when displaying Cairo bitmaps using OpenGL ES.
@@ -49,13 +15,13 @@ public class CairoUtils {
 
     public static int bitsPerPixelForCairoFormat(int cairoFormat) {
         switch (cairoFormat) {
-        case CairoImage.FORMAT_A1:          return 1;
-        case CairoImage.FORMAT_A8:          return 8;
-        case CairoImage.FORMAT_RGB16_565:   return 16;
-        case CairoImage.FORMAT_RGB24:       return 24;
-        case CairoImage.FORMAT_ARGB32:      return 32;
-        default:
-            throw new RuntimeException("Unknown Cairo format");
+            case CairoImage.FORMAT_A1:          return 1;
+            case CairoImage.FORMAT_A8:          return 8;
+            case CairoImage.FORMAT_RGB16_565:   return 16;
+            case CairoImage.FORMAT_RGB24:       return 24;
+            case CairoImage.FORMAT_ARGB32:      return 32;
+            default:
+                throw new RuntimeException("Unknown Cairo format");
         }
     }
 
@@ -64,21 +30,21 @@ public class CairoUtils {
             return CairoImage.FORMAT_ARGB32;    /* Droid Pro fix. */
 
         switch (config) {
-        case ALPHA_8:   return CairoImage.FORMAT_A8;
-        case ARGB_4444: throw new RuntimeException("ARGB_444 unsupported");
-        case ARGB_8888: return CairoImage.FORMAT_ARGB32;
-        case RGB_565:   return CairoImage.FORMAT_RGB16_565;
-        default:        throw new RuntimeException("Unknown Skia bitmap config");
+            case ALPHA_8:   return CairoImage.FORMAT_A8;
+            case ARGB_4444: throw new RuntimeException("ARGB_444 unsupported");
+            case ARGB_8888: return CairoImage.FORMAT_ARGB32;
+            case RGB_565:   return CairoImage.FORMAT_RGB16_565;
+            default:        throw new RuntimeException("Unknown Skia bitmap config");
         }
     }
 
     public static Bitmap.Config cairoFormatTobitmapConfig(int format) {
         switch (format) {
-        case CairoImage.FORMAT_A8:        return Bitmap.Config.ALPHA_8;
-        case CairoImage.FORMAT_ARGB32:    return Bitmap.Config.ARGB_8888;
-        case CairoImage.FORMAT_RGB16_565: return Bitmap.Config.RGB_565;
-        default:
-            throw new RuntimeException("Unknown CairoImage format");
+            case CairoImage.FORMAT_A8:        return Bitmap.Config.ALPHA_8;
+            case CairoImage.FORMAT_ARGB32:    return Bitmap.Config.ARGB_8888;
+            case CairoImage.FORMAT_RGB16_565: return Bitmap.Config.RGB_565;
+            default:
+                throw new RuntimeException("Unknown CairoImage format");
         }
     }
 }
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
index 5fb73ec18df9..dd9c1b38e714 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FloatSize.java
@@ -1,78 +1,33 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Android code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2009-2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Patrick Walton <pcwalton@mozilla.com>
- *   Chris Lord <chrislord.net@gmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.gfx;
 
+import org.mozilla.gecko.util.FloatUtils;
+
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.mozilla.gecko.util.FloatUtils;
 
 public class FloatSize {
     public final float width, height;
 
-    public FloatSize(FloatSize size) {
-        width = size.width;
-        height = size.height;
-    }
-
-    public FloatSize(IntSize size) {
-        width = size.width;
-        height = size.height;
-    }
-
-    public FloatSize(float aWidth, float aHeight) {
-        width = aWidth;
-        height = aHeight;
-    }
+    public FloatSize(FloatSize size) { width = size.width; height = size.height; }
+    public FloatSize(IntSize size) { width = size.width; height = size.height; }
+    public FloatSize(float aWidth, float aHeight) { width = aWidth; height = aHeight; }
 
     public FloatSize(JSONObject json) {
         try {
-            width = (float) json.getDouble("width");
-            height = (float) json.getDouble("height");
+            width = (float)json.getDouble("width");
+            height = (float)json.getDouble("height");
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }
     }
 
     @Override
-    public String toString() {
-        return "(" + width + "," + height + ")";
-    }
+    public String toString() { return "(" + width + "," + height + ")"; }
 
     public boolean isPositive() {
         return (width > 0 && height > 0);