cc: Add SwapAck watchdog.

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 48 matching lines @@
 
 bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const {
   return 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 &&
+         swap_ack_watchdog_enabled == other.swap_ack_watchdog_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 &&
          async_worker_context_enabled == other.async_worker_context_enabled &&
          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 &&
@@ skipping 44 matching lines @@
 }
 
 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_swap_ack_watchdog_enabled(swap_ack_watchdog_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_async_worker_context_enabled(async_worker_context_enabled);
   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));
@@ skipping 38 matching lines @@
 }
 
 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();
+  swap_ack_watchdog_enabled = proto.swap_ack_watchdog_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();
   async_worker_context_enabled = proto.async_worker_context_enabled();
   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());
@@ skipping 44 matching lines @@
       main_frame_before_activation_enabled;
   scheduler_settings.timeout_and_draw_when_animation_checkerboards =
       timeout_and_draw_when_animation_checkerboards;
   scheduler_settings.using_synchronous_renderer_compositor =
       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;
+  scheduler_settings.swap_ack_watchdog_enabled = swap_ack_watchdog_enabled;
   return scheduler_settings;
 }
 
 }  // namespace cc