Move convolver, image_operations, and skia_utils from base/gfx to skia/ext....

chrome/views/table_view.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 <algorithm>
 #include <windowsx.h>
 
 #include "chrome/views/table_view.h"
 
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/hwnd_view.h"
 #include "SkBitmap.h"
 #include "SkColorFilter.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
 // Added to column width to prevent truncation.
 const int kListViewTextPadding = 15;
 // Additional column width necessary if column has icons.
 const int kListViewIconWidthAndPadding = 18;
 
 const int kImageSize = 18;
 
@@ skipping 1137 matching lines @@
                           &background,
                           &logfont)) {
           // TODO(tc): Creating/deleting a font for every cell seems like a
           // waste if the font hasn't changed.  Maybe we should use a struct
           // with a bool like we do with colors?
           if (custom_cell_font_)
             DeleteObject(custom_cell_font_);
           custom_cell_font_ = CreateFontIndirect(&logfont);
           SelectObject(draw_info->nmcd.hdc, custom_cell_font_);
           draw_info->clrText = foreground.color_is_set
-                               ? gfx::SkColorToCOLORREF(foreground.color)
+                               ? skia::SkColorToCOLORREF(foreground.color)
                                : CLR_DEFAULT;
           draw_info->clrTextBk = background.color_is_set
-                                 ? gfx::SkColorToCOLORREF(background.color)
+                                 ? skia::SkColorToCOLORREF(background.color)
                                  : CLR_DEFAULT;
           return CDRF_NEWFONT;
         }
       }
       return CDRF_DODEFAULT;
     }
     case CDDS_ITEMPOSTPAINT: {
       DCHECK((table_type_ == ICON_AND_TEXT) || (ImplementPostPaint()));
       int view_index = static_cast<int>(draw_info->nmcd.dwItemSpec);
       // We get notifications for empty items, just ignore them.
@@ skipping 29 matching lines @@
               else if (drop_highlight)
                 bg_color_index = COLOR_HIGHLIGHT;
               else if (selected)
                 bg_color_index = HasFocus() ? COLOR_HIGHLIGHT : COLOR_3DFACE;
               else
                 bg_color_index = COLOR_WINDOW;
               // NOTE: This may be invoked without the ListView filling in the
               // background (or rather windows paints background, then invokes
               // this twice). As such, we always fill in the background.
               canvas.drawColor(
-                  gfx::COLORREFToSkColor(GetSysColor(bg_color_index)),
+                  skia::COLORREFToSkColor(GetSysColor(bg_color_index)),
                   SkPorterDuff::kSrc_Mode);
               // + 1 for padding (we declared the image as 18x18 in the list-
               // view when they are 16x16 so we get an extra pixel of padding).
               canvas.DrawBitmapInt(image, 0, 0,
                                    image.width(), image.height(),
                                    1, 1, kFavIconSize, kFavIconSize, true);
 
               // Only paint the visible region of the icon.
               RECT to_draw = { intersection.left - icon_rect.left,
                                intersection.top - icon_rect.top,
@@ skipping 286 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->view_to_model(view_index_);
 }
 
 }  // namespace views