Fix for the font files being maped multiple times (Fontconfig).

content/common/font_config_ipc_linux.h

Index: content/common/font_config_ipc_linux.h
diff --git a/content/common/font_config_ipc_linux.h b/content/common/font_config_ipc_linux.h
index c5cf80f72744dac30632e84bd43563e9fa94472d..226eb6b6f720a2f2a74e67711b94e0a4c21e03ab 100644
--- a/content/common/font_config_ipc_linux.h
+++ b/content/common/font_config_ipc_linux.h
@@ -6,6 +6,8 @@
 #define CONTENT_COMMON_FONT_CONFIG_IPC_LINUX_H_
 
 #include "base/compiler_specific.h"
+#include "base/containers/hash_tables.h"
+#include "base/synchronization/lock.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
 
 #include <string>
@@ -37,7 +39,15 @@ class FontConfigIPC : public SkFontConfigInterface {
   };
 
  private:
+  class MappedFontFile;
+  friend class MappedFontFile;
+
+  void RemoveMappedFontFile(MappedFontFile* mapped_font_file);

[Daniel Erat, 2014/11/07 15:07:36]

add a comment:

  // Removes |mapped_font_file| from |mapped_font_files_|.
  // Does not delete the passed-in object.

[Krzysztof Olczyk, 2015/01/14 12:42:23]

Done

+
   const int fd_;
+  base::Lock stream_opening_lock_;

[Daniel Erat, 2014/11/07 15:07:36]

please add a comment documenting what this lock protects

[Krzysztof Olczyk, 2015/01/14 12:42:23]

Done

+  // Maps font identity ID to the memory-mapped file with font data:

[Daniel Erat, 2014/11/07 15:07:36]

s/:/./

[Krzysztof Olczyk, 2015/01/14 12:42:23]

Done

[Krzysztof Olczyk, 2015/01/14 12:42:23]

Done

+  base::hash_map<uint32_t, MappedFontFile*> mapped_font_files_;
 };
 
 }  // namespace content