Index: trunk/src/cc/trees/layer_tree_host.cc |
=================================================================== |
--- trunk/src/cc/trees/layer_tree_host.cc (revision 191412) |
+++ trunk/src/cc/trees/layer_tree_host.cc (working copy) |
@@ -86,12 +86,12 @@ |
num_failed_recreate_attempts_(0), |
settings_(settings), |
debug_state_(settings.initial_debug_state), |
- overdraw_bottom_height_(0.f), |
device_scale_factor_(1.f), |
visible_(true), |
page_scale_factor_(1.f), |
min_page_scale_factor_(1.f), |
max_page_scale_factor_(1.f), |
+ overdraw_bottom_height_(0.f), |
trigger_idle_updates_(true), |
background_color_(SK_ColorWHITE), |
has_transparent_background_(false), |
Property changes on: trunk/src/cc/trees/layer_tree_host.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |