summaryrefslogtreecommitdiff
path: root/android/source
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-01 23:06:09 +0100
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-02 08:52:18 +0100
commitb3a91cf20bae871ef8438101425d5f176d0b0135 (patch)
treeb74b128e56336366143d80a874cef2c90369787c /android/source
parent7c5580234f785f20db097b49317dc3ff50d26b4f (diff)
android: don't crash in LO when SurfaceView layout is 0 width
Change-Id: I49be19b273d0c263637369e9b095f374b345191b (cherry picked from commit 37d41674c2b1a706c95c2c326cbfbd06b0c1a655)
Diffstat (limited to 'android/source')
-rw-r--r--android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
index e11c91c59fcc..e902a060a69b 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java
@@ -149,6 +149,11 @@ public abstract class ComposedTileLayer extends Layer implements ComponentCallba
RectF newViewPort = getViewPort(viewportMetrics);
float newZoom = getZoom(viewportMetrics);
+ // When
+ if (newZoom <= 0.0 || Float.isNaN(newZoom)) {
+ return;
+ }
+
if (currentViewport.equals(newViewPort) && FloatUtils.fuzzyEquals(currentZoom, newZoom)) {
return;
}