From 8f09c556567355de9bb5eead8dce0ad73a8fa658 Mon Sep 17 00:00:00 2001
From: Randall Barker <rbarker@mozilla.com>
Date: Tue, 10 Nov 2015 12:01:35 -0500
Subject: [PATCH] Bug 1223434 - Fix Fennec's Java selection handles to work
 with the C++ APZ. r=kats

--HG--
extra : commitid : CbeuaLWQT1j
---
 mobile/android/base/gfx/GeckoLayerClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/gfx/GeckoLayerClient.java b/mobile/android/base/gfx/GeckoLayerClient.java
index 68b1635e1153..5b2acd04e83d 100644
--- a/mobile/android/base/gfx/GeckoLayerClient.java
+++ b/mobile/android/base/gfx/GeckoLayerClient.java
@@ -930,7 +930,7 @@ class GeckoLayerClient implements LayerView.Listener, PanZoomTarget
         ImmutableViewportMetrics viewportMetrics = mViewportMetrics;
         PointF origin = viewportMetrics.getOrigin();
         float zoom = viewportMetrics.zoomFactor;
-        ImmutableViewportMetrics geckoViewport = mGeckoViewport;
+        ImmutableViewportMetrics geckoViewport = (AppConstants.MOZ_ANDROID_APZ ? mViewportMetrics : mGeckoViewport);
         PointF geckoOrigin = geckoViewport.getOrigin();
         float geckoZoom = geckoViewport.zoomFactor;