OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/android/synchronous_compositor_output_surface.h" | 5 #include "content/renderer/android/synchronous_compositor_output_surface.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/macros.h" |
9 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
10 #include "cc/output/context_provider.h" | 11 #include "cc/output/context_provider.h" |
11 #include "cc/output/output_surface_client.h" | 12 #include "cc/output/output_surface_client.h" |
12 #include "cc/output/software_output_device.h" | 13 #include "cc/output/software_output_device.h" |
13 #include "content/renderer/android/synchronous_compositor_external_begin_frame_s
ource.h" | 14 #include "content/renderer/android/synchronous_compositor_external_begin_frame_s
ource.h" |
14 #include "content/renderer/android/synchronous_compositor_registry.h" | 15 #include "content/renderer/android/synchronous_compositor_registry.h" |
15 #include "content/renderer/gpu/frame_swap_message_queue.h" | 16 #include "content/renderer/gpu/frame_swap_message_queue.h" |
16 #include "gpu/command_buffer/client/context_support.h" | 17 #include "gpu/command_buffer/client/context_support.h" |
17 #include "gpu/command_buffer/client/gles2_interface.h" | 18 #include "gpu/command_buffer/client/gles2_interface.h" |
18 #include "gpu/command_buffer/common/gpu_memory_allocation.h" | 19 #include "gpu/command_buffer/common/gpu_memory_allocation.h" |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope = | 229 scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope = |
229 frame_swap_message_queue_->AcquireSendMessageScope(); | 230 frame_swap_message_queue_->AcquireSendMessageScope(); |
230 frame_swap_message_queue_->DrainMessages(messages); | 231 frame_swap_message_queue_->DrainMessages(messages); |
231 } | 232 } |
232 | 233 |
233 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const { | 234 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const { |
234 return thread_checker_.CalledOnValidThread(); | 235 return thread_checker_.CalledOnValidThread(); |
235 } | 236 } |
236 | 237 |
237 } // namespace content | 238 } // namespace content |
OLD | NEW |