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

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

Issue 640203002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_HOST_IMPL_H_
6 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_HOST_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 UIResourceMap; 582 UIResourceMap;
583 UIResourceMap ui_resource_map_; 583 UIResourceMap ui_resource_map_;
584 584
585 // Resources that were evicted by EvictAllUIResources. Resources are removed 585 // Resources that were evicted by EvictAllUIResources. Resources are removed
586 // from this when they are touched by a create or destroy from the UI resource 586 // from this when they are touched by a create or destroy from the UI resource
587 // request queue. 587 // request queue.
588 std::set<UIResourceId> evicted_ui_resources_; 588 std::set<UIResourceId> evicted_ui_resources_;
589 589
590 scoped_ptr<OutputSurface> output_surface_; 590 scoped_ptr<OutputSurface> output_surface_;
591 591
592 // |resource_provider_| and |tile_manager_| can be NULL, e.g. when using tile- 592 // |resource_provider_| and |tile_manager_| can be nullptr, e.g. when using ti le-
danakj 2014/10/09 16:00:53 is upload presubmit not warning you about going ov
593 // free rendering - see OutputSurface::ForcedDrawToSoftwareDevice(). 593 // free rendering - see OutputSurface::ForcedDrawToSoftwareDevice().
594 scoped_ptr<ResourceProvider> resource_provider_; 594 scoped_ptr<ResourceProvider> resource_provider_;
595 scoped_ptr<TileManager> tile_manager_; 595 scoped_ptr<TileManager> tile_manager_;
596 bool use_gpu_rasterization_; 596 bool use_gpu_rasterization_;
597 scoped_ptr<RasterWorkerPool> raster_worker_pool_; 597 scoped_ptr<RasterWorkerPool> raster_worker_pool_;
598 scoped_ptr<ResourcePool> resource_pool_; 598 scoped_ptr<ResourcePool> resource_pool_;
599 scoped_ptr<ResourcePool> staging_resource_pool_; 599 scoped_ptr<ResourcePool> staging_resource_pool_;
600 scoped_ptr<Renderer> renderer_; 600 scoped_ptr<Renderer> renderer_;
601 601
602 GlobalStateThatImpactsTilePriority global_tile_state_; 602 GlobalStateThatImpactsTilePriority global_tile_state_;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 std::vector<PictureLayerImpl::Pair> picture_layer_pairs_; 708 std::vector<PictureLayerImpl::Pair> picture_layer_pairs_;
709 709
710 bool requires_high_res_to_draw_; 710 bool requires_high_res_to_draw_;
711 711
712 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl); 712 DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
713 }; 713 };
714 714
715 } // namespace cc 715 } // namespace cc
716 716
717 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_ 717 #endif // CC_TREES_LAYER_TREE_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698