| 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 <memory> |   8 #include <memory> | 
|   9  |   9  | 
|  10 #include "base/cancelable_callback.h" |  10 #include "base/cancelable_callback.h" | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  50       const std::vector<ui::LatencyInfo>& latency_info, |  50       const std::vector<ui::LatencyInfo>& latency_info, | 
|  51       gfx::SwapResult result, |  51       gfx::SwapResult result, | 
|  52       const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override; |  52       const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override; | 
|  53 #if defined(OS_MACOSX) |  53 #if defined(OS_MACOSX) | 
|  54   void SetSurfaceSuspendedForRecycle(bool suspended) override; |  54   void SetSurfaceSuspendedForRecycle(bool suspended) override; | 
|  55 #endif |  55 #endif | 
|  56  |  56  | 
|  57   // cc::OutputSurface implementation. |  57   // cc::OutputSurface implementation. | 
|  58   void SwapBuffers(cc::CompositorFrame* frame) override; |  58   void SwapBuffers(cc::CompositorFrame* frame) override; | 
|  59   bool BindToClient(cc::OutputSurfaceClient* client) override; |  59   bool BindToClient(cc::OutputSurfaceClient* client) override; | 
 |  60   uint32_t GetFramebufferCopyTextureFormat() override; | 
 |  61  | 
|  60   gpu::CommandBufferProxyImpl* GetCommandBufferProxy(); |  62   gpu::CommandBufferProxyImpl* GetCommandBufferProxy(); | 
|  61  |  63  | 
|  62   base::CancelableCallback<void( |  64   base::CancelableCallback<void( | 
|  63       const std::vector<ui::LatencyInfo>&, |  65       const std::vector<ui::LatencyInfo>&, | 
|  64       gfx::SwapResult, |  66       gfx::SwapResult, | 
|  65       const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac)> |  67       const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac)> | 
|  66       swap_buffers_completion_callback_; |  68       swap_buffers_completion_callback_; | 
|  67   base::CancelableCallback<void(base::TimeTicks timebase, |  69   base::CancelableCallback<void(base::TimeTicks timebase, | 
|  68                                 base::TimeDelta interval)> |  70                                 base::TimeDelta interval)> | 
|  69       update_vsync_parameters_callback_; |  71       update_vsync_parameters_callback_; | 
|  70  |  72  | 
|  71   std::unique_ptr<ReflectorTexture> reflector_texture_; |  73   std::unique_ptr<ReflectorTexture> reflector_texture_; | 
|  72  |  74  | 
|  73   DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |  75   DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 
|  74 }; |  76 }; | 
|  75  |  77  | 
|  76 }  // namespace content |  78 }  // namespace content | 
|  77  |  79  | 
|  78 #endif  // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |  80 #endif  // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 
| OLD | NEW |