Make tile size a function of the device scale factor.

cc/trees/layer_tree_settings.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_settings.h"
 
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/layer_tree_settings.pb.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
@@ skipping 29 matching lines @@
     case proto::LayerTreeSettings_ScrollbarAnimator_UNKNOWN:
       NOTREACHED() << "proto::LayerTreeSettings_ScrollbarAnimator_UNKNOWN";
       return LayerTreeSettings::ScrollbarAnimator::NO_ANIMATOR;
   }
   return LayerTreeSettings::ScrollbarAnimator::NO_ANIMATOR;
 }
 
 }  // namespace
 
 LayerTreeSettings::LayerTreeSettings()
-    : default_tile_size(gfx::Size(256, 256)),
-      max_untiled_layer_size(gfx::Size(512, 512)),
-      minimum_occlusion_tracking_size(gfx::Size(160, 160)),
+    : minimum_occlusion_tracking_size(gfx::Size(160, 160)),
       use_image_texture_targets(
           static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
           GL_TEXTURE_2D),
       memory_policy_(64 * 1024 * 1024,
                      gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING,
                      ManagedMemoryPolicy::kDefaultNumResourcesLimit) {}
 
 LayerTreeSettings::LayerTreeSettings(const LayerTreeSettings& other) = default;
 LayerTreeSettings::~LayerTreeSettings() = default;
 
@@ skipping 24 matching lines @@
              other.timeout_and_draw_when_animation_checkerboards &&
          layer_transforms_should_scale_layer_contents ==
              other.layer_transforms_should_scale_layer_contents &&
          layers_always_allowed_lcd_text ==
              other.layers_always_allowed_lcd_text &&
          minimum_contents_scale == other.minimum_contents_scale &&
          low_res_contents_scale_factor == other.low_res_contents_scale_factor &&
          top_controls_show_threshold == other.top_controls_show_threshold &&
          top_controls_hide_threshold == other.top_controls_hide_threshold &&
          background_animation_rate == other.background_animation_rate &&
-         default_tile_size == other.default_tile_size &&
-         max_untiled_layer_size == other.max_untiled_layer_size &&
+         use_viewport_for_tile_size == other.use_viewport_for_tile_size &&
          minimum_occlusion_tracking_size ==
              other.minimum_occlusion_tracking_size &&
          tiling_interest_area_padding == other.tiling_interest_area_padding &&
          skewport_target_time_in_seconds ==
              other.skewport_target_time_in_seconds &&
          skewport_extrapolation_limit_in_screen_pixels ==
              other.skewport_extrapolation_limit_in_screen_pixels &&
          max_memory_for_prepaint_percentage ==
              other.max_memory_for_prepaint_percentage &&
          use_zero_copy == other.use_zero_copy &&
@@ skipping 40 matching lines @@
   proto->set_timeout_and_draw_when_animation_checkerboards(
       timeout_and_draw_when_animation_checkerboards);
   proto->set_layer_transforms_should_scale_layer_contents(
       layer_transforms_should_scale_layer_contents);
   proto->set_layers_always_allowed_lcd_text(layers_always_allowed_lcd_text);
   proto->set_minimum_contents_scale(minimum_contents_scale);
   proto->set_low_res_contents_scale_factor(low_res_contents_scale_factor);
   proto->set_top_controls_show_threshold(top_controls_show_threshold);
   proto->set_top_controls_hide_threshold(top_controls_hide_threshold);
   proto->set_background_animation_rate(background_animation_rate);
-  SizeToProto(default_tile_size, proto->mutable_default_tile_size());
-  SizeToProto(max_untiled_layer_size, proto->mutable_max_untiled_layer_size());
+  proto->set_use_viewport_for_tile_size(use_viewport_for_tile_size);
   SizeToProto(minimum_occlusion_tracking_size,
               proto->mutable_minimum_occlusion_tracking_size());
   proto->set_tiling_interest_area_padding(tiling_interest_area_padding);
   proto->set_skewport_target_time_in_seconds(skewport_target_time_in_seconds);
   proto->set_skewport_extrapolation_limit_in_screen_pixels(
       skewport_extrapolation_limit_in_screen_pixels);
   proto->set_max_memory_for_prepaint_percentage(
       max_memory_for_prepaint_percentage);
   proto->set_use_zero_copy(use_zero_copy);
   proto->set_use_partial_raster(use_partial_raster);
@@ skipping 39 matching lines @@
   timeout_and_draw_when_animation_checkerboards =
       proto.timeout_and_draw_when_animation_checkerboards();
   layer_transforms_should_scale_layer_contents =
       proto.layer_transforms_should_scale_layer_contents();
   layers_always_allowed_lcd_text = proto.layers_always_allowed_lcd_text();
   minimum_contents_scale = proto.minimum_contents_scale();
   low_res_contents_scale_factor = proto.low_res_contents_scale_factor();
   top_controls_show_threshold = proto.top_controls_show_threshold();
   top_controls_hide_threshold = proto.top_controls_hide_threshold();
   background_animation_rate = proto.background_animation_rate();
-  default_tile_size = ProtoToSize(proto.default_tile_size());
-  max_untiled_layer_size = ProtoToSize(proto.max_untiled_layer_size());
+  use_viewport_for_tile_size = proto.use_viewport_for_tile_size();
   minimum_occlusion_tracking_size =
       ProtoToSize(proto.minimum_occlusion_tracking_size());
   tiling_interest_area_padding = proto.tiling_interest_area_padding();
   skewport_target_time_in_seconds = proto.skewport_target_time_in_seconds();
   skewport_extrapolation_limit_in_screen_pixels =
       proto.skewport_extrapolation_limit_in_screen_pixels();
   max_memory_for_prepaint_percentage =
       proto.max_memory_for_prepaint_percentage();
   use_zero_copy = proto.use_zero_copy();
   use_partial_raster = proto.use_partial_raster();
@@ skipping 27 matching lines @@
       using_synchronous_renderer_compositor;
   scheduler_settings.throttle_frame_production = wait_for_beginframe_interval;
   scheduler_settings.background_frame_interval =
       base::TimeDelta::FromSecondsD(1.0 / background_animation_rate);
   scheduler_settings.abort_commit_before_output_surface_creation =
       abort_commit_before_output_surface_creation;
   return scheduler_settings;
 }
 
 }  // namespace cc