Index: webkit/port/platform/graphics/FontWin.cpp |
=================================================================== |
--- webkit/port/platform/graphics/FontWin.cpp (revision 6142) |
+++ webkit/port/platform/graphics/FontWin.cpp (working copy) |
@@ -35,8 +35,8 @@ |
#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 { |
@@ -69,7 +69,7 @@ |
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 |
@@ -168,7 +168,7 @@ |
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 |