From 0ceadd73a89d435ca42b4673cb32cfbf07e73b1c Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Tue, 29 Dec 2015 22:57:38 +0900 Subject: [PATCH] Bug 1208944 - Part 7. Don't post WM_IME_REQUEST on windowless plugin since we don't convert pointer over process. r=masayuki --- widget/windows/IMMHandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/widget/windows/IMMHandler.cpp b/widget/windows/IMMHandler.cpp index 562d5417d0fd..bd35d83d532c 100644 --- a/widget/windows/IMMHandler.cpp +++ b/widget/windows/IMMHandler.cpp @@ -703,12 +703,16 @@ IMMHandler::ProcessMessageForPlugin(nsWindow* aWindow, case WM_IME_CONTROL: case WM_IME_KEYDOWN: case WM_IME_KEYUP: - case WM_IME_REQUEST: case WM_IME_SELECT: aResult.mConsumed = aWindow->DispatchPluginEvent(msg, wParam, lParam, false); aRet = true; return true; + case WM_IME_REQUEST: + // Our plugin implementation is alwasy OOP. So WM_IME_REQUEST doesn't + // allow that parameter is pointer and shouldn't handle into Gecko. + aRet = false; + return true; } return false; }