Change the DidChangeView update to take a new ViewChanged resource.

ppapi/shared_impl/ppp_instance_combined.h

 // 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.
 
 #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
 #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
 
 #include "base/basictypes.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace ppapi {
 
-struct PPAPI_SHARED_EXPORT PPP_Instance_Combined : public PPP_Instance_1_0 {
+// This exposes the 1.1 interface and forwards it to the 1.0 interface is
+// necessary.
+struct PPAPI_SHARED_EXPORT PPP_Instance_Combined {
  public:
   explicit PPP_Instance_Combined(const PPP_Instance_1_0& instance_if);
+  explicit PPP_Instance_Combined(const PPP_Instance_1_1& instance_if);
+
+  PP_Bool DidCreate(PP_Instance instance,
+                    uint32_t argc,
+                    const char* argn[],
+                    const char* argv[]);
+  void DidDestroy(PP_Instance instance);
+
+  // This version of DidChangeView encapsulates all arguments for both 1.0
+  // and 1.1 versions of this function. Conversion from 1.1 -> 1.0 is easy,
+  // but this class doesn't have the necessary context (resource interfaces)
+  // to do the conversion, so the caller must do it.
+  void DidChangeView(PP_Instance instance,
+                     PP_Resource view_changed_resource,
+                     const struct PP_Rect* position,
+                     const struct PP_Rect* clip);
+
+  void DidChangeFocus(PP_Instance instance, PP_Bool has_focus);
+  PP_Bool HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader);
+
+ private:
+  // For version 1.0, DidChangeView will be NULL, and DidChangeView_1_0 will
+  // be set below.
+  PPP_Instance_1_1 instance_1_1_;
+
+  // Non-NULL when Instance 1.0 is used.
+  void (*did_change_view_1_0_)(PP_Instance instance,
+                               const struct PP_Rect* position,
+                               const struct PP_Rect* clip);
 
   DISALLOW_COPY_AND_ASSIGN(PPP_Instance_Combined);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_