infobar: Do not animate bad flag and automation infobars

Animating infobars during startup is speculated to cause regressions and
noise in rendering benchmarks.  This CL disables animations for bad flag
and automation infobars by allowing the InfoBarDelegate to control if
the infobar animates or not.

Bug: 804324
Change-Id: I2c1067e122cf031ab151a1f51d9d11bc6bac60e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808297Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697791}

chrome/browser/plugins/plugin_observer.cc

@@ -189,8 +189,7 @@ void PluginObserver::CreatePluginObserverInfoBar(
       infobars::InfoBarDelegate::PLUGIN_OBSERVER_INFOBAR_DELEGATE,
       &kExtensionCrashedIcon,
       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT,
-                                 plugin_name),
-      true);
+                                 plugin_name));
 }
 
 void PluginObserver::BlockedOutdatedPlugin(

chrome/browser/ui/chrome_select_file_policy.cc

@@ -32,8 +32,7 @@ void ChromeSelectFilePolicy::SelectFileDenied() {
     SimpleAlertInfoBarDelegate::Create(
         InfoBarService::FromWebContents(source_contents_),
         infobars::InfoBarDelegate::FILE_ACCESS_DISABLED_INFOBAR_DELEGATE,
-        nullptr, l10n_util::GetStringUTF16(IDS_FILE_SELECTION_DIALOG_INFOBAR),
-        true);
+        nullptr, l10n_util::GetStringUTF16(IDS_FILE_SELECTION_DIALOG_INFOBAR));
   } else {
     LOG(WARNING) << "File-selection dialogs are disabled but no WebContents "
                  << "is given to display the InfoBar.";

chrome/browser/ui/startup/automation_infobar_delegate.cc

@@ -31,6 +31,14 @@ bool AutomationInfoBarDelegate::ShouldExpire(
   return false;
 }
 
+bool AutomationInfoBarDelegate::ShouldAnimate() const {
+  // Animating the infobar also animates the content area size which can trigger
+  // a flood of page layout, compositing, texture reallocations, etc.  Since
+  // this infobar is primarily used for automated testing do not animate the
+  // infobar to reduce noise in tests.
+  return false;
+}
+
 base::string16 AutomationInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_CONTROLLED_BY_AUTOMATION);
 }

chrome/browser/ui/startup/automation_infobar_delegate.h

@@ -23,6 +23,7 @@ class AutomationInfoBarDelegate : public ConfirmInfoBarDelegate {
 
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
   bool ShouldExpire(const NavigationDetails& details) const override;
+  bool ShouldAnimate() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
 

chrome/browser/ui/startup/bad_flags_prompt.cc

@@ -150,14 +150,19 @@ static const base::Feature* kBadFeatureFlagsInAboutFlags[] = {
 #endif  // OS_ANDROID
 };
 
-void ShowBadFeatureFlagsInfoBar(content::WebContents* web_contents,
+void ShowBadFlagsInfoBarHelper(content::WebContents* web_contents,
                                int message_id,
-                                const base::Feature* feature) {
+                               base::StringPiece flag) {
+  // Animating the infobar also animates the content area size which can trigger
+  // a flood of page layout, compositing, texture reallocations, etc.  Do not
+  // animate the infobar to reduce noise in perf benchmarks because they pass
+  // --ignore-certificate-errors-spki-list.  This infobar only appears at
+  // startup so the animation isn't visible to users anyway.
   SimpleAlertInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents),
       infobars::InfoBarDelegate::BAD_FLAGS_INFOBAR_DELEGATE, nullptr,
-      l10n_util::GetStringFUTF16(message_id, base::UTF8ToUTF16(feature->name)),
-      false);
+      l10n_util::GetStringFUTF16(message_id, base::UTF8ToUTF16(flag)),
+      /*auto_expire=*/false, /*should_animate=*/false);
 }
 
 }  // namespace
