diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 03:48:24 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 03:48:24 +0000 |
| commit | 7d0284e0c4638201635bccec014a6a8f08e58131 (patch) | |
| tree | ba4e4f4a30e43b2e24773ad9b440f49d23958ac3 /ppapi/proxy | |
| parent | 9d56dd31573039d45135ec516260bcc070cc284f (diff) | |
| download | chromium_src-7d0284e0c4638201635bccec014a6a8f08e58131.zip chromium_src-7d0284e0c4638201635bccec014a6a8f08e58131.tar.gz chromium_src-7d0284e0c4638201635bccec014a6a8f08e58131.tar.bz2 | |
Reland http://codereview.chromium.org/7292033
Plus bonus change to a comment in pp_bool.h to try to get the bots to rebuild things properly
------
First pass at revving stable pepper interfaces to 1.0.
Missing PPB_Core (pending removal of MemAlloc/MemFree) and new input event interfaces, in case we want to change them in the next ~week.
BUG=84519
TEST=ppapi tests
TBR=dmichael
Review URL: http://codereview.chromium.org/7355014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
| -rw-r--r-- | ppapi/proxy/dispatcher.cc | 1 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 16 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_instance_proxy.h | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc index ad32beb..e9b57c3 100644 --- a/ppapi/proxy/dispatcher.cc +++ b/ppapi/proxy/dispatcher.cc @@ -141,6 +141,7 @@ InterfaceList::InterfaceList() { AddPPB(PPB_InputEvent_Proxy::GetInfo()); AddPPB(PPB_Instance_Proxy::GetInfo0_4()); AddPPB(PPB_Instance_Proxy::GetInfo0_5()); + AddPPB(PPB_Instance_Proxy::GetInfo1_0()); AddPPB(PPB_Instance_Proxy::GetInfoFullscreen()); AddPPB(PPB_Instance_Proxy::GetInfoMessaging()); AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 7c3827f..5a6158a 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -51,7 +51,7 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_4() { static const Info info = { ppapi::thunk::GetPPB_Instance_0_4_Thunk(), PPB_INSTANCE_INTERFACE_0_4, - INTERFACE_ID_NONE, // 0_5 is the canonical one. + INTERFACE_ID_NONE, // 1_0 is the canonical one. false, &CreateInstanceProxy, }; @@ -61,8 +61,20 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_4() { // static const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_5() { static const Info info = { - ppapi::thunk::GetPPB_Instance_0_5_Thunk(), + ppapi::thunk::GetPPB_Instance_1_0_Thunk(), PPB_INSTANCE_INTERFACE_0_5, + INTERFACE_ID_NONE, // 1_0 is the canonical one. + false, + &CreateInstanceProxy, + }; + return &info; +} + +// static +const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo1_0() { + static const Info info = { + ppapi::thunk::GetPPB_Instance_1_0_Thunk(), + PPB_INSTANCE_INTERFACE_1_0, INTERFACE_ID_PPB_INSTANCE, false, &CreateInstanceProxy, diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h index d4de0a4..9d045fb 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -31,6 +31,7 @@ class PPB_Instance_Proxy : public InterfaceProxy, static const Info* GetInfo0_4(); static const Info* GetInfo0_5(); + static const Info* GetInfo1_0(); static const Info* GetInfoMessaging(); static const Info* GetInfoPrivate(); static const Info* GetInfoFullscreen(); |