| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ppapi/shared_impl/ppp_instance_combined.h" | 5 #include "ppapi/shared_impl/ppp_instance_combined.h" |
| 6 | 6 |
| 7 namespace ppapi { | 7 namespace ppapi { |
| 8 | 8 |
| 9 PPP_Instance_Combined::PPP_Instance_Combined( | 9 PPP_Instance_Combined::PPP_Instance_Combined( |
| 10 const PPP_Instance_0_5& instance_if) | 10 const PPP_Instance_0_5& instance_if) |
| 11 : PPP_Instance_0_5(instance_if), | 11 : PPP_Instance_0_5(instance_if) { |
| 12 GetInstanceObject_0_4(NULL) { | |
| 13 } | |
| 14 | |
| 15 PPP_Instance_Combined::PPP_Instance_Combined( | |
| 16 const PPP_Instance_0_4& instance_if) | |
| 17 : PPP_Instance_0_5(), // Zero-initialize. | |
| 18 GetInstanceObject_0_4(instance_if.GetInstanceObject) { | |
| 19 DidCreate = instance_if.DidCreate; | |
| 20 DidDestroy = instance_if.DidDestroy; | |
| 21 DidChangeView = instance_if.DidChangeView; | |
| 22 DidChangeFocus = instance_if.DidChangeFocus; | |
| 23 HandleInputEvent = instance_if.HandleInputEvent; | |
| 24 HandleDocumentLoad = instance_if.HandleDocumentLoad; | |
| 25 } | 12 } |
| 26 | 13 |
| 27 } // namespace ppapi | 14 } // namespace ppapi |
| 28 | 15 |
| OLD | NEW |