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

webkit/port/platform/graphics/FontWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 
 #include "ChromiumBridge.h"
 #include "Font.h"
 #include "FontFallbackList.h"
 #include "GlyphBuffer.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
 #include "SkiaUtils.h"
 #include "UniscribeHelperTextRun.h"
 
-#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this dependency.
 #include "skia/ext/platform_canvas_win.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace WebCore {
 
 void Font::drawGlyphs(GraphicsContext* graphicsContext,
                       const SimpleFontData* font,
                       const GlyphBuffer& glyphBuffer,
                       int from,
                       int numGlyphs,
                       const FloatPoint& point) const
 {
@@ skipping 12 matching lines @@
 
     // Set up our graphics context.
     HDC hdc = context->canvas()->beginPlatformPaint();
     HGDIOBJ oldFont = SelectObject(hdc, font->platformData().hfont());
 
     // TODO(maruel): http://b/700464 SetTextColor doesn't support transparency.
     // Enforce non-transparent color.
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
-    SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
+    SetTextColor(hdc, skia::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Windows needs the characters and the advances in nice contiguous
     // buffers, which we build here.
     Vector<WORD, kDefaultBufferLength> glyphs;
     Vector<int, kDefaultBufferLength> advances;
 
     // Compute the coordinate. The 'origin' represents the baseline, so we need
     // to move it up to the top of the bounding square.
     int x = static_cast<int>(point.x());
@@ skipping 78 matching lines @@
     if (!alpha)
         return;
 
     HDC hdc = context->canvas()->beginPlatformPaint();
 
     // TODO(maruel): http://b/700464 SetTextColor doesn't support transparency.
     // Enforce non-transparent color.
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
-    SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
+    SetTextColor(hdc, skia::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Uniscribe counts the coordinates from the upper left, while WebKit uses
     // the baseline, so we have to subtract off the ascent.
     state.Draw(hdc,
                static_cast<int>(point.x()),
                static_cast<int>(point.y() - ascent()),
                from,
                to);
     context->canvas()->endPlatformPaint();
@@ skipping 14 matching lines @@
     int char_index = state.XToCharacter(x);
 
     // XToCharacter will return -1 if the position is before the first
     // character (we get called like this sometimes).
     if (char_index < 0)
       char_index = 0;
     return char_index;
 }
 
 } // namespace WebCore