| 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> |
| 8 |
| 7 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
| 8 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| 9 #include "cc/debug/benchmark_instrumentation.h" | 11 #include "cc/debug/benchmark_instrumentation.h" |
| 10 #include "cc/output/compositor_frame.h" | 12 #include "cc/output/compositor_frame.h" |
| 11 #include "cc/output/compositor_frame_ack.h" | 13 #include "cc/output/compositor_frame_ack.h" |
| 12 #include "cc/output/direct_renderer.h" | 14 #include "cc/output/direct_renderer.h" |
| 13 #include "cc/output/gl_renderer.h" | 15 #include "cc/output/gl_renderer.h" |
| 14 #include "cc/output/renderer_settings.h" | 16 #include "cc/output/renderer_settings.h" |
| 15 #include "cc/output/software_renderer.h" | 17 #include "cc/output/software_renderer.h" |
| 16 #include "cc/output/texture_mailbox_deleter.h" | 18 #include "cc/output/texture_mailbox_deleter.h" |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 | 362 |
| 361 if (surface_id == current_surface_id_) | 363 if (surface_id == current_surface_id_) |
| 362 UpdateRootSurfaceResourcesLocked(); | 364 UpdateRootSurfaceResourcesLocked(); |
| 363 } | 365 } |
| 364 | 366 |
| 365 SurfaceId Display::CurrentSurfaceId() { | 367 SurfaceId Display::CurrentSurfaceId() { |
| 366 return current_surface_id_; | 368 return current_surface_id_; |
| 367 } | 369 } |
| 368 | 370 |
| 369 } // namespace cc | 371 } // namespace cc |
| OLD | NEW |