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

Unified Diff: cc/input/top_controls_manager.cc

Issue 1961173002: Remove invalid pinch-zoom assert in top_controls_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/input/top_controls_manager.cc
diff --git a/cc/input/top_controls_manager.cc b/cc/input/top_controls_manager.cc
index 44ed92049c892a58f8b4dfd778b3303266dd38fe..c20d310d5b92c5af8129bf20bbadc2d41bb48514 100644
--- a/cc/input/top_controls_manager.cc
+++ b/cc/input/top_controls_manager.cc
@@ -95,7 +95,9 @@ void TopControlsManager::UpdateTopControlsState(TopControlsState constraints,
}
void TopControlsManager::ScrollBegin() {
- DCHECK(!pinch_gesture_active_);
+ if (pinch_gesture_active_)
+ return;
+
ResetAnimations();
ResetBaseline();
}
@@ -132,7 +134,9 @@ gfx::Vector2dF TopControlsManager::ScrollBy(
}
void TopControlsManager::ScrollEnd() {
- DCHECK(!pinch_gesture_active_);
+ if (pinch_gesture_active_)
+ return;
+
StartAnimationIfNecessary();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698