more cross-platform graphics changes

Review URL: http://codereview.chromium.org/1704

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1993 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 5 deletions

diff --git a/webkit/port/platform/graphics/SkGraphicsContext.cpp b/webkit/port/platform/graphics/SkGraphicsContext.cpp
index 51d7e51..3a1b3c7 100644
--- a/webkit/port/platform/graphics/SkGraphicsContext.cpp
+++ b/webkit/port/platform/graphics/SkGraphicsContext.cpp
@@ -243,9 +243,9 @@ void SkGraphicsContext::paintComplexText(UniscribeStateTextRun& state,
   canvas_->endPlatformPaint();
 }
 
-bool SkGraphicsContext::paintText(HFONT hfont,
+bool SkGraphicsContext::paintText(FontHandle hfont,
                                   int number_glyph,
-                                  const WORD* glyphs,
+                                  const uint16* glyphs,
                                   const int* advances,
                                   const SkPoint& origin) {
   SkColor color(paint_context_->fillColor());
diff --git a/webkit/port/platform/graphics/SkGraphicsContext.h b/webkit/port/platform/graphics/SkGraphicsContext.h
index 9301620..40bf38b 100644
--- a/webkit/port/platform/graphics/SkGraphicsContext.h
+++ b/webkit/port/platform/graphics/SkGraphicsContext.h
@@ -5,6 +5,7 @@
 #ifndef SkGraphicsContext_h
 #define SkGraphicsContext_h
 
+#include "base/basictypes.h"
 #include "base/gfx/platform_canvas.h"
 #include "SkPorterDuff.h"
 
@@ -76,13 +77,11 @@ class SkGraphicsContext {
                         int from,
                         int to,
                         int ascent);
-#if defined(OS_WIN)
   bool paintText(FontHandle hfont,
                  int number_glyph,
-                 const WORD* glyphs,
+                 const uint16* glyphs,
                  const int* advances,
                  const SkPoint& origin);
-#endif
 
   // TODO(maruel): I'm still unsure how I will serialize this call.
   void paintSkPaint(const SkRect& rect, const SkPaint& paint);