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

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

Issue 2730203002: Revert of Discard compositor frames from unloaded web content (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 CC_TREES_LAYER_TREE_IMPL_H_ 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_
6 #define CC_TREES_LAYER_TREE_IMPL_H_ 6 #define CC_TREES_LAYER_TREE_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 void SetDeviceScaleFactor(float device_scale_factor); 222 void SetDeviceScaleFactor(float device_scale_factor);
223 float device_scale_factor() const { return device_scale_factor_; } 223 float device_scale_factor() const { return device_scale_factor_; }
224 224
225 void set_painted_device_scale_factor(float painted_device_scale_factor) { 225 void set_painted_device_scale_factor(float painted_device_scale_factor) {
226 painted_device_scale_factor_ = painted_device_scale_factor; 226 painted_device_scale_factor_ = painted_device_scale_factor;
227 } 227 }
228 float painted_device_scale_factor() const { 228 float painted_device_scale_factor() const {
229 return painted_device_scale_factor_; 229 return painted_device_scale_factor_;
230 } 230 }
231 231
232 void set_content_source_id(uint32_t id) { content_source_id_ = id; }
233 uint32_t content_source_id() { return content_source_id_; }
234
235 void SetDeviceColorSpace(const gfx::ColorSpace& device_color_space); 232 void SetDeviceColorSpace(const gfx::ColorSpace& device_color_space);
236 const gfx::ColorSpace& device_color_space() const { 233 const gfx::ColorSpace& device_color_space() const {
237 return device_color_space_; 234 return device_color_space_;
238 } 235 }
239 236
240 SyncedElasticOverscroll* elastic_overscroll() { 237 SyncedElasticOverscroll* elastic_overscroll() {
241 return elastic_overscroll_.get(); 238 return elastic_overscroll_.get();
242 } 239 }
243 const SyncedElasticOverscroll* elastic_overscroll() const { 240 const SyncedElasticOverscroll* elastic_overscroll() const {
244 return elastic_overscroll_.get(); 241 return elastic_overscroll_.get();
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 LayerSelection selection_; 488 LayerSelection selection_;
492 489
493 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_; 490 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_;
494 float min_page_scale_factor_; 491 float min_page_scale_factor_;
495 float max_page_scale_factor_; 492 float max_page_scale_factor_;
496 493
497 float device_scale_factor_; 494 float device_scale_factor_;
498 float painted_device_scale_factor_; 495 float painted_device_scale_factor_;
499 gfx::ColorSpace device_color_space_; 496 gfx::ColorSpace device_color_space_;
500 497
501 uint32_t content_source_id_;
502
503 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_; 498 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
504 499
505 std::unique_ptr<OwnedLayerImplList> layers_; 500 std::unique_ptr<OwnedLayerImplList> layers_;
506 LayerImplMap layer_id_map_; 501 LayerImplMap layer_id_map_;
507 LayerImplList layer_list_; 502 LayerImplList layer_list_;
508 // Set of layers that need to push properties. 503 // Set of layers that need to push properties.
509 std::unordered_set<LayerImpl*> layers_that_should_push_properties_; 504 std::unordered_set<LayerImpl*> layers_that_should_push_properties_;
510 505
511 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_; 506 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_;
512 507
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 563
569 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 564 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
570 565
571 private: 566 private:
572 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 567 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
573 }; 568 };
574 569
575 } // namespace cc 570 } // namespace cc
576 571
577 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 572 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698