From bd513291051d0d75c7a2052aa98fa2ce2742f8c3 Mon Sep 17 00:00:00 2001 From: "milligan@google.com" Date: Tue, 22 Feb 2011 18:58:08 +0000 Subject: Baby steps toward o2d and o3d dynamic switching in the video accelerator browser plugin. This step rolls the o2d renderer and the gl renderer into the same linux plugin. Unfortunately the code path for which one gets used is still controlled by a compile time switch. That switch is force_cairo which is set to 0 by default (meaning o3d) in common.gypi. Review URL: http://codereview.chromium.org/6532010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75614 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/converter/cross/converter.cc | 9 ++------- o3d/converter/cross/renderer_stub.cc | 9 --------- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'o3d/converter') diff --git a/o3d/converter/cross/converter.cc b/o3d/converter/cross/converter.cc index 63e52a1..68969f2 100644 --- a/o3d/converter/cross/converter.cc +++ b/o3d/converter/cross/converter.cc @@ -279,12 +279,7 @@ bool Convert(const FilePath& in_filename, // Collect error messages. ErrorCollector error_collector(&service_locator); - scoped_ptr renderer( -#if !defined(RENDERER_CAIRO) - Renderer::CreateDefaultRenderer(&service_locator)); -#else - RendererStub::CreateDefault(&service_locator)); -#endif + scoped_ptr renderer(RendererStub::CreateDefault(&service_locator)); renderer->InitCommon(); Pack::Ref pack(object_manager.CreatePack()); @@ -476,7 +471,7 @@ bool Verify(const FilePath& in_filename, ErrorCollector error_collector(&service_locator); scoped_ptr renderer( - Renderer::CreateDefaultRenderer(&service_locator)); + RendererStub::CreateDefault(&service_locator)); renderer->InitCommon(); Pack::Ref pack(object_manager.CreatePack()); diff --git a/o3d/converter/cross/renderer_stub.cc b/o3d/converter/cross/renderer_stub.cc index c7c9f4c..0155068 100644 --- a/o3d/converter/cross/renderer_stub.cc +++ b/o3d/converter/cross/renderer_stub.cc @@ -211,13 +211,4 @@ const int* RendererStub::GetRGBAUByteNSwizzleTable() { return swizzle_table; } -// TODO(fransiskusx): This violates the One Definition Rule. -#if !defined(RENDERER_CAIRO) -// This is a factory function for creating Renderer objects. Since -// we're implementing a stub renderer, we only ever return a stub renderer. -Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) { - return RendererStub::CreateDefault(service_locator); -} -#endif - } // namespace o3d -- cgit v1.1