Fixes couple of bugs in the TabStrip that could cause tabs to dance

chrome/browser/ui/views/tabs/tab.cc

 // Copyright (c) 2012 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/tabs/tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 849 matching lines @@
   if (!controller())
     return false;
 
   controller()->OnMouseEventInTab(this, event);
 
   // Allow a right click from touch to drag, which corresponds to a long click.
   if (event.IsOnlyLeftMouseButton() ||
       (event.IsOnlyRightMouseButton() && event.flags() & ui::EF_FROM_TOUCH)) {
     ui::ListSelectionModel original_selection;
     original_selection.Copy(controller()->GetSelectionModel());
+    // Changing the selection may cause our bounds to change. If that happens
+    // the location of the event may no longer be valid. Create a copy of the
+    // event in the parents coordinate, which won't change, and recreate an
+    // event after changing so the coordinates are correct.
+    ui::MouseEvent event_in_parent(event, static_cast<View*>(this), parent());
     if (controller()->SupportsMultipleSelection()) {
       if (event.IsShiftDown() && event.IsControlDown()) {
         controller()->AddSelectionFromAnchorTo(this);
       } else if (event.IsShiftDown()) {
         controller()->ExtendSelectionTo(this);
       } else if (event.IsControlDown()) {
         controller()->ToggleSelected(this);
         if (!IsSelected()) {
           // Don't allow dragging non-selected tabs.
           return false;
         }
       } else if (!IsSelected()) {
         controller()->SelectTab(this);
       }
     } else if (!IsSelected()) {
       controller()->SelectTab(this);
     }
-    controller()->MaybeStartDrag(this, event, original_selection);
+    ui::MouseEvent cloned_event(event_in_parent, parent(),
+                                static_cast<View*>(this));
+    controller()->MaybeStartDrag(this, cloned_event, original_selection);
   }
   return true;
 }
 
 bool Tab::OnMouseDragged(const ui::MouseEvent& event) {
   if (controller())
     controller()->ContinueDrag(this, event.location());
   return true;
 }
 
@@ skipping 58 matching lines @@
   if (!controller()) {
     event->SetHandled();
     return;
   }
 
   switch (event->type()) {
     case ui::ET_GESTURE_BEGIN: {
       if (event->details().touch_points() != 1)
         return;
 
+      // See comment in OnMousePressed() as to why we copy the event.
+      ui::GestureEvent event_in_parent(*event, static_cast<View*>(this),
+                                       parent());
       ui::ListSelectionModel original_selection;
       original_selection.Copy(controller()->GetSelectionModel());
       if (!IsSelected())
         controller()->SelectTab(this);
       gfx::Point loc(event->location());
       views::View::ConvertPointToScreen(this, &loc);
-      controller()->MaybeStartDrag(this, *event, original_selection);
+      ui::GestureEvent cloned_event(event_in_parent, parent(),
+                                    static_cast<View*>(this));
+      controller()->MaybeStartDrag(this, cloned_event, original_selection);
       break;
     }
 
     case ui::ET_GESTURE_END:
       controller()->EndDrag(END_DRAG_COMPLETE);
       break;
 
     case ui::ET_GESTURE_SCROLL_UPDATE:
       controller()->ContinueDrag(this, event->location());
       break;
@@ skipping 630 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }