| Index: webkit/plugins/ppapi/plugin_module.cc
|
| diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
|
| index 615481778e854c739b83df700cf0866a2ac0a1ad..29d6dbc43737b09eba51707e550896c05f5e2ef2 100644
|
| --- a/webkit/plugins/ppapi/plugin_module.cc
|
| +++ b/webkit/plugins/ppapi/plugin_module.cc
|
| @@ -59,6 +59,7 @@
|
| #include "ppapi/c/ppb_url_request_info.h"
|
| #include "ppapi/c/ppb_url_response_info.h"
|
| #include "ppapi/c/ppb_var.h"
|
| +#include "ppapi/c/ppb_view.h"
|
| #include "ppapi/c/ppp.h"
|
| #include "ppapi/c/ppp_instance.h"
|
| #include "ppapi/c/private/ppb_file_ref_private.h"
|
| @@ -497,10 +498,14 @@ PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() {
|
|
|
| PluginInstance* PluginModule::CreateInstance(PluginDelegate* delegate) {
|
| PluginInstance* instance(NULL);
|
| - const void* ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_1_0);
|
| + const void* ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_1_1);
|
| if (ppp_instance) {
|
| + instance = PluginInstance::Create1_1(delegate, this, ppp_instance);
|
| + } else if ((ppp_instance = GetPluginInterface(PPP_INSTANCE_INTERFACE_1_0))) {
|
| instance = PluginInstance::Create1_0(delegate, this, ppp_instance);
|
| - } if (!instance) {
|
| + }
|
| +
|
| + if (!instance) {
|
| LOG(WARNING) << "Plugin doesn't support instance interface, failing.";
|
| return NULL;
|
| }
|
|
|