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

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

Issue 2336853002: cc: Plumb device color space through to rasterization (Closed)
Patch Set: Remove redundant commit Created 4 years, 3 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 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 void SetDeviceScaleFactor(float device_scale_factor); 224 void SetDeviceScaleFactor(float device_scale_factor);
225 float device_scale_factor() const { return device_scale_factor_; } 225 float device_scale_factor() const { return device_scale_factor_; }
226 226
227 void set_painted_device_scale_factor(float painted_device_scale_factor) { 227 void set_painted_device_scale_factor(float painted_device_scale_factor) {
228 painted_device_scale_factor_ = painted_device_scale_factor; 228 painted_device_scale_factor_ = painted_device_scale_factor;
229 } 229 }
230 float painted_device_scale_factor() const { 230 float painted_device_scale_factor() const {
231 return painted_device_scale_factor_; 231 return painted_device_scale_factor_;
232 } 232 }
233 233
234 void SetDeviceColorSpace(const gfx::ColorSpace& device_color_space);
235 const gfx::ColorSpace& device_color_space() const {
236 return device_color_space_;
237 }
238
234 SyncedElasticOverscroll* elastic_overscroll() { 239 SyncedElasticOverscroll* elastic_overscroll() {
235 return elastic_overscroll_.get(); 240 return elastic_overscroll_.get();
236 } 241 }
237 const SyncedElasticOverscroll* elastic_overscroll() const { 242 const SyncedElasticOverscroll* elastic_overscroll() const {
238 return elastic_overscroll_.get(); 243 return elastic_overscroll_.get();
239 } 244 }
240 245
241 SyncedTopControls* top_controls_shown_ratio() { 246 SyncedTopControls* top_controls_shown_ratio() {
242 return top_controls_shown_ratio_.get(); 247 return top_controls_shown_ratio_.get();
243 } 248 }
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 int outer_viewport_scroll_layer_id_; 483 int outer_viewport_scroll_layer_id_;
479 484
480 LayerSelection selection_; 485 LayerSelection selection_;
481 486
482 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_; 487 scoped_refptr<SyncedProperty<ScaleGroup>> page_scale_factor_;
483 float min_page_scale_factor_; 488 float min_page_scale_factor_;
484 float max_page_scale_factor_; 489 float max_page_scale_factor_;
485 490
486 float device_scale_factor_; 491 float device_scale_factor_;
487 float painted_device_scale_factor_; 492 float painted_device_scale_factor_;
493 gfx::ColorSpace device_color_space_;
488 494
489 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_; 495 scoped_refptr<SyncedElasticOverscroll> elastic_overscroll_;
490 496
491 std::unique_ptr<OwnedLayerImplList> layers_; 497 std::unique_ptr<OwnedLayerImplList> layers_;
492 LayerImplMap layer_id_map_; 498 LayerImplMap layer_id_map_;
493 LayerImplList layer_list_; 499 LayerImplList layer_list_;
494 // Set of layers that need to push properties. 500 // Set of layers that need to push properties.
495 std::unordered_set<LayerImpl*> layers_that_should_push_properties_; 501 std::unordered_set<LayerImpl*> layers_that_should_push_properties_;
496 502
497 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_; 503 std::unordered_map<ElementId, int, ElementIdHash> element_layers_map_;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 558
553 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; 559 std::unique_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
554 560
555 private: 561 private:
556 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); 562 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl);
557 }; 563 };
558 564
559 } // namespace cc 565 } // namespace cc
560 566
561 #endif // CC_TREES_LAYER_TREE_IMPL_H_ 567 #endif // CC_TREES_LAYER_TREE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698