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

ppapi/cpp/instance.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_CPP_INSTANCE_H_
 #define PPAPI_CPP_INSTANCE_H_
 
 /// @file
 /// Defines the C++ wrapper for an instance.
 
 #include <map>
 #include <string>
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
 struct PP_InputEvent;
 
 /// The C++ interface to the Pepper API.
 namespace pp {
 
 class Graphics2D;
-class Graphics3D;
+class Graphics3D_Dev;
 class InputEvent;
 class ImageData;
 class Point;
 class Rect;
 class Rect;
 class Resource;
 class Surface3D_Dev;
 class URLLoader;
 class Var;
 
@@ skipping 233 matching lines @@
   ///
   /// @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 Graphics2D& graphics);
 
   /// Binds the given Graphics3D as the current display surface.
   /// 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
   /// further information.
   ///
   /// @param[in] graphics A <code>Surface3D_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.
@@ skipping 217 matching lines @@
  private:
   PP_Instance pp_instance_;
 
   typedef std::map<std::string, void*> InterfaceNameToObjectMap;
   InterfaceNameToObjectMap interface_name_to_objects_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_INSTANCE_H_