From ab500085957b7b0ea6d699cc9d09262abdd3f2a1 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 24 Apr 2015 14:11:32 +0300
Subject: [PATCH] Windows: Fix placement of IME window (issue #1610)

---
 patch/patch.cfg              |  6 ++++++
 patch/patches/ime_1610.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 patch/patches/ime_1610.patch

diff --git a/patch/patch.cfg b/patch/patch.cfg
index 60b07c187..1d31f6404 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -149,4 +149,10 @@ patches = [
     'name': 'chrome_pepper_flash_1586',
     'path': '../chrome/common/',
   },
+  {
+    # Fix placement of IME window on Windows.
+    # https://bitbucket.org/chromiumembedded/cef/issue/1610
+    'name': 'ime_1610',
+    'path': '../ui/base/ime/',
+  },
 ]
diff --git a/patch/patches/ime_1610.patch b/patch/patches/ime_1610.patch
new file mode 100644
index 000000000..511137946
--- /dev/null
+++ b/patch/patches/ime_1610.patch
@@ -0,0 +1,13 @@
+diff --git input_method_win.cc input_method_win.cc
+index 6961683..9072906 100644
+--- input_method_win.cc
++++ input_method_win.cc
+@@ -26,7 +26,7 @@ static const size_t kExtraNumberOfChars = 20;
+ 
+ InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate,
+                                HWND toplevel_window_handle)
+-    : toplevel_window_handle_(toplevel_window_handle),
++    : toplevel_window_handle_(::GetAncestor(toplevel_window_handle, GA_ROOT)),
+       pending_requested_direction_(base::i18n::UNKNOWN_DIRECTION),
+       accept_carriage_return_(false),
+       active_(false),