| 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 GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ | 5 #ifndef GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
| 6 #define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ | 6 #define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #import "base/mac/scoped_nsobject.h" | 12 #import "base/mac/scoped_nsobject.h" |
| 13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
| 14 #include "gpu/ipc/service/gpu_command_buffer_stub.h" | 14 #include "gpu/ipc/service/gpu_command_buffer_stub.h" |
| 15 #include "gpu/ipc/service/image_transport_surface.h" | 15 #include "gpu/ipc/service/image_transport_surface.h" |
| 16 #include "ui/base/cocoa/remote_layer_api.h" | 16 #include "ui/base/cocoa/remote_layer_api.h" |
| 17 #include "ui/events/latency_info.h" | |
| 18 #include "ui/gl/gl_surface.h" | 17 #include "ui/gl/gl_surface.h" |
| 19 #include "ui/gl/gpu_switching_observer.h" | 18 #include "ui/gl/gpu_switching_observer.h" |
| 19 #include "ui/latency/latency_info.h" |
| 20 | 20 |
| 21 @class CAContext; | 21 @class CAContext; |
| 22 @class CALayer; | 22 @class CALayer; |
| 23 | 23 |
| 24 namespace ui { | 24 namespace ui { |
| 25 class CALayerTreeCoordinator; | 25 class CALayerTreeCoordinator; |
| 26 struct CARendererLayerParams; | 26 struct CARendererLayerParams; |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace gl { | 29 namespace gl { |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 base::ScopedTypeRef<CGLContextObj> fence_context_obj_; | 98 base::ScopedTypeRef<CGLContextObj> fence_context_obj_; |
| 99 | 99 |
| 100 // The renderer ID that all contexts made current to this surface should be | 100 // The renderer ID that all contexts made current to this surface should be |
| 101 // targeting. | 101 // targeting. |
| 102 GLint gl_renderer_id_; | 102 GLint gl_renderer_id_; |
| 103 }; | 103 }; |
| 104 | 104 |
| 105 } // namespace gpu | 105 } // namespace gpu |
| 106 | 106 |
| 107 #endif // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ | 107 #endif // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_ |
| OLD | NEW |