summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-08-10 22:28:59 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-08-10 23:00:44 +0200
commitc1b793d501de2c13bd75d28420af4ea772ab336a (patch)
tree384b066be84dfd6a0e54cd058bb7ba8ec6c02bd6
parentd8f5616f1ab7c9ba03552403b77cc60faa5a2fbf (diff)
LOAndroid3: remove unused GeckoEventListener and WidgetTileLayer
Change-Id: Id5c245d308221975f4071c96fb275c41348dce68
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/GeckoEventListener.java44
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/WidgetTileLayer.java160
2 files changed, 0 insertions, 204 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/GeckoEventListener.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/GeckoEventListener.java
deleted file mode 100644
index 670513f2cfb2..000000000000
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/GeckoEventListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- 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):
- * Sriram Ramasubramanian <sriram@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 ***** */
-
-package org.mozilla.gecko;
-
-import org.json.JSONObject;
-
-public interface GeckoEventListener {
- public void handleMessage(String event, JSONObject message);
-}
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/WidgetTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/WidgetTileLayer.java
deleted file mode 100644
index b123d55c403d..000000000000
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/WidgetTileLayer.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- 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):
- * James Willcox <jwillcox@mozilla.com>
- * Arkady Blyakher <rkadyb@mit.edu>
- *
- * 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 ***** */
-
-package org.mozilla.gecko.gfx;
-
-import org.libreoffice.LOKitShell;
-import org.mozilla.gecko.gfx.LayerController;
-import org.mozilla.gecko.gfx.SingleTileLayer;
-//import org.mozilla.gecko.GeckoAppShell;
-import android.graphics.RectF;
-import android.util.Log;
-import android.opengl.GLES20;
-import java.nio.FloatBuffer;
-
-/**
- * Encapsulates the logic needed to draw the single-tiled Gecko texture
- */
-public class WidgetTileLayer extends Layer {
- private static final String LOGTAG = "WidgetTileLayer";
-
- private int[] mTextureIDs;
- private CairoImage mImage;
-
- public WidgetTileLayer(CairoImage image) {
- mImage = image;
- }
-
- protected boolean initialized() { return mTextureIDs != null; }
-
- @Override
- public IntSize getSize() { return mImage.getSize(); }
-
- protected void bindAndSetGLParameters() {
- GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureIDs[0]);
- GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST);
- GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
- }
-
- @Override
- protected void finalize() throws Throwable {
- if (mTextureIDs != null)
- TextureReaper.get().add(mTextureIDs);
- }
-
- @Override
- protected boolean performUpdates(RenderContext context) {
- super.performUpdates(context);
-
- if (mTextureIDs == null) {
- mTextureIDs = new int[1];
- GLES20.glGenTextures(1, mTextureIDs, 0);
- }
-
- bindAndSetGLParameters();
- LOKitShell.bindWidgetTexture();
-
- return true;
- }
-
- @Override
- public void draw(RenderContext context) {
- // mTextureIDs may be null here during startup if Layer.java's draw method
- // failed to acquire the transaction lock and call performUpdates.
- if (!initialized())
- return;
-
- GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureIDs[0]);
-
- RectF bounds;
- int[] cropRect;
- IntSize size = getSize();
- RectF viewport = context.viewport;
-
- bounds = getBounds(context, new FloatSize(size));
- cropRect = new int[] { 0, 0, size.width, size.height };
- bounds.offset(-viewport.left, -viewport.top);
-
- float top = viewport.height() - (bounds.top + bounds.height());
-
- // There may be errors from a previous GL call, so clear them first because
- // we want to check for one below
- while (GLES20.glGetError() != GLES20.GL_NO_ERROR);
-
- float[] coords = {
- //x, y, z, texture_x, texture_y
- bounds.left/viewport.width(), top/viewport.height(), 0,
- cropRect[0]/size.width, cropRect[1]/size.height,
-
- bounds.left/viewport.width(), (top+bounds.height())/viewport.height(), 0,
- cropRect[0]/size.width, cropRect[3]/size.height,
-
- (bounds.left+bounds.width())/viewport.width(), top/viewport.height(), 0,
- cropRect[2]/size.width, cropRect[1]/size.height,
-
- (bounds.left+bounds.width())/viewport.width(), (top+bounds.height())/viewport.height(),
- 0,
- cropRect[2]/size.width, cropRect[3]/size.height
- };
-
- // Get the buffer and handles from the context
- FloatBuffer coordBuffer = context.coordBuffer;
- int positionHandle = context.positionHandle;
- int textureHandle = context.textureHandle;
-
- // Make sure we are at position zero in the buffer in case other draw methods did not clean
- // up after themselves
- coordBuffer.position(0);
- coordBuffer.put(coords);
-
- // Vertex coordinates are x,y,z starting at position 0 into the buffer.
- coordBuffer.position(0);
- GLES20.glVertexAttribPointer(positionHandle, 3, GLES20.GL_FLOAT, false, 20, coordBuffer);
-
- // Texture coordinates are texture_x, texture_y starting at position 3 into the buffer.
- coordBuffer.position(3);
- GLES20.glVertexAttribPointer(textureHandle, 2, GLES20.GL_FLOAT, false, 20, coordBuffer);
- GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
-
- int error = GLES20.glGetError();
- if (error != GLES20.GL_NO_ERROR) {
- Log.i(LOGTAG, "Failed to draw texture: " + error);
- }
- }
-}
-