ozone: xkb: Load keymaps on worker thread & cache them

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_
 #define UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_
 
+#include <map>
 #include <xkbcommon/xkbcommon.h>
 
 #include "base/containers/hash_tables.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/events/ozone/layout/events_ozone_layout_export.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
 #include "ui/events/ozone/layout/xkb/scoped_xkb.h"
 #include "ui/events/ozone/layout/xkb/xkb_key_code_converter.h"
 
 namespace ui {
 
 class EVENTS_OZONE_LAYOUT_EXPORT XkbKeyboardLayoutEngine
@@ skipping 58 matching lines @@
   // the keycode and mapped |ui_flags|.
   base::char16 XkbSubCharacter(xkb_keycode_t xkb_keycode,
                                xkb_mod_mask_t base_flags,
                                base::char16 base_character,
                                int ui_flags) const;
 
   // libxkbcommon uses explicit reference counting for its structures,
   // so we need to trigger its cleanup.
   scoped_ptr<xkb_context, XkbContextDeleter> xkb_context_;
   scoped_ptr<xkb_state, XkbStateDeleter> xkb_state_;
+  std::map<std::string, xkb_keymap*> xkb_keymaps_;
+
+  // The class is used to load keymap files.
+  class XkbKeymapLoader : public base::RefCountedThreadSafe<XkbKeymapLoader> {

[Shu Chen, 2014/12/24 02:24:21]

Usually we put inner class definition as the first section in class' definition.

[FengYuan, 2014/12/26 02:42:20]

Done.

+   public:
+    explicit XkbKeymapLoader(XkbKeyboardLayoutEngine* layout_engine);
+    void loadKeymap(const std::string& layout_name);
+
+   private:
+     friend class base::RefCountedThreadSafe<XkbKeymapLoader>;
+     ~XkbKeymapLoader() {}
+     XkbKeyboardLayoutEngine* layout_engine_;
+     struct xkb_rule_names* names;
+     // Uses xkb_keymap_new_from_names from libxkbcommon to load keymap file,
+     // And pushes this keymap file load into FILE thread.
+     void startLoadKeymap(const std::string& layout_name,
+                          xkb_rule_names* names);
+  };
+
+  XkbKeymapLoader* keymap_loader_;

[Shu Chen, 2014/12/24 02:24:21]

Use scoped_ptr

[FengYuan, 2014/12/26 02:42:20]

Done.

 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_LAYOUT_XKB_XKB_KEYBOARD_LAYOUT_ENGINE_H_