Removed O3D command buffer protocol code and O3D comand buffer configuration.

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

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

2 files changed, 6 insertions, 77 deletions

diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index 9ea6e00..d320b61 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -50,7 +50,6 @@
       '../../v8/tools/gyp/v8.gyp:v8',
       '../core/core.gyp:o3dCore',
       '../core/core.gyp:o3dCorePlatform',
-      '../gpu/gpu.gyp:np_utils',
       '../import/archive.gyp:o3dArchive',
       '../utils/utils.gyp:o3dUtils',
       '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc',
@@ -95,7 +94,7 @@
             ],
           },
         ],
-        ['renderer == "gl" or cb_service == "gl"',
+        ['renderer == "gl"',
           {
             'dependencies': [
               '../build/libs.gyp:gl_libs',
@@ -124,6 +123,7 @@
               'mac/plugin_mac.h',
               'mac/plugin_mac.mm',
               'mac/graphics_utils_mac.mm',
+              'mac/main_mac.mm',
             ],
             'mac_framework_dirs': [
               '../../<(cgdir)',
@@ -188,18 +188,12 @@
             ],
           },
         ],
-        ['OS == "mac" and cb_service != "remote"',
-          {
-            'sources': [
-              'mac/main_mac.mm',
-            ],
-          },
-        ],
         ['OS == "linux"',
           {
             'sources': [
               'linux/config.cc',
               'linux/envvars.cc',
+              'linux/main_linux.cc',
             ],
             'ldflags': [
               '-z',
@@ -215,10 +209,9 @@
             ],
           },
         ],
-        ['OS == "linux" and cb_service != "remote"',
+        ['OS == "linux"',
           {
             'sources': [
-              'linux/main_linux.cc',
             ],
           },
         ],
@@ -230,6 +223,7 @@
             'sources': [
               'win/config.cc',
               'win/logger_main.cc',
+              'win/main_win.cc',
               'win/o3dPlugin.def',
               'win/o3dPlugin.rc',
               'win/plugin_logging-win32.cc',
@@ -244,39 +238,17 @@
             },
           },
         ],
-        ['OS == "win" and cb_service != "remote"',
-          {
-            'sources': [
-              'win/main_win.cc',
-            ],
-          },
-        ],
         ['OS == "win" and renderer == "d3d9"',
           {
             'link_settings': {
               'libraries': [
                 '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"',
                 '-ld3d9.lib',
-              ],
-            },
-          },
-        ],
-        ['OS == "win" and (renderer == "d3d9" or cb_service == "d3d9" or cb_service == "remote")',
-          {
-            'link_settings': {
-              'libraries': [
                 '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"',
               ],
             },
           },
         ],
-        ['cb_service == "remote"',
-          {
-            'sources': [
-              'cross/main_remote_cb.cc',
-            ],
-          },
-        ],
       ],
     },
   ],
@@ -424,7 +396,7 @@
                   },
                 },
               ],
-              ['OS == "win" and (renderer == "d3d9" or cb_service == "d3d9")',
+              ['OS == "win" and renderer == "d3d9"',
                 {
                   'link_settings': {
                     'libraries': [
diff --git a/o3d/plugin/win/main_win.cc b/o3d/plugin/win/main_win.cc
index da4a1c2..6e8743f 100644
--- a/o3d/plugin/win/main_win.cc
+++ b/o3d/plugin/win/main_win.cc
@@ -51,31 +51,14 @@
 #include "v8/include/v8.h"
 #include "breakpad/win/bluescreen_detector.h"
 
-#if defined(RENDERER_CB)
-#include "core/cross/command_buffer/renderer_cb.h"
-#include "core/cross/command_buffer/display_window_cb.h"
-#include "gpu/command_buffer/common/command_buffer.h"
-#endif
-
 using glue::_o3d::PluginObject;
 using glue::StreamManager;
 using o3d::DisplayWindowWindows;
 using o3d::Event;
 
-#if defined(RENDERER_CB)
-using command_buffer::CommandBuffer;
-#endif
-
 namespace {
 // The instance handle of the O3D DLL.
 HINSTANCE g_module_instance;
-
-// TODO(apatrick): We can have an NPBrowser in the other configurations when we
-//    move over to gyp. This is just to avoid having to write scons files for
-//    np_utils.
-#if defined(RENDERER_CB)
-np_utils::NPBrowser* g_browser;
-#endif
 }  // namespace anonymous
 
 #if !defined(O3D_INTERNAL_PLUGIN)
@@ -736,10 +719,6 @@ extern "C" {
 NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs) {
   HANDLE_CRASHES;
 
-#if defined(RENDERER_CB)
-  g_browser = new np_utils::NPBrowser(browserFuncs);
-#endif
-
   NPError retval = InitializeNPNApi(browserFuncs);
   if (retval != NPERR_NO_ERROR) return retval;
   return InitializePlugin();
@@ -778,11 +757,6 @@ NPError OSCALL NP_Shutdown(void) {
     g_bluescreen_detector = NULL;
   }
 
-#if defined(RENDERER_CB)
-  delete g_browser;
-  g_browser = NULL;
-#endif
-
 #endif  // O3D_INTERNAL_PLUGIN
 
   return NPERR_NO_ERROR;
@@ -915,27 +889,10 @@ NPError NPP_SetWindow(NPP instance, NPWindow *window) {
   ::ShowWindow(content_window, SW_SHOW);
 
   // create and assign the graphics context
-#if defined(RENDERER_CB)
-  const unsigned int kDefaultCommandBufferSize = 256 << 10;
-
-  // RendererCB takes ownership of CommandBuffer.
-  CommandBuffer* command_buffer =
-      RendererCBLocal::CreateCommandBuffer(instance,
-                                           obj->GetHWnd(),
-                                           kDefaultCommandBufferSize);
-
-  DisplayWindowCB default_display;
-  default_display.set_command_buffer(command_buffer);
-
-  obj->CreateRenderer(default_display);
-  obj->renderer()->Resize(window->width, window->height);
-  obj->client()->Init();
-#else
   DisplayWindowWindows default_display;
   default_display.set_hwnd(obj->GetHWnd());
   obj->CreateRenderer(default_display);
   obj->client()->Init();
-#endif
 
   // we set the timer to 10ms or 100fps. At the time of this comment
   // the renderer does a vsync the max fps it will run will be the refresh