Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_graphics_3d.cc

 // Copyright (c) 2010 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 "webkit/glue/plugins/pepper_graphics_3d.h"
 
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "base/singleton.h"
 #include "base/thread_local.h"
+#include "third_party/ppapi/c/dev/ppb_graphics_3d_dev.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 
 namespace pepper {
 
 namespace {
 
 struct CurrentContextTag {};
 typedef Singleton<base::ThreadLocalPointer<Graphics3D>,
     DefaultSingletonTraits<base::ThreadLocalPointer<Graphics3D> >,
     CurrentContextTag> CurrentContextKey;
@@ skipping 77 matching lines @@
 bool SwapBuffers(PP_Resource graphics3d) {
   scoped_refptr<Graphics3D> context(Resource::GetAs<Graphics3D>(graphics3d));
   return context && context->SwapBuffers();
 }
 
 uint32_t GetError() {
   // TODO(neb): Figure out error checking.
   return PP_GRAPHICS_3D_ERROR_SUCCESS;
 }
 
-const PPB_Graphics3D ppb_graphics3d = {
+const PPB_Graphics3D_Dev ppb_graphics3d = {
   &IsGraphics3D,
   &GetConfigs,
   &ChooseConfig,
   &GetConfigAttrib,
   &QueryString,
   &CreateContext,
   &GetProcAddress,
   &MakeCurrent,
   &GetCurrentContext,
   &SwapBuffers,
   &GetError
 };
 
-
 }  // namespace
 
 Graphics3D::Graphics3D(PluginModule* module)
     : Resource(module),
       command_buffer_(NULL),
       transfer_buffer_id_(0),
       method_factory3d_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
-const PPB_Graphics3D* Graphics3D::GetInterface() {
+const PPB_Graphics3D_Dev* Graphics3D::GetInterface() {
   return &ppb_graphics3d;
 }
 
 Graphics3D* Graphics3D::GetCurrent() {
   return CurrentContextKey::get()->Get();
 }
 
 void Graphics3D::ResetCurrent() {
   CurrentContextKey::get()->Set(NULL);
 }
@@ skipping 105 matching lines @@
     if (platform_context_.get()) {
       platform_context_->SetNotifyRepaintTask(
           method_factory3d_.NewRunnableMethod(&Graphics3D::HandleRepaint,
                                               instance_id));
     }
   }
 }
 
 }  // namespace pepper