Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: ppapi/proxy/interface_proxy.h

Issue 7740038: Use macros to define pepper interfaces (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/interface_proxy.h
diff --git a/ppapi/proxy/interface_proxy.h b/ppapi/proxy/interface_proxy.h
index 1fed704428e965f5f07fa56ebcd31c3d030e7526..795944b43e501f81c58ea62ce7408f63372c1173 100644
--- a/ppapi/proxy/interface_proxy.h
+++ b/ppapi/proxy/interface_proxy.h
@@ -12,6 +12,7 @@
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/proxy/interface_id.h"
+#include "ppapi/shared_impl/function_group_base.h"
namespace ppapi {
namespace proxy {
@@ -19,13 +20,16 @@ namespace proxy {
class Dispatcher;
class InterfaceProxy : public IPC::Channel::Listener,
- public IPC::Message::Sender {
+ public IPC::Message::Sender,
+ public FunctionGroupBase {
public:
// Factory function type for interfaces. Ownership of the returned pointer
// is transferred to the caller.
- typedef InterfaceProxy* (*Factory)(Dispatcher* dispatcher,
- const void* target_interface);
+ typedef InterfaceProxy* (*Factory)(Dispatcher* dispatcher);
+ // DEPRECATED: New classes should be registered directly in the interface
+ // list. This is kept around until we convert all the existing code.
+ //
// Information about the interface. Each interface has a static function to
// return its info, which allows either construction on the target side, and
// getting the proxied interface on the source side (see dispatcher.h for
@@ -43,9 +47,6 @@ class InterfaceProxy : public IPC::Channel::Listener,
virtual ~InterfaceProxy();
- // The actual implementation of the given interface in the current process.
- const void* target_interface() const { return target_interface_; }
-
Dispatcher* dispatcher() const { return dispatcher_; }
// IPC::Message::Sender implementation.
@@ -57,19 +58,13 @@ class InterfaceProxy : public IPC::Channel::Listener,
protected:
// Creates the given interface associated with the given dispatcher. The
// dispatcher manages our lifetime.
- //
- // The target interface pointer, when non-NULL, indicates that this is a
- // target proxy (see dispatcher.h for a definition). In this case, the proxy
- // will interpret this pointer to the actual implementation of the interface
- // in the local process.
- InterfaceProxy(Dispatcher* dispatcher, const void* target_interface);
+ InterfaceProxy(Dispatcher* dispatcher);
uint32 SendCallback(PP_CompletionCallback callback);
PP_CompletionCallback ReceiveCallback(uint32 serialized_callback);
private:
Dispatcher* dispatcher_;
- const void* target_interface_;
};
} // namespace proxy

Powered by Google App Engine
This is Rietveld 408576698