diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 18:26:36 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 18:26:36 +0000 |
| commit | 912f3d6c2193584bc9376ed17f3dd2b90e78a40e (patch) | |
| tree | 98729e7a810cc29cdc414ea8e0e75e9967a0ac4c /ppapi/shared_impl/ppp_instance_combined.h | |
| parent | 0daefc769a7578184c1c57ef2b59970a41d8cf79 (diff) | |
| download | chromium_src-912f3d6c2193584bc9376ed17f3dd2b90e78a40e.zip chromium_src-912f3d6c2193584bc9376ed17f3dd2b90e78a40e.tar.gz chromium_src-912f3d6c2193584bc9376ed17f3dd2b90e78a40e.tar.bz2 | |
Make o.o.p. proxy handle PPP_Instance versions 0.4 and 0.5.
Move & tweak PPP_Instance_Combined to ppapi_shared so the proxy can use it. Use versioned PPP_Instance types only.
BUG=82606
TEST=run tests o.o.p.
Review URL: http://codereview.chromium.org/7189045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl/ppp_instance_combined.h')
| -rw-r--r-- | ppapi/shared_impl/ppp_instance_combined.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ppapi/shared_impl/ppp_instance_combined.h b/ppapi/shared_impl/ppp_instance_combined.h new file mode 100644 index 0000000..a186c06 --- /dev/null +++ b/ppapi/shared_impl/ppp_instance_combined.h @@ -0,0 +1,26 @@ +// 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. + +#ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ +#define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ + +#include "base/basictypes.h" +#include "ppapi/c/ppp_instance.h" + +namespace ppapi { + +struct PPP_Instance_Combined : public PPP_Instance_0_5 { + public: + explicit PPP_Instance_Combined(const PPP_Instance_0_5& instance_if); + explicit PPP_Instance_Combined(const PPP_Instance_0_4& instance_if); + + PP_Var (*const GetInstanceObject_0_4)(PP_Instance instance); + + DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined); +}; + +} // namespace ppapi + +#endif // PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_ + |