Add support for LayerTreeSettings (de)serialization

cc/trees/layer_tree_settings.cc

Index: cc/trees/layer_tree_settings.cc
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
index 1a978fb20c2eee64cb83553b85eecd92a02d6942..d1fb4276677e11609ed27352491f039388a8b233 100644
--- a/cc/trees/layer_tree_settings.cc
+++ b/cc/trees/layer_tree_settings.cc
@@ -10,10 +10,50 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "cc/proto/gfx_conversions.h"
+#include "cc/proto/gpu_conversions.h"
+#include "cc/proto/layer_tree_settings.pb.h"
 #include "ui/gfx/buffer_types.h"
 
 namespace cc {
 
+namespace {
+
+proto::LayerTreeSettings_ScrollbarAnimator
+LayerTreeSettingsScrollbarAnimatorToProto(
+    const LayerTreeSettings::ScrollbarAnimator& animator) {
+  switch (animator) {
+    case LayerTreeSettings::ScrollbarAnimator::NO_ANIMATOR:
+      return proto::LayerTreeSettings_ScrollbarAnimator_NO_ANIMATOR;
+    case LayerTreeSettings::ScrollbarAnimator::LINEAR_FADE:
+      return proto::LayerTreeSettings_ScrollbarAnimator_LINEAR_FADE;
+    case LayerTreeSettings::ScrollbarAnimator::THINNING:
+      return proto::LayerTreeSettings_ScrollbarAnimator_THINNING;
+  }
+  NOTREACHED() << "Sending proto::LayerTreeSettings_ScrollbarAnimator_UNKNOWN";

[vmpstr, 2015/12/08 18:26:13]

nit: s/Sending // 

I'd like to avoid language that suggests that this is only for over the network
processing.

[nyquist, 2015/12/08 22:44:58]

Done.

+  return proto::LayerTreeSettings_ScrollbarAnimator_UNKNOWN;
+}
+
+LayerTreeSettings::ScrollbarAnimator
+LayerTreeSettingsScrollbarAnimatorFromProto(
+    const proto::LayerTreeSettings_ScrollbarAnimator& animator) {
+  switch (animator) {
+    case proto::LayerTreeSettings_ScrollbarAnimator_NO_ANIMATOR:
+      return LayerTreeSettings::ScrollbarAnimator::NO_ANIMATOR;
+    case proto::LayerTreeSettings_ScrollbarAnimator_LINEAR_FADE:
+      return LayerTreeSettings::ScrollbarAnimator::LINEAR_FADE;
+    case proto::LayerTreeSettings_ScrollbarAnimator_THINNING:
+      return LayerTreeSettings::ScrollbarAnimator::THINNING;
+    case proto::LayerTreeSettings_ScrollbarAnimator_UNKNOWN:
+      NOTREACHED()
+          << "Received proto::LayerTreeSettings_ScrollbarAnimator_UNKNOWN";

[vmpstr, 2015/12/08 18:26:13]

nit: s/Received //

[nyquist, 2015/12/08 22:44:58]

Done.

+      return LayerTreeSettings::ScrollbarAnimator::NO_ANIMATOR;
+  }
+  return LayerTreeSettings::ScrollbarAnimator::NO_ANIMATOR;
+}
+
+}  // namespace
+
 LayerTreeSettings::LayerTreeSettings()
     : single_thread_proxy_scheduler(true),
       use_external_begin_frame_source(false),
@@ -70,6 +110,213 @@ LayerTreeSettings::LayerTreeSettings()
 
 LayerTreeSettings::~LayerTreeSettings() {}
 
+bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const {
+  bool equals =
+      renderer_settings == other.renderer_settings &&
+      single_thread_proxy_scheduler == other.single_thread_proxy_scheduler &&
+      use_external_begin_frame_source ==
+          other.use_external_begin_frame_source &&
+      main_frame_before_activation_enabled ==
+          other.main_frame_before_activation_enabled &&
+      using_synchronous_renderer_compositor ==
+          other.using_synchronous_renderer_compositor &&
+      accelerated_animation_enabled == other.accelerated_animation_enabled &&
+      can_use_lcd_text == other.can_use_lcd_text &&
+      use_distance_field_text == other.use_distance_field_text &&
+      gpu_rasterization_enabled == other.gpu_rasterization_enabled &&
+      gpu_rasterization_forced == other.gpu_rasterization_forced &&
+      gpu_rasterization_msaa_sample_count ==
+          other.gpu_rasterization_msaa_sample_count &&
+      create_low_res_tiling == other.create_low_res_tiling &&
+      scrollbar_animator == other.scrollbar_animator &&
+      scrollbar_fade_delay_ms == other.scrollbar_fade_delay_ms &&
+      scrollbar_fade_resize_delay_ms == other.scrollbar_fade_resize_delay_ms &&
+      scrollbar_fade_duration_ms == other.scrollbar_fade_duration_ms &&
+      solid_color_scrollbar_color == other.solid_color_scrollbar_color &&
+      timeout_and_draw_when_animation_checkerboards ==
+          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 &&
+      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_content_pixels ==
+          other.skewport_extrapolation_limit_in_content_pixels &&
+      max_memory_for_prepaint_percentage ==
+          other.max_memory_for_prepaint_percentage &&
+      strict_layer_property_change_checking ==
+          other.strict_layer_property_change_checking &&
+      use_zero_copy == other.use_zero_copy &&
+      use_partial_raster == other.use_partial_raster &&
+      enable_elastic_overscroll == other.enable_elastic_overscroll &&
+      use_image_texture_targets.size() ==
+          other.use_image_texture_targets.size() &&  // See below.

[vmpstr, 2015/12/08 18:26:13]

std::vector has operator==, you can just compare the two vectors.

[nyquist, 2015/12/08 22:44:58]

Done.
Also; I'm sorry, because this messed up the diff since now I could just remove
the whole equals-variable, and instead just return the result.
If you can see the inline diff though, it's just the indent that's different on
all the other lines. I just did you you said, removed the last part of the
function, and changed the top to just return instead of declaring equals.

+      ignore_root_layer_flings == other.ignore_root_layer_flings &&
+      scheduled_raster_task_limit == other.scheduled_raster_task_limit &&
+      use_occlusion_for_tile_prioritization ==
+          other.use_occlusion_for_tile_prioritization &&
+      verify_property_trees == other.verify_property_trees &&
+      use_property_trees == other.use_property_trees &&
+      image_decode_tasks_enabled == other.image_decode_tasks_enabled &&
+      use_compositor_animation_timelines ==
+          other.use_compositor_animation_timelines &&
+      wait_for_beginframe_interval == other.wait_for_beginframe_interval &&
+      max_staging_buffer_usage_in_bytes ==
+          other.max_staging_buffer_usage_in_bytes &&
+      memory_policy_ == other.memory_policy_ &&
+      LayerTreeDebugState::Equal(initial_debug_state,
+                                 other.initial_debug_state);
+  if (!equals)
+    return false;
+  int i = 0;
+  for (auto u : use_image_texture_targets) {
+    if (u != other.use_image_texture_targets[i++])
+      return false;
+  }
+  return true;
+}
+
+void LayerTreeSettings::ToProtobuf(proto::LayerTreeSettings* proto) const {
+  renderer_settings.ToProtobuf(proto->mutable_renderer_settings());
+  proto->set_single_thread_proxy_scheduler(single_thread_proxy_scheduler);
+  proto->set_use_external_begin_frame_source(use_external_begin_frame_source);
+  proto->set_main_frame_before_activation_enabled(
+      main_frame_before_activation_enabled);
+  proto->set_using_synchronous_renderer_compositor(
+      using_synchronous_renderer_compositor);
+  proto->set_accelerated_animation_enabled(accelerated_animation_enabled);
+  proto->set_can_use_lcd_text(can_use_lcd_text);
+  proto->set_use_distance_field_text(use_distance_field_text);
+  proto->set_gpu_rasterization_enabled(gpu_rasterization_enabled);
+  proto->set_gpu_rasterization_forced(gpu_rasterization_forced);
+  proto->set_gpu_rasterization_msaa_sample_count(
+      gpu_rasterization_msaa_sample_count);
+  proto->set_create_low_res_tiling(create_low_res_tiling);
+  proto->set_scrollbar_animator(
+      LayerTreeSettingsScrollbarAnimatorToProto(scrollbar_animator));
+  proto->set_scrollbar_fade_delay_ms(scrollbar_fade_delay_ms);
+  proto->set_scrollbar_fade_resize_delay_ms(scrollbar_fade_resize_delay_ms);
+  proto->set_scrollbar_fade_duration_ms(scrollbar_fade_duration_ms);
+  proto->set_solid_color_scrollbar_color(solid_color_scrollbar_color);
+  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());
+  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_content_pixels(
+      skewport_extrapolation_limit_in_content_pixels);
+  proto->set_max_memory_for_prepaint_percentage(
+      max_memory_for_prepaint_percentage);
+  proto->set_strict_layer_property_change_checking(
+      strict_layer_property_change_checking);
+  proto->set_use_zero_copy(use_zero_copy);
+  proto->set_use_partial_raster(use_partial_raster);
+  proto->set_enable_elastic_overscroll(enable_elastic_overscroll);
+  for (auto u : use_image_texture_targets)

[vmpstr, 2015/12/08 18:26:13]

can you put this at the end with a blank line before?

also, auto? it's just an unsigned...

[nyquist, 2015/12/08 22:44:58]

Done.

+    proto->add_use_image_texture_targets(u);
+  proto->set_ignore_root_layer_flings(ignore_root_layer_flings);
+  proto->set_scheduled_raster_task_limit(scheduled_raster_task_limit);
+  proto->set_use_occlusion_for_tile_prioritization(
+      use_occlusion_for_tile_prioritization);
+  proto->set_verify_property_trees(verify_property_trees);
+  proto->set_use_property_trees(use_property_trees);
+  proto->set_image_decode_tasks_enabled(image_decode_tasks_enabled);
+  proto->set_use_compositor_animation_timelines(
+      use_compositor_animation_timelines);
+  proto->set_wait_for_beginframe_interval(wait_for_beginframe_interval);
+  proto->set_max_staging_buffer_usage_in_bytes(
+      max_staging_buffer_usage_in_bytes);
+  memory_policy_.ToProtobuf(proto->mutable_memory_policy());
+  initial_debug_state.ToProtobuf(proto->mutable_initial_debug_state());
+}
+
+void LayerTreeSettings::FromProtobuf(const proto::LayerTreeSettings& proto) {
+  renderer_settings.FromProtobuf(proto.renderer_settings());
+  single_thread_proxy_scheduler = proto.single_thread_proxy_scheduler();
+  use_external_begin_frame_source = proto.use_external_begin_frame_source();
+  main_frame_before_activation_enabled =
+      proto.main_frame_before_activation_enabled();
+  using_synchronous_renderer_compositor =
+      proto.using_synchronous_renderer_compositor();
+  accelerated_animation_enabled = proto.accelerated_animation_enabled();
+  can_use_lcd_text = proto.can_use_lcd_text();
+  use_distance_field_text = proto.use_distance_field_text();
+  gpu_rasterization_enabled = proto.gpu_rasterization_enabled();
+  gpu_rasterization_forced = proto.gpu_rasterization_forced();
+  gpu_rasterization_msaa_sample_count =
+      proto.gpu_rasterization_msaa_sample_count();
+  create_low_res_tiling = proto.create_low_res_tiling();
+  scrollbar_animator =
+      LayerTreeSettingsScrollbarAnimatorFromProto(proto.scrollbar_animator());
+  scrollbar_fade_delay_ms = proto.scrollbar_fade_delay_ms();
+  scrollbar_fade_resize_delay_ms = proto.scrollbar_fade_resize_delay_ms();
+  scrollbar_fade_duration_ms = proto.scrollbar_fade_duration_ms();
+  solid_color_scrollbar_color = proto.solid_color_scrollbar_color();
+  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());
+  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_content_pixels =
+      proto.skewport_extrapolation_limit_in_content_pixels();
+  max_memory_for_prepaint_percentage =
+      proto.max_memory_for_prepaint_percentage();
+  strict_layer_property_change_checking =
+      proto.strict_layer_property_change_checking();
+  use_zero_copy = proto.use_zero_copy();
+  use_partial_raster = proto.use_partial_raster();
+  enable_elastic_overscroll = proto.enable_elastic_overscroll();
+  // |use_image_texture_targets| contains default values, so clear first.
+  use_image_texture_targets.clear();
+  for (int i = 0; i < proto.use_image_texture_targets_size(); i++)

[vmpstr, 2015/12/08 18:26:13]

Can you put this at the end with a blank line before

[nyquist, 2015/12/08 22:44:58]

Done.

+    use_image_texture_targets.push_back(proto.use_image_texture_targets(i));
+  ignore_root_layer_flings = proto.ignore_root_layer_flings();
+  scheduled_raster_task_limit = proto.scheduled_raster_task_limit();
+  use_occlusion_for_tile_prioritization =
+      proto.use_occlusion_for_tile_prioritization();
+  verify_property_trees = proto.verify_property_trees();
+  use_property_trees = proto.use_property_trees();
+  image_decode_tasks_enabled = proto.image_decode_tasks_enabled();
+  use_compositor_animation_timelines =
+      proto.use_compositor_animation_timelines();
+  wait_for_beginframe_interval = proto.wait_for_beginframe_interval();
+  max_staging_buffer_usage_in_bytes = proto.max_staging_buffer_usage_in_bytes();
+  memory_policy_.FromProtobuf(proto.memory_policy());
+  initial_debug_state.FromProtobuf(proto.initial_debug_state());
+}
+
 SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const {
   SchedulerSettings scheduler_settings;
   scheduler_settings.use_external_begin_frame_source =