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

6 files changed, 20 insertions, 20 deletions

diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 5f84711..8bee4b2 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -25,11 +25,8 @@
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
-#include "ppapi/c/dev/ppb_graphics_3d_dev.h"
-#include "ppapi/c/dev/ppb_graphics_3d_trusted_dev.h"
 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
-#include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/dev/ppb_query_policy_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_surface_3d_dev.h"
@@ -52,9 +49,11 @@
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_graphics_2d.h"
+#include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
+#include "ppapi/c/ppb_opengles.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/c/ppb_url_response_info.h"
@@ -74,6 +73,7 @@
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/c/trusted/ppb_buffer_trusted.h"
 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
+#include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/shared_impl/input_event_impl.h"
@@ -345,9 +345,9 @@ const void* GetInterface(const char* name) {
     return ::ppapi::thunk::GetPPB_Zoom_Thunk();
 
 #ifdef ENABLE_GPU
-  if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_GRAPHICS_3D_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Graphics3D_Thunk();
-  if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk();
   if (strcmp(name, PPB_CONTEXT_3D_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Context3D_Thunk();
@@ -355,7 +355,7 @@ const void* GetInterface(const char* name) {
     return ::ppapi::thunk::GetPPB_Context3DTrusted_Thunk();
   if (strcmp(name, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_GLESChromiumTextureMapping_Thunk();
-  if (strcmp(name, PPB_OPENGLES2_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0)
     return PPB_OpenGLES_Impl::GetInterface();
   if (strcmp(name, PPB_SURFACE_3D_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Surface3D_Thunk();
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index b0a63309..4857bdf 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -17,11 +17,11 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
-#include "ppapi/c/dev/ppp_graphics_3d_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppp_graphics_3d.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/instance_impl.h"
@@ -432,7 +432,7 @@ class PluginInstance : public base::RefCounted<PluginInstance>,
   const PPP_Printing_Dev* plugin_print_interface_;
 
   // The plugin 3D interface.
-  const PPP_Graphics3D_Dev* plugin_graphics_3d_interface_;
+  const PPP_Graphics3D* plugin_graphics_3d_interface_;
 
   // Contains the cursor if it's set by the plugin.
   scoped_ptr<WebKit::WebCursorInfo> cursor_;
diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
index aadb023..cdd7d6c7 100644
--- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
+++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
@@ -245,10 +245,10 @@ void PPB_Graphics3D_Impl::SendContextLost() {
   if (!instance || !instance->container())
     return;
 
-  const PPP_Graphics3D_Dev* ppp_graphics_3d =
-      static_cast<const PPP_Graphics3D_Dev*>(
+  const PPP_Graphics3D* ppp_graphics_3d =
+      static_cast<const PPP_Graphics3D*>(
           instance->module()->GetPluginInterface(
-              PPP_GRAPHICS_3D_DEV_INTERFACE));
+              PPP_GRAPHICS_3D_INTERFACE));
   if (ppp_graphics_3d)
     ppp_graphics_3d->Graphics3DContextLost(pp_instance());
 }
diff --git a/webkit/plugins/ppapi/ppb_opengles_impl.cc b/webkit/plugins/ppapi/ppb_opengles_impl.cc
index 3744a5d..1f95df5 100644
--- a/webkit/plugins/ppapi/ppb_opengles_impl.cc
+++ b/webkit/plugins/ppapi/ppb_opengles_impl.cc
@@ -9,7 +9,7 @@
 namespace webkit {
 namespace ppapi {
 
-const PPB_OpenGLES2_Dev* PPB_OpenGLES_Impl::GetInterface() {
+const PPB_OpenGLES2* PPB_OpenGLES_Impl::GetInterface() {
   return ::ppapi::OpenGLES2Impl::GetInterface();
 }
 
diff --git a/webkit/plugins/ppapi/ppb_opengles_impl.h b/webkit/plugins/ppapi/ppb_opengles_impl.h
index 11df197..e4a69d2 100644
--- a/webkit/plugins/ppapi/ppb_opengles_impl.h
+++ b/webkit/plugins/ppapi/ppb_opengles_impl.h
@@ -1,18 +1,18 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 WEBKIT_PLUGINS_PPAPI_PPB_OPENGLES_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_OPENGLES_IMPL_H_
 
-struct PPB_OpenGLES2_Dev;
+struct PPB_OpenGLES2;
 
 namespace webkit {
 namespace ppapi {
 
 class PPB_OpenGLES_Impl {
  public:
-  static const PPB_OpenGLES2_Dev* GetInterface();
+  static const PPB_OpenGLES2* GetInterface();
 };
 
 }  // namespace ppapi
diff --git a/webkit/plugins/ppapi/ppb_surface_3d_impl.cc b/webkit/plugins/ppapi/ppb_surface_3d_impl.cc
index e0217a2..4cbc306 100644
--- a/webkit/plugins/ppapi/ppb_surface_3d_impl.cc
+++ b/webkit/plugins/ppapi/ppb_surface_3d_impl.cc
@@ -7,8 +7,8 @@
 #include "base/message_loop.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
-#include "ppapi/c/dev/ppb_graphics_3d_dev.h"
-#include "ppapi/c/dev/ppp_graphics_3d_dev.h"
+#include "ppapi/c/ppb_graphics_3d.h"
+#include "ppapi/c/ppp_graphics_3d.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ -180,10 +180,10 @@ void PPB_Surface3D_Impl::SendContextLost() {
   // callback after DidDestroy.
   if (!plugin_instance || !plugin_instance->container())
     return;
-  const PPP_Graphics3D_Dev* ppp_graphics_3d =
-      static_cast<const PPP_Graphics3D_Dev*>(
+  const PPP_Graphics3D* ppp_graphics_3d =
+      static_cast<const PPP_Graphics3D*>(
           plugin_instance->module()->GetPluginInterface(
-              PPP_GRAPHICS_3D_DEV_INTERFACE));
+              PPP_GRAPHICS_3D_INTERFACE));
   if (ppp_graphics_3d)
     ppp_graphics_3d->Graphics3DContextLost(pp_instance());
 }