Reland r65152 with mac and linux fix.

Original review URL: http://codereview.chromium.org/3531008

TEST=try, ui_tests
BUG=none

Review URL: http://codereview.chromium.org/4545003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65283 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 0 deletions

diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index d900c8a..86996d6 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -7,6 +7,7 @@
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/cpp/common.h"
+#include "ppapi/cpp/dev/graphics_3d_dev.h"
 #include "ppapi/cpp/dev/scrollbar_dev.h"
 #include "ppapi/cpp/dev/widget_dev.h"
 #include "ppapi/cpp/graphics_2d.h"
@@ -88,6 +89,13 @@ bool Instance::BindGraphics(const Graphics2D& graphics) {
                                                    graphics.pp_resource()));
 }
 
+bool Instance::BindGraphics(const Graphics3D_Dev& graphics) {
+  if (!ppb_instance_f)
+    return false;
+  return PPBoolToBool(ppb_instance_f->BindGraphics(pp_instance(),
+                                                   graphics.pp_resource()));
+}
+
 bool Instance::IsFullFrame() {
   if (!ppb_instance_f)
     return false;
diff --git a/ppapi/cpp/instance.h b/ppapi/cpp/instance.h
index df09bb9..e0a5889 100644
--- a/ppapi/cpp/instance.h
+++ b/ppapi/cpp/instance.h
@@ -27,6 +27,7 @@ struct PP_InputEvent;
 namespace pp {
 
 class Graphics2D;
+class Graphics3D_Dev;
 class ImageData;
 class Point;
 class Rect;
@@ -89,6 +90,9 @@ class Instance {
   /** See PPB_Instance.BindGraphics. */
   bool BindGraphics(const Graphics2D& graphics);
 
+  /** See PPB_Instance.BindGraphics. */
+  bool BindGraphics(const Graphics3D_Dev& graphics);
+
   /** See PPB_Instance.IsFullFrame. */
   bool IsFullFrame();