diff options
author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 21:05:28 +0000 |
---|---|---|
committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 21:05:28 +0000 |
commit | 5e4127cea18127621a0ccb5ee4dd84f1bd505222 (patch) | |
tree | b685f234462be552af1c15499491d405954f0028 /webkit/glue/webkit_glue.cc | |
parent | dbc61e9ff96b8d9b7418ceff4384d54e40ea0247 (diff) | |
download | chromium_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/glue/webkit_glue.cc')
-rw-r--r-- | webkit/glue/webkit_glue.cc | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index a5bc0fe..841be36 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -89,44 +89,6 @@ void EnableWebCoreNotImplementedLogging() { WebCore::LogNotYetImplemented.state = WTFLogChannelOn; } -#if defined(OS_WIN) -IMLangFontLink2* GetLangFontLinkHelper() { - // TODO(hbono): http://b/1072298 Experimentally disabled this code to - // prevent registry leaks caused by this IMLangFontLink2 interface. - // If you find any font-rendering regressions. Please feel free to blame me. - // TODO(hbono): http://b/1072298 The test shell does not use our font metrics - // but it uses its own font metrics which heavily depend on this - // IMLangFontLink2 interface. Even though we should change the test shell to - // use out font metrics and re-baseline such tests, we temporarily let the - // test shell use this interface until we complete the said change. - if (!IsLayoutTestMode()) - return NULL; - - static IMultiLanguage *multi_language = NULL; - - if (!multi_language) { - if (CoCreateInstance(CLSID_CMultiLanguage, - 0, - CLSCTX_ALL, - IID_IMultiLanguage, - reinterpret_cast<void**>(&multi_language)) != S_OK) { - return 0; - } - } - - static IMLangFontLink2* lang_font_link; - if (!lang_font_link) { - if (multi_language->QueryInterface( - IID_IMLangFontLink2, - reinterpret_cast<void**>(&lang_font_link)) != S_OK) { - return 0; - } - } - - return lang_font_link; -} -#endif // defined(OS_WIN) - std::wstring DumpDocumentText(WebFrame* web_frame) { WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame); WebCore::Frame* frame = webFrameImpl->frame(); |