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

Unified Diff: ppapi/proxy/ppp_input_event_proxy.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/proxy/ppp_input_event_proxy.cc
diff --git a/ppapi/proxy/ppp_input_event_proxy.cc b/ppapi/proxy/ppp_input_event_proxy.cc
index fce2ca59ffa201eb1efa9a7dc7b9e6915550a029..a8843f5c73d2ebc3a9dae0e42d78b20227b64161 100644
--- a/ppapi/proxy/ppp_input_event_proxy.cc
+++ b/ppapi/proxy/ppp_input_event_proxy.cc
@@ -12,6 +12,7 @@
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/ppb_input_event_proxy.h"
+#include "ppapi/shared_impl/input_event_impl.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_input_event_api.h"
@@ -93,21 +94,19 @@ bool PPP_InputEvent_Proxy::OnMessageReceived(const IPC::Message& msg) {
void PPP_InputEvent_Proxy::OnMsgHandleInputEvent(PP_Instance instance,
const InputEventData& data) {
- PP_Resource event_resource = PPB_InputEvent_Proxy::CreateProxyResource(
- instance, data);
- ppp_input_event_target()->HandleInputEvent(instance, event_resource);
- PluginResourceTracker::GetInstance()->ReleaseResource(event_resource);
+ scoped_refptr<InputEventImpl> resource(new InputEventImpl(
+ InputEventImpl::InitAsProxy(), instance, data));
+ ppp_input_event_target()->HandleInputEvent(instance, resource->pp_resource());
}
void PPP_InputEvent_Proxy::OnMsgHandleFilteredInputEvent(
PP_Instance instance,
const InputEventData& data,
PP_Bool* result) {
- PP_Resource event_resource = PPB_InputEvent_Proxy::CreateProxyResource(
- instance, data);
+ scoped_refptr<InputEventImpl> resource(new InputEventImpl(
+ InputEventImpl::InitAsProxy(), instance, data));
*result = ppp_input_event_target()->HandleInputEvent(instance,
- event_resource);
- PluginResourceTracker::GetInstance()->ReleaseResource(event_resource);
+ resource->pp_resource());
}
} // namespace proxy

Powered by Google App Engine
This is Rietveld 408576698