summaryrefslogtreecommitdiffstats
path: root/gpu/demos/framework
diff options
context:
space:
mode:
authornfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 23:11:53 +0000
committernfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 23:11:53 +0000
commitd3a250fc8802f10bc22d9f04475867821fa45f57 (patch)
tree6bcdec51bd5fd7949882aa2f03da94f7a7def95a /gpu/demos/framework
parent5031ca3bb62745e1da95bffbf401db75df03115f (diff)
downloadchromium_src-d3a250fc8802f10bc22d9f04475867821fa45f57.zip
chromium_src-d3a250fc8802f10bc22d9f04475867821fa45f57.tar.gz
chromium_src-d3a250fc8802f10bc22d9f04475867821fa45f57.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos/framework')
-rw-r--r--gpu/demos/framework/pepper.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/demos/framework/pepper.cc b/gpu/demos/framework/pepper.cc
index 9be8085..3a2e180b 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_Dev(*this, pp::Graphics3D_Dev(), attribs);
+ context_ = pp::Graphics3D(*this, pp::Graphics3D(), attribs);
if (context_.is_null())
return;
@@ -110,7 +110,7 @@ class PluginInstance : public pp::Instance {
pp::Module* module_;
Demo* demo_;
- pp::Graphics3D_Dev context_;
+ pp::Graphics3D context_;
pp::Size size_;
bool swap_pending_;
bool paint_needed_;