diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/content/browser/android/in_process | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/browser/android/in_process')
| -rw-r--r-- | chromium/content/browser/android/in_process/synchronous_compositor_impl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/content/browser/android/in_process/synchronous_compositor_impl.cc b/chromium/content/browser/android/in_process/synchronous_compositor_impl.cc index 678f622875b..5ab105b9a70 100644 --- a/chromium/content/browser/android/in_process/synchronous_compositor_impl.cc +++ b/chromium/content/browser/android/in_process/synchronous_compositor_impl.cc @@ -70,7 +70,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { if (!offscreen_context_for_main_thread_.get() || offscreen_context_for_main_thread_->DestroyedOnMainThread()) { offscreen_context_for_main_thread_ = - webkit::gpu::ContextProviderInProcess::CreateOffscreen(); + webkit::gpu::ContextProviderInProcess::Create(); if (offscreen_context_for_main_thread_.get() && !offscreen_context_for_main_thread_->BindToCurrentThread()) offscreen_context_for_main_thread_ = NULL; @@ -90,7 +90,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { if (!offscreen_context_for_compositor_thread_.get() || offscreen_context_for_compositor_thread_->DestroyedOnMainThread()) { offscreen_context_for_compositor_thread_ = - webkit::gpu::ContextProviderInProcess::CreateOffscreen(); + webkit::gpu::ContextProviderInProcess::Create(); } return offscreen_context_for_compositor_thread_; } @@ -228,7 +228,8 @@ void SynchronousCompositorImpl::SetInputHandler( void SynchronousCompositorImpl::DidOverscroll( const cc::DidOverscrollParams& params) { if (compositor_client_) { - compositor_client_->DidOverscroll(params.latest_overscroll_delta, + compositor_client_->DidOverscroll(params.accumulated_overscroll, + params.latest_overscroll_delta, params.current_fling_velocity); } } |