Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.

ppapi/cpp/instance.h

Index: ppapi/cpp/instance.h
===================================================================
--- ppapi/cpp/instance.h	(revision 99860)
+++ ppapi/cpp/instance.h	(working copy)
@@ -21,7 +21,7 @@
 namespace pp {
 
 class Graphics2D;
-class Graphics3D;
+class Graphics3D_Dev;
 class InputEvent;
 class ImageData;
 class Point;
@@ -275,12 +275,12 @@
   /// Refer to <code>BindGraphics(const Graphics2D& graphics)</code> for
   /// further information.
   ///
-  /// @param[in] graphics A <code>Graphics3D</code> to bind.
+  /// @param[in] graphics A <code>Graphics3D_Dev</code> to bind.
   ///
   /// @return true if bind was successful or false if the device was not the
   /// correct type. On success, a reference to the device will be held by the
   /// instance, so the caller can release its reference if it chooses.
-  bool BindGraphics(const Graphics3D& graphics);
+  bool BindGraphics(const Graphics3D_Dev& graphics);
 
   /// Binds the given Surface3D as the current display surface.
   /// Refer to <code>BindGraphics(const Graphics2D& graphics)</code> for
Property changes on: ppapi/cpp/instance.h
___________________________________________________________________
Added: svn:mergeinfo