Call SendIq() from plugin asynchronously.

remoting/client/plugin/chromoting_scriptable_object.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 "remoting/client/plugin/chromoting_scriptable_object.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 // TODO(wez): Remove this when crbug.com/86353 is complete.
 #include "ppapi/cpp/private/var_private.h"
@@ skipping 254 matching lines @@
   if (properties_[width_index].attribute.AsInt() != width ||
       properties_[height_index].attribute.AsInt() != height) {
     properties_[width_index].attribute = Var(width);
     properties_[height_index].attribute = Var(height);
     SignalDesktopSizeChange();
   }
 
   LOG(INFO) << "Update desktop size to: " << width << " x " << height;
 }
 
+void ChromotingScriptableObject::SignalLoginChallenge() {
+  plugin_message_loop_->PostTask(
+      FROM_HERE, task_factory_.NewRunnableMethod(
+          &ChromotingScriptableObject::DoSignalLoginChallenge));
+}
+
+void ChromotingScriptableObject::AttachXmppProxy(PepperXmppProxy* xmpp_proxy) {
+  xmpp_proxy_ = xmpp_proxy;
+}
+
+void ChromotingScriptableObject::SendIq(const std::string& message_xml) {
+  plugin_message_loop_->PostTask(
+      FROM_HERE, task_factory_.NewRunnableMethod(
+          &ChromotingScriptableObject::DoSendIq, message_xml));
+}
+
 void ChromotingScriptableObject::AddAttribute(const std::string& name,
                                               Var attribute) {
   property_names_[name] = properties_.size();
   properties_.push_back(PropertyDescriptor(name, attribute));
 }
 
 void ChromotingScriptableObject::AddMethod(const std::string& name,
                                            MethodHandler handler) {
   property_names_[name] = properties_.size();
   properties_.push_back(PropertyDescriptor(name, handler));
 }
 
 void ChromotingScriptableObject::SignalConnectionInfoChange() {
   plugin_message_loop_->PostTask(
       FROM_HERE, task_factory_.NewRunnableMethod(
           &ChromotingScriptableObject::DoSignalConnectionInfoChange));
 }
 
 void ChromotingScriptableObject::SignalDesktopSizeChange() {
   plugin_message_loop_->PostTask(
       FROM_HERE, task_factory_.NewRunnableMethod(
           &ChromotingScriptableObject::DoSignalDesktopSizeChange));
 }
 
-void ChromotingScriptableObject::SignalLoginChallenge() {
-  plugin_message_loop_->PostTask(
-      FROM_HERE, task_factory_.NewRunnableMethod(
-          &ChromotingScriptableObject::DoSignalLoginChallenge));
-}
-
 void ChromotingScriptableObject::DoSignalConnectionInfoChange() {
   Var exception;
   VarPrivate cb = GetProperty(Var(kConnectionInfoUpdate), &exception);
 
-  // Var() means call the object directly as a function rather than calling
-  // a method in the object.
+  // |this| must not be touched after Call() returns.
   cb.Call(Var(), &exception);
 
   if (!exception.is_undefined())
     LOG(ERROR) << "Exception when invoking connectionInfoUpdate JS callback.";
 }
 
-
 void ChromotingScriptableObject::DoSignalDesktopSizeChange() {
   Var exception;
   VarPrivate cb = GetProperty(Var(kDesktopSizeUpdate), &exception);
 
-  // Var() means call the object directly as a function rather than calling
-  // a method in the object.
+  // |this| must not be touched after Call() returns.
   cb.Call(Var(), &exception);
 
   if (!exception.is_undefined()) {
     LOG(ERROR) << "Exception when invoking JS callback"
                << exception.DebugString();
   }
 }
 
 void ChromotingScriptableObject::DoSignalLoginChallenge() {
   Var exception;
   VarPrivate cb = GetProperty(Var(kLoginChallenge), &exception);
 
-  // Var() means call the object directly as a function rather than calling
-  // a method in the object.
+  // |this| must not be touched after Call() returns.
   cb.Call(Var(), &exception);
 
   if (!exception.is_undefined())
     LOG(ERROR) << "Exception when invoking loginChallenge JS callback.";
 }
 
-void ChromotingScriptableObject::AttachXmppProxy(PepperXmppProxy* xmpp_proxy) {
-  xmpp_proxy_ = xmpp_proxy;
-}
-
-void ChromotingScriptableObject::SendIq(const std::string& message_xml) {
+void ChromotingScriptableObject::DoSendIq(const std::string& message_xml) {
   Var exception;
   VarPrivate cb = GetProperty(Var(kSendIq), &exception);
 
-  // Var() means call the object directly as a function rather than calling
-  // a method in the object.
+  // |this| must not be touched after Call() returns.
   cb.Call(Var(), Var(message_xml), &exception);
 
   if (!exception.is_undefined())
     LOG(ERROR) << "Exception when invoking sendiq JS callback.";
 }
 
 Var ChromotingScriptableObject::DoConnect(const std::vector<Var>& args,
                                           Var* exception) {
   // Parameter order is:
   //   host_jid
@@ skipping 116 matching lines @@
     const std::vector<pp::Var>& args, pp::Var* exception) {
   if (args.size() != 0) {
     *exception = Var("Usage: DoReleaseAllKeys()");
     return Var();
   }
   instance_->ReleaseAllKeys();
   return Var();
 }
 
 }  // namespace remoting