Chromium Code Reviews| Index: content/browser/android/in_process/synchronous_compositor_impl.cc |
| diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc |
| index 66ce2cc14d47618013631c7fa60ead9adc8e7265..9098a70c7f564aa2481f7e163e2636422c480be9 100644 |
| --- a/content/browser/android/in_process/synchronous_compositor_impl.cc |
| +++ b/content/browser/android/in_process/synchronous_compositor_impl.cc |
| @@ -256,11 +256,13 @@ void SynchronousCompositorImpl::DidActivatePendingTree() { |
| compositor_client_->DidUpdateContent(); |
| } |
| -gfx::Vector2dF SynchronousCompositorImpl::GetTotalScrollOffset() { |
| +gfx::ScrollOffset SynchronousCompositorImpl::GetTotalScrollOffset() { |
| DCHECK(CalledOnValidThread()); |
| - if (compositor_client_) |
| - return compositor_client_->GetTotalRootLayerScrollOffset(); |
| - return gfx::Vector2dF(); |
| + if (compositor_client_) { |
| + return gfx::ScrollOffset( |
| + compositor_client_->GetTotalRootLayerScrollOffset()); |
| + } |
| + return gfx::ScrollOffset(); |
| } |
| bool SynchronousCompositorImpl::IsExternalFlingActive() const { |
| @@ -271,8 +273,8 @@ bool SynchronousCompositorImpl::IsExternalFlingActive() const { |
| } |
| void SynchronousCompositorImpl::UpdateRootLayerState( |
| - const gfx::Vector2dF& total_scroll_offset, |
| - const gfx::Vector2dF& max_scroll_offset, |
| + 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, |
| @@ -281,8 +283,8 @@ void SynchronousCompositorImpl::UpdateRootLayerState( |
| if (!compositor_client_) |
| return; |
| - compositor_client_->UpdateRootLayerState(total_scroll_offset, |
| - max_scroll_offset, |
| + compositor_client_->UpdateRootLayerState(total_scroll_offset.ToVector2dF(), |
|
danakj
2014/09/25 22:01:27
these look like they should stay ScrollOffsets?
Yufeng Shen (Slow to review)
2014/09/26 20:19:08
Done.
|
| + max_scroll_offset.ToVector2dF(), |
| scrollable_size, |
| page_scale_factor, |
| min_page_scale_factor, |