From 20ca5ea8ab6d652fc70aa29038685845f6e3881b Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
Date: Wed, 1 Oct 2014 17:41:02 +0200
Subject: android: null safeguards and cleanup unneeded calls

Change-Id: I0ffcfb0fbaa03e5035bec9dd1ffed21f85972470
---
 .../LOAndroid3/src/java/org/libreoffice/LOKitShell.java           | 5 -----
 .../src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java          | 5 +++++
 .../src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java          | 8 --------
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'android')

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index 859a3d8eccba..332e0f8157c7 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -3,7 +3,6 @@ package org.libreoffice;
 
 import android.os.Handler;
 import android.util.DisplayMetrics;
-import android.util.Log;
 
 
 public class LOKitShell {
@@ -20,10 +19,6 @@ public class LOKitShell {
         }
     }
 
-    public static void viewSizeChanged() {
-        Log.i(LOGTAG, "viewSizeChanged");
-    }
-
     // Get a Handler for the main java thread
     public static Handler getMainHandler() {
         return LibreOfficeMainActivity.mAppContext.mMainHandler;
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
index 03da4bfe4ad7..c6c7d79383b0 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java
@@ -131,6 +131,10 @@ public class DynamicTileLayer extends Layer {
     }
 
     public void reevaluateTiles(ImmutableViewportMetrics viewportMetrics) {
+        if (tileProvider == null) {
+            return;
+        }
+
         RectF newCurrentViewPort = inflate(roundToTileSize(viewportMetrics.getViewport(), tileSize), tileSize);
 
         if (!currentViewport.equals(newCurrentViewPort)) {
@@ -193,5 +197,6 @@ public class DynamicTileLayer extends Layer {
 
     public void clearAllTiles() {
         tiles.clear();
+        currentViewport = new RectF();
     }
 }
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index 9ae462b68b40..5905d4a006ca 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -71,7 +71,6 @@ public class GeckoLayerClient implements LayerView.Listener {
     private ImmutableViewportMetrics mNewGeckoViewport;
     private Context mContext;
     private boolean mPendingViewportAdjust;
-    private boolean mViewportSizeChanged;
 
     public GeckoLayerClient(Context context) {
         mContext = context;
@@ -147,8 +146,6 @@ public class GeckoLayerClient implements LayerView.Listener {
 
     /* Informs Gecko that the screen size has changed. */
     private void sendResizeEventIfNecessary(boolean force) {
-        Log.e(LOGTAG, "### sendResizeEventIfNecessary " + force);
-
         DisplayMetrics metrics = new DisplayMetrics();
         LibreOfficeMainActivity.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
         View view = mLayerController.getView();
@@ -183,7 +180,6 @@ public class GeckoLayerClient implements LayerView.Listener {
 
     public void viewportSizeChanged() {
         sendResizeEventIfNecessary(true);
-        LOKitShell.viewSizeChanged();
     }
 
     void adjustViewport(DisplayPortMetrics displayPort) {
@@ -204,10 +200,6 @@ public class GeckoLayerClient implements LayerView.Listener {
         }
 
         LOKitShell.sendEvent(LOEventFactory.viewport(clampedMetrics));
-        if (mViewportSizeChanged) {
-            mViewportSizeChanged = false;
-            LOKitShell.viewSizeChanged();
-        }
     }
 
     /** This function is invoked by Gecko via JNI; be careful when modifying signature.
-- 
cgit