2009-02-19 Dimitri Glazkov <dglazkov@chromium.org>

        Reviewed by Eric Seidel.

        https://bugs.webkit.org/show_bug.cgi?id=24041
        Correct Skia type conversion issues, fix Chromium Linux build.

        * platform/graphics/chromium/FontLinux.cpp:
        (WebCore::Font::drawGlyphs): changed parameters to RGBA32, not WebCore::Color.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fb5279d20341126d4bab404fc19c31c1507db01e..34c1af565bdc4c2e4af1873028cf072883a1b4a2 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-02-19  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24041
+        Correct Skia type conversion issues, fix Chromium Linux build.
+
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::Font::drawGlyphs): changed parameters to RGBA32, not WebCore::Color.
+
 2009-02-19  Jungshik Shin <jshin@chromium.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebCore/platform/graphics/chromium/FontLinux.cpp b/WebCore/platform/graphics/chromium/FontLinux.cpp
index e0a876e01b2fce40178864021f90c86d2092afa7..2b7c562e9f23d5a9c9da8823b2fc0add9a9863e1 100644 (file)
--- a/WebCore/platform/graphics/chromium/FontLinux.cpp
+++ b/WebCore/platform/graphics/chromium/FontLinux.cpp
@@ -80,7 +80,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
         gc->platformContext()->setupPaintForFilling(&paint);
         font->platformData().setupPaint(&paint);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        paint.setColor(gc->fillColor());
+        paint.setColor(gc->fillColor().rgb());
         canvas->drawPosText(glyphs, numGlyphs << 1, pos, paint);
     }
 
@@ -93,7 +93,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
         font->platformData().setupPaint(&paint);
         paint.setFlags(SkPaint::kAntiAlias_Flag);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        paint.setColor(gc->strokeColor());
+        paint.setColor(gc->strokeColor().rgb());
 
         if (textMode & cTextFill) {
             // If we also filled, we don't want to draw shadows twice.