* 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

3 files changed, 0 insertions, 61 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
diff --git a/chrome/renderer/render_process.h b/chrome/renderer/render_process.h
index e839c88..8fcb186 100644
--- a/chrome/renderer/render_process.h
+++ b/chrome/renderer/render_process.h
@@ -25,8 +25,6 @@ class RenderProcess : public ChildProcess {
   // Returns true if plugins should be loaded in-process.
   static bool ShouldLoadPluginsInProcess();
 
-  static IMLangFontLink2* GetLangFontLink();
-
   // Allocates shared memory.  When no longer needed, you should pass the
   // SharedMemory pointer to FreeSharedMemory so it can be recycled.  The size
   // reported in the resulting SharedMemory object will be greater than or
@@ -46,13 +44,6 @@ class RenderProcess : public ChildProcess {
   RenderProcess(const std::wstring& channel_name);
   ~RenderProcess();
 
-  // Initializes the LangFontLink object. This function cannot be called
-  // while the process is restricted by the sandbox or it will fail.
-  static void InitializeLangFontLink();
-
-  // Releases the LangFontLink object if already created.
-  static void ReleaseLangFontLink();
-
   // Returns a pointer to the RenderProcess singleton instance.  This is
   // guaranteed to be non-NULL between calls to GlobalInit and GlobalCleanup.
   static RenderProcess* self() {
@@ -90,8 +81,6 @@ class RenderProcess : public ChildProcess {
   // This factory is used to lazily invoke ClearSharedMemCache.
   ScopedRunnableMethodFactory<RenderProcess> clearer_factory_;
 
-  static IMLangFontLink2* lang_font_link_;
-
   static bool load_plugins_in_process_;
 
   DISALLOW_EVIL_CONSTRUCTORS(RenderProcess);
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 297e5ac..1cc689f 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -188,10 +188,6 @@ bool webkit_glue::GetPreferredExtensionForMimeType(const std::string& mime_type,
   return !ext->empty();
 }
 
-IMLangFontLink2* webkit_glue::GetLangFontLink() {
-  return RenderProcess::GetLangFontLink();
-}
-
 std::string webkit_glue::GetDataResource(int resource_id) {
   return ResourceBundle::GetSharedInstance().GetDataResource(resource_id);
 }