| 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 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 bool BindToClient(cc::OutputSurfaceClient* client) override; | 36 bool BindToClient(cc::OutputSurfaceClient* client) override; |
| 37 | 37 |
| 38 #if defined(OS_MACOSX) | 38 #if defined(OS_MACOSX) |
| 39 void OnSurfaceDisplayed() override; | 39 void OnSurfaceDisplayed() override; |
| 40 void OnSurfaceRecycled() override; | 40 void OnSurfaceRecycled() override; |
| 41 bool ShouldNotShowFramesAfterRecycle() const override; | 41 bool ShouldNotShowFramesAfterRecycle() const override; |
| 42 bool should_not_show_frames_; | 42 bool should_not_show_frames_; |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 CommandBufferProxyImpl* GetCommandBufferProxy(); | 45 CommandBufferProxyImpl* GetCommandBufferProxy(); |
| 46 void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info); | 46 virtual void OnSwapBuffersCompleted( |
| 47 const std::vector<ui::LatencyInfo>& latency_info, |
| 48 int result); |
| 47 | 49 |
| 48 base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&)> | 50 base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&, int)> |
| 49 swap_buffers_completion_callback_; | 51 swap_buffers_completion_callback_; |
| 50 base::CancelableCallback<void(base::TimeTicks timebase, | 52 base::CancelableCallback<void(base::TimeTicks timebase, |
| 51 base::TimeDelta interval)> | 53 base::TimeDelta interval)> |
| 52 update_vsync_parameters_callback_; | 54 update_vsync_parameters_callback_; |
| 53 | 55 |
| 54 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 56 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
| 55 }; | 57 }; |
| 56 | 58 |
| 57 } // namespace content | 59 } // namespace content |
| 58 | 60 |
| 59 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 61 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |