diff options
author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
---|---|---|
committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp | |
parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 |
Get WebKit r44544.
Diffstat (limited to 'WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp')
-rw-r--r-- | WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp b/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp index 31c5256..2cb1cc5 100644 --- a/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp +++ b/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp @@ -72,7 +72,7 @@ static bool fillBMPGlyphs(unsigned offset, bool recurse) { HDC dc = GetDC((HWND)0); - HGDIOBJ oldFont = SelectObject(dc, fontData->m_font.hfont()); + HGDIOBJ oldFont = SelectObject(dc, fontData->platformData().hfont()); TEXTMETRIC tm = {0}; if (!GetTextMetrics(dc, &tm)) { @@ -80,7 +80,7 @@ static bool fillBMPGlyphs(unsigned offset, ReleaseDC(0, dc); if (recurse) { - if (ChromiumBridge::ensureFontLoaded(fontData->m_font.hfont())) + if (ChromiumBridge::ensureFontLoaded(fontData->platformData().hfont())) return fillBMPGlyphs(offset, length, buffer, page, fontData, false); else { fillEmptyGlyphs(page); @@ -191,9 +191,9 @@ static bool fillNonBMPGlyphs(unsigned offset, bool haveGlyphs = false; 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); state.init(); |