[android_webview] Use a fraction to calculate scroll offset.

android_webview/native/aw_contents.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_contents.h"
 
 #include <limits>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 782 matching lines @@
   if (obj.is_null())
     return gfx::Point();
   std::vector<int> location;
   base::android::JavaIntArrayToIntVector(
       env,
       Java_AwContents_getLocationOnScreen(env, obj.obj()).obj(),
       &location);
   return gfx::Point(location[0], location[1]);
 }
 
+void AwContents::SetMaxContainerViewScrollOffset(gfx::Vector2d new_value) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+  Java_AwContents_setMaxContainerViewScrollOffset(
+      env, obj.obj(), new_value.x(), new_value.y());
+}
+
 void AwContents::ScrollContainerViewTo(gfx::Vector2d new_value) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_scrollContainerViewTo(
       env, obj.obj(), new_value.x(), new_value.y());
 }
 
+void AwContents::SetPageScaleFactor(float page_scale_factor) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+  Java_AwContents_setPageScaleFactor(env, obj.obj(), page_scale_factor);
+}
+
+void AwContents::SetContentsSize(gfx::SizeF contents_size_dip) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+  Java_AwContents_setContentsSize(
+      env, obj.obj(), contents_size_dip.width(), contents_size_dip.height());
+}
 
 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_didOverscroll(
       env, obj.obj(), overscroll_delta.x(), overscroll_delta.y());
 }
 
 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) {
   browser_view_renderer_->SetDipScale(dip_scale);
 }
 
-void AwContents::SetDisplayedPageScaleFactor(JNIEnv* env,
-                                             jobject obj,
-                                             jfloat page_scale_factor) {
-  browser_view_renderer_->SetPageScaleFactor(page_scale_factor);
-}
-
 void AwContents::SetFixedLayoutSize(JNIEnv* env,
                                     jobject obj,
                                     jint width_dip,
                                     jint height_dip) {
   render_view_host_ext_->SetFixedLayoutSize(gfx::Size(width_dip, height_dip));
 }
 
-void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix) {
-  browser_view_renderer_->ScrollTo(gfx::Vector2d(xPix, yPix));
+void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint x, jint y) {
+  browser_view_renderer_->ScrollTo(gfx::Vector2d(x, y));
 }
 
 void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_onWebLayoutPageScaleFactorChanged(env, obj.obj(),
                                                          page_scale_factor);
 }
@@ skipping 22 matching lines @@
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 void AwContents::SetJsOnlineProperty(JNIEnv* env,
                                      jobject obj,
                                      jboolean network_up) {
   render_view_host_ext_->SetJsOnlineProperty(network_up);
 }
 
 }  // namespace android_webview