| 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 CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 7 | 7 |
| 8 #include "base/cancelable_callback.h" | 8 #include "base/cancelable_callback.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 // Adapts a WebGraphicsContext3DCommandBufferImpl into a | 26 // Adapts a WebGraphicsContext3DCommandBufferImpl into a |
| 27 // cc::OutputSurface that also handles vsync parameter updates | 27 // cc::OutputSurface that also handles vsync parameter updates |
| 28 // arriving from the GPU process. | 28 // arriving from the GPU process. |
| 29 class GpuBrowserCompositorOutputSurface | 29 class GpuBrowserCompositorOutputSurface |
| 30 : public BrowserCompositorOutputSurface { | 30 : public BrowserCompositorOutputSurface { |
| 31 public: | 31 public: |
| 32 GpuBrowserCompositorOutputSurface( | 32 GpuBrowserCompositorOutputSurface( |
| 33 const scoped_refptr<ContextProviderCommandBuffer>& context, | 33 const scoped_refptr<ContextProviderCommandBuffer>& context, |
| 34 const scoped_refptr<ContextProviderCommandBuffer>& worker_context, | 34 const scoped_refptr<ContextProviderCommandBuffer>& worker_context, |
| 35 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | 35 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
| 36 scoped_ptr<BrowserCompositorOverlayCandidateValidator> | 36 std::unique_ptr<BrowserCompositorOverlayCandidateValidator> |
| 37 overlay_candidate_validator); | 37 overlay_candidate_validator); |
| 38 | 38 |
| 39 ~GpuBrowserCompositorOutputSurface() override; | 39 ~GpuBrowserCompositorOutputSurface() override; |
| 40 | 40 |
| 41 protected: | 41 protected: |
| 42 // BrowserCompositorOutputSurface: | 42 // BrowserCompositorOutputSurface: |
| 43 void OnReflectorChanged() override; | 43 void OnReflectorChanged() override; |
| 44 void OnGpuSwapBuffersCompleted( | 44 void OnGpuSwapBuffersCompleted( |
| 45 const std::vector<ui::LatencyInfo>& latency_info, | 45 const std::vector<ui::LatencyInfo>& latency_info, |
| 46 gfx::SwapResult result) override; | 46 gfx::SwapResult result) override; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 69 | 69 |
| 70 gpu::CommandBufferProxyImpl* GetCommandBufferProxy(); | 70 gpu::CommandBufferProxyImpl* GetCommandBufferProxy(); |
| 71 | 71 |
| 72 base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&, | 72 base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&, |
| 73 gfx::SwapResult)> | 73 gfx::SwapResult)> |
| 74 swap_buffers_completion_callback_; | 74 swap_buffers_completion_callback_; |
| 75 base::CancelableCallback<void(base::TimeTicks timebase, | 75 base::CancelableCallback<void(base::TimeTicks timebase, |
| 76 base::TimeDelta interval)> | 76 base::TimeDelta interval)> |
| 77 update_vsync_parameters_callback_; | 77 update_vsync_parameters_callback_; |
| 78 | 78 |
| 79 scoped_ptr<ReflectorTexture> reflector_texture_; | 79 std::unique_ptr<ReflectorTexture> reflector_texture_; |
| 80 | 80 |
| 81 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 81 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace content | 84 } // namespace content |
| 85 | 85 |
| 86 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 86 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |