| 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 8da13af5727c54e1eb437254417d8aa972e90599..ce3d2c4c01cd057551066c15b32b8be9b69600f5 100644
|
| --- a/ppapi/shared_impl/ppp_instance_combined.cc
|
| +++ b/ppapi/shared_impl/ppp_instance_combined.cc
|
| @@ -8,20 +8,7 @@ namespace ppapi {
|
|
|
| PPP_Instance_Combined::PPP_Instance_Combined(
|
| const PPP_Instance_0_5& instance_if)
|
| - : PPP_Instance_0_5(instance_if),
|
| - GetInstanceObject_0_4(NULL) {
|
| -}
|
| -
|
| -PPP_Instance_Combined::PPP_Instance_Combined(
|
| - const PPP_Instance_0_4& instance_if)
|
| - : PPP_Instance_0_5(), // Zero-initialize.
|
| - GetInstanceObject_0_4(instance_if.GetInstanceObject) {
|
| - DidCreate = instance_if.DidCreate;
|
| - DidDestroy = instance_if.DidDestroy;
|
| - DidChangeView = instance_if.DidChangeView;
|
| - DidChangeFocus = instance_if.DidChangeFocus;
|
| - HandleInputEvent = instance_if.HandleInputEvent;
|
| - HandleDocumentLoad = instance_if.HandleDocumentLoad;
|
| + : PPP_Instance_0_5(instance_if) {
|
| }
|
|
|
| } // namespace ppapi
|
|
|