am 93f808ab: am 388e461f: Add proper support for fixed position elements

Merge commit '93f808abccaf6f09c5c0226c01942c3be445031a'

* commit '93f808abccaf6f09c5c0226c01942c3be445031a':
  Add proper support for fixed position elements

1 files changed, 4 insertions, 3 deletions

diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 8931d72..0dccbee 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -1515,7 +1515,8 @@ static void nativeDrawMatches(JNIEnv *env, jobject obj, jobject canv)
 }
 
 static void nativeDrawLayers(JNIEnv *env, jobject obj,
-    jint layer, jfloat scrollX, jfloat scrollY,
+    jint layer, jint scrollX, jint scrollY,
+    jint width, jint height,
     jfloat scale, jobject canv)
 {
     if (!env)
@@ -1529,7 +1530,7 @@ static void nativeDrawLayers(JNIEnv *env, jobject obj,
     LayerAndroid* layerImpl = reinterpret_cast<LayerAndroid*>(layer);
     SkCanvas* canvas = GraphicsJNI::getNativeCanvas(env, canv);
     if (canvas)
-        layerImpl->paintOn(scrollX, scrollY, scale, canvas);
+        layerImpl->paintOn(scrollX, scrollY, width, height, scale, canvas);
 #endif
 }
 
@@ -2134,7 +2135,7 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeLayersHaveAnimations },
     { "nativeEvaluateLayersAnimations", "(I)I",
         (void*) nativeEvaluateLayersAnimations },
-    { "nativeDrawLayers", "(IFFFLandroid/graphics/Canvas;)V",
+    { "nativeDrawLayers", "(IIIIIFLandroid/graphics/Canvas;)V",
         (void*) nativeDrawLayers },
     { "nativeUpdateLayers", "(II)V",
         (void*) nativeUpdateLayers },