Changeset 44471

Timestamp:

06/05/09 07:53:24 (10 months ago)

Author:

dglazkov@chromium.org

Message:

2009-06-05 Fumitoshi Ukai < ukai@google.com>

Reviewed by Dimitri Glazkov.

 https://bugs.webkit.org/show_bug.cgi?id=26215
Try to fix the Chromium build.

• platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp: (WebCore::fillBMPGlyphs): (WebCore::fillNonBMPGlyphs):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-06-05  Fumitoshi Ukai  <ukai@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26215
+        Try to fix the Chromium build.
+
+        * platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp:
+        (WebCore::fillBMPGlyphs):
+        (WebCore::fillNonBMPGlyphs):
+
 2009-06-05  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp

@@ -73 +73 @@
 {
     HDC dc = GetDC((HWND)0);
-    HGDIOBJ oldFont = SelectObject(dc, fontData->m_font.hfont());
+    HGDIOBJ oldFont = SelectObject(dc, fontData->platformData().hfont());
 
     TEXTMETRIC tm = {0};
@@ -81 +81 @@
 
         if (recurse) {
-            if (ChromiumBridge::ensureFontLoaded(fontData->m_font.hfont()))
+            if (ChromiumBridge::ensureFontLoaded(fontData->platformData().hfont()))
                 return fillBMPGlyphs(offset, length, buffer, page, fontData, false);
             else {
@@ -192 +192 @@
 
     UniscribeHelperTextRun state(buffer, length * 2, false,
-                                 fontData->m_font.hfont(),
-                                 fontData->m_font.scriptCache(),
-                                 fontData->m_font.scriptFontProperties());
+                                 fontData->platformData().hfont(),
+                                 fontData->platformData().scriptCache(),
+                                 fontData->platformData().scriptFontProperties());
     state.setInhibitLigate(true);
     state.setDisableFontFallback(true);