Move PPAPI graphics3d and opengles interfaces out of Dev.

ppapi/cpp/graphics_3d.cc

 // 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.
 
-#include "ppapi/cpp/dev/graphics_3d_dev.h"
+#include "ppapi/cpp/graphics_3d.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/var.h"
 
 namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_Graphics3D_Dev>() {
-  return PPB_GRAPHICS_3D_DEV_INTERFACE;
+template <> const char* interface_name<PPB_Graphics3D>() {
+  return PPB_GRAPHICS_3D_INTERFACE;
 }
 
 }  // namespace
 
-Graphics3D_Dev::Graphics3D_Dev() {
+Graphics3D::Graphics3D() {
 }
 
-Graphics3D_Dev::Graphics3D_Dev(const Instance& instance,
-                               const Graphics3D_Dev& share_context,
-                               const int32_t* attrib_list) {
-  if (has_interface<PPB_Graphics3D_Dev>()) {
-    PassRefFromConstructor(get_interface<PPB_Graphics3D_Dev>()->Create(
+Graphics3D::Graphics3D(const Instance& instance,
+                       const Graphics3D& share_context,
+                       const int32_t* attrib_list) {
+  if (has_interface<PPB_Graphics3D>()) {
+    PassRefFromConstructor(get_interface<PPB_Graphics3D>()->Create(
         instance.pp_instance(),
         share_context.pp_resource(),
         attrib_list));
   }
 }
 
-Graphics3D_Dev::~Graphics3D_Dev() {
+Graphics3D::~Graphics3D() {
 }
 
-int32_t Graphics3D_Dev::GetAttribs(int32_t* attrib_list) const {
-  if (!has_interface<PPB_Graphics3D_Dev>())
+int32_t Graphics3D::GetAttribs(int32_t* attrib_list) const {
+  if (!has_interface<PPB_Graphics3D>())
     return PP_ERROR_NOINTERFACE;
 
-  return get_interface<PPB_Graphics3D_Dev>()->GetAttribs(
+  return get_interface<PPB_Graphics3D>()->GetAttribs(
       pp_resource(),
       attrib_list);
 }
 
-int32_t Graphics3D_Dev::SetAttribs(int32_t* attrib_list) {
-  if (!has_interface<PPB_Graphics3D_Dev>())
+int32_t Graphics3D::SetAttribs(int32_t* attrib_list) {
+  if (!has_interface<PPB_Graphics3D>())
     return PP_ERROR_NOINTERFACE;
 
-  return get_interface<PPB_Graphics3D_Dev>()->SetAttribs(
+  return get_interface<PPB_Graphics3D>()->SetAttribs(
       pp_resource(),
       attrib_list);
 }
 
-int32_t Graphics3D_Dev::ResizeBuffers(int32_t width, int32_t height) {
-  if (!has_interface<PPB_Graphics3D_Dev>())
+int32_t Graphics3D::ResizeBuffers(int32_t width, int32_t height) {
+  if (!has_interface<PPB_Graphics3D>())
     return PP_ERROR_NOINTERFACE;
 
-  return get_interface<PPB_Graphics3D_Dev>()->ResizeBuffers(
+  return get_interface<PPB_Graphics3D>()->ResizeBuffers(
       pp_resource(), width, height);
 }
 
-int32_t Graphics3D_Dev::SwapBuffers(const CompletionCallback& cc) {
-  if (!has_interface<PPB_Graphics3D_Dev>())
+int32_t Graphics3D::SwapBuffers(const CompletionCallback& cc) {
+  if (!has_interface<PPB_Graphics3D>())
     return PP_ERROR_NOINTERFACE;
 
-  return get_interface<PPB_Graphics3D_Dev>()->SwapBuffers(
+  return get_interface<PPB_Graphics3D>()->SwapBuffers(
       pp_resource(),
       cc.pp_completion_callback());
 }
 
 }  // namespace pp