Index: cc/trees/layer_tree_settings.cc |
diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc |
index 66d1c48976a4b9a427e20aaa924bb60095e2108a..cf315c93e60704cc22032e6c9e7902f5035a017d 100644 |
--- a/cc/trees/layer_tree_settings.cc |
+++ b/cc/trees/layer_tree_settings.cc |
@@ -66,6 +66,7 @@ bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const { |
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 && |
@@ -130,6 +131,7 @@ void LayerTreeSettings::ToProtobuf(proto::LayerTreeSettings* proto) const { |
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); |
@@ -188,6 +190,7 @@ void LayerTreeSettings::FromProtobuf(const proto::LayerTreeSettings& proto) { |
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(); |
@@ -252,6 +255,7 @@ SchedulerSettings LayerTreeSettings::ToSchedulerSettings() const { |
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; |
} |