Fix a crash related to PPAPI scripting.

ppapi/proxy/serialized_var.h

 // 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.
 
 #ifndef PPAPI_PROXY_SERIALIZED_VAR_H_
 #define PPAPI_PROXY_SERIALIZED_VAR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
+#include "ppapi/proxy/var_serialization_rules.h"
 
 class PickleIterator;
 
 namespace IPC {
 class Message;
 }
 
 namespace ppapi {
 namespace proxy {
 
@@ skipping 77 matching lines @@
     PP_Var GetVar() const;
     void SetVar(PP_Var var);
 
     // For the SerializedVarTestConstructor, this writes the Var value as if
     // it was just received off the wire, without any serialization rules.
     void ForceSetVarValueForTest(PP_Var value);
 
     void WriteToMessage(IPC::Message* m) const;
     bool ReadFromMessage(const IPC::Message* m, PickleIterator* iter);
 
-    // Sets the cleanup mode. See the CleanupMode enum below. These functions
-    // are not just a simple setter in order to require that the appropriate
-    // data is set along with the corresponding mode.
-    void SetCleanupModeToEndSendPassRef(Dispatcher* dispatcher);
+    // Sets the cleanup mode. See the CleanupMode enum below.
+    void SetCleanupModeToEndSendPassRef();
     void SetCleanupModeToEndReceiveCallerOwned();
 
    private:
     enum CleanupMode {
       // The serialized var won't do anything special in the destructor
       // (default).
       CLEANUP_NONE,
 
       // The serialized var will call EndSendPassRef in the destructor.
       END_SEND_PASS_REF,
 
       // The serialized var will call EndReceiveCallerOwned in the destructor.
       END_RECEIVE_CALLER_OWNED
     };
 
     // Rules for serializing and deserializing vars for this process type.
     // This may be NULL, but must be set before trying to serialize to IPC when
     // sending, or before converting back to a PP_Var when receiving.
-    VarSerializationRules* serialization_rules_;
+    scoped_refptr<VarSerializationRules> serialization_rules_;
 
     // If this is set to VARTYPE_STRING and the 'value.id' is 0, then the
     // string_from_ipc_ holds the string. This means that the caller hasn't
     // called Deserialize with a valid Dispatcher yet, which is how we can
     // convert the serialized string value to a PP_Var string ID.
     //
     // This var may not be complete until the serialization rules are set when
     // reading from IPC since we'll need that to convert the string_value to
     // a string ID. Before this, the as_id will be 0 for VARTYPE_STRING.
     PP_Var var_;
 
     CleanupMode cleanup_mode_;
 
-    // The dispatcher saved for the call to EndSendPassRef for the cleanup.
-    // This is only valid when cleanup_mode == END_SEND_PASS_REF.
-    Dispatcher* dispatcher_for_end_send_pass_ref_;
-
 #ifndef NDEBUG
     // When being sent or received over IPC, we should only be serialized or
     // deserialized once. These flags help us assert this is true.
     mutable bool has_been_serialized_;
     mutable bool has_been_deserialized_;
 #endif
 
     DISALLOW_COPY_AND_ASSIGN(Inner);
   };
 
@@ skipping 36 matching lines @@
 // Example for API:
 //   PP_Var MyFunction()
 // IPC message:
 //   IPC_SYNC_MESSAGE_ROUTED0_1(MyFunction, SerializedVar);
 // Message handler would be:
 //   PP_Var MyFunctionProxy() {
 //     ReceiveSerializedVarReturnValue result;
 //     Send(new MyFunctionMsg(&result));
 //     return result.Return(dispatcher());
 //   }
+//
+// TODO(yzshen): Move the dispatcher parameter to the constructor and store a
+// VarSerializationRules reference instead, in case the dispatcher is destroyed
+// while waiting for reply to the sync message.
 class PPAPI_PROXY_EXPORT ReceiveSerializedVarReturnValue
     : public SerializedVar {
  public:
   // Note that we can't set the dispatcher in the constructor because the
   // data will be overridden when the return value is set. This constructor is
   // normally used in the pattern above (operator= will be implicitly invoked
   // when the sync message writes the output values).
   ReceiveSerializedVarReturnValue();
 
   // This constructor can be used when deserializing manually. This is useful
@@ skipping 20 matching lines @@
 class PPAPI_PROXY_EXPORT ReceiveSerializedException : public SerializedVar {
  public:
   ReceiveSerializedException(Dispatcher* dispatcher, PP_Var* exception);
   ~ReceiveSerializedException();
 
   // Returns true if the exception passed in the constructor is set. Check
   // this before actually issuing the IPC.
   bool IsThrown() const;
 
  private:
-  Dispatcher* dispatcher_;
-
   // The input/output exception we're wrapping. May be NULL.
   PP_Var* exception_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ReceiveSerializedException);
 };
 
 // Helper class for when we're returning a vector of Vars. When it goes out
 // of scope it will automatically convert the vector filled by the IPC layer
 // into the array specified by the constructor params.
 //
@@ skipping 42 matching lines @@
   // We rely on the implicit constructor here since the IPC layer will call
   // us with a SerializedVar. Pass this object by value, the copy constructor
   // will pass along the pointer (as cheap as passing a pointer arg).
   SerializedVarReceiveInput(const SerializedVar& serialized);
   ~SerializedVarReceiveInput();
 
   PP_Var Get(Dispatcher* dispatcher);
 
  private:
   const SerializedVar& serialized_;
-
-  // Since the SerializedVar is const, we can't set its dispatcher (which is
-  // OK since we don't need to). But since we need it for our own uses, we
-  // track it here. Will be NULL before Get() is called.
-  Dispatcher* dispatcher_;
-  PP_Var var_;
 };
 
 // For receiving an input vector of vars from the remote side.
 //
 // Example:
 //   OnMsgMyFunction(SerializedVarVectorReceiveInput vector) {
 //     uint32_t size;
 //     PP_Var* array = vector.Get(dispatcher, &size);
 //     MyFunction(size, array);
 //   }
@@ skipping 115 matching lines @@
   // The "incomplete" var is the one sent over the wire. Strings and object
   // IDs have not yet been converted, so this is the thing that tests will
   // actually want to check.
   PP_Var GetVar() const { return inner_->GetVar(); }
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_SERIALIZED_VAR_H_
-