summaryrefslogtreecommitdiffstats
path: root/o3d/converter
diff options
context:
space:
mode:
authormilligan@google.com <milligan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-22 18:58:08 +0000
committermilligan@google.com <milligan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-22 18:58:08 +0000
commitbd513291051d0d75c7a2052aa98fa2ce2742f8c3 (patch)
tree61cd63ea56c6c02bfba4932a290b1fabd57158ee /o3d/converter
parent01ac68fa4b00341fc5afc63cc6e8a16bf9d2d5c8 (diff)
downloadchromium_src-bd513291051d0d75c7a2052aa98fa2ce2742f8c3.zip
chromium_src-bd513291051d0d75c7a2052aa98fa2ce2742f8c3.tar.gz
chromium_src-bd513291051d0d75c7a2052aa98fa2ce2742f8c3.tar.bz2
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
Diffstat (limited to 'o3d/converter')
-rw-r--r--o3d/converter/cross/converter.cc9
-rw-r--r--o3d/converter/cross/renderer_stub.cc9
2 files changed, 2 insertions, 16 deletions
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> renderer(
-#if !defined(RENDERER_CAIRO)
- Renderer::CreateDefaultRenderer(&service_locator));
-#else
- RendererStub::CreateDefault(&service_locator));
-#endif
+ scoped_ptr<Renderer> 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(
- 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