Index: cc/trees/proxy_common.cc |
diff --git a/cc/trees/proxy_common.cc b/cc/trees/proxy_common.cc |
index c96af7b4acdbd739a29e8492061491f3b52ff6f2..05624cc09dfde81fae6c14d81d1fc63796fb5d05 100644 |
--- a/cc/trees/proxy_common.cc |
+++ b/cc/trees/proxy_common.cc |
@@ -10,7 +10,10 @@ |
namespace cc { |
BeginMainFrameAndCommitState::BeginMainFrameAndCommitState() |
- : memory_allocation_limit_bytes(0), evicted_ui_resources(false) {} |
+ : memory_allocation_limit_bytes(0), |
danakj
2016/05/13 20:41:47
while you're here... mind moving all this init sad
vmpstr
2016/05/13 21:17:10
Done.
|
+ evicted_ui_resources(false), |
+ has_fixed_raster_scale_blurry_content(false), |
+ has_fixed_raster_scale_potential_performance_regression(false) {} |
BeginMainFrameAndCommitState::~BeginMainFrameAndCommitState() {} |
@@ -21,6 +24,10 @@ void BeginMainFrameAndCommitState::ToProtobuf( |
scroll_info->ToProtobuf(proto->mutable_scroll_info()); |
proto->set_memory_allocation_limit_bytes(memory_allocation_limit_bytes); |
proto->set_evicted_ui_resources(evicted_ui_resources); |
+ proto->set_has_fixed_raster_scale_blurry_content( |
+ has_fixed_raster_scale_blurry_content); |
+ proto->set_has_fixed_raster_scale_potential_performance_regression( |
+ has_fixed_raster_scale_potential_performance_regression); |
} |
void BeginMainFrameAndCommitState::FromProtobuf( |
@@ -31,6 +38,10 @@ void BeginMainFrameAndCommitState::FromProtobuf( |
scroll_info->FromProtobuf(proto.scroll_info()); |
memory_allocation_limit_bytes = proto.memory_allocation_limit_bytes(); |
evicted_ui_resources = proto.evicted_ui_resources(); |
+ has_fixed_raster_scale_blurry_content = |
+ proto.has_fixed_raster_scale_blurry_content(); |
+ has_fixed_raster_scale_potential_performance_regression = |
+ proto.has_fixed_raster_scale_potential_performance_regression(); |
} |
} // namespace cc |