Index: cc/trees/layer_tree_host.h |
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h |
index 54962fc4eafdf401556a0450315b90b4f8e183a0..90886e05215656705b86231c71e71e70549a98ac 100644 |
--- a/cc/trees/layer_tree_host.h |
+++ b/cc/trees/layer_tree_host.h |
@@ -94,7 +94,8 @@ class CC_EXPORT LayerTreeHost { |
const LayerTreeSettings& settings); |
virtual ~LayerTreeHost(); |
- void SetLayerTreeHostClientReady(); |
+ void SetLayerTreeHostClientReady( |
+ scoped_ptr<OutputSurface> first_output_surface); |
jamesr
2013/11/26 18:20:28
hmm, why do you need this? we don't makecurrent()
no sievers
2013/11/26 19:28:37
I'm happy to try removing |first_output_surface| e
no sievers
2013/11/26 22:19:57
Also note odd behavior that I see in some of the b
|
void set_needs_filter_context() { needs_filter_context_ = true; } |
bool needs_offscreen_context() const { |
@@ -290,11 +291,11 @@ class CC_EXPORT LayerTreeHost { |
LayerTreeHost(LayerTreeHostClient* client, |
SharedBitmapManager* manager, |
const LayerTreeSettings& settings); |
- bool InitializeThreaded( |
+ void InitializeThreaded( |
scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner); |
- bool InitializeSingleThreaded( |
+ void InitializeSingleThreaded( |
LayerTreeHostSingleThreadClient* single_thread_client); |
- bool InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing); |
+ void InitializeForTesting(scoped_ptr<Proxy> proxy_for_testing); |
void SetOutputSurfaceLostForTesting(bool is_lost) { |
output_surface_lost_ = is_lost; |
} |
@@ -302,7 +303,7 @@ class CC_EXPORT LayerTreeHost { |
MicroBenchmarkController micro_benchmark_controller_; |
private: |
- bool InitializeProxy(scoped_ptr<Proxy> proxy); |
+ void InitializeProxy(scoped_ptr<Proxy> proxy); |
void PaintLayerContents( |
const RenderSurfaceLayerList& render_surface_layer_list, |
@@ -356,6 +357,7 @@ class CC_EXPORT LayerTreeHost { |
int source_frame_number_; |
scoped_ptr<RenderingStatsInstrumentation> rendering_stats_instrumentation_; |
+ bool client_ready_; |
bool output_surface_can_be_initialized_; |
bool output_surface_lost_; |
int num_failed_recreate_attempts_; |