Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: webkit/port/platform/graphics/FontWin.cpp

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/skia.vcproj ('k') | webkit/port/platform/graphics/ImageSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « skia/skia.vcproj ('k') | webkit/port/platform/graphics/ImageSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698