summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Teng-Hui Zhu <ztenghui@google.com> 2012-02-14 11:22:14 -0800
committer Teng-Hui Zhu <ztenghui@google.com> 2012-02-14 11:29:52 -0800
commit7e2346d51a4511879d92a73fd35c30c71d0f3003 (patch)
tree6ba137452e93e43f3a5614bbc7bedab3ab38d48e
parent81453f761a21c4d76dfd2f81c8651eab3217b3df (diff)
Update the scale while updating the drawGL functor
bug:6008955 webkit change: https://android-git.corp.google.com/g/#/c/165734/ Change-Id: I5ba7998a6b8f33b44582b0158ba966054aaad2a8
-rw-r--r--core/java/android/webkit/WebView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4a42e92acb03..2cdf93036994 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -6029,7 +6029,7 @@ public class WebView extends AbsoluteLayout
calcOurContentVisibleRectF(mVisibleContentRect);
nativeUpdateDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport,
mGLViewportEmpty ? null : mViewRectViewport,
- mVisibleContentRect);
+ mVisibleContentRect, getScale());
}
/**
@@ -9815,7 +9815,7 @@ public class WebView extends AbsoluteLayout
private native int nativeGetDrawGLFunction(int nativeInstance, Rect rect,
Rect viewRect, RectF visibleRect, float scale, int extras);
private native void nativeUpdateDrawGLFunction(Rect rect, Rect viewRect,
- RectF visibleRect);
+ RectF visibleRect, float scale);
private native void nativeExtendSelection(int x, int y);
private native int nativeFindAll(String findLower, String findUpper,
boolean sameAsLastSearch);