Resubmitting r36268 with a fix for mac:...

webkit/tools/pepper_test_plugin/plugin_object.h

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_
 #define WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "webkit/glue/plugins/nphostapi.h"
 #if !defined(INDEPENDENT_PLUGIN)
-#include "gpu/command_buffer/client/gles2_implementation.h"
-#include "webkit/tools/pepper_test_plugin/command_buffer_pepper.h"
+#include "gpu/pgl/pgl.h"
 #endif
 
 extern NPNetscapeFuncs* browser;
 
 class PluginObject {
  public:
   explicit PluginObject(NPP npp);
   ~PluginObject();
 
   static NPClass* GetPluginClass();
 
   NPObject* header() { return &header_; }
   NPP npp() const { return npp_; }
 
   void New(NPMIMEType pluginType, int16 argc, char* argn[], char* argv[]);
   void SetWindow(const NPWindow& window);
   void Draw3D();
 
  private:
-  bool InitializeCommandBuffer();
-
   NPObject header_;
   NPP npp_;
   NPObject* test_object_;
   int dimensions_;
 
   NPDevice* device2d_;
+  NPDevice* device3d_;
+
+#if !defined(INDEPENDENT_PLUGIN)
+  PGLContext pgl_context_;
+#endif
+
   NPDevice* deviceaudio_;
 
+  NPDeviceContext3D context3d_;
   NPDeviceContextAudio context_audio_;
 
-#if !defined(INDEPENDENT_PLUGIN)
-  scoped_ptr<CommandBufferPepper> command_buffer_;
-  scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;
-  scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;
-#endif
 
   int width_;
   int height_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginObject);
 };
 
 
 #endif  // WEBKIT_TOOLS_PEPPER_TEST_PLUGIN_PLUGIN_OBJECT_H_