OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_RENDER_WIDGET_COMPOSITOR_H_ | 5 #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
71 void SetNeedsCommit(); | 71 void SetNeedsCommit(); |
72 void NotifyInputThrottledUntilCommit(); | 72 void NotifyInputThrottledUntilCommit(); |
73 const cc::Layer* GetRootLayer() const; | 73 const cc::Layer* GetRootLayer() const; |
74 int ScheduleMicroBenchmark( | 74 int ScheduleMicroBenchmark( |
75 const std::string& name, | 75 const std::string& name, |
76 scoped_ptr<base::Value> value, | 76 scoped_ptr<base::Value> value, |
77 const base::Callback<void(scoped_ptr<base::Value>)>& callback); | 77 const base::Callback<void(scoped_ptr<base::Value>)>& callback); |
78 bool SendMessageToMicroBenchmark(int id, scoped_ptr<base::Value> value); | 78 bool SendMessageToMicroBenchmark(int id, scoped_ptr<base::Value> value); |
79 void StartCompositor(); | 79 void StartCompositor(); |
80 void SetSurfaceIdNamespace(uint32_t surface_id_namespace); | 80 void SetSurfaceIdNamespace(uint32_t surface_id_namespace); |
81 scoped_ptr<cc::OutputSurface> GiveBackOutputSurface(); | |
no sievers
2015/09/10 00:00:22
Can you remove the changes to RenderWidgetComposit
sohanjg
2015/09/10 15:07:23
Done.
| |
81 | 82 |
82 // WebLayerTreeView implementation. | 83 // WebLayerTreeView implementation. |
83 virtual void setRootLayer(const blink::WebLayer& layer); | 84 virtual void setRootLayer(const blink::WebLayer& layer); |
84 virtual void clearRootLayer(); | 85 virtual void clearRootLayer(); |
85 virtual void attachCompositorAnimationTimeline( | 86 virtual void attachCompositorAnimationTimeline( |
86 blink::WebCompositorAnimationTimeline* compositor_timeline); | 87 blink::WebCompositorAnimationTimeline* compositor_timeline); |
87 virtual void detachCompositorAnimationTimeline( | 88 virtual void detachCompositorAnimationTimeline( |
88 blink::WebCompositorAnimationTimeline* compositor_timeline); | 89 blink::WebCompositorAnimationTimeline* compositor_timeline); |
89 virtual void setViewportSize( | 90 virtual void setViewportSize( |
90 const blink::WebSize& unused_deprecated, | 91 const blink::WebSize& unused_deprecated, |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
186 bool CompositeIsSynchronous() const; | 187 bool CompositeIsSynchronous() const; |
187 void SynchronouslyComposite(); | 188 void SynchronouslyComposite(); |
188 | 189 |
189 int num_failed_recreate_attempts_; | 190 int num_failed_recreate_attempts_; |
190 RenderWidget* widget_; | 191 RenderWidget* widget_; |
191 CompositorDependencies* compositor_deps_; | 192 CompositorDependencies* compositor_deps_; |
192 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; | 193 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; |
193 | 194 |
194 blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_; | 195 blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_; |
195 scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_; | 196 scoped_ptr<cc::CopyOutputRequest> temporary_copy_output_request_; |
197 bool did_give_back_output_surface_; | |
196 | 198 |
197 base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_; | 199 base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_; |
198 }; | 200 }; |
199 | 201 |
200 } // namespace content | 202 } // namespace content |
201 | 203 |
202 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 204 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
OLD | NEW |