Skip to content

Commit 06534e4

Browse files
author
W. James MacLean
committed
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. [email protected] (cherry picked from commit cb6a710) 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 <[email protected]> Commit-Queue: James MacLean <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#577351} Reviewed-on: https://chromium-review.googlesource.com/1150842 Reviewed-by: James MacLean <[email protected]> Cr-Commit-Position: refs/branch-heads/3497@{#93} Cr-Branched-From: 271eaf5-refs/heads/master@{#576753}
1 parent 1473edd commit 06534e4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cc/trees/layer_tree_host_impl.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4584,10 +4584,10 @@ std::unique_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {
45844584
scroll_info->page_scale_delta =
45854585
active_tree_->page_scale_factor()->PullDeltaForMainThread();
45864586
// We should never process non-unit page_scale_delta for an OOPIF subframe.
4587-
// TODO(wjmaclean): Remove this check as a pre-condition to closing the bug.
4587+
// TODO(wjmaclean): Remove this DCHECK as a pre-condition to closing the bug.
45884588
// https://crbug.com/845097
4589-
CHECK(!settings().is_layer_tree_for_subframe ||
4590-
scroll_info->page_scale_delta == 1.f);
4589+
DCHECK(!settings().is_layer_tree_for_subframe ||
4590+
scroll_info->page_scale_delta == 1.f);
45914591
scroll_info->top_controls_delta =
45924592
active_tree()->top_controls_shown_ratio()->PullDeltaForMainThread();
45934593
scroll_info->elastic_overscroll_delta =

0 commit comments

Comments
 (0)