diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 02:49:39 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 02:49:39 +0000 |
| commit | 84e59a487499dbfb1e52cf066f124aaef78782ba (patch) | |
| tree | b4850110e0e96fa079922b802e3129dad7d4efbe /ppapi/proxy | |
| parent | 92cdabdebc9082f557265390a017ad6a59df2460 (diff) | |
| download | chromium_src-84e59a487499dbfb1e52cf066f124aaef78782ba.zip chromium_src-84e59a487499dbfb1e52cf066f124aaef78782ba.tar.gz chromium_src-84e59a487499dbfb1e52cf066f124aaef78782ba.tar.bz2 | |
Revert 92302 - 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
Review URL: http://codereview.chromium.org/7292033
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/7342032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92304 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, 2 insertions, 16 deletions
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc index e9b57c3..ad32beb 100644 --- a/ppapi/proxy/dispatcher.cc +++ b/ppapi/proxy/dispatcher.cc @@ -141,7 +141,6 @@ 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 5a6158a..7c3827f 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, // 1_0 is the canonical one. + INTERFACE_ID_NONE, // 0_5 is the canonical one. false, &CreateInstanceProxy, }; @@ -61,20 +61,8 @@ 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_1_0_Thunk(), + ppapi::thunk::GetPPB_Instance_0_5_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 9d045fb..d4de0a4 100644 --- a/ppapi/proxy/ppb_instance_proxy.h +++ b/ppapi/proxy/ppb_instance_proxy.h @@ -31,7 +31,6 @@ 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(); |