diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-02-14 12:51:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-14 12:51:21 -0800 |
| commit | 628a06bda2490e4c405ce3263381412423f4c735 (patch) | |
| tree | 8c6bd8864e8f9aae28ec72a24eeb6913e15f1557 | |
| parent | cde0ee28aca1d56028645acbf5b1250d45bffac7 (diff) | |
| parent | d0a011b30b97598ee74f329aaa217a6ab733f1f1 (diff) | |
| download | external_webkit-628a06bda2490e4c405ce3263381412423f4c735.zip external_webkit-628a06bda2490e4c405ce3263381412423f4c735.tar.gz external_webkit-628a06bda2490e4c405ce3263381412423f4c735.tar.bz2 | |
Merge "Update the scale when updating DrawGL functor"
| -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 b0c06b9..5d01e49 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1518,6 +1518,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*, @@ -1792,7 +1795,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(); @@ -1805,6 +1808,8 @@ static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jobject jrect, WebCore::IntRect webViewRect = jrect_to_webrect(env, jviewrect); functor->updateViewRect(webViewRect); + + functor->updateScale(scale); } } } @@ -2662,7 +2667,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 }, |