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

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

Issue 2652643004: Make PageScaleFactor work for oopif subframes.
Patch Set: Put function prototype in correct place. Created 3 years, 10 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/test/fake_layer_tree_host_impl.cc ('k') | cc/trees/layer_tree.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_H_ 5 #ifndef CC_TREES_LAYER_TREE_H_
6 #define CC_TREES_LAYER_TREE_H_ 6 #define CC_TREES_LAYER_TREE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <unordered_map> 9 #include <unordered_map>
10 #include <unordered_set> 10 #include <unordered_set>
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 return inputs_.device_viewport_size; 83 return inputs_.device_viewport_size;
84 } 84 }
85 85
86 void SetBrowserControlsHeight(float height, bool shrink); 86 void SetBrowserControlsHeight(float height, bool shrink);
87 void SetBrowserControlsShownRatio(float ratio); 87 void SetBrowserControlsShownRatio(float ratio);
88 void SetBottomControlsHeight(float height); 88 void SetBottomControlsHeight(float height);
89 89
90 void SetPageScaleFactorAndLimits(float page_scale_factor, 90 void SetPageScaleFactorAndLimits(float page_scale_factor,
91 float min_page_scale_factor, 91 float min_page_scale_factor,
92 float max_page_scale_factor); 92 float max_page_scale_factor);
93 void SetSubframePageScaleFactor(float sub_frame_page_scale_factor);
93 float page_scale_factor() const { return inputs_.page_scale_factor; } 94 float page_scale_factor() const { return inputs_.page_scale_factor; }
95 float subframe_page_scale_factor() const {
96 return inputs_.subframe_page_scale_factor;
97 }
94 float min_page_scale_factor() const { return inputs_.min_page_scale_factor; } 98 float min_page_scale_factor() const { return inputs_.min_page_scale_factor; }
95 float max_page_scale_factor() const { return inputs_.max_page_scale_factor; } 99 float max_page_scale_factor() const { return inputs_.max_page_scale_factor; }
96 100
97 void set_background_color(SkColor color) { inputs_.background_color = color; } 101 void set_background_color(SkColor color) { inputs_.background_color = color; }
98 SkColor background_color() const { return inputs_.background_color; } 102 SkColor background_color() const { return inputs_.background_color; }
99 103
100 void set_has_transparent_background(bool transparent) { 104 void set_has_transparent_background(bool transparent) {
101 inputs_.has_transparent_background = transparent; 105 inputs_.has_transparent_background = transparent;
102 } 106 }
103 bool has_transparent_background() const { 107 bool has_transparent_background() const {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 236
233 float top_controls_height; 237 float top_controls_height;
234 float top_controls_shown_ratio; 238 float top_controls_shown_ratio;
235 bool browser_controls_shrink_blink_size; 239 bool browser_controls_shrink_blink_size;
236 240
237 float bottom_controls_height; 241 float bottom_controls_height;
238 242
239 float device_scale_factor; 243 float device_scale_factor;
240 float painted_device_scale_factor; 244 float painted_device_scale_factor;
241 float page_scale_factor; 245 float page_scale_factor;
246 float subframe_page_scale_factor;
242 float min_page_scale_factor; 247 float min_page_scale_factor;
243 float max_page_scale_factor; 248 float max_page_scale_factor;
244 gfx::ColorSpace device_color_space; 249 gfx::ColorSpace device_color_space;
245 250
246 SkColor background_color; 251 SkColor background_color;
247 bool has_transparent_background; 252 bool has_transparent_background;
248 253
249 LayerSelection selection; 254 LayerSelection selection;
250 255
251 gfx::Size device_viewport_size; 256 gfx::Size device_viewport_size;
(...skipping 29 matching lines...) Expand all
281 286
282 MutatorHost* mutator_host_; 287 MutatorHost* mutator_host_;
283 LayerTreeHost* layer_tree_host_; 288 LayerTreeHost* layer_tree_host_;
284 289
285 DISALLOW_COPY_AND_ASSIGN(LayerTree); 290 DISALLOW_COPY_AND_ASSIGN(LayerTree);
286 }; 291 };
287 292
288 } // namespace cc 293 } // namespace cc
289 294
290 #endif // CC_TREES_LAYER_TREE_H_ 295 #endif // CC_TREES_LAYER_TREE_H_
OLDNEW
« no previous file with comments | « cc/test/fake_layer_tree_host_impl.cc ('k') | cc/trees/layer_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698