| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 5 #ifndef COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
| 6 #define COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 6 #define COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 10 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/surfaces/display_client.h" | 12 #include "cc/surfaces/display_client.h" |
| 10 #include "cc/surfaces/surface_factory.h" | 13 #include "cc/surfaces/surface_factory.h" |
| 11 #include "cc/surfaces/surface_factory_client.h" | 14 #include "cc/surfaces/surface_factory_client.h" |
| 12 #include "components/mus/gles2/gpu_state.h" | 15 #include "components/mus/gles2/gpu_state.h" |
| 13 #include "components/mus/surfaces/surfaces_context_provider.h" | 16 #include "components/mus/surfaces/surfaces_context_provider.h" |
| 14 #include "components/mus/surfaces/surfaces_context_provider_delegate.h" | 17 #include "components/mus/surfaces/surfaces_context_provider_delegate.h" |
| 15 #include "components/mus/surfaces/surfaces_state.h" | 18 #include "components/mus/surfaces/surfaces_state.h" |
| 16 #include "mojo/public/cpp/bindings/strong_binding.h" | 19 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 17 #include "ui/gfx/native_widget_types.h" | 20 #include "ui/gfx/native_widget_types.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 scoped_ptr<cc::CompositorFrame> pending_frame_; | 70 scoped_ptr<cc::CompositorFrame> pending_frame_; |
| 68 | 71 |
| 69 scoped_ptr<cc::Display> display_; | 72 scoped_ptr<cc::Display> display_; |
| 70 | 73 |
| 71 DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient); | 74 DISALLOW_COPY_AND_ASSIGN(TopLevelDisplayClient); |
| 72 }; | 75 }; |
| 73 | 76 |
| 74 } // namespace mus | 77 } // namespace mus |
| 75 | 78 |
| 76 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ | 79 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_IMPL_H_ |
| OLD | NEW |