| Index: ppapi/shared_impl/input_event_impl.cc
|
| diff --git a/ppapi/shared_impl/input_event_impl.cc b/ppapi/shared_impl/input_event_impl.cc
|
| index 599cfa1dce8a7bdcc7a96b9f89e05957b910e9b8..3b455b61b13c4c4f20b94331c1ecf812ad28861a 100644
|
| --- a/ppapi/shared_impl/input_event_impl.cc
|
| +++ b/ppapi/shared_impl/input_event_impl.cc
|
| @@ -4,6 +4,11 @@
|
|
|
| #include "ppapi/shared_impl/input_event_impl.h"
|
|
|
| +#include "ppapi/shared_impl/tracker_base.h"
|
| +#include "ppapi/shared_impl/var.h"
|
| +
|
| +using ppapi::thunk::PPB_InputEvent_API;
|
| +
|
| namespace ppapi {
|
|
|
| InputEventData::InputEventData()
|
| @@ -24,7 +29,22 @@ InputEventData::InputEventData()
|
| InputEventData::~InputEventData() {
|
| }
|
|
|
| -InputEventImpl::InputEventImpl(const InputEventData& data) : data_(data) {
|
| +InputEventImpl::InputEventImpl(const InitAsImpl&,
|
| + PP_Instance instance,
|
| + const InputEventData& data)
|
| + : Resource(instance),
|
| + data_(data) {
|
| +}
|
| +
|
| +InputEventImpl::InputEventImpl(const InitAsProxy&,
|
| + PP_Instance instance,
|
| + const InputEventData& data)
|
| + : Resource(HostResource::MakeInstanceOnly(instance)),
|
| + data_(data) {
|
| +}
|
| +
|
| +PPB_InputEvent_API* InputEventImpl::AsPPB_InputEvent_API() {
|
| + return this;
|
| }
|
|
|
| const InputEventData& InputEventImpl::GetInputEventData() const {
|
| @@ -72,7 +92,9 @@ uint32_t InputEventImpl::GetKeyCode() {
|
| }
|
|
|
| PP_Var InputEventImpl::GetCharacterText() {
|
| - return StringToPPVar(data_.character_text);
|
| + return StringVar::StringToPPVar(
|
| + TrackerBase::Get()->GetModuleForInstance(pp_instance()),
|
| + data_.character_text);
|
| }
|
|
|
| } // namespace ppapi
|
|
|