diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 23:36:26 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 23:36:26 +0000 |
| commit | 24efa80adcf956b606bdda62091357510894e5cf (patch) | |
| tree | e9b63f7e520bd38592f5de2e27e4ca67af8f8f3b /gpu/demos | |
| parent | 844cf21c267a04f519386c2753780531f0dc9214 (diff) | |
| download | chromium_src-24efa80adcf956b606bdda62091357510894e5cf.zip chromium_src-24efa80adcf956b606bdda62091357510894e5cf.tar.gz chromium_src-24efa80adcf956b606bdda62091357510894e5cf.tar.bz2 | |
Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.
BUG= http://code.google.com/p/chromium/issues/detail?id=94320
TEST= various nacl exmaples, try bots
Review URL: http://codereview.chromium.org/7737013
TBR=nfullagar@google.com
Review URL: http://codereview.chromium.org/7782020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
| -rw-r--r-- | gpu/demos/framework/pepper.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/demos/framework/pepper.cc b/gpu/demos/framework/pepper.cc index 3a2e180b..9be8085 100644 --- a/gpu/demos/framework/pepper.cc +++ b/gpu/demos/framework/pepper.cc @@ -7,11 +7,11 @@ #include "gpu/demos/framework/demo.h" #include "gpu/demos/framework/demo_factory.h" #include "ppapi/cpp/completion_callback.h" -#include "ppapi/cpp/graphics_3d.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/rect.h" #include "ppapi/cpp/size.h" +#include "ppapi/cpp/dev/graphics_3d_dev.h" #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h" namespace gpu { @@ -88,7 +88,7 @@ class PluginInstance : public pp::Instance { PP_GRAPHICS3DATTRIB_HEIGHT, size_.height(), PP_GRAPHICS3DATTRIB_NONE }; - context_ = pp::Graphics3D(*this, pp::Graphics3D(), attribs); + context_ = pp::Graphics3D_Dev(*this, pp::Graphics3D_Dev(), attribs); if (context_.is_null()) return; @@ -110,7 +110,7 @@ class PluginInstance : public pp::Instance { pp::Module* module_; Demo* demo_; - pp::Graphics3D context_; + pp::Graphics3D_Dev context_; pp::Size size_; bool swap_pending_; bool paint_needed_; |