| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <limits> | 8 #include <limits> | 
| 9 #include <map> | 9 #include <map> | 
| 10 #include <utility> | 10 #include <utility> | 
| (...skipping 1966 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1977     return layout_test_deps_->CreateCompositorFrameSink( | 1977     return layout_test_deps_->CreateCompositorFrameSink( | 
| 1978         routing_id, std::move(gpu_channel_host), std::move(context_provider), | 1978         routing_id, std::move(gpu_channel_host), std::move(context_provider), | 
| 1979         std::move(worker_context_provider), GetGpuMemoryBufferManager(), | 1979         std::move(worker_context_provider), GetGpuMemoryBufferManager(), | 
| 1980         this); | 1980         this); | 
| 1981   } | 1981   } | 
| 1982 | 1982 | 
| 1983 #if defined(OS_ANDROID) | 1983 #if defined(OS_ANDROID) | 
| 1984   if (sync_compositor_message_filter_) { | 1984   if (sync_compositor_message_filter_) { | 
| 1985     return base::MakeUnique<SynchronousCompositorFrameSink>( | 1985     return base::MakeUnique<SynchronousCompositorFrameSink>( | 
| 1986         std::move(context_provider), std::move(worker_context_provider), | 1986         std::move(context_provider), std::move(worker_context_provider), | 
| 1987         GetGpuMemoryBufferManager(), routing_id, compositor_frame_sink_id, | 1987         GetGpuMemoryBufferManager(), shared_bitmap_manager(), routing_id, | 
| 1988         CreateExternalBeginFrameSource(routing_id), | 1988         compositor_frame_sink_id, CreateExternalBeginFrameSource(routing_id), | 
| 1989         sync_compositor_message_filter_.get(), | 1989         sync_compositor_message_filter_.get(), | 
| 1990         std::move(frame_swap_message_queue)); | 1990         std::move(frame_swap_message_queue)); | 
| 1991   } | 1991   } | 
| 1992 #endif | 1992 #endif | 
| 1993   return base::WrapUnique(new RendererCompositorFrameSink( | 1993   return base::WrapUnique(new RendererCompositorFrameSink( | 
| 1994       routing_id, compositor_frame_sink_id, | 1994       routing_id, compositor_frame_sink_id, | 
| 1995       CreateExternalBeginFrameSource(routing_id), std::move(context_provider), | 1995       CreateExternalBeginFrameSource(routing_id), std::move(context_provider), | 
| 1996       std::move(worker_context_provider), GetGpuMemoryBufferManager(), | 1996       std::move(worker_context_provider), GetGpuMemoryBufferManager(), | 
| 1997       nullptr, std::move(frame_swap_message_queue))); | 1997       nullptr, std::move(frame_swap_message_queue))); | 
| 1998 } | 1998 } | 
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2412   } | 2412   } | 
| 2413 } | 2413 } | 
| 2414 | 2414 | 
| 2415 void RenderThreadImpl::OnRendererInterfaceRequest( | 2415 void RenderThreadImpl::OnRendererInterfaceRequest( | 
| 2416     mojom::RendererAssociatedRequest request) { | 2416     mojom::RendererAssociatedRequest request) { | 
| 2417   DCHECK(!renderer_binding_.is_bound()); | 2417   DCHECK(!renderer_binding_.is_bound()); | 
| 2418   renderer_binding_.Bind(std::move(request)); | 2418   renderer_binding_.Bind(std::move(request)); | 
| 2419 } | 2419 } | 
| 2420 | 2420 | 
| 2421 }  // namespace content | 2421 }  // namespace content | 
| OLD | NEW | 
|---|