Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: cc/trees/layer_tree_host.h

Issue 286293002: cc: Remove CreateAndInitializeOutputSurface from the Proxy interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: createandinitos: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 CC_TREES_LAYER_TREE_HOST_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_H_
6 #define CC_TREES_LAYER_TREE_HOST_H_ 6 #define CC_TREES_LAYER_TREE_HOST_H_
7 7
8 #include <limits> 8 #include <limits>
9 #include <list> 9 #include <list>
10 #include <set> 10 #include <set>
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 void CommitComplete(); 111 void CommitComplete();
112 scoped_ptr<OutputSurface> CreateOutputSurface(); 112 scoped_ptr<OutputSurface> CreateOutputSurface();
113 virtual scoped_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl( 113 virtual scoped_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl(
114 LayerTreeHostImplClient* client); 114 LayerTreeHostImplClient* client);
115 void DidLoseOutputSurface(); 115 void DidLoseOutputSurface();
116 bool output_surface_lost() const { return output_surface_lost_; } 116 bool output_surface_lost() const { return output_surface_lost_; }
117 virtual void OnCreateAndInitializeOutputSurfaceAttempted(bool success); 117 virtual void OnCreateAndInitializeOutputSurfaceAttempted(bool success);
118 void DidCommitAndDrawFrame() { client_->DidCommitAndDrawFrame(); } 118 void DidCommitAndDrawFrame() { client_->DidCommitAndDrawFrame(); }
119 void DidCompleteSwapBuffers() { client_->DidCompleteSwapBuffers(); } 119 void DidCompleteSwapBuffers() { client_->DidCompleteSwapBuffers(); }
120 void DeleteContentsTexturesOnImplThread(ResourceProvider* resource_provider); 120 void DeleteContentsTexturesOnImplThread(ResourceProvider* resource_provider);
121 // Returns false if we should abort this frame due to initialization failure.
122 bool InitializeOutputSurfaceIfNeeded();
123 bool UpdateLayers(ResourceUpdateQueue* queue); 121 bool UpdateLayers(ResourceUpdateQueue* queue);
124 122
125 LayerTreeHostClient* client() { return client_; } 123 LayerTreeHostClient* client() { return client_; }
126 const base::WeakPtr<InputHandler>& GetInputHandler() { 124 const base::WeakPtr<InputHandler>& GetInputHandler() {
127 return input_handler_weak_ptr_; 125 return input_handler_weak_ptr_;
128 } 126 }
129 127
130 void NotifyInputThrottledUntilCommit(); 128 void NotifyInputThrottledUntilCommit();
131 129
132 void Composite(base::TimeTicks frame_begin_time); 130 void Composite(base::TimeTicks frame_begin_time);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 bool needs_full_tree_sync_; 355 bool needs_full_tree_sync_;
358 356
359 base::CancelableClosure prepaint_callback_; 357 base::CancelableClosure prepaint_callback_;
360 358
361 LayerTreeHostClient* client_; 359 LayerTreeHostClient* client_;
362 scoped_ptr<Proxy> proxy_; 360 scoped_ptr<Proxy> proxy_;
363 361
364 int source_frame_number_; 362 int source_frame_number_;
365 scoped_ptr<RenderingStatsInstrumentation> rendering_stats_instrumentation_; 363 scoped_ptr<RenderingStatsInstrumentation> rendering_stats_instrumentation_;
366 364
367 bool output_surface_can_be_initialized_;
368 bool output_surface_lost_; 365 bool output_surface_lost_;
369 int num_failed_recreate_attempts_; 366 int num_failed_recreate_attempts_;
370 367
371 scoped_refptr<Layer> root_layer_; 368 scoped_refptr<Layer> root_layer_;
372 scoped_refptr<HeadsUpDisplayLayer> hud_layer_; 369 scoped_refptr<HeadsUpDisplayLayer> hud_layer_;
373 370
374 scoped_ptr<PrioritizedResourceManager> contents_texture_manager_; 371 scoped_ptr<PrioritizedResourceManager> contents_texture_manager_;
375 scoped_ptr<PrioritizedResource> surface_memory_placeholder_; 372 scoped_ptr<PrioritizedResource> surface_memory_placeholder_;
376 373
377 base::WeakPtr<InputHandler> input_handler_weak_ptr_; 374 base::WeakPtr<InputHandler> input_handler_weak_ptr_;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 440
444 ScopedPtrVector<SwapPromise> swap_promise_list_; 441 ScopedPtrVector<SwapPromise> swap_promise_list_;
445 std::set<SwapPromiseMonitor*> swap_promise_monitor_; 442 std::set<SwapPromiseMonitor*> swap_promise_monitor_;
446 443
447 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost); 444 DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
448 }; 445 };
449 446
450 } // namespace cc 447 } // namespace cc
451 448
452 #endif // CC_TREES_LAYER_TREE_HOST_H_ 449 #endif // CC_TREES_LAYER_TREE_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698