From cb6a7105b2f3c1a762b62bd938728a03f6e048d5 Mon Sep 17 00:00:00 2001 From: "W. James MacLean" Date: Tue, 24 Jul 2018 00:05:23 +0000 Subject: [PATCH] Convert CHECK to DCHECK. Now that we know this pathway is involved in the incorrect setting of page scale factors for OOPIFs, convert this CHECK to a DCHECK. Bug: 859428 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I4d8805056546cc6ada3525e57d307dbcb27e6f55 Reviewed-on: https://chromium-review.googlesource.com/1146329 Reviewed-by: Fady Samuel Commit-Queue: James MacLean Cr-Commit-Position: refs/heads/master@{#577351} --- cc/trees/layer_tree_host_impl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 9722a75143411..20a662a444f06 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -4583,10 +4583,10 @@ std::unique_ptr LayerTreeHostImpl::ProcessScrollDeltas() { scroll_info->page_scale_delta = active_tree_->page_scale_factor()->PullDeltaForMainThread(); // We should never process non-unit page_scale_delta for an OOPIF subframe. - // TODO(wjmaclean): Remove this check as a pre-condition to closing the bug. + // TODO(wjmaclean): Remove this DCHECK as a pre-condition to closing the bug. // https://crbug.com/845097 - CHECK(!settings().is_layer_tree_for_subframe || - scroll_info->page_scale_delta == 1.f); + DCHECK(!settings().is_layer_tree_for_subframe || + scroll_info->page_scale_delta == 1.f); scroll_info->top_controls_delta = active_tree()->top_controls_shown_ratio()->PullDeltaForMainThread(); scroll_info->elastic_overscroll_delta =