2009-06-05 Xan Lopez <xlopez@igalia.com>

        More build fixes.

        * platform/graphics/gtk/GlyphPageTreeNodePango.cpp:
        (WebCore::GlyphPage::fill):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 536c2dbf340440ae63e0642575f2c4c8cb6cc468..954b4973cf491a865aa792162ab6d59fff58e2ce 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-05  Xan Lopez  <xlopez@igalia.com>
+
+        More build fixes.
+
+        * platform/graphics/gtk/GlyphPageTreeNodePango.cpp:
+        (WebCore::GlyphPage::fill):
+
 2009-06-05  Xan Lopez  <xlopez@igalia.com>
 
         Fix the GTK+ build.

diff --git a/WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp b/WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp
index 8fada5c5e949d7f510589849609a56b80ee0a558..8d0baa613a2d3e7bac4f8d80037113cacfbb6e73 100644 (file)
--- a/WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp
+++ b/WebCore/platform/graphics/gtk/GlyphPageTreeNodePango.cpp
@@ -78,12 +78,12 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b
     if (bufferLength > GlyphPage::size)
         return false;
 
-    if (!fontData->m_font.m_font || fontData->m_font.m_font == reinterpret_cast<PangoFont*>(-1))
+    if (!fontData->platformData().m_font || fontData->platformData().m_font == reinterpret_cast<PangoFont*>(-1))
         return false;
 
     bool haveGlyphs = false;
     for (unsigned i = 0; i < length; i++) {
-        Glyph glyph = pango_font_get_glyph(fontData->m_font.m_font, fontData->m_font.m_context, buffer[i]);
+        Glyph glyph = pango_font_get_glyph(fontData->platformData().m_font, fontData->platformData().m_context, buffer[i]);
         if (!glyph)
             setGlyphDataForIndex(offset + i, 0, 0);
         else {