| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 gfx::SwapResult result, | 52 gfx::SwapResult result, |
| 53 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override; | 53 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override; |
| 54 | 54 |
| 55 // cc::OutputSurface implementation. | 55 // cc::OutputSurface implementation. |
| 56 void SwapBuffers(cc::CompositorFrame* frame) override; | 56 void SwapBuffers(cc::CompositorFrame* frame) override; |
| 57 bool BindToClient(cc::OutputSurfaceClient* client) override; | 57 bool BindToClient(cc::OutputSurfaceClient* client) override; |
| 58 bool SurfaceIsSuspendForRecycle() const override; | 58 bool SurfaceIsSuspendForRecycle() const override; |
| 59 | 59 |
| 60 #if defined(OS_MACOSX) | 60 #if defined(OS_MACOSX) |
| 61 void SetSurfaceSuspendedForRecycle(bool suspended) override; | 61 void SetSurfaceSuspendedForRecycle(bool suspended) override; |
| 62 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override; | |
| 63 enum ShouldShowFramesState { | 62 enum ShouldShowFramesState { |
| 64 // Frames that come from the GPU process should appear on-screen. | 63 // Frames that come from the GPU process should appear on-screen. |
| 65 SHOULD_SHOW_FRAMES, | 64 SHOULD_SHOW_FRAMES, |
| 66 // The compositor has been suspended. Any frames that come from the GPU | 65 // The compositor has been suspended. Any frames that come from the GPU |
| 67 // process are for the pre-suspend content and should not be displayed. | 66 // process are for the pre-suspend content and should not be displayed. |
| 68 SHOULD_NOT_SHOW_FRAMES_SUSPENDED, | 67 SHOULD_NOT_SHOW_FRAMES_SUSPENDED, |
| 69 // The compositor has been un-suspended, but has not yet issued a swap | 68 // The compositor has been un-suspended, but has not yet issued a swap |
| 70 // since being un-suspended, so any frames that come from the GPU process | 69 // since being un-suspended, so any frames that come from the GPU process |
| 71 // are for pre-suspend content and should not be displayed. | 70 // are for pre-suspend content and should not be displayed. |
| 72 SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED, | 71 SHOULD_NOT_SHOW_FRAMES_NO_SWAP_AFTER_SUSPENDED, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 86 update_vsync_parameters_callback_; | 85 update_vsync_parameters_callback_; |
| 87 | 86 |
| 88 std::unique_ptr<ReflectorTexture> reflector_texture_; | 87 std::unique_ptr<ReflectorTexture> reflector_texture_; |
| 89 | 88 |
| 90 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 89 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
| 91 }; | 90 }; |
| 92 | 91 |
| 93 } // namespace content | 92 } // namespace content |
| 94 | 93 |
| 95 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 94 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |