Make our IME backend platform-independent.

This change makes our IME backend run not only on Windows but also on Linux and Mac. This change also adds another unit-test which verifies the backend runs on Linux and Mac without problems.
Review URL: http://codereview.chromium.org/27124

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10783 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index dca001d..2fac917 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1125,7 +1125,7 @@ bool WebViewImpl::ImeSetComposition(int string_type,
       return false;
   }
 
-  if (string_type == 0) {
+  if (string_type == -1) {
     // A browser process sent an IPC message which does not contain a valid
     // string, which means an ongoing composition has been canceled.
     // If the ongoing composition has been canceled, replace the ongoing
@@ -1165,14 +1165,12 @@ bool WebViewImpl::ImeSetComposition(int string_type,
     // there are not any characters in the above region.
     editor->setComposition(composition_string, underlines,
                            cursor_position, cursor_position);
-#if defined(OS_WIN)
     // The given string is a result string, which means the ongoing
     // composition has been completed. I have to call the
     // Editor::confirmCompletion() and complete this composition.
-    if (string_type == GCS_RESULTSTR) {
+    if (string_type == 1) {
       editor->confirmComposition();
     }
-#endif
   }
 
   return editor->hasComposition();