diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 23:24:41 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 23:24:41 +0000 |
| commit | ba1d6b0893d6d07cf1fb924f4212446d4e6136d4 (patch) | |
| tree | 1a614a02f797a7e172a72c99857debbd9706d28f /o3d/tests | |
| parent | 8ca3290c9c7bc8dfff4520562290363c71cf0235 (diff) | |
| download | chromium_src-ba1d6b0893d6d07cf1fb924f4212446d4e6136d4.zip chromium_src-ba1d6b0893d6d07cf1fb924f4212446d4e6136d4.tar.gz chromium_src-ba1d6b0893d6d07cf1fb924f4212446d4e6136d4.tar.bz2 | |
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
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/common/win/testing_common.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/o3d/tests/common/win/testing_common.cc b/o3d/tests/common/win/testing_common.cc index ba7c402..7e8937d 100644 --- a/o3d/tests/common/win/testing_common.cc +++ b/o3d/tests/common/win/testing_common.cc @@ -53,7 +53,6 @@ #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/np_utils/np_browser_stub.h" #endif @@ -61,9 +60,8 @@ using o3d::DisplayWindowWindows; #if defined(RENDERER_CB) using o3d::DisplayWindowCB; -using gpu_plugin::CommandBuffer; -using gpu_plugin::NPObjectPointer; -using gpu_plugin::StubNPBrowser; +using np_utils::NPObjectPointer; +using np_utils::StubNPBrowser; using o3d::RendererCBLocal; #endif @@ -190,8 +188,8 @@ int WINAPI WinMain(HINSTANCE instance, #if defined(RENDERER_CB) const unsigned int kDefaultCommandBufferSize = 256 << 10; + // RendererCB takes ownership of CommandBuffer. DisplayWindowCB* display_window = new o3d::DisplayWindowCB; - display_window->set_npp(NULL); display_window->set_command_buffer(RendererCBLocal::CreateCommandBuffer( NULL, g_window_handle, |