Fix <rdar://problem/5301994> Garbled text still showing on some sites

[WebKit-https.git] / WebCore / platform / win / FontDataWin.cpp

diff --git a/WebCore/platform/win/FontDataWin.cpp b/WebCore/platform/win/FontDataWin.cpp
index 29c42bc7f95a8427e61708252873b9527f7681b5..2780cfdd51c563185ff2eed8de5a9a54ef603b36 100644 (file)
--- a/WebCore/platform/win/FontDataWin.cpp
+++ b/WebCore/platform/win/FontDataWin.cpp
@@ -144,15 +144,8 @@ FontData* FontData::smallCapsFontData(const FontDescription& fontDescription) co
 
 bool FontData::containsCharacters(const UChar* characters, int length) const
 {
-    HDC dc = GetDC(0);
-    SaveDC(dc);
-    SelectObject(dc, m_font.hfont());
-
-    WORD* glyphBuffer = new WORD[length];
-    GetGlyphIndices(dc, characters, length, glyphBuffer, GGI_MARK_NONEXISTING_GLYPHS);
-    
-    RestoreDC(dc, -1);
-    ReleaseDC(0, dc);
+    Vector<CGGlyph> glyphBuffer(length);
+    wkGetGlyphs(m_font.cgFont(), characters, glyphBuffer.data(), length);
 
     for (int i = 0; i < length; i++) {
         if (glyphBuffer[i] == 0xFFFFFFFF) {