diff options
| author | piman <piman@chromium.org> | 2015-09-24 15:47:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-24 22:47:49 +0000 |
| commit | 5d36daebe789988bc73b35d122c5401d79d8f322 (patch) | |
| tree | c2116c088e96821225cfb537cfe9181027bd6241 /content/browser/android/in_process | |
| parent | 45f3e6e6d9c4fb8203104ee60aee358036b9871c (diff) | |
| download | chromium_src-5d36daebe789988bc73b35d122c5401d79d8f322.zip chromium_src-5d36daebe789988bc73b35d122c5401d79d8f322.tar.gz chromium_src-5d36daebe789988bc73b35d122c5401d79d8f322.tar.bz2 | |
Remove surface_id from RenderWidget/RenderWidgetHost and friends
We don't need them any more.
BUG=487471
Review URL: https://codereview.chromium.org/1359163005
Cr-Commit-Position: refs/heads/master@{#350686}
Diffstat (limited to 'content/browser/android/in_process')
| -rw-r--r-- | content/browser/android/in_process/synchronous_compositor_factory_impl.cc | 8 | ||||
| -rw-r--r-- | content/browser/android/in_process/synchronous_compositor_factory_impl.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc index 5d62030..7048000 100644 --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc @@ -166,10 +166,14 @@ SynchronousCompositorFactoryImpl::GetCompositorTaskRunner() { scoped_ptr<cc::OutputSurface> SynchronousCompositorFactoryImpl::CreateOutputSurface( int routing_id, - int surface_id, scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) { + // TODO(piman): we still need to create a View command buffer until + // crbug.com/526196 is fixed. The surface_id doesn't matter, it just needs to + // be !0. + const int32 kDummySurfaceId = 1; scoped_refptr<cc::ContextProvider> onscreen_context = - CreateContextProviderForCompositor(surface_id, RENDER_COMPOSITOR_CONTEXT); + CreateContextProviderForCompositor(kDummySurfaceId, + RENDER_COMPOSITOR_CONTEXT); scoped_refptr<cc::ContextProvider> worker_context = GetSharedWorkerContextProvider(); return make_scoped_ptr(new SynchronousCompositorOutputSurface( diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.h b/content/browser/android/in_process/synchronous_compositor_factory_impl.h index 90d6105..b78d2c8 100644 --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h @@ -40,7 +40,6 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { override; scoped_ptr<cc::OutputSurface> CreateOutputSurface( int routing_id, - int surface_id, scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) override; InputHandlerManagerClient* GetInputHandlerManagerClient() override; |