diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 17:10:46 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 17:10:46 +0000 |
| commit | fae0e947dd72d6499abcd4cc9d8a2c988802ecc7 (patch) | |
| tree | 64894d705184fa15943381a1a083cd4a82e242a0 /ppapi/cpp/instance.cc | |
| parent | 29ee58a0ca74da203815ffc416e0b52cafb9c79e (diff) | |
| download | chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.zip chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.tar.gz chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.tar.bz2 | |
reconstitute moving 3d out of dev CL. (previous attempt was reverted)
previous CL: http://codereview.chromium.org/7737013/
BUG= http://code.google.com/p/chromium/issues/detail?id=94320
TEST= try bots, manual testing
Review URL: http://codereview.chromium.org/7837018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp/instance.cc')
| -rw-r--r-- | ppapi/cpp/instance.cc | 4 |
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( |