| commit | 4d967ef418b87a1a7923b05eeecf1ac18bb28f31 | [log] [tgz] |
|---|---|---|
| author | Mehran Mahmoudi <[email protected]> | Tue Oct 20 15:05:49 2020 |
| committer | Mehran Mahmoudi <[email protected]> | Tue Oct 20 15:05:49 2020 |
| tree | 96b0465769267823e5ffa1906b42276ecbfe9757 | |
| parent | 6a978a6ef32581dea4d5bee77e82c0b74b08db6b [diff] |
[Paint Preview] Fix failed assertion in PseudoTab This assertion can fail because this path is now also accessible if PAINT_PREVIEW_SHOW_ON_STARTUP flag is enabled. It was added here: crrev.com/c/2472432 (cherry picked from commit 157c155ba04ccf127cdd943686406dfec93927ad) Bug: 1134752 Change-Id: I20d8937b24de77c366a8bf552a68ff787d488959 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485395 Commit-Queue: Mehran Mahmoudi <[email protected]> Reviewed-by: Wei-Yin Chen (陳威尹) <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#818561} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485584 Reviewed-by: Mehran Mahmoudi <[email protected]> Cr-Commit-Position: refs/branch-heads/4280@{#529} Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java index 12c7acd9b..a2edb6d 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTab.java
@@ -314,7 +314,8 @@ } private static void readAllPseudoTabsFromStateFile() { - assert CachedFeatureFlags.isEnabled(ChromeFeatureList.INSTANT_START); + assert CachedFeatureFlags.isEnabled(ChromeFeatureList.INSTANT_START) + || CachedFeatureFlags.isEnabled(ChromeFeatureList.PAINT_PREVIEW_SHOW_ON_STARTUP); if (sReadStateFile) return; sReadStateFile = true;