From d0a011b30b97598ee74f329aaa217a6ab733f1f1 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Tue, 14 Feb 2012 11:16:19 -0800
Subject: Update the scale when updating DrawGL functor

bug:6008955

framework change:
https://android-git.corp.google.com/g/#/c/165735/

Change-Id: I4228af004ac2060fa53cf49d34cde68b15fedc80
---
 Source/WebKit/android/nav/WebView.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit/android/nav/WebView.cpp')

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index efdb67f..e9d1d87 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -1520,6 +1520,9 @@ class GLDrawFunctor : Functor {
     void updateViewRect(WebCore::IntRect& _viewRect) {
         webViewRect = _viewRect;
     }
+    void updateScale(float _scale) {
+        scale = _scale;
+    }
     private:
     WebView* wvInstance;
     bool (WebView::*funcPtr)(WebCore::IntRect&, WebCore::IntRect*,
@@ -1794,7 +1797,7 @@ static jint nativeGetDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView,
 }
 
 static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jobject jrect,
-        jobject jviewrect, jobject jvisiblerect) {
+        jobject jviewrect, jobject jvisiblerect, jfloat scale) {
     WebView *wvInstance = GET_NATIVE_VIEW(env, obj);
     if (wvInstance) {
         GLDrawFunctor* functor = (GLDrawFunctor*) wvInstance->getFunctor();
@@ -1807,6 +1810,8 @@ static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jobject jrect,
 
             WebCore::IntRect webViewRect = jrect_to_webrect(env, jviewrect);
             functor->updateViewRect(webViewRect);
+
+            functor->updateScale(scale);
         }
     }
 }
@@ -2671,7 +2676,7 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeDraw },
     { "nativeGetDrawGLFunction", "(ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;FI)I",
         (void*) nativeGetDrawGLFunction },
-    { "nativeUpdateDrawGLFunction", "(Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;)V",
+    { "nativeUpdateDrawGLFunction", "(Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;F)V",
         (void*) nativeUpdateDrawGLFunction },
     { "nativeDumpDisplayTree", "(Ljava/lang/String;)V",
         (void*) nativeDumpDisplayTree },
-- 
cgit v1.1