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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java

Issue 2551653002: Fix a bug in pinch handling of the tab switcher. (Closed)
Patch Set: Created 4 years 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: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
index 973938e5b5abd66f1541b64243acd125ad081456..d67e862dfc74958f6f3d38e64391ed93ff590e87 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java
@@ -1167,8 +1167,10 @@ public class Stack {
float maxScreen = tab0ScreenAfter;
for (int i = pinch0TabIndex; i <= pinch1TabIndex; i++) {
float screenBefore = approxScreen(mStackTabs[i], oldScrollTarget);
- float t = (screenBefore - tab0ScreenBefore)
- / (tab1ScreenBefore - tab0ScreenBefore);
+ float t = (tab1ScreenBefore == tab0ScreenBefore)
+ ? 1
+ : ((screenBefore - tab0ScreenBefore)
+ / (tab1ScreenBefore - tab0ScreenBefore));
float screenAfter = (1 - t) * tab0ScreenAfter + t * tab1ScreenAfter;
screenAfter = Math.max(minScreen, screenAfter);
screenAfter = Math.min(maxScreen, screenAfter);
« 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