diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 07:19:31 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 07:19:31 +0000 |
| commit | cd910b93160f754297e51b27bdbc5f98cf52a743 (patch) | |
| tree | 098dd0816260568abeae1662fa7de759e8372c49 /ppapi/proxy/plugin_resource_tracker.h | |
| parent | 20da3817eb403599ec87537bf2bc862446a13abf (diff) | |
| download | chromium_src-cd910b93160f754297e51b27bdbc5f98cf52a743.zip chromium_src-cd910b93160f754297e51b27bdbc5f98cf52a743.tar.gz chromium_src-cd910b93160f754297e51b27bdbc5f98cf52a743.tar.bz2 | |
Convert more interfaces to the new thunk system. This goes up to and including
the ones starting with "F".
Since this adds a lot more interfaces, I added the macro stuff we used for the
old system to generate the various template specializations. This involded a
lot of renaming since the As* needs to match the name (I was previously leaving
off the "PPB_" part). I did other misc cleanup to the infrastructure.
Review URL: http://codereview.chromium.org/7082036
Reland 87415
Review URL: http://codereview.chromium.org/7105013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_resource_tracker.h')
| -rw-r--r-- | ppapi/proxy/plugin_resource_tracker.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ppapi/proxy/plugin_resource_tracker.h b/ppapi/proxy/plugin_resource_tracker.h index 5dfdf82..c00d3f2 100644 --- a/ppapi/proxy/plugin_resource_tracker.h +++ b/ppapi/proxy/plugin_resource_tracker.h @@ -8,6 +8,7 @@ #include <map> #include <utility> +#include "base/compiler_specific.h" #include "base/memory/linked_ptr.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" @@ -56,10 +57,11 @@ class PluginResourceTracker : public ::ppapi::TrackerBase { // TrackerBase. virtual ::ppapi::ResourceObjectBase* GetResourceAPI( - PP_Resource res); + PP_Resource res) OVERRIDE; virtual ::ppapi::FunctionGroupBase* GetFunctionAPI( PP_Instance inst, - pp::proxy::InterfaceID id); + pp::proxy::InterfaceID id) OVERRIDE; + virtual PP_Instance GetInstanceForResource(PP_Resource resource) OVERRIDE; private: friend struct DefaultSingletonTraits<PluginResourceTracker>; |