Share an instance of the ibus factory between all ibus engines.

chrome/browser/chromeos/input_method/ibus_engine_controller.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/input_method/ibus_engine_controller.h"
 
 #if defined(HAVE_IBUS)
 #include <ibus.h>
 #endif
 
@@ skipping 602 matching lines @@
         reinterpret_cast<gpointer>(G_CALLBACK(IBusBusDisconnectedCallback)),
         this);
   }
 
   // Handles "connected" signal from ibus-daemon.
   static void IBusBusConnectedCallback(IBusBus* bus, gpointer user_data) {
     LOG(WARNING) << "IBus connection is recovered.";
     g_return_if_fail(user_data);
     IBusEngineControllerImpl* self
         = static_cast<IBusEngineControllerImpl*>(user_data);
+    if (!g_factory_) {
+      g_factory_ = ibus_factory_new(ibus_bus_get_connection(bus));

[Peng, 2011/10/26 17:53:21]

I only find you create g_factory in connected signal handler. So I am wandering
if ibus-daemon can be started before chrome. If the answer is true,
ibus_bus_new() will return a connected bus object, and you will not get the
connected signal I think.

[Zachary Kuznia, 2011/10/27 07:25:11]

Done.

+    }
+
     if (!self->MaybeCreateComponent()) {
       LOG(ERROR) << "MaybeCreateComponent() failed";
       return;
     }
   }
 
   // Handles "disconnected" signal from ibus-daemon.
   static void IBusBusDisconnectedCallback(IBusBus* bus, gpointer user_data) {
     LOG(WARNING) << "IBus connection is terminated.";
+    g_factory_ = NULL;
   }
 
   bool MaybeCreateComponent() {
-    if (!ibus_ || !ibus_bus_is_connected(ibus_)) {
+    if (!ibus_ || !ibus_bus_is_connected(ibus_) || !g_factory_) {
       return false;
     }
 
     VLOG(1) << "MaybeCreateComponent";
     IBusComponent* component = ibus_component_new(bus_name_.c_str(),
                                                   description_.c_str(),
                                                   "",
                                                   "",
                                                   engine_name_.c_str(),
                                                   "",
                                                   "",
                                                   "");
     ibus_component_add_engine(component,
                               ibus_engine_desc_new(engine_id_.c_str(),
                                                    description_.c_str(),
                                                    description_.c_str(),
                                                    language_.c_str(),
                                                    "",
                                                    engine_name_.c_str(),
                                                    "",
                                                    layout_.c_str()));
 
-    IBusFactory* factory = ibus_factory_new(ibus_bus_get_connection(ibus_));
-    ibus_factory_add_engine(factory, engine_id_.c_str(),
+    ibus_factory_add_engine(g_factory_, engine_id_.c_str(),
                             IBUS_TYPE_CHROMEOS_ENGINE);
     ibus_bus_register_component(ibus_, component);
     g_object_unref(component);
 
     return true;
   }
 
   static void OnServiceMethodCall(IBusService* service,
                                   GDBusConnection* connection,
                                   const gchar* sender,
@@ skipping 194 matching lines @@
   unsigned int page_size_;
   unsigned int cursor_position_;
   std::string aux_text_;
   bool aux_text_visible_;
   std::vector<EngineProperty*> properties_;
   std::map<std::string, EngineProperty*> property_map_;
 
   std::set<IBusChromeOSEngine*> engine_instances_;
 
   static ConnectionMap* g_connections_;
+  static IBusFactory* g_factory_;
 };
 
 IBusEngineControllerImpl::ConnectionMap*
     IBusEngineControllerImpl::g_connections_ = NULL;
 
+IBusFactory* IBusEngineControllerImpl::g_factory_ = NULL;
+
 void ibus_chromeos_engine_class_init(IBusChromeOSEngineClass *klass) {
   IBusEngineControllerImpl::InitEngineClass(klass);
 }
 
 void ibus_chromeos_engine_init(IBusChromeOSEngine* engine) {
   IBusEngineControllerImpl::InitEngine(engine);
 }
 
 #endif // HAVE_IBUS
 
@@ skipping 17 matching lines @@
 #else
   return NULL;
 #endif
 }
 
 IBusEngineController::~IBusEngineController() {
 }
 
 }  // namespace input_method
 }  // namespace chromeos