[Extensions Toolbar] Protect against crazy bounds

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 287 matching lines @@
     AnimationEnded(resize_animation_.get());
   }
 }
 
 void BrowserActionsContainer::SetChevronVisibility(bool visible) {
   if (chevron_)
     chevron_->SetVisible(visible);
 }
 
 int BrowserActionsContainer::GetWidth() const {
-  return container_width_;
+  return width();
 }
 
 bool BrowserActionsContainer::IsAnimating() const {
   return animating();
 }
 
 void BrowserActionsContainer::StopAnimating() {
   animation_target_size_ = container_width_;
   resize_animation_->Reset();
 }
@@ skipping 81 matching lines @@
 
   if (toolbar_action_views_.empty()) {
     SetVisible(false);
     return;
   }
 
   SetVisible(true);
   if (resize_area_)
     resize_area_->SetBounds(0, 0, platform_settings().item_spacing, height());
 
+  // The range of visible icons, from start_index (inclusive) to end_index
+  // (exclusive).
+  size_t start_index = toolbar_actions_bar_->GetStartIndexInBounds();
+  size_t end_index = toolbar_actions_bar_->GetEndIndexInBounds();
+
   // If the icons don't all fit, show the chevron (unless suppressed).
-  int max_x = GetPreferredSize().width();
-  if (toolbar_actions_bar_->IconCountToWidth(-1) > max_x &&
-      !suppress_chevron_ && chevron_) {
+  if (end_index != toolbar_action_views_.size() && !suppress_chevron_ &&
+      chevron_) {
     chevron_->SetVisible(true);
     gfx::Size chevron_size(chevron_->GetPreferredSize());
-    max_x -= chevron_size.width() + kChevronSpacing;
     chevron_->SetBounds(
         width() - ToolbarView::kStandardSpacing - chevron_size.width(),
         0,
         chevron_size.width(),
         chevron_size.height());
   } else if (chevron_) {
     chevron_->SetVisible(false);
   }
 
-  // The range of visible icons, from start_index (inclusive) to end_index
-  // (exclusive).
-  size_t start_index = in_overflow_mode() ?
-      toolbar_action_views_.size() - toolbar_actions_bar_->GetIconCount() : 0u;
-  // For the main container's last visible icon, we calculate how many icons we
-  // can display with the given width. We add an extra item_spacing because the
-  // last icon doesn't need padding, but we want it to divide easily.
-  size_t end_index = in_overflow_mode() ?
-      toolbar_action_views_.size() :
-      (max_x - platform_settings().left_padding -
-          platform_settings().right_padding +
-          platform_settings().item_spacing) /
-          ToolbarActionsBar::IconWidth(true);
-
   // Now draw the icons for the actions in the available space. Once all the
   // variables are in place, the layout works equally well for the main and
   // overflow container.
   for (size_t i = 0u; i < toolbar_action_views_.size(); ++i) {
     ToolbarActionView* view = toolbar_action_views_[i];
     if (i < start_index || i >= end_index) {
       view->SetVisible(false);
     } else {
       view->SetBoundsRect(toolbar_actions_bar_->GetFrameForIndex(i));
       view->SetVisible(true);
@@ skipping 173 matching lines @@
                                                   const gfx::Point& press_pt,
                                                   const gfx::Point& p) {
   // We don't allow dragging while we're highlighting.
   return !toolbar_actions_bar_->is_highlighting();
 }
 
 void BrowserActionsContainer::OnResize(int resize_amount, bool done_resizing) {
   // We don't allow resize while the toolbar is highlighting a subset of
   // actions, since this is a temporary and entirely browser-driven sequence in
   // order to warn the user about potentially dangerous items.
-  if (toolbar_actions_bar_->is_highlighting())
+  // We also don't allow resize when the bar is already animating, since we
+  // don't want two competing size changes.
+  if (toolbar_actions_bar_->is_highlighting() || animating())
     return;
 
   if (!done_resizing) {
+    // If this is the start of the resize gesture, then set |container_width_|
+    // to be the current width. It might not have been if the container was
+    // shrank to give room to the omnibox, but to adjust the size, it needs to

[Peter Kasting, 2015/09/15 00:13:38]

Nit: shrunk (or remove "was" on previous line)

[Devlin, 2015/09/15 18:22:39]

Done.

+    // be accurate.
+    if (!resize_amount_)
+      container_width_ = width();
+
     resize_amount_ = resize_amount;
     Redraw(false);
     return;
   }
 
   // Up until now we've only been modifying the resize_amount, but now it is
   // time to set the container size to the size we have resized to, and then
   // animate to the nearest icon count size if necessary (which may be 0).
   container_width_ =
       std::min(std::max(toolbar_actions_bar_->GetMinimumWidth(),
@@ skipping 140 matching lines @@
   warning_highlight_painter_.reset(
       views::Painter::CreateImageGridPainter(kWarningImages));
 }
 
 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) {
   DCHECK(active_bubble_);
   DCHECK_EQ(active_bubble_->GetWidget(), widget);
   widget->RemoveObserver(this);
   active_bubble_ = nullptr;
 }