Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2293)

Unified Diff: ppapi/shared_impl/input_event_impl.cc

Issue 7621070: Merge the plugin and impl side of the audio config and input event resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed compile issues Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698