Change the DidChangeView update to take a new ViewChanged resource.

ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc

 // Copyright (c) 2011 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 "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_core.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_var.h"
 #include "native_client/src/shared/ppapi_proxy/ppruntime.h"
 #include "native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h"
@@ skipping 91 matching lines @@
 const PPP_Find_Dev* PPPFindInterface() {
   static const void* ppp = GetPluginInterfaceSafe(PPP_FIND_DEV_INTERFACE);
   return static_cast<const PPP_Find_Dev*>(ppp);
 }
 
 const PPP_InputEvent* PPPInputEventInterface() {
   static const void* ppp = GetPluginInterfaceSafe(PPP_INPUT_EVENT_INTERFACE);
   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 = GetPluginInterface(

[dmichael (off chromium), 2011/12/22 17:40:05]

This is so that we don't spit out Debug, right? May be worth a comment to avoid
somebody coming along and changing it.

+        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() {
   static const void* ppp = GetPluginInterfaceSafe(PPP_MESSAGING_INTERFACE);
   return static_cast<const PPP_Messaging*>(ppp);
 }
 
 const PPP_MouseLock* PPPMouseLockInterface() {
   static const void* ppp = GetPluginInterfaceSafe(PPP_MOUSELOCK_INTERFACE);
   return static_cast<const PPP_MouseLock*>(ppp);
@@ skipping 52 matching lines @@
   PpapiPluginRegisterDefaultThreadCreator();
   // Designate this as the main thread for PPB_Core::IsMainThread().
   ppapi_proxy::PluginCore::MarkMainThread();
   if (!NaClSrpcAcceptClientConnection(PppRpcs::srpc_methods)) {
     return 1;
   }
   NaClSrpcModuleFini();
 
   return 0;
 }