@@ -176,8 +181,8 @@ void ShowBadFlagsPrompt(content::WebContents* web_contents) {
 
   for (const base::Feature* feature : kBadFeatureFlagsInAboutFlags) {
     if (base::FeatureList::IsEnabled(*feature)) {
-      ShowBadFeatureFlagsInfoBar(web_contents, IDS_BAD_FEATURES_WARNING_MESSAGE,
-                                 feature);
+      ShowBadFlagsInfoBarHelper(web_contents, IDS_BAD_FEATURES_WARNING_MESSAGE,
+                                feature->name);
       return;
     }
   }
@@ -190,13 +195,8 @@ void ShowBadFlagsInfoBar(content::WebContents* web_contents,
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(flag);
   if (!switch_value.empty())
     switch_value = "=" + switch_value;
-  SimpleAlertInfoBarDelegate::Create(
-      InfoBarService::FromWebContents(web_contents),
-      infobars::InfoBarDelegate::BAD_FLAGS_INFOBAR_DELEGATE, nullptr,
-      l10n_util::GetStringFUTF16(
-          message_id,
-          base::UTF8ToUTF16(std::string("--") + flag + switch_value)),
-      false);
+  ShowBadFlagsInfoBarHelper(web_contents, message_id,
+                            std::string("--") + flag + switch_value);
 }
 
 void MaybeShowInvalidUserDataDirWarningDialog() {

components/infobars/core/infobar.cc

@@ -24,8 +24,10 @@ InfoBar::InfoBar(std::unique_ptr<InfoBarDelegate> delegate)
       target_height_(0) {
   DCHECK(delegate_ != nullptr);
   animation_.SetTweenType(gfx::Tween::LINEAR);
-  if (!gfx::Animation::ShouldRenderRichAnimation())
+  if (!gfx::Animation::ShouldRenderRichAnimation() ||
+      !delegate_->ShouldAnimate()) {
     animation_.SetSlideDuration(base::TimeDelta());
+  }
   delegate_->set_infobar(this);
 }
 

components/infobars/core/infobar_delegate.cc

@@ -76,6 +76,10 @@ bool InfoBarDelegate::IsCloseable() const {
   return true;
 }
 
+bool InfoBarDelegate::ShouldAnimate() const {
+  return true;
+}
+
 ConfirmInfoBarDelegate* InfoBarDelegate::AsConfirmInfoBarDelegate() {
   return nullptr;
 }

components/infobars/core/infobar_delegate.h

@@ -225,6 +225,10 @@ class InfoBarDelegate {
   // Returns true if the InfoBar has a close button; true by default.
   virtual bool IsCloseable() const;
 
+  // Returns true if the InfoBar should animate when showing or hiding; true by
+  // default.
+  virtual bool ShouldAnimate() const;
+
   // Type-checking downcast routines:
   virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate();
   virtual HungRendererInfoBarDelegate* AsHungRendererInfoBarDelegate();

components/infobars/core/simple_alert_infobar_delegate.cc

@@ -16,24 +16,27 @@ void SimpleAlertInfoBarDelegate::Create(
     infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
     const gfx::VectorIcon* vector_icon,
     const base::string16& message,
-    bool auto_expire) {
+    bool auto_expire,
+    bool should_animate) {
   infobar_manager->AddInfoBar(infobar_manager->CreateConfirmInfoBar(
       std::unique_ptr<ConfirmInfoBarDelegate>(new SimpleAlertInfoBarDelegate(
-          infobar_identifier, vector_icon, message, auto_expire))));
+          infobar_identifier, vector_icon, message, auto_expire,
+          should_animate))));
 }
 
 SimpleAlertInfoBarDelegate::SimpleAlertInfoBarDelegate(
     infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
     const gfx::VectorIcon* vector_icon,
     const base::string16& message,
-    bool auto_expire)
+    bool auto_expire,
+    bool should_animate)
     : infobar_identifier_(infobar_identifier),
       vector_icon_(vector_icon),
       message_(message),
-      auto_expire_(auto_expire) {}
+      auto_expire_(auto_expire),
+      should_animate_(should_animate) {}
 
-SimpleAlertInfoBarDelegate::~SimpleAlertInfoBarDelegate() {
-}
+SimpleAlertInfoBarDelegate::~SimpleAlertInfoBarDelegate() = default;
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 SimpleAlertInfoBarDelegate::GetIdentifier() const {
@@ -49,6 +52,10 @@ bool SimpleAlertInfoBarDelegate::ShouldExpire(
   return auto_expire_ && ConfirmInfoBarDelegate::ShouldExpire(details);
 }
 
+bool SimpleAlertInfoBarDelegate::ShouldAnimate() const {
+  return should_animate_ && ConfirmInfoBarDelegate::ShouldAnimate();
+}
+
 base::string16 SimpleAlertInfoBarDelegate::GetMessageText() const {
   return message_;
 }

components/infobars/core/simple_alert_infobar_delegate.h

@@ -28,20 +28,23 @@ class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
       infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
       const gfx::VectorIcon* vector_icon,
       const base::string16& message,
-      bool auto_expire);
+      bool auto_expire = true,
+      bool should_animate = true);
 
  private:
   SimpleAlertInfoBarDelegate(
       infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
       const gfx::VectorIcon* vector_icon,
       const base::string16& message,
-      bool auto_expire);
+      bool auto_expire,
+      bool should_animate);
   ~SimpleAlertInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
   const gfx::VectorIcon& GetVectorIcon() const override;
   bool ShouldExpire(const NavigationDetails& details) const override;
+  bool ShouldAnimate() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
 
@@ -49,6 +52,7 @@ class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
   const gfx::VectorIcon* vector_icon_;
   base::string16 message_;
   bool auto_expire_;  // Should it expire automatically on navigation?
+  bool should_animate_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleAlertInfoBarDelegate);
 };

ios/chrome/browser/ui/download/pass_kit_coordinator.mm

@@ -119,8 +119,7 @@ PresentAddPassesDialogResult GetUmaResult(
       InfoBarManagerImpl::FromWebState(_webState),
       infobars::InfoBarDelegate::SHOW_PASSKIT_ERROR_INFOBAR_DELEGATE_IOS,
       /*vector_icon=*/nullptr,
-      l10n_util::GetStringUTF16(IDS_IOS_GENERIC_PASSKIT_ERROR),
-      /*auto_expire=*/true);
+      l10n_util::GetStringUTF16(IDS_IOS_GENERIC_PASSKIT_ERROR));
 
   // Infobar does not provide callback on dismissal.
   [self stop];