Move Image operations and convolver to the skia namespace and clean up a few ...

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 <limits>
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser.h"
@@ skipping 568 matching lines @@
 void TabRenderer::PaintActiveTabBackground(ChromeCanvas* canvas) {
   canvas->DrawBitmapInt(*tab_active_l, 0, 0);
   canvas->TileImageInt(*tab_active_c, tab_active_l_width, 0,
     width() - tab_active_l_width - tab_active_r_width, height());
   canvas->DrawBitmapInt(*tab_active_r, width() - tab_active_r_width, 0);
 }
 
 void TabRenderer::PaintHoverTabBackground(ChromeCanvas* canvas,
                                           double opacity) {
   bool is_otr = data_.off_the_record;
-  SkBitmap left = gfx::ImageOperations::CreateBlendedBitmap(
+  SkBitmap left = skia::ImageOperations::CreateBlendedBitmap(
                   (is_otr ? *tab_inactive_otr_l : *tab_inactive_l),
                   *tab_hover_l, opacity);
-  SkBitmap center = gfx::ImageOperations::CreateBlendedBitmap(
+  SkBitmap center = skia::ImageOperations::CreateBlendedBitmap(
                    (is_otr ? *tab_inactive_otr_c : *tab_inactive_c),
                     *tab_hover_c, opacity);
-  SkBitmap right = gfx::ImageOperations::CreateBlendedBitmap(
+  SkBitmap right = skia::ImageOperations::CreateBlendedBitmap(
                    (is_otr ? *tab_inactive_otr_r : *tab_inactive_r),
                    *tab_hover_r, opacity);
 
   canvas->DrawBitmapInt(left, 0, 0);
   canvas->TileImageInt(center, tab_active_l_width, 0,
       width() - tab_active_l_width - tab_active_r_width, height());
   canvas->DrawBitmapInt(right, width() - tab_active_r_width, 0);
 }
 
 void TabRenderer::PaintLoadingAnimation(ChromeCanvas* canvas) {
@@ skipping 65 matching lines @@
 }
 
 void TabRenderer::DisplayCrashedFavIcon() {
   should_display_crashed_favicon_ = true;
 }
 
 void TabRenderer::ResetCrashedFavIcon() {
   should_display_crashed_favicon_ = false;
 }