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

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

Issue 2417783005: [Master/Overview CL] Make PageScaleFactor work for oopif subframe.
Patch Set: Rebase to master@{#429656}. Created 4 years, 1 month 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/test_layer_tree_host_base.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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 return inputs_.device_viewport_size; 94 return inputs_.device_viewport_size;
95 } 95 }
96 96
97 void SetBrowserControlsHeight(float height, bool shrink); 97 void SetBrowserControlsHeight(float height, bool shrink);
98 void SetBrowserControlsShownRatio(float ratio); 98 void SetBrowserControlsShownRatio(float ratio);
99 void SetBottomControlsHeight(float height); 99 void SetBottomControlsHeight(float height);
100 100
101 void SetPageScaleFactorAndLimits(float page_scale_factor, 101 void SetPageScaleFactorAndLimits(float page_scale_factor,
102 float min_page_scale_factor, 102 float min_page_scale_factor,
103 float max_page_scale_factor); 103 float max_page_scale_factor);
104 void SetSubframePageScaleFactor(float subframe_page_scale_factor);
104 float page_scale_factor() const { return inputs_.page_scale_factor; } 105 float page_scale_factor() const { return inputs_.page_scale_factor; }
106 float subframe_page_scale_factor() const {
107 return inputs_.subframe_page_scale_factor;
108 }
105 109
106 void set_background_color(SkColor color) { inputs_.background_color = color; } 110 void set_background_color(SkColor color) { inputs_.background_color = color; }
107 SkColor background_color() const { return inputs_.background_color; } 111 SkColor background_color() const { return inputs_.background_color; }
108 112
109 void set_has_transparent_background(bool transparent) { 113 void set_has_transparent_background(bool transparent) {
110 inputs_.has_transparent_background = transparent; 114 inputs_.has_transparent_background = transparent;
111 } 115 }
112 116
113 void StartPageScaleAnimation(const gfx::Vector2d& target_offset, 117 void StartPageScaleAnimation(const gfx::Vector2d& target_offset,
114 bool use_anchor, 118 bool use_anchor,
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 255
252 float top_controls_height; 256 float top_controls_height;
253 float top_controls_shown_ratio; 257 float top_controls_shown_ratio;
254 bool browser_controls_shrink_blink_size; 258 bool browser_controls_shrink_blink_size;
255 259
256 float bottom_controls_height; 260 float bottom_controls_height;
257 261
258 float device_scale_factor; 262 float device_scale_factor;
259 float painted_device_scale_factor; 263 float painted_device_scale_factor;
260 float page_scale_factor; 264 float page_scale_factor;
265 float subframe_page_scale_factor;
261 float min_page_scale_factor; 266 float min_page_scale_factor;
262 float max_page_scale_factor; 267 float max_page_scale_factor;
263 gfx::ColorSpace device_color_space; 268 gfx::ColorSpace device_color_space;
264 269
265 SkColor background_color; 270 SkColor background_color;
266 bool has_transparent_background; 271 bool has_transparent_background;
267 272
268 LayerSelection selection; 273 LayerSelection selection;
269 274
270 gfx::Size device_viewport_size; 275 gfx::Size device_viewport_size;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 // external embedder. 310 // external embedder.
306 EnginePictureCache* engine_picture_cache_; 311 EnginePictureCache* engine_picture_cache_;
307 ClientPictureCache* client_picture_cache_; 312 ClientPictureCache* client_picture_cache_;
308 313
309 DISALLOW_COPY_AND_ASSIGN(LayerTree); 314 DISALLOW_COPY_AND_ASSIGN(LayerTree);
310 }; 315 };
311 316
312 } // namespace cc 317 } // namespace cc
313 318
314 #endif // CC_TREES_LAYER_TREE_H_ 319 #endif // CC_TREES_LAYER_TREE_H_
OLDNEW
« no previous file with comments | « cc/test/test_layer_tree_host_base.cc ('k') | cc/trees/layer_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698