[arch-commits] Commit in chromium/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, May 25, 2013 @ 01:17:32
  Author: foutrelis
Revision: 186333

upgpkg: chromium 27.0.1453.93-2

Fix crash when quickly dragging a new tab (FS#35431).

Added:
  chromium/trunk/chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch
Modified:
  chromium/trunk/PKGBUILD

-----------------------------------------------------------------------+
 PKGBUILD                                                              |    8 +-
 chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch |   39 ++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-24 20:45:34 UTC (rev 186332)
+++ PKGBUILD	2013-05-24 23:17:32 UTC (rev 186333)
@@ -6,7 +6,7 @@
 
 pkgname=chromium
 pkgver=27.0.1453.93
-pkgrel=1
+pkgrel=2
 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
 arch=('i686' 'x86_64')
 url="http://www.chromium.org/"
@@ -25,12 +25,14 @@
         chromium.default
         chromium.sh
         chromium-pnacl-r0.patch
+        chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch
         chromium-26.0.1410.43-speechd-0.8.patch)
 sha256sums=('6dd8c01a4d72acc512652332d67e92ff9bcb3533b621f2b281c30f00ce26ad40'
             '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
             '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
             '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
             '9875ffcc0e9ae9420876ac66b130b1b017d445a031d43cbe0119793e1fb3781c'
+            'd530f52cb485ff8da035b38ffebe171309a1d8e515040f5e6398ecb286336797'
             '23b04468881642ffdc8457016c8f91df395dfccb4af2ad6b758168180ae070f3')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -47,6 +49,10 @@
   # Fix build without pnacl (patch from Gentoo)
   patch -Np0 -i "$srcdir/chromium-pnacl-r0.patch"
 
+  # Fix crash when quickly dragging a new tab
+  # https://code.google.com/p/chromium/issues/detail?id=228918
+  patch -Np1 -i "$srcdir/chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch"
+
   # Fix header location for speech-dispatcher 0.8 (patch from PLD Linux)
   patch -Np2 -i "$srcdir/chromium-26.0.1410.43-speechd-0.8.patch"
 

Added: chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch
===================================================================
--- chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch	                        (rev 0)
+++ chromium-27.0.1453.93-fix-crash-when-quickly-dragging-a-new-tab.patch	2013-05-24 23:17:32 UTC (rev 186333)
@@ -0,0 +1,39 @@
+From afcf3acc715aef47855ced19434dba2f52b92400 Mon Sep 17 00:00:00 2001
+From: "dcheng at chromium.org"
+ <dcheng at chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
+Date: Fri, 24 May 2013 21:49:42 +0000
+Subject: [PATCH] Fix crash when quickly dragging a new tab.
+
+The root cause is r185551, which changed the semantics of
+scoped_ptr::reset(). This code depended on the fact that a get() during
+a reset() would return the original value of the stored pointer, but
+after r185551, it returns the value that it is being reset to. This
+caused the code to stop an animation and the code to end a drag to
+conflict, since the animation code would sometimes delete a TabGtk that
+was still being dragged.
+
+BUG=228918
+
+Review URL: https://chromiumcodereview.appspot.com/16035005
+
+git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202184 0039d316-1c4b-4281-b951-d872f2087c98
+---
+ chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+index d86364d..4e6c352 100644
+--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
++++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+@@ -1406,7 +1406,7 @@ void TabStripGtk::RemoveTabAt(int index) {
+   // Remove the Tab from the TabStrip's list.
+   tab_data_.erase(tab_data_.begin() + index);
+ 
+-  if (!IsDragSessionActive() || !drag_controller_->IsDraggingTab(removed)) {
++  if (!removed->dragging()) {
+     gtk_container_remove(GTK_CONTAINER(tabstrip_.get()), removed->widget());
+     delete removed;
+   }
+-- 
+1.8.2.3
+