Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java |
index f44df724948eae71652d450bdefba401a9b2a668..657c0f2398b34538bb8dcfc1848a153676474a46 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java |
@@ -935,8 +935,15 @@ public abstract class Layout implements TabContentManager.ThumbnailChangeListene |
mLayoutAnimations = null; |
onAnimationFinished(); |
} |
- requestUpdate(); |
} |
+ |
+ // LayoutTabs may be running their own animations; make sure they are done. |
+ for (int i = 0; mLayoutTabs != null && i < mLayoutTabs.length; i++) { |
+ finished &= mLayoutTabs[i].onUpdateAnimation(time); |
+ } |
+ |
+ if (!finished) requestUpdate(); |
+ |
return finished; |
} |