| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 class CompositorOutputSurface | 41 class CompositorOutputSurface |
| 42 : NON_EXPORTED_BASE(public cc::OutputSurface), | 42 : NON_EXPORTED_BASE(public cc::OutputSurface), |
| 43 NON_EXPORTED_BASE(public base::NonThreadSafe) { | 43 NON_EXPORTED_BASE(public base::NonThreadSafe) { |
| 44 public: | 44 public: |
| 45 CompositorOutputSurface( | 45 CompositorOutputSurface( |
| 46 int32_t routing_id, | 46 int32_t routing_id, |
| 47 uint32_t output_surface_id, | 47 uint32_t output_surface_id, |
| 48 const scoped_refptr<ContextProviderCommandBuffer>& context_provider, | 48 const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
| 49 const scoped_refptr<ContextProviderCommandBuffer>& | 49 const scoped_refptr<ContextProviderCommandBuffer>& |
| 50 worker_context_provider, | 50 worker_context_provider, |
| 51 #if defined(ENABLE_VULKAN) | |
| 52 const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider, | 51 const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider, |
| 53 #endif | |
| 54 std::unique_ptr<cc::SoftwareOutputDevice> software, | 52 std::unique_ptr<cc::SoftwareOutputDevice> software, |
| 55 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, | 53 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, |
| 56 bool use_swap_compositor_frame_message); | 54 bool use_swap_compositor_frame_message); |
| 57 ~CompositorOutputSurface() override; | 55 ~CompositorOutputSurface() override; |
| 58 | 56 |
| 59 // cc::OutputSurface implementation. | 57 // cc::OutputSurface implementation. |
| 60 bool BindToClient(cc::OutputSurfaceClient* client) override; | 58 bool BindToClient(cc::OutputSurfaceClient* client) override; |
| 61 void DetachFromClient() override; | 59 void DetachFromClient() override; |
| 62 void SwapBuffers(cc::CompositorFrame* frame) override; | 60 void SwapBuffers(cc::CompositorFrame* frame) override; |
| 63 | 61 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 105 |
| 108 // TODO(danakj): Remove this when crbug.com/311404 | 106 // TODO(danakj): Remove this when crbug.com/311404 |
| 109 bool layout_test_mode_; | 107 bool layout_test_mode_; |
| 110 std::unique_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_; | 108 std::unique_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_; |
| 111 base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_; | 109 base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_; |
| 112 }; | 110 }; |
| 113 | 111 |
| 114 } // namespace content | 112 } // namespace content |
| 115 | 113 |
| 116 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 114 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |