| Index: ppapi/shared_impl/ppp_instance_combined.cc
|
| diff --git a/ppapi/shared_impl/ppp_instance_combined.cc b/ppapi/shared_impl/ppp_instance_combined.cc
|
| index ce3d2c4c01cd057551066c15b32b8be9b69600f5..ffb96a40e365bf4b80f793f3289669319f15a86d 100644
|
| --- a/ppapi/shared_impl/ppp_instance_combined.cc
|
| +++ b/ppapi/shared_impl/ppp_instance_combined.cc
|
| @@ -7,8 +7,20 @@
|
| namespace ppapi {
|
|
|
| PPP_Instance_Combined::PPP_Instance_Combined(
|
| + const PPP_Instance_1_0& instance_if)
|
| + : PPP_Instance_1_0(instance_if),
|
| + HandleInputEvent_0_5(NULL) {
|
| +}
|
| +
|
| +PPP_Instance_Combined::PPP_Instance_Combined(
|
| const PPP_Instance_0_5& instance_if)
|
| - : PPP_Instance_0_5(instance_if) {
|
| + : PPP_Instance_1_0(),
|
| + HandleInputEvent_0_5(instance_if.HandleInputEvent) {
|
| + DidCreate = instance_if.DidCreate;
|
| + DidDestroy = instance_if.DidDestroy;
|
| + DidChangeView = instance_if.DidChangeView;
|
| + DidChangeFocus = instance_if.DidChangeFocus;
|
| + HandleDocumentLoad = instance_if.HandleDocumentLoad;
|
| }
|
|
|
| } // namespace ppapi
|
|
|