diff options
author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 20:27:07 +0000 |
---|---|---|
committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 20:27:07 +0000 |
commit | da8765903e7d3addd573aca2559b57cd0052d667 (patch) | |
tree | 643f5cba883bc2b112384c828db779fb5fa8d2e0 /chrome/renderer/render_process.cc | |
parent | dc8c5b2a54e0485c291b4c080ab896bb7637716c (diff) | |
download | chromium_src-da8765903e7d3addd573aca2559b57cd0052d667.zip chromium_src-da8765903e7d3addd573aca2559b57cd0052d667.tar.gz chromium_src-da8765903e7d3addd573aca2559b57cd0052d667.tar.bz2 |
* Copy webkit_glue font functions into ChromiumBridge.
* removed a few unneeded headers from MIMETypeRegistry
* removed all uses of IMLangFontLang2
Review URL: http://codereview.chromium.org/10661
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_process.cc')
-rw-r--r-- | chrome/renderer/render_process.cc | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index f1885b9..44a8055 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -24,7 +24,6 @@ //----------------------------------------------------------------------------- -IMLangFontLink2* RenderProcess::lang_font_link_ = NULL; bool RenderProcess::load_plugins_in_process_ = false; //----------------------------------------------------------------------------- @@ -64,8 +63,6 @@ bool RenderProcess::GlobalInit(const std::wstring &channel_name) { } } - InitializeLangFontLink(); - CommandLine command_line; if (command_line.HasSwitch(switches::kJavaScriptFlags)) { webkit_glue::SetJavaScriptFlags( @@ -103,49 +100,6 @@ bool RenderProcess::GlobalInit(const std::wstring &channel_name) { // static void RenderProcess::GlobalCleanup() { ChildProcess::GlobalCleanup(); - ReleaseLangFontLink(); -} - -// static -void RenderProcess::InitializeLangFontLink() { - // TODO(hbono): http://b/1072298 Experimentally commented out this code to - // prevent registry leaks caused by this IMLangFontLink2 interface. - // If you find any font-rendering regressions. Please feel free to blame me. -#ifdef USE_IMLANGFONTLINK2 - IMultiLanguage* multi_language = NULL; - lang_font_link_ = NULL; - if (S_OK != CoCreateInstance(CLSID_CMultiLanguage, - 0, - CLSCTX_ALL, - IID_IMultiLanguage, - reinterpret_cast<void**>(&multi_language))) { - DLOG(ERROR) << "Cannot CoCreate CMultiLanguage"; - } else { - if (S_OK != multi_language->QueryInterface(IID_IMLangFontLink2, - reinterpret_cast<void**>(&lang_font_link_))) { - DLOG(ERROR) << "Cannot query LangFontLink2 interface"; - } - } - - if (multi_language) - multi_language->Release(); -#endif -} - -// static -void RenderProcess::ReleaseLangFontLink() { - // TODO(hbono): http://b/1072298 Experimentally commented out this code to - // prevent registry leaks caused by this IMLangFontLink2 interface. - // If you find any font-rendering regressions. Please feel free to blame me. -#ifdef USE_IMLANGFONTLINK2 - if (lang_font_link_) - lang_font_link_->Release(); -#endif -} - -// static -IMLangFontLink2* RenderProcess::GetLangFontLink() { - return lang_font_link_; } // static |