Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3635)

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 1640373002: Fix broken MainThreadScrollingReason DCHECK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/input/main_thread_scrolling_reason.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 52be560f7e03a89cccd7bc220b4ff97063d2984f..3ebc475fc4d7570641d205d1ec796bde35e32978 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2500,10 +2500,10 @@ LayerImpl* LayerTreeHostImpl::FindScrollLayerForDeviceViewportPoint(
if (status.thread == SCROLL_ON_MAIN_THREAD) {
if (layer_impl->should_scroll_on_main_thread()) {
DCHECK_LE(status.main_thread_scrolling_reasons,
- MainThreadScrollingReason::kMaxNonTransientScrollingReason);
+ MainThreadScrollingReason::kMaxNonTransientScrollingReasons);
} else {
DCHECK_GT(status.main_thread_scrolling_reasons,
- MainThreadScrollingReason::kMaxNonTransientScrollingReason);
+ MainThreadScrollingReason::kMaxNonTransientScrollingReasons);
}
*scroll_on_main_thread = true;
@@ -2522,10 +2522,10 @@ LayerImpl* LayerTreeHostImpl::FindScrollLayerForDeviceViewportPoint(
if (status.thread == SCROLL_ON_MAIN_THREAD) {
if (layer_impl->should_scroll_on_main_thread()) {
DCHECK_LE(status.main_thread_scrolling_reasons,
- MainThreadScrollingReason::kMaxNonTransientScrollingReason);
+ MainThreadScrollingReason::kMaxNonTransientScrollingReasons);
} else {
DCHECK_GT(status.main_thread_scrolling_reasons,
- MainThreadScrollingReason::kMaxNonTransientScrollingReason);
+ MainThreadScrollingReason::kMaxNonTransientScrollingReasons);
}
*scroll_on_main_thread = true;
« no previous file with comments | « cc/input/main_thread_scrolling_reason.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698