Add support for runtime fall-back from o3d to o2d.

plugin/cross/o3d_glue.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 239 matching lines @@
   features_ = NULL;
 
   // There is a reference cycle between the V8 bridge and the plugin.
   // Explicitly remove all V8 references during tear-down, so that the cycle is
   // broken, and the reference counting system will successfully delete the
   // plugin.
   np_v8_bridge_.ReleaseNPObjects();
 }
 
 void PluginObject::CreateRenderer(const o3d::DisplayWindow& display_window) {
-  if (!o3d::CheckConfig(npp_)) {
-    renderer_init_status_ = o3d::Renderer::GPU_NOT_UP_TO_SPEC;
-  } else {
+  renderer_init_status_ = o3d::Renderer::GPU_NOT_UP_TO_SPEC;

[Tristan Schmelcher 2, 2011/02/23 02:08:51]

I preferred the previous code structure where this was only assigned once
o3d::CheckConfig() returned false. I think that is a bit clearer.

+#if !defined(FORCE_CAIRO)
+  if (o3d::CheckConfig(npp_)) {
     renderer_ = o3d::Renderer::CreateDefaultRenderer(&service_locator_);
     DCHECK(renderer_);
 
     // Attempt to initialize renderer.
     renderer_init_status_ = renderer_->Init(display_window, false);
     if (renderer_init_status_ != o3d::Renderer::SUCCESS) {
       DeleteRenderer();
     }
   }
+#endif
+#if defined(SUPPORT_CAIRO)
+  if (renderer_init_status_ != o3d::Renderer::SUCCESS) {
+    // Attempt to fall back to o2d renderer
+    renderer_ = o3d::Renderer::Create2DRenderer(&service_locator_);
+    if (renderer_) {
+      Renderer::InitStatus temp_status = renderer_->Init(display_window,

[Tristan Schmelcher 2, 2011/02/23 02:08:51]

I don't think you need this temp_status variable.

+                                                         false);
+      if (temp_status != o3d::Renderer::SUCCESS) {
+        DeleteRenderer();
+      } else {
+        renderer_init_status_ = o3d::Renderer::SUCCESS;
+        ClientInfoManager* client_info_manager =
+              service_locator()->GetService<ClientInfoManager>();
+        client_info_manager->SetRenderer2d(true);
+      }
+    }
+  }
+#endif
 }
 
 void PluginObject::DeleteRenderer() {
   if (renderer_) {
     delete renderer_;
     renderer_ = NULL;
   }
 }
 
 
@@ skipping 916 matching lines @@
   PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata);
   if (plugin_object) {  // May not be initialized yet.
     return plugin_object->client()->ProfileToString();
   } else {
     return "";
   }
 }
 
 }  // namespace globals
 }  // namespace glue