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

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

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

Powered by Google App Engine
This is Rietveld 408576698