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

base/gfx/native_theme.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 "base/gfx/native_theme.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/skia_utils.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
 #include "skia/ext/platform_canvas.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkShader.h"
 
 namespace gfx {
 
 /* static */
 const NativeTheme* NativeTheme::instance() {
   // The global NativeTheme instance.
   static const NativeTheme s_native_theme;
   return &s_native_theme;
 }
@@ skipping 178 matching lines @@
 
   // Draw it manually.
   const DWORD colorScrollbar = GetSysColor(COLOR_SCROLLBAR);
   const DWORD color3DFace = GetSysColor(COLOR_3DFACE);
   if ((colorScrollbar != color3DFace) &&
       (colorScrollbar != GetSysColor(COLOR_WINDOW))) {
     FillRect(hdc, target_rect, reinterpret_cast<HBRUSH>(COLOR_SCROLLBAR + 1));
   } else {
     // Create a 2x2 checkerboard pattern using the 3D face and highlight
     // colors.
-    SkColor face = COLORREFToSkColor(color3DFace);
-    SkColor highlight = COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
+    SkColor face = skia::COLORREFToSkColor(color3DFace);
+    SkColor highlight = skia::COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
     SkColor buffer[] = { face, highlight, highlight, face };
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
     bitmap.setPixels(buffer);
     SkShader* shader = SkShader::CreateBitmapShader(bitmap,
                                                     SkShader::kRepeat_TileMode,
                                                     SkShader::kRepeat_TileMode);
 
     // Draw that pattern into the target rect, setting the origin to the top
     // left corner of the scrollbar track (so the checked rect below the thumb
     // aligns properly with the portion above the thumb).
     SkMatrix matrix;
     matrix.setTranslate(SkIntToScalar(align_rect->left),
                         SkIntToScalar(align_rect->top));
     shader->setLocalMatrix(matrix);
     SkPaint paint;
     paint.setShader(shader)->unref();
-    canvas->drawIRect(RECTToSkIRect(*target_rect), paint);
+    canvas->drawIRect(skia::RECTToSkIRect(*target_rect), paint);
   }
   if (classic_state & DFCS_PUSHED)
     InvertRect(hdc, target_rect);
   return S_OK;
 }
 
 HRESULT NativeTheme::PaintScrollbarThumb(HDC hdc,
                                          int part_id,
                                          int state_id,
                                          int classic_state,
@@ skipping 213 matching lines @@
 HRESULT NativeTheme::GetThemeColor(ThemeName theme,
                                    int part_id,
                                    int state_id,
                                    int prop_id,
                                    SkColor* color) const {
   HANDLE handle = GetThemeHandle(theme);
   if (handle && get_theme_color_) {
     COLORREF color_ref;
     if (get_theme_color_(handle, part_id, state_id, prop_id, &color_ref) ==
         S_OK) {
-      *color = gfx::COLORREFToSkColor(color_ref);
+      *color = skia::COLORREFToSkColor(color_ref);
       return S_OK;
     }
   }
   return E_NOTIMPL;
 }
 
 SkColor NativeTheme::GetThemeColorWithDefault(ThemeName theme,
                                               int part_id,
                                               int state_id,
                                               int prop_id,
                                               int default_sys_color) const {
   SkColor color;
   if (GetThemeColor(theme, part_id, state_id, prop_id, &color) != S_OK)
-    color = gfx::COLORREFToSkColor(GetSysColor(default_sys_color));
+    color = skia::COLORREFToSkColor(GetSysColor(default_sys_color));
   return color;
 }
 
 HRESULT NativeTheme::GetThemeInt(ThemeName theme,
                                  int part_id,
                                  int state_id,
                                  int prop_id,
                                  int *value) const {
   HANDLE handle = GetThemeHandle(theme);
   if (handle && get_theme_int_)
@@ skipping 109 matching lines @@
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace gfx