Refactoring of new IPC-only pepper implementation

ppapi/shared_impl/resource.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_SHARED_IMPL_RESOURCE_H_
 #define PPAPI_SHARED_IMPL_RESOURCE_H_
 
 #include <stddef.h>  // For NULL.
 
 #include <string>
@@ skipping 53 matching lines @@
   F(PPB_WebSocket_API) \
   F(PPB_Widget_API) \
   F(PPB_X509Certificate_Private_API)
 
 namespace IPC {
 class Message;
 }
 
 namespace ppapi {
 
+// Normally we shouldn't reply on proxy here, but this is to support
+// OnReplyReceived. See that comment.
+namespace proxy {
+class ResourceMessageReplyParams;
+}
+
 // Forward declare all the resource APIs.
 namespace thunk {
 #define DECLARE_RESOURCE_CLASS(RESOURCE) class RESOURCE;
 FOR_ALL_PPAPI_RESOURCE_APIS(DECLARE_RESOURCE_CLASS)
 #undef DECLARE_RESOURCE_CLASS
 }  // namespace thunk
 
 // Resources have slightly different registration behaviors when the're an
 // in-process ("impl") resource in the host (renderer) process, or when they're
 // a proxied resource in the plugin process. This enum differentiates those
@@ skipping 78 matching lines @@
   FOR_ALL_PPAPI_RESOURCE_APIS(DEFINE_TYPE_GETTER)
   #undef DEFINE_TYPE_GETTER
 
   // Template-based dynamic casting. See specializations below.
   template <typename T> T* GetAs() { return NULL; }
 
   // Called when a PpapiPluginMsg_ResourceReply reply is received for a
   // previous CallRenderer. The sequence number is the value returned the
   // send function for the given request. The message is the nested reply
   // message, which may be an empty message (depending on what the host
   // sends).

[raymes, 2012/07/30 17:23:37]

This comment is out of date now

   //
   // The default implementation will assert (if you send a request, you should
   // override this function).
   //
   // (This function would make more conceptual sense on PluginResource but we
   // need to call this function from general code that doesn't know how to
   // distinguish the classes.)
-  virtual void OnReplyReceived(int sequence,
-                               int32_t result,
+  virtual void OnReplyReceived(const proxy::ResourceMessageReplyParams& params,
                                const IPC::Message& msg);
 
  protected:
   // Logs a message to the console from this resource.
   void Log(PP_LogLevel_Dev level, const std::string& message);
 
  private:
   // See the getters above.
   PP_Resource pp_resource_;
   HostResource host_resource_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Resource);
 };
 
 // Template-based dynamic casting. These specializations forward to the
 // AsXXX virtual functions to return whether the given type is supported.
 #define DEFINE_RESOURCE_CAST(RESOURCE) \
   template<> inline thunk::RESOURCE* Resource::GetAs() { \
     return As##RESOURCE(); \
   }
 FOR_ALL_PPAPI_RESOURCE_APIS(DEFINE_RESOURCE_CAST)
 #undef DEFINE_RESOURCE_CAST
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_RESOURCE_H_