Hookup android_webview scroll offset delegation to Java side.

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 "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/gpu_memory_buffer_impl.h"
 #include "android_webview/browser/in_process_view_renderer.h"
@@ skipping 610 matching lines @@
                 state_vector.size());
   PickleIterator iterator(pickle);
 
   return RestoreFromPickle(&iterator, web_contents_.get());
 }
 
 bool AwContents::OnDraw(JNIEnv* env,
                         jobject obj,
                         jobject canvas,
                         jboolean is_hardware_accelerated,
-                        jint scroll_x,
-                        jint scroll_y,
+                        jint scroll_x_pix,
+                        jint scroll_y_pix,
                         jint clip_left,
                         jint clip_top,
                         jint clip_right,
                         jint clip_bottom) {
-  return browser_view_renderer_->OnDraw(canvas,
-                                        is_hardware_accelerated,
-                                        gfx::Point(scroll_x, scroll_y),
-                                        gfx::Rect(clip_left,
-                                                  clip_top,
-                                                  clip_right - clip_left,
-                                                  clip_bottom - clip_top));
+  return browser_view_renderer_->OnDraw(
+      canvas,
+      is_hardware_accelerated,
+      gfx::Vector2d(scroll_x_pix, scroll_y_pix),
+      gfx::Rect(clip_left,
+                clip_top,
+                clip_right - clip_left,
+                clip_bottom - clip_top));
 }
 
 void AwContents::SetPendingWebContentsForPopup(
     scoped_ptr<content::WebContents> pending) {
   if (pending_contents_.get()) {
     // TODO(benm): Support holding multiple pop up window requests.
     LOG(WARNING) << "Blocking popup window creation as an outstanding "
                  << "popup window is still pending.";
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release());
     return;
@@ skipping 15 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::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::SetDipScale(JNIEnv* env, jobject obj, jdouble dipScale) {
+  browser_view_renderer_->SetDipScale(dipScale);
+}
+
+void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix) {
+  browser_view_renderer_->ScrollTo(gfx::Vector2d(xPix, yPix));
+}
+
 void AwContents::OnPageScaleFactorChanged(float page_scale_factor) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_onPageScaleFactorChanged(env, obj.obj(), page_scale_factor);
 }
 
 ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env,
                                                        jobject obj) {
   return browser_view_renderer_->CapturePicture();
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview