Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: webkit/plugins/npapi/webplugin_ime_win.cc

Issue 9666050: Emulate ImmSetAssociateContextEx() for Flash. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/npapi/webplugin_delegate_impl_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/webplugin_ime_win.cc
===================================================================
--- webkit/plugins/npapi/webplugin_ime_win.cc (revision 126103)
+++ webkit/plugins/npapi/webplugin_ime_win.cc (working copy)
@@ -147,13 +147,9 @@
}
bool WebPluginIMEWin::GetStatus(int* input_type, gfx::Rect* caret_rect) {
- bool status_updated = status_updated_;
- if (status_updated) {
- *input_type = input_type_;
- *caret_rect = caret_rect_;
- status_updated_ = false;
- }
- return status_updated;
+ *input_type = input_type_;
+ *caret_rect = caret_rect_;
+ return true;
}
// static
@@ -199,6 +195,13 @@
BOOL WINAPI WebPluginIMEWin::ImmAssociateContextEx(HWND window,
HIMC context,
DWORD flags) {
+ WebPluginIMEWin* instance = GetInstance(context);
+ if (!instance)
+ return ::ImmAssociateContextEx(window, context, flags);
+
+ int input_type = !context && !flags;
+ instance->input_type_ = input_type;
+ instance->status_updated_ = true;
return TRUE;
}
« no previous file with comments | « webkit/plugins/npapi/webplugin_delegate_impl_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698