Support CancelCompositionText/ComfirmCompositionText in TSF

ui/base/ime/win/tsf_bridge.cc

 // Copyright (c) 2012 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 <msctf.h>
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 21 matching lines @@
  public:
   TSFBridgeDelegate();
   virtual ~TSFBridgeDelegate();
 
   bool Initialize();
 
   // TsfBridge:
   virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE;
   virtual void OnTextLayoutChanged() OVERRIDE;
   virtual bool CancelComposition() OVERRIDE;
+  virtual bool ConfirmComposition() OVERRIDE;
   virtual void SetFocusedClient(HWND focused_window,
                                 TextInputClient* client) OVERRIDE;
   virtual void RemoveFocusedClient(TextInputClient* client) OVERRIDE;
   virtual base::win::ScopedComPtr<ITfThreadMgr> GetThreadManager() OVERRIDE;
   virtual TextInputClient* GetFocusedTextInputClient() const OVERRIDE;
 
  private:
   // Returns true if |tsf_document_map_| is successfully initialized. This
   // method should be called from and only from Initialize().
   bool InitializeDocumentMapInternal();
@@ skipping 154 matching lines @@
     return;
   if (!document->text_store)
     return;
   document->text_store->SendOnLayoutChange();
 }
 
 bool TSFBridgeDelegate::CancelComposition() {
   DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type());
   DCHECK(IsInitialized());
 
-  base::win::ScopedComPtr<ITfDocumentMgr> focused_document_manager;
-  for (TSFDocumentMap::iterator it = tsf_document_map_.begin();
-       it != tsf_document_map_.end(); ++it) {
-    if (IsFocused(it->second.document_manager.get())) {
-      focused_document_manager = it->second.document_manager.get();
-      break;
-    }
-  }
-
-  if (focused_document_manager.get() == NULL)
+  TSFDocument* document = GetAssociatedDocument();
+  if (!document)
+    return false;
+  if (!document->text_store)
     return false;
 
-  base::win::ScopedComPtr<ITfContext> context;
-  // We should use ITfDocumentMgr::GetBase instead of ITfDocumentMgr::GetTop,
-  // which may return a temporal context created by an IME for its modal UI
-  // handling, to obtain a context against which on-going composition is
-  // canceled. This is because ITfDocumentMgr::GetBase always returns the
-  // context that is created by us and owns the on-going composition.
-  // See http://crbug.com/169664 for details.
-  if (FAILED(focused_document_manager->GetBase(context.Receive()))) {
-    DVLOG(1) << "Failed to get top context.";
+  return document->text_store->CancelComposition();
+}
+
+bool TSFBridgeDelegate::ConfirmComposition() {
+  DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type());
+  DCHECK(IsInitialized());
+
+  TSFDocument* document = GetAssociatedDocument();
+  if (!document)
     return false;
-  }
+  if (!document->text_store)
+    return false;
 
-  base::win::ScopedComPtr<ITfContextOwnerCompositionServices> owner;
-  if (FAILED(owner.QueryFrom(context))) {
-    DVLOG(1) << "Failed to get ITfContextOwnerCompositionService.";
-    return false;
-  }
-  // Cancel all compositions.
-  owner->TerminateComposition(NULL);
-  return true;
+  return document->text_store->ConfirmComposition();
 }
 
+

[Seigo Nonaka, 2013/06/21 08:09:53]

nit: please remove

[Yohei Yukawa, 2013/06/21 08:26:55]

Done.

 void TSFBridgeDelegate::SetFocusedClient(HWND focused_window,
                                          TextInputClient* client) {
   DCHECK_EQ(base::MessageLoop::TYPE_UI, base::MessageLoop::current()->type());
   DCHECK(client);
   DCHECK(IsInitialized());
   client_ = client;
 
   for (TSFDocumentMap::iterator it = tsf_document_map_.begin();
        it != tsf_document_map_.end(); ++it) {
     if (it->second.text_store.get() == NULL)
@@ skipping 239 matching lines @@
   return delegate;
 }
 
 // static
 void TSFBridge::Finalize(void* data) {
   TSFBridgeDelegate* delegate = static_cast<TSFBridgeDelegate*>(data);
   delete delegate;
 }
 
 }  // namespace ui