| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "cc/surfaces/display.h" | 5 #include "cc/surfaces/display.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | |
| 11 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| 12 #include "cc/debug/benchmark_instrumentation.h" | 11 #include "cc/debug/benchmark_instrumentation.h" |
| 13 #include "cc/output/compositor_frame.h" | 12 #include "cc/output/compositor_frame.h" |
| 14 #include "cc/output/direct_renderer.h" | 13 #include "cc/output/direct_renderer.h" |
| 15 #include "cc/output/gl_renderer.h" | 14 #include "cc/output/gl_renderer.h" |
| 16 #include "cc/output/renderer_settings.h" | 15 #include "cc/output/renderer_settings.h" |
| 17 #include "cc/output/software_renderer.h" | 16 #include "cc/output/software_renderer.h" |
| 18 #include "cc/output/texture_mailbox_deleter.h" | 17 #include "cc/output/texture_mailbox_deleter.h" |
| 19 #include "cc/scheduler/begin_frame_source.h" | 18 #include "cc/scheduler/begin_frame_source.h" |
| 20 #include "cc/surfaces/display_client.h" | 19 #include "cc/surfaces/display_client.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 | 420 |
| 422 if (surface_id == current_surface_id_) | 421 if (surface_id == current_surface_id_) |
| 423 UpdateRootSurfaceResourcesLocked(); | 422 UpdateRootSurfaceResourcesLocked(); |
| 424 } | 423 } |
| 425 | 424 |
| 426 const SurfaceId& Display::CurrentSurfaceId() { | 425 const SurfaceId& Display::CurrentSurfaceId() { |
| 427 return current_surface_id_; | 426 return current_surface_id_; |
| 428 } | 427 } |
| 429 | 428 |
| 430 } // namespace cc | 429 } // namespace cc |
| OLD | NEW |