diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 17:02:50 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 17:02:50 +0000 |
| commit | c30664c9350b9885c543b0b3a2d855d2ca842e31 (patch) | |
| tree | e3ae610a5a99f2a545f51da1609fcbf73218c350 /chrome/browser | |
| parent | 33ba5fbf040015cd4dd9c330db3b7eec65510cfd (diff) | |
| download | chromium_src-c30664c9350b9885c543b0b3a2d855d2ca842e31.zip chromium_src-c30664c9350b9885c543b0b3a2d855d2ca842e31.tar.gz chromium_src-c30664c9350b9885c543b0b3a2d855d2ca842e31.tar.bz2 | |
Fixes a gcc-4.3 warning in tab_strip_gtk.cc.
Also factorizes some code in tab_strip.cc and tab_strip_gtk.cc.
One of the inlined call to GenerateStartAndEndWidths with end_tab_count =
start_tab_count - 1 caused line 164 to be rewritten as:
if (start_tab_count < start_tab_count - 1 &&
which raised the following warning with gcc-4.3:
tab_strip_gtk.cc:164: warning: assuming signed overflow does not occur when
assuming that (X - c) > X is always false
patch by vincent.zanotti@gmail.com <http://codereview.chromium.org/99031>
R=me
Review URL: http://codereview.chromium.org/100045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_strip_gtk.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.cc | 10 |
2 files changed, 3 insertions, 19 deletions
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 9c8fd1d..e008cdb 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -161,7 +161,7 @@ class TabStripGtk::TabAnimation : public AnimationDelegate { double standard_tab_width = static_cast<double>(TabRendererGtk::GetStandardSize().width()); - if (start_tab_count < end_tab_count && + if ((end_tab_count - start_tab_count) > 0 && start_unselected_width_ < standard_tab_width) { double minimum_tab_width = static_cast<double>( TabRendererGtk::GetMinimumUnselectedSize().width()); @@ -710,15 +710,7 @@ bool TabStripGtk::IsTabSelected(const TabGtk* tab) const { if (tab->closing()) return false; - int tab_count = GetTabCount(); - for (int i = 0, index = 0; i < tab_count; ++i, ++index) { - TabGtk* current_tab = GetTabAt(i); - if (current_tab->closing()) - --index; - if (current_tab == tab) - return index == model_->selected_index(); - } - return false; + return GetIndexOfTab(tab) == model_->selected_index(); } void TabStripGtk::GetCurrentTabWidths(double* unselected_width, diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 5328927..37e1a94 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -883,15 +883,7 @@ bool TabStrip::IsTabSelected(const Tab* tab) const { if (tab->closing()) return false; - int tab_count = GetTabCount(); - for (int i = 0, index = 0; i < tab_count; ++i, ++index) { - Tab* current_tab = GetTabAt(i); - if (current_tab->closing()) - --index; - if (current_tab == tab) - return index == model_->selected_index(); - } - return false; + return GetIndexOfTab(tab) == model_->selected_index(); } void TabStrip::SelectTab(Tab* tab) { |