From 8fae09d575161a54f2b5863d996e7acd7390e5a0 Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Mon, 28 Nov 2011 09:31:49 -0500
Subject: [PATCH] Update Webkit with the zoom level after double tap gesture

In the hardware accelerated case we were not updating webkit
with the new zoom information. This was causing plugins to
render at the old zoom level.

bug: 5663981
Change-Id: I3cb18ad9ca4f185f384ea9fb68780f29160391ad
---
 core/java/android/webkit/ZoomManager.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 84d00c90ef010..cf2c8a6778d76 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -498,6 +498,11 @@ class ZoomManager {
             if (mZoomScale == 0) {
                 // We've reached the end of the zoom animation.
                 mInHWAcceleratedZoom = false;
+
+                // Ensure that the zoom level is pushed to WebCore. This has not
+                // yet occurred because we prevent it from happening while
+                // mInHWAcceleratedZoom is true.
+                mWebView.sendViewSizeZoom(false);
             }
         } else {
             canvas.translate(tx, ty);