Hookup android_webview scroll offset delegation to Java side.

android_webview/browser/browser_view_renderer.h

 // Copyright (c) 2013 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/vector2d_f.h"
 
 struct AwDrawGLInfo;
 struct AwDrawSWFunctionTable;
 
 namespace content {
 class ContentViewCore;
 }
 
-namespace gfx {
-class Rect;
-}
-
 namespace android_webview {
 
 // Interface for all the WebView-specific content rendering operations.
 // Provides software and hardware rendering and the Capture Picture API.
 class BrowserViewRenderer {
  public:
   class Client {
    public:
     // Request DrawGL be called. Passing null canvas implies the request
     // will be of AwDrawGLInfo::kModeProcess type. The callback
     // may never be made, and the mode may be promoted to kModeDraw.
     virtual bool RequestDrawGL(jobject canvas) = 0;
 
     // Called when a new Picture is available. Needs to be enabled
     // via the EnableOnNewPicture method.
     virtual void OnNewPicture() = 0;
 
     // Called to trigger view invalidations.
     virtual void PostInvalidate() = 0;
 
     // Called to get view's absolute location on the screen.
     virtual gfx::Point GetLocationOnScreen() = 0;
 
+    // Try to set the view's scroll offset to |new_value_pix|.
+    virtual void ScrollContainerViewTo(gfx::Vector2d new_value_pix) = 0;
+
    protected:
     virtual ~Client() {}
   };
 
   // Delegate to perform rendering actions involving Java objects.
   class JavaHelper {
    public:
     // Creates a RGBA_8888 Java Bitmap object of the requested size.
     virtual base::android::ScopedJavaLocalRef<jobject> CreateBitmap(
         JNIEnv* env,
@@ skipping 25 matching lines @@
   // Rendering methods.
 
   // Main handler for view drawing: performs a SW draw immediately, or sets up
   // a subsequent GL Draw (via Client::RequestDrawGL) and returns true. A false
   // return value indicates nothing was or will be drawn.
   // |java_canvas| is the target of the draw. |is_hardware_canvas| indicates
   // a GL Draw maybe possible on this canvas. |scroll| if the view's current
   // scroll offset. |clip| is the canvas's clip bounds.
   virtual bool OnDraw(jobject java_canvas,
                       bool is_hardware_canvas,
-                      const gfx::Point& scroll,
+                      const gfx::Vector2d& scroll,
                       const gfx::Rect& clip) = 0;
   // Called in response to a prior Client::RequestDrawGL() call. See
   // AwDrawGLInfo documentation for more details of the contract.
   virtual void DrawGL(AwDrawGLInfo* draw_info) = 0;
 
   // CapturePicture API methods.
   virtual base::android::ScopedJavaLocalRef<jobject> CapturePicture() = 0;
   virtual void EnableOnNewPicture(bool enabled) = 0;
 
   // View update notifications.
   virtual void OnVisibilityChanged(bool view_visible, bool window_visible) = 0;
   virtual void OnSizeChanged(int width, int height) = 0;
   virtual void OnAttachedToWindow(int width, int height) = 0;
   virtual void OnDetachedFromWindow() = 0;
 
+  // Sets the scale for logical<->physical pixel conversions.
+  virtual void SetDipScale(double dip_scale) = 0;
+
+  // Set the root layer scroll offset to |new_value_pix|.
+  virtual void ScrollTo(gfx::Vector2d new_value_pix) = 0;

[joth, 2013/06/19 05:34:45]

ok you dropped _pix from scroll in OnDraw above, but added it here now. Should
be in both then?

[mkosiba (inactive), 2013/06/19 11:12:19]

I'm not sure why I changed it to that. moving it back to new_value.

+
   // Android views hierarchy gluing.
   virtual bool IsAttachedToWindow() = 0;
   virtual bool IsViewVisible() = 0;
   virtual gfx::Rect GetScreenRect() = 0;
 
   virtual ~BrowserViewRenderer() {}
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_