Renamed CommandBuffer to CommandBufferServer and extracted CommandBuffer interface.

Moved np_utils classes into new np_utils namespace.
Removed some of the command_buffer dependencies on NPAPI.
CommandBuffer(Server) is no longer an NPObject.


Review URL: http://codereview.chromium.org/387063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32119 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/o3d/plugin/cross/o3d_glue.cc b/o3d/plugin/cross/o3d_glue.cc
index 0dfa4b5..aa59a5d 100644
--- a/o3d/plugin/cross/o3d_glue.cc
+++ b/o3d/plugin/cross/o3d_glue.cc
@@ -54,9 +54,9 @@
 #endif
 
 using o3d::DisplayWindowCB;
-using gpu_plugin::NPObjectPointer;
-using gpu_plugin::NPVariantToValue;
-using gpu_plugin::ValueToNPVariant;
+using np_utils::NPObjectPointer;
+using np_utils::NPVariantToValue;
+using np_utils::ValueToNPVariant;
 
 namespace glue {
 namespace _o3d {
diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc
index 13cfc12..da4a1c2 100644
--- a/o3d/plugin/win/main_win.cc
+++ b/o3d/plugin/win/main_win.cc
@@ -54,7 +54,7 @@
 #if defined(RENDERER_CB)
 #include "core/cross/command_buffer/renderer_cb.h"
 #include "core/cross/command_buffer/display_window_cb.h"
-#include "gpu/gpu_plugin/command_buffer.h"
+#include "gpu/command_buffer/common/command_buffer.h"
 #endif
 
 using glue::_o3d::PluginObject;
@@ -63,8 +63,7 @@ using o3d::DisplayWindowWindows;
 using o3d::Event;
 
 #if defined(RENDERER_CB)
-using gpu_plugin::CommandBuffer;
-using gpu_plugin::NPObjectPointer;
+using command_buffer::CommandBuffer;
 #endif
 
 namespace {
@@ -75,7 +74,7 @@ HINSTANCE g_module_instance;
 //    move over to gyp. This is just to avoid having to write scons files for
 //    np_utils.
 #if defined(RENDERER_CB)
-gpu_plugin::NPBrowser* g_browser;
+np_utils::NPBrowser* g_browser;
 #endif
 }  // namespace anonymous
 
@@ -738,7 +737,7 @@ NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) {
   HANDLE_CRASHES;
 
 #if defined(RENDERER_CB)
-  g_browser = new gpu_plugin::NPBrowser(browserFuncs);
+  g_browser = new np_utils::NPBrowser(browserFuncs);
 #endif
 
   NPError retval = InitializeNPNApi(browserFuncs);
@@ -918,13 +917,14 @@ NPError NPP_SetWindow(NPP instance, NPWindow *window) {
   // create and assign the graphics context
 #if defined(RENDERER_CB)
   const unsigned int kDefaultCommandBufferSize = 256 << 10;
-  NPObjectPointer<CommandBuffer> command_buffer =
+
+  // RendererCB takes ownership of CommandBuffer.
+  CommandBuffer* command_buffer =
       RendererCBLocal::CreateCommandBuffer(instance,
                                            obj->GetHWnd(),
                                            kDefaultCommandBufferSize);
 
   DisplayWindowCB default_display;
-  default_display.set_npp(instance);
   default_display.set_command_buffer(command_buffer);
 
   obj->CreateRenderer(default_display);