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 !defined(FORCE_CAIRO)
   if (!o3d::CheckConfig(npp_)) {
     renderer_init_status_ = o3d::Renderer::GPU_NOT_UP_TO_SPEC;
   } else {
     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();
     }
   }
+#else
+  // To force cairo, pretend all previous renderer initialization has failed.

[Tristan Schmelcher 2, 2011/02/23 19:27:30]

You shouldn't need this, because renderer_init_status_ is set to UNINITIALIZED
in the constructor.

Hmm, though actually, it looks like CreateRenderer() could be called more than
once, so it may not be UNINITIALIZED at the start of this function. But the
original code does not appear to do the right thing in that case because it does
not delete the renderer_ before assigning the new one to it.

So actually, I think you should add this to the start of the function:

DeleteRenderer();
renderer_init_status_ = o3d::Renderer::UNINITIALIZED;

+  renderer_init_status_ = o3d::Renderer::GPU_NOT_UP_TO_SPEC;
+#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_) {
+      if (renderer_->Init(display_window, false) != o3d::Renderer::SUCCESS) {

[Tristan Schmelcher 2, 2011/02/23 19:27:30]

I think we might as well just assign this result directly to
renderer_init_status_. If both 3D and 2D initialization fails, the error code
from the 2D failure is probably more appropriate since it is the more
fundamental error. For example, 3D may have failed with GPU_NOT_UP_TO_SPEC, but
it would not be accurate to say that that is the cause of initialization failure
because there is no requirement for any particular GPU when 2D is supported.

+        DeleteRenderer();
+      } else {
+        renderer_init_status_ = o3d::Renderer::SUCCESS;
+        ClientInfoManager* client_info_manager =
+              service_locator()->GetService<ClientInfoManager>();
+        client_info_manager->SetRender2d(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