| Index: ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
|
| index 8efe062dd6b8bf19438060c48145e4e65dab9e7c..7e44468f14f0a676464098d428f4600cbc14fc53 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
|
| @@ -109,9 +109,19 @@ const PPP_InputEvent* PPPInputEventInterface() {
|
| return static_cast<const PPP_InputEvent*>(ppp);
|
| }
|
|
|
| -const PPP_Instance* PPPInstanceInterface() {
|
| - static const void* ppp = GetPluginInterfaceSafe(PPP_INSTANCE_INTERFACE);
|
| - return static_cast<const PPP_Instance*>(ppp);
|
| +PPP_Instance_Combined* PPPInstanceInterface() {
|
| + static PPP_Instance_Combined combined;
|
| + if (!combined.initialized()) {
|
| + const void* instance1_1 = GetPluginInterfaceSafe(
|
| + PPP_INSTANCE_INTERFACE_1_1);
|
| + if (instance1_1) {
|
| + combined.Init1_1(static_cast<const PPP_Instance_1_1*>(instance1_1));
|
| + } else {
|
| + combined.Init1_0(static_cast<const PPP_Instance_1_0*>(
|
| + GetPluginInterfaceSafe(PPP_INSTANCE_INTERFACE_1_0)));
|
| + }
|
| + }
|
| + return &combined;
|
| }
|
|
|
| const PPP_Messaging* PPPMessagingInterface() {
|
|
|