From 61e3ef3a32dd7b5bd4c8c6b1b3a68ed081101a97 Mon Sep 17 00:00:00 2001
From: "dmichael@chromium.org"
 <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 20 Jul 2011 16:03:38 +0000
Subject: Remove HandleInputEvent from PPP_Instance and freeze to 1.0.

Note I'm leaving in temporary backwards-compatibility.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=2035
TEST=ppapi tests

Review URL: http://codereview.chromium.org/7452002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93202 0039d316-1c4b-4281-b951-d872f2087c98
---
 ppapi/proxy/ppp_instance_proxy.cc | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'ppapi/proxy/ppp_instance_proxy.cc')

diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc
index 99dcaab..cc2f9db 100644
--- a/ppapi/proxy/ppp_instance_proxy.cc
+++ b/ppapi/proxy/ppp_instance_proxy.cc
@@ -65,21 +65,6 @@ void DidChangeFocus(PP_Instance instance, PP_Bool has_focus) {
                                               instance, has_focus));
 }
 
-PP_Bool HandleInputEvent(PP_Instance instance,
-                         const PP_InputEvent* event) {
-  PP_Bool result = PP_FALSE;
-  IPC::Message* msg = new PpapiMsg_PPPInstance_HandleInputEvent(
-      INTERFACE_ID_PPP_INSTANCE, instance, *event, &result);
-  // Make this message not unblock, to avoid re-entrancy problems when the
-  // plugin does a synchronous call to the renderer. This will force any
-  // synchronous calls from the plugin to complete before processing this
-  // message. We avoid deadlock by never un-setting the unblock flag on messages
-  // from the plugin to the renderer.
-  msg->set_unblock(false);
-  HostDispatcher::GetForInstance(instance)->Send(msg);
-  return result;
-}
-
 PP_Bool HandleDocumentLoad(PP_Instance instance,
                            PP_Resource url_loader) {
   PP_Bool result = PP_FALSE;
@@ -112,12 +97,11 @@ PP_Bool HandleDocumentLoad(PP_Instance instance,
   return result;
 }
 
-static const PPP_Instance_0_5 instance_interface_0_5 = {
+static const PPP_Instance_1_0 instance_interface_1_0 = {
   &DidCreate,
   &DidDestroy,
   &DidChangeView,
   &DidChangeFocus,
-  &HandleInputEvent,
   &HandleDocumentLoad
 };
 
@@ -135,13 +119,13 @@ PPP_Instance_Proxy::~PPP_Instance_Proxy() {
 }
 
 // static
-const InterfaceProxy::Info* PPP_Instance_Proxy::GetInfo0_5() {
+const InterfaceProxy::Info* PPP_Instance_Proxy::GetInfo1_0() {
   static const Info info = {
-    &instance_interface_0_5,
-    PPP_INSTANCE_INTERFACE_0_5,
+    &instance_interface_1_0,
+    PPP_INSTANCE_INTERFACE_1_0,
     INTERFACE_ID_PPP_INSTANCE,
     false,
-    &CreateInstanceProxy<PPP_Instance_0_5>,
+    &CreateInstanceProxy<PPP_Instance_1_0>,
   };
   return &info;
 }
@@ -157,8 +141,6 @@ bool PPP_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
                         OnMsgDidChangeView)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_DidChangeFocus,
                         OnMsgDidChangeFocus)
-    IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_HandleInputEvent,
-                        OnMsgHandleInputEvent)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_HandleDocumentLoad,
                         OnMsgHandleDocumentLoad)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -224,12 +206,6 @@ void PPP_Instance_Proxy::OnMsgDidChangeFocus(PP_Instance instance,
   combined_interface_->DidChangeFocus(instance, has_focus);
 }
 
-void PPP_Instance_Proxy::OnMsgHandleInputEvent(PP_Instance instance,
-                                               const PP_InputEvent& event,
-                                               PP_Bool* result) {
-  *result = combined_interface_->HandleInputEvent(instance, &event);
-}
-
 void PPP_Instance_Proxy::OnMsgHandleDocumentLoad(PP_Instance instance,
                                                  const HostResource& url_loader,
                                                  PP_Bool* result) {
-- 
cgit v1.1