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 "content/browser/compositor/browser_compositor_output_surface.h" | 9 #include "content/browser/compositor/browser_compositor_output_surface.h" |
| 10 #include "ui/gfx/swap_result.h" |
10 | 11 |
11 namespace ui { | 12 namespace ui { |
12 class CompositorVSyncManager; | 13 class CompositorVSyncManager; |
13 } | 14 } |
14 | 15 |
15 namespace content { | 16 namespace content { |
16 class CommandBufferProxyImpl; | 17 class CommandBufferProxyImpl; |
17 class BrowserCompositorOverlayCandidateValidator; | 18 class BrowserCompositorOverlayCandidateValidator; |
18 class ReflectorTexture; | 19 class ReflectorTexture; |
19 | 20 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 SHOULD_NOT_SHOW_FRAMES_SUSPENDED, | 52 SHOULD_NOT_SHOW_FRAMES_SUSPENDED, |
52 // The compositor has been un-suspended, but has not yet issued a swap | 53 // The compositor has been un-suspended, but has not yet issued a swap |
53 // since being un-suspended, so any frames that come from the GPU process | 54 // since being un-suspended, so any frames that come from the GPU process |
54 // are for pre-suspend content and should not be displayed. | 55 // are for pre-suspend content and should not be displayed. |
55 SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED, | 56 SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED, |
56 }; | 57 }; |
57 ShouldShowFramesState should_show_frames_state_; | 58 ShouldShowFramesState should_show_frames_state_; |
58 #endif | 59 #endif |
59 | 60 |
60 CommandBufferProxyImpl* GetCommandBufferProxy(); | 61 CommandBufferProxyImpl* GetCommandBufferProxy(); |
61 void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info); | 62 void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info, |
| 63 gfx::SwapResult result); |
62 | 64 |
63 base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&)> | 65 base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&, |
| 66 gfx::SwapResult)> |
64 swap_buffers_completion_callback_; | 67 swap_buffers_completion_callback_; |
65 base::CancelableCallback<void(base::TimeTicks timebase, | 68 base::CancelableCallback<void(base::TimeTicks timebase, |
66 base::TimeDelta interval)> | 69 base::TimeDelta interval)> |
67 update_vsync_parameters_callback_; | 70 update_vsync_parameters_callback_; |
68 | 71 |
69 scoped_ptr<ReflectorTexture> reflector_texture_; | 72 scoped_ptr<ReflectorTexture> reflector_texture_; |
70 | 73 |
71 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 74 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
72 }; | 75 }; |
73 | 76 |
74 } // namespace content | 77 } // namespace content |
75 | 78 |
76 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 79 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |