| 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 #ifndef CC_SURFACES_DISPLAY_H_ | |
| 6 #define CC_SURFACES_DISPLAY_H_ | |
| 7 | |
| 8 #include "cc/surfaces/display.h" | 5 #include "cc/surfaces/display.h" |
| 9 | 6 |
| 10 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 11 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
| 12 #include "cc/output/direct_renderer.h" | 9 #include "cc/output/direct_renderer.h" |
| 13 #include "cc/output/gl_renderer.h" | 10 #include "cc/output/gl_renderer.h" |
| 14 #include "cc/surfaces/display_client.h" | 11 #include "cc/surfaces/display_client.h" |
| 15 #include "cc/surfaces/surface.h" | 12 #include "cc/surfaces/surface.h" |
| 16 #include "ui/gfx/frame_time.h" | 13 #include "ui/gfx/frame_time.h" |
| 17 | 14 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 int Display::CurrentSurfaceID() { | 101 int Display::CurrentSurfaceID() { |
| 105 return current_surface_ ? current_surface_->surface_id() : 0; | 102 return current_surface_ ? current_surface_->surface_id() : 0; |
| 106 } | 103 } |
| 107 | 104 |
| 108 void Display::ReturnResources(const ReturnedResourceArray& resources) { | 105 void Display::ReturnResources(const ReturnedResourceArray& resources) { |
| 109 // We never generate any resources, so we should never have any returned. | 106 // We never generate any resources, so we should never have any returned. |
| 110 DCHECK(resources.empty()); | 107 DCHECK(resources.empty()); |
| 111 } | 108 } |
| 112 | 109 |
| 113 } // namespace cc | 110 } // namespace cc |
| 114 | |
| 115 #endif // CC_SURFACES_DISPLAY_H_ | |
| OLD | NEW |