Show a replacement plug-in for loading errors.

webkit/plugins/ppapi/ppapi_webplugin_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 
 #include <cmath>
 
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
@@ skipping 10 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/plugins/ppapi/message_channel.h"
 #include "webkit/plugins/ppapi/npobject_var.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 
 using ppapi::NPObjectVar;
 using WebKit::WebCanvas;
 using WebKit::WebPluginContainer;
 using WebKit::WebPluginParams;

[darin (slow to review), 2012/04/30 18:57:02]

add using WebKit::WebPlugin here?

[Bernhard Bauer, 2012/04/30 19:30:36]

Done.

 using WebKit::WebPoint;
 using WebKit::WebRect;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 using WebKit::WebView;
 
 namespace webkit {
 namespace ppapi {
 
@@ skipping 35 matching lines @@
     return false;
 
   bool success = instance_->Initialize(container,
                                        init_data_->arg_names,
                                        init_data_->arg_values,
                                        init_data_->url,
                                        full_frame_);
   if (!success) {
     instance_->Delete();
     instance_ = NULL;
-    return false;
+
+    WebKit::WebPlugin* replacement_plugin =
+        init_data_->delegate->CreatePluginReplacement(
+            init_data_->module->path());
+    if (!replacement_plugin->initialize(container)) {
+      LOG(ERROR) << "Couldn't initialize replacement plug-in";

[darin (slow to review), 2012/04/30 18:57:02]

do we really need all of these LOG(ERROR) statements in this patch?  just use
DLOG(ERROR) instead?  or, are you really hoping to collect chrome_debug.log
files from end users?

[Bernhard Bauer, 2012/04/30 19:30:36]

Right; I do want logging if we can't load the actual plug-in, but the
replacement plug-in won't ever fail as long as it is a WebViewPlugin.

+      return false;
+    }
+    container->setPlugin(replacement_plugin);
+    return true;
   }
 
   init_data_.reset();
   return true;
 }
 
 void WebPluginImpl::destroy() {
   if (instance_) {
     ::ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);
     instance_object_ = PP_MakeUndefined();
@@ skipping 168 matching lines @@
 bool WebPluginImpl::canRotateView() {
   return instance_->CanRotateView();
 }
 
 void WebPluginImpl::rotateView(RotationType type) {
   instance_->RotateView(type);
 }
 
 }  // namespace ppapi
 }  // namespace webkit