Clean up some code to make it more comprehensible. No functional change.

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2006-2008 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/views/tabs/tab_renderer.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
@@ skipping 13 matching lines @@
 #include "views/window/window.h"
 
 #ifdef WIN32
 #include "app/win_util.h"
 #endif
 
 static const int kLeftPadding = 16;
 static const int kTopPadding = 6;
 static const int kRightPadding = 15;
 static const int kBottomPadding = 5;
+static const int kDropShadowHeight = 2;
+static const int kToolbarOverlap = 1;
 static const int kFavIconTitleSpacing = 4;
 static const int kTitleCloseButtonSpacing = 5;
 static const int kStandardTitleWidth = 175;
 static const int kCloseButtonVertFuzz = 0;
 static const int kCloseButtonHorzFuzz = 5;
 static const int kFaviconSize = 16;
 static const int kSelectedTitleColor = SK_ColorBLACK;
 
 // How long the hover state takes.
 static const int kHoverDurationMs = 90;
@@ skipping 557 matching lines @@
       PaintActiveTabBackground(canvas);
       canvas->restore();
     }
   }
 }
 
 void TabRenderer::PaintInactiveTabBackground(gfx::Canvas* canvas) {
   bool is_otr = data_.off_the_record;
 
   // The tab image needs to be lined up with the background image
-  // so that it feels partially transparent.
+  // so that it feels partially transparent.  These offsets represent the tab
+  // position within the frame background image.
   int offset = GetX(views::View::APPLY_MIRRORING_TRANSFORMATION) + 1;
+  // TODO(glen): http://crbug.com/12761  This should use
+  // BrowserView::GetTabstripBounds() instead of a hardcoded constant.
   int offset_y = 20;
 
   int tab_id;
   if (GetWidget() &&
       GetWidget()->GetWindow()->GetNonClientView()->UseNativeFrame()) {
     tab_id = IDR_THEME_TAB_BACKGROUND_V;
   } else {
     tab_id = is_otr ? IDR_THEME_TAB_BACKGROUND_INCOGNITO :
                       IDR_THEME_TAB_BACKGROUND;
   }
 
   SkBitmap* tab_bg = GetThemeProvider()->GetBitmapNamed(tab_id);
 
-  // Draw left edge.
+  // Draw left edge.  Don't draw over the toolbar, as we're not the foreground
+  // tab.
   SkBitmap tab_l = skia::ImageOperations::CreateTiledBitmap(
       *tab_bg, offset, offset_y,
       tab_active.l_width, height());
   SkBitmap theme_l = skia::ImageOperations::CreateMaskedBitmap(
       tab_l, *tab_alpha.image_l);
   canvas->DrawBitmapInt(theme_l,
-      0, 0, theme_l.width(), theme_l.height() - 1,
-      0, 0, theme_l.width(), theme_l.height() - 1,
+      0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
+      0, 0, theme_l.width(), theme_l.height() - kToolbarOverlap,
       false);
 
-  // Draw right edge.
+  // Draw right edge.  Again, don't draw over the toolbar.
   SkBitmap tab_r = skia::ImageOperations::CreateTiledBitmap(
       *tab_bg,
       offset + width() - tab_active.r_width, offset_y,
       tab_active.r_width, height());
   SkBitmap theme_r = skia::ImageOperations::CreateMaskedBitmap(
       tab_r, *tab_alpha.image_r);
   canvas->DrawBitmapInt(theme_r,
-      0, 0, theme_r.width(), theme_r.height() - 1,
-      width() - theme_r.width(), 0, theme_r.width(), theme_r.height() - 1,
-      false);
+      0, 0, theme_r.width(), theme_r.height() - kToolbarOverlap,
+      width() - theme_r.width(), 0, theme_r.width(),
+      theme_r.height() - kToolbarOverlap, false);
 
-  // Draw center.
+  // Draw center.  Instead of masking out the top portion we simply skip over it
+  // by incrementing by kDropShadowHeight, since it's a simple rectangle.  And
+  // again, don't draw over the toolbar.
   canvas->TileImageInt(*tab_bg,
-     offset + tab_active.l_width, 2 + offset_y,  // 2 is the drop shadow offset.
-     tab_active.l_width, 2,
-     width() - tab_active.l_width - tab_active.r_width, height() - 3);
+     offset + tab_active.l_width, offset_y + kDropShadowHeight,
+     tab_active.l_width, kDropShadowHeight,
+     width() - tab_active.l_width - tab_active.r_width,
+     height() - kDropShadowHeight - kToolbarOverlap);
 
+  // Now draw the highlights/shadows around the tab edge.
   canvas->DrawBitmapInt(*tab_inactive.image_l, 0, 0);
   canvas->TileImageInt(*tab_inactive.image_c,
                        tab_inactive.l_width, 0,
                        width() - tab_inactive.l_width - tab_inactive.r_width,
                        height());
   canvas->DrawBitmapInt(*tab_inactive.image_r,
                         width() - tab_inactive.r_width, 0);
 }
 
 void TabRenderer::PaintActiveTabBackground(gfx::Canvas* canvas) {
@@ skipping 13 matching lines @@
 
   // Draw right edge.
   SkBitmap tab_r = skia::ImageOperations::CreateTiledBitmap(
       *tab_bg,
       offset + width() - tab_active.r_width, 0,
       tab_active.r_width, height());
   SkBitmap theme_r = skia::ImageOperations::CreateMaskedBitmap(
       tab_r, *tab_alpha.image_r);
   canvas->DrawBitmapInt(theme_r, width() - tab_active.r_width, 0);
 
-  // Draw center.
+  // Draw center.  Instead of masking out the top portion we simply skip over it
+  // by incrementing by kDropShadowHeight, since it's a simple rectangle.
   canvas->TileImageInt(*tab_bg,
-     offset + tab_active.l_width, 2,
-     tab_active.l_width, 2,
-     width() - tab_active.l_width - tab_active.r_width, height() - 2);
+     offset + tab_active.l_width, kDropShadowHeight,
+     tab_active.l_width, kDropShadowHeight,
+     width() - tab_active.l_width - tab_active.r_width,
+     height() - kDropShadowHeight);
 
+  // Now draw the highlights/shadows around the tab edge.
   canvas->DrawBitmapInt(*tab_active.image_l, 0, 0);
   canvas->TileImageInt(*tab_active.image_c, tab_active.l_width, 0,
       width() - tab_active.l_width - tab_active.r_width, height());
   canvas->DrawBitmapInt(*tab_active.image_r, width() - tab_active.r_width, 0);
 }
 
 void TabRenderer::PaintHoverTabBackground(gfx::Canvas* canvas,
                                           double opacity) {
   SkBitmap left = skia::ImageOperations::CreateBlendedBitmap(
                   *tab_inactive.image_l, *tab_active.image_l, opacity);
@@ skipping 101 matching lines @@
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
 
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 
   loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
   waiting_animation_frames = rb.GetBitmapNamed(IDR_THROBBER_WAITING);
 }