From 10e048e2fdd9563e34fcfbe4e77bdd113a4308cc Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Thu, 31 Jul 2008 18:48:41 +0000 Subject: It's causing regressions. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190 0039d316-1c4b-4281-b951-d872f2087c98 --- .../platform/graphics/GlyphPageTreeNodeWin.cpp | 23 +--------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'webkit/port') diff --git a/webkit/port/platform/graphics/GlyphPageTreeNodeWin.cpp b/webkit/port/platform/graphics/GlyphPageTreeNodeWin.cpp index 315bef7c..65d1350 100644 --- a/webkit/port/platform/graphics/GlyphPageTreeNodeWin.cpp +++ b/webkit/port/platform/graphics/GlyphPageTreeNodeWin.cpp @@ -32,7 +32,6 @@ #include #include -#include "Font.h" #include "GlyphPageTreeNode.h" #include "SimpleFontData.h" #include "UniscribeStateTextRun.h" @@ -146,28 +145,8 @@ static bool FillBMPGlyphs(UChar* buffer, !(tm.tmPitchAndFamily & TMPF_TRUETYPE)) invalid_glyph = 0x1F; - WORD space_glyph = 0; // Glyph for a space. Lazily filled, see below. - for (unsigned i = 0; i < GlyphPage::size; i++) { - // When this character should be a space, we ignore whatever the font - // says and use a space. Otherwise, if fonts don't map one of these - // space or zero width glyphs, we will get a box. - // - // TODO(brettw): we should have Font::treatAsZeroWidthSpace return true - // for zero width spaces (U+200B) just like Font::treatAsSpace will - // return true for spaces. Then the additional OR is not necessary. - if (Font::treatAsSpace(buffer[i]) || - Font::treatAsZeroWidthSpace(buffer[i]) || - buffer[i] == 0x200B) { - // Hard code the glyph indices for characters that should be treated - // like spaces. - if (!space_glyph) { - // Get the glyph index for space. - wchar_t space = ' '; - GetGlyphIndices(dc, &space, 1, &space_glyph, 0); - } - page->setGlyphDataForIndex(i, space_glyph, fontData); - } else if (localGlyphBuffer[i] == invalid_glyph) { + if (localGlyphBuffer[i] == invalid_glyph) { // WebKit expects both the glyph index and FontData // pointer to be NULL if the glyph is not present page->setGlyphDataForIndex(i, 0, 0); -- cgit v1.1