diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-02-14 11:16:19 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-02-14 11:31:46 -0800 |
| commit | d0a011b30b97598ee74f329aaa217a6ab733f1f1 (patch) | |
| tree | 74311077c2317d0918816a6d993c648b5f15ea29 /Source/WebKit/android | |
| parent | 451fcf2a39629f20f52ee6bb0294d217d8aa487f (diff) | |
| download | external_webkit-d0a011b30b97598ee74f329aaa217a6ab733f1f1.zip external_webkit-d0a011b30b97598ee74f329aaa217a6ab733f1f1.tar.gz external_webkit-d0a011b30b97598ee74f329aaa217a6ab733f1f1.tar.bz2 | |
Update the scale when updating DrawGL functor
bug:6008955
framework change:
https://android-git.corp.google.com/g/#/c/165735/
Change-Id: I4228af004ac2060fa53cf49d34cde68b15fedc80
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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 }, |