summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-26 21:05:28 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-26 21:05:28 +0000
commit5e4127cea18127621a0ccb5ee4dd84f1bd505222 (patch)
treeb685f234462be552af1c15499491d405954f0028 /webkit/port
parentdbc61e9ff96b8d9b7418ceff4384d54e40ea0247 (diff)
downloadchromium_src-5e4127cea18127621a0ccb5ee4dd84f1bd505222.zip
chromium_src-5e4127cea18127621a0ccb5ee4dd84f1bd505222.tar.gz
chromium_src-5e4127cea18127621a0ccb5ee4dd84f1bd505222.tar.bz2
Remove a layout-test-only font-fallback path.
The net impact is that "times new roman" is fallen back to instead of "Times" for a couple of layout tests. Overall this affects 9 tests. 6 have been rebased, and 3 marked as expected fail (since am uncertain of their correctness). This also removes some dead code relating to IMLangFontLink. Review URL: http://codereview.chromium.org/12457 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/platform/graphics/FontCacheWin.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/webkit/port/platform/graphics/FontCacheWin.cpp b/webkit/port/platform/graphics/FontCacheWin.cpp
index 5bb808e..2f09499 100644
--- a/webkit/port/platform/graphics/FontCacheWin.cpp
+++ b/webkit/port/platform/graphics/FontCacheWin.cpp
@@ -513,8 +513,6 @@ static LONG toGDIFontWeight(FontWeight fontWeight)
// TODO in pending/FontCache.h.
AtomicString FontCache::getGenericFontForScript(UScriptCode script, const FontDescription& description)
{
- if (ChromiumBridge::layoutTestMode() && script == USCRIPT_LATIN)
- return emptyAtom;
FontDescription::GenericFamilyType generic = description.genericFamily();
const wchar_t* scriptFont = GetFontFamilyForScript(
script, static_cast<GenericFamilyType>(generic));