OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 const scoped_refptr<ContextProviderCommandBuffer>& context_provider, | 44 const scoped_refptr<ContextProviderCommandBuffer>& context_provider, |
45 const scoped_refptr<ContextProviderCommandBuffer>& | 45 const scoped_refptr<ContextProviderCommandBuffer>& |
46 worker_context_provider, | 46 worker_context_provider, |
47 scoped_ptr<cc::SoftwareOutputDevice> software, | 47 scoped_ptr<cc::SoftwareOutputDevice> software, |
48 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, | 48 scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue, |
49 bool use_swap_compositor_frame_message); | 49 bool use_swap_compositor_frame_message); |
50 ~CompositorOutputSurface() override; | 50 ~CompositorOutputSurface() override; |
51 | 51 |
52 // cc::OutputSurface implementation. | 52 // cc::OutputSurface implementation. |
53 bool BindToClient(cc::OutputSurfaceClient* client) override; | 53 bool BindToClient(cc::OutputSurfaceClient* client) override; |
| 54 void DetachFromClient() override; |
54 void SwapBuffers(cc::CompositorFrame* frame) override; | 55 void SwapBuffers(cc::CompositorFrame* frame) override; |
55 | 56 |
56 // TODO(epenner): This seems out of place here and would be a better fit | 57 // TODO(epenner): This seems out of place here and would be a better fit |
57 // int CompositorThread after it is fully refactored (http://crbug/170828) | 58 // int CompositorThread after it is fully refactored (http://crbug/170828) |
58 void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; | 59 void UpdateSmoothnessTakesPriority(bool prefer_smoothness) override; |
59 | 60 |
60 protected: | 61 protected: |
61 void ShortcutSwapAck(uint32 output_surface_id, | 62 void ShortcutSwapAck(uint32 output_surface_id, |
62 scoped_ptr<cc::GLFrameData> gl_frame_data); | 63 scoped_ptr<cc::GLFrameData> gl_frame_data); |
63 virtual void OnSwapAck(uint32 output_surface_id, | 64 virtual void OnSwapAck(uint32 output_surface_id, |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 | 108 |
108 // TODO(danakj): Remove this when crbug.com/311404 | 109 // TODO(danakj): Remove this when crbug.com/311404 |
109 bool layout_test_mode_; | 110 bool layout_test_mode_; |
110 scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_; | 111 scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_; |
111 base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_; | 112 base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_; |
112 }; | 113 }; |
113 | 114 |
114 } // namespace content | 115 } // namespace content |
115 | 116 |
116 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ | 117 #endif // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |