diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 17:06:43 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 17:06:43 +0000 |
| commit | 4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8 (patch) | |
| tree | efafdd70c921591168a8cc34dff990f83c147916 /ppapi/proxy/dispatcher.cc | |
| parent | ad301eb035b5610de22356cadaac3a3826ca3abe (diff) | |
| download | chromium_src-4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8.zip chromium_src-4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8.tar.gz chromium_src-4c85f66d40d3b1b25e6f30ad90888dc29eb90ee8.tar.bz2 | |
Revert 91859 - Porting ppapi_tests framework to postMessage.
Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl.
I also added a gyp option: pepper_scripting. The default is that scripting is on in this CL, but it will make it easy to turn it off in local builds. Soon we'll switch the default to no scripting, and soon after we can remove the option entirely.
BUG=82606
TEST=these tests
Review URL: http://codereview.chromium.org/7312008
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/7329024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/dispatcher.cc')
| -rw-r--r-- | ppapi/proxy/dispatcher.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc index ad32beb..8cb8028 100644 --- a/ppapi/proxy/dispatcher.cc +++ b/ppapi/proxy/dispatcher.cc @@ -139,11 +139,10 @@ InterfaceList::InterfaceList() { AddPPB(PPB_Graphics2D_Proxy::GetInfo()); AddPPB(PPB_ImageData_Proxy::GetInfo()); AddPPB(PPB_InputEvent_Proxy::GetInfo()); + AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); AddPPB(PPB_Instance_Proxy::GetInfo0_4()); AddPPB(PPB_Instance_Proxy::GetInfo0_5()); AddPPB(PPB_Instance_Proxy::GetInfoFullscreen()); - AddPPB(PPB_Instance_Proxy::GetInfoMessaging()); - AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); AddPPB(PPB_Memory_Proxy::GetInfo()); AddPPB(PPB_OpenGLES2_Proxy::GetInfo()); AddPPB(PPB_PDF_Proxy::GetInfo()); |