Add a KeyboardLayoutEngine::SetCurrentLayoutFromBuffer implementation

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

 // 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.
 
 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 
 #include <stddef.h>
 #include <xkbcommon/xkbcommon-names.h>
 
 #include <algorithm>
@@ skipping 674 matching lines @@
   }
   LoadKeymapCallback reply_callback = base::Bind(
       &XkbKeyboardLayoutEngine::OnKeymapLoaded, weak_ptr_factory_.GetWeakPtr());
   base::PostTaskWithTraits(
       FROM_HERE, base::TaskTraits()
                      .WithShutdownBehavior(
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)
                      .MayBlock(),
       base::Bind(&LoadKeymap, layout_name, base::ThreadTaskRunnerHandle::Get(),
                  reply_callback));
+#else
+  NOTIMPLEMENTED();
+#endif  // defined(OS_CHROMEOS)
   return true;
-#else
-  // Required by ozone-wayland (at least) for non ChromeOS builds. See
-  // http://xkbcommon.org/doc/current/md_doc_quick-guide.html for further info.
-  xkb_keymap* keymap = xkb_keymap_new_from_string(
-      xkb_context_.get(), layout_name.c_str(), XKB_KEYMAP_FORMAT_TEXT_V1,
-      XKB_KEYMAP_COMPILE_NO_FLAGS);
-  if (!keymap)
-    return false;
-  SetKeymap(keymap);
-  return true;
-#endif  // defined(OS_CHROMEOS)
 }
 
 void XkbKeyboardLayoutEngine::OnKeymapLoaded(
     const std::string& layout_name,
     std::unique_ptr<char, base::FreeDeleter> keymap_str) {
   if (keymap_str) {
     xkb_keymap* keymap = xkb_keymap_new_from_string(
         xkb_context_.get(), keymap_str.get(), XKB_KEYMAP_FORMAT_TEXT_V1,
         XKB_KEYMAP_COMPILE_NO_FLAGS);
     XkbKeymapEntry entry = {layout_name, keymap};
@@ skipping 78 matching lines @@
   *key_code = AlphanumericKeyboardCode(xkb_keysym, character);
   if (*key_code == VKEY_UNKNOWN) {
     *key_code = DifficultKeyboardCode(dom_code, flags, xkb_keycode, xkb_flags,
                                       xkb_keysym, character);
     if (*key_code == VKEY_UNKNOWN)
       *key_code = DomCodeToUsLayoutNonLocatedKeyboardCode(dom_code);
   }
   return true;
 }
 
-void XkbKeyboardLayoutEngine::SetKeymapFromStringForTest(
-    const char* keymap_string) {
-  xkb_keymap* keymap = xkb_keymap_new_from_string(
-      xkb_context_.get(), keymap_string, XKB_KEYMAP_FORMAT_TEXT_V1,
+bool XkbKeyboardLayoutEngine::SetCurrentLayoutFromBuffer(
+    const char* keymap_string,
+    size_t size) {
+  xkb_keymap* keymap = xkb_keymap_new_from_buffer(
+      xkb_context_.get(), keymap_string, size, XKB_KEYMAP_FORMAT_TEXT_V1,
       XKB_KEYMAP_COMPILE_NO_FLAGS);
-  if (keymap)
-    SetKeymap(keymap);
+  if (!keymap)
+    return false;
+
+  SetKeymap(keymap);
+  return true;
 }
 
 void XkbKeyboardLayoutEngine::SetKeymap(xkb_keymap* keymap) {
   xkb_state_.reset(xkb_state_new(keymap));
   // Update flag map.
   static const struct {
     int ui_flag;
     const char* xkb_name;
   } flags[] = {{ui::EF_SHIFT_DOWN, XKB_MOD_NAME_SHIFT},
                {ui::EF_CONTROL_DOWN, XKB_MOD_NAME_CTRL},
@@ skipping 151 matching lines @@
       close_index = layout_name.size();
     *layout_variant = layout_name.substr(parentheses_index + 1,
                                          close_index - parentheses_index - 1);
   } else if (dash_index != std::string::npos) {
     *layout_id = layout_name.substr(0, dash_index);
     *layout_variant = layout_name.substr(dash_index + 1);
   }
 }
 
 }  // namespace ui