| Index: content/browser/android/in_process/synchronous_compositor_impl.h
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h
|
| index 582e4df6965ca405096c6c18710329f99dc6d508..3dbd509552f03a4b96fd5e691d2fd40bd3b151d6 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_impl.h
|
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.h
|
| @@ -76,13 +76,14 @@ class SynchronousCompositorImpl
|
| virtual void DidActivatePendingTree() OVERRIDE;
|
|
|
| // LayerScrollOffsetDelegate
|
| - virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE;
|
| - virtual void UpdateRootLayerState(const gfx::Vector2dF& total_scroll_offset,
|
| - const gfx::Vector2dF& max_scroll_offset,
|
| - const gfx::SizeF& scrollable_size,
|
| - float page_scale_factor,
|
| - float min_page_scale_factor,
|
| - float max_page_scale_factor) OVERRIDE;
|
| + virtual gfx::ScrollOffset GetTotalScrollOffset() OVERRIDE;
|
| + virtual void UpdateRootLayerState(
|
| + const gfx::ScrollOffset& total_scroll_offset,
|
| + const gfx::ScrollOffset& max_scroll_offset,
|
| + const gfx::SizeF& scrollable_size,
|
| + float page_scale_factor,
|
| + float min_page_scale_factor,
|
| + float max_page_scale_factor) OVERRIDE;
|
| virtual bool IsExternalFlingActive() const OVERRIDE;
|
|
|
| void SetInputHandler(cc::InputHandler* input_handler);
|
|
|