Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / frame_host / render_widget_host_view_child_frame.h

diff --git a/src/content/browser/frame_host/render_widget_host_view_child_frame.h b/src/content/browser/frame_host/render_widget_host_view_child_frame.h
index 07e8428..141a10c 100644 (file)
--- a/src/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/src/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -49,6 +49,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
   virtual void Hide() OVERRIDE;
   virtual bool IsShowing() OVERRIDE;
   virtual gfx::Rect GetViewBounds() const OVERRIDE;
+  virtual gfx::Vector2dF GetLastScrollOffset() const OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
   virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
@@ -84,7 +85,6 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
                                 const gfx::Range& range) OVERRIDE;
   virtual void SelectionBoundsChanged(
       const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
-  virtual void ScrollOffsetChanged() OVERRIDE;
   virtual void CopyFromCompositingSurface(
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
@@ -137,11 +137,14 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
       const NativeWebKeyboardEvent& event) OVERRIDE;
 #endif  // defined(OS_MACOSX)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(TOOLKIT_VIEWS) || defined(USE_AURA)
   // RenderWidgetHostViewBase implementation.
   virtual void ShowDisambiguationPopup(
-      const gfx::Rect& target_rect,
+      const gfx::Rect& rect_pixels,
       const SkBitmap& zoomed_bitmap) OVERRIDE;
+#endif  // defined(OS_ANDROID) || defined(TOOLKIT_VIEWS)
+
+#if defined(OS_ANDROID)
   virtual void LockCompositingSurface() OVERRIDE;
   virtual void UnlockCompositingSurface() OVERRIDE;
 #endif  // defined(OS_ANDROID)
@@ -159,6 +162,9 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
  protected:
   friend class RenderWidgetHostView;
 
+  // The last scroll offset of the view.
+  gfx::Vector2dF last_scroll_offset_;
+
   // Members will become private when RenderWidgetHostViewGuest is removed.
   // The model object.
   RenderWidgetHostImpl* host_;