summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp/instance.cc
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 /ppapi/cpp/instance.cc
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 'ppapi/cpp/instance.cc')
-rw-r--r--ppapi/cpp/instance.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index 9bb77dc..a6f5997 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -8,9 +8,9 @@
#include "ppapi/c/ppb_input_event.h"
#include "ppapi/c/ppb_instance.h"
#include "ppapi/c/ppb_messaging.h"
-#include "ppapi/cpp/dev/graphics_3d_dev.h"
#include "ppapi/cpp/dev/surface_3d_dev.h"
#include "ppapi/cpp/graphics_2d.h"
+#include "ppapi/cpp/graphics_3d.h"
#include "ppapi/cpp/image_data.h"
#include "ppapi/cpp/logging.h"
#include "ppapi/cpp/module.h"
@@ -82,7 +82,7 @@ bool Instance::BindGraphics(const Graphics2D& graphics) {
pp_instance(), graphics.pp_resource()));
}
-bool Instance::BindGraphics(const Graphics3D_Dev& graphics) {
+bool Instance::BindGraphics(const Graphics3D& graphics) {
if (!has_interface<PPB_Instance>())
return false;
return PP_ToBool(get_interface<PPB_Instance>()->BindGraphics(