Revert 93223 - Reland http://codereview.chromium.org/7452002/

Update chromoting input events. (Clang caught this. Thanks, Clang!)

Note I'm leaving in temporary backwards-compatibility.

brettw, just need a rubber-stamp. This is the same as the last CL. awong/garykac/sergeyu, looking for someone on chromoting team to glance at my changes and make sure I didn't do anything you don't like. This is a high priority for 14, so please look if you can.

BUG=None
TEST=ppapi tests

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

TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/7471006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93229 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 1 deletions

diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index 9bb77dc..75e9a1f 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -67,6 +67,10 @@ bool Instance::HandleDocumentLoad(const URLLoader& /*url_loader*/) {
   return false;
 }
 
+bool Instance::HandleInputEvent(const PP_InputEvent& /*event*/) {
+  return false;
+}
+
 bool Instance::HandleInputEvent(const InputEvent& /*event*/) {
   return false;
 }
diff --git a/ppapi/cpp/instance.h b/ppapi/cpp/instance.h
index f08c2d5..abf441f 100644
--- a/ppapi/cpp/instance.h
+++ b/ppapi/cpp/instance.h
@@ -154,7 +154,10 @@ class Instance {
   /// @param[in] event The input event.
   ///
   /// @return true if @a event was handled, false otherwise.
-  virtual bool HandleInputEvent(const pp::InputEvent& event);
+  virtual bool HandleInputEvent(const PP_InputEvent& event);
+
+  /// @see InputEvent for an example
+  virtual bool HandleInputEvent(const InputEvent& event);
 
   /// Notification of a data stream available after an instance was created
   /// based on the MIME type of a DOMWindow navigation. This only applies to
diff --git a/ppapi/cpp/module.cc b/ppapi/cpp/module.cc
index b727e46..927710a 100644
--- a/ppapi/cpp/module.cc
+++ b/ppapi/cpp/module.cc
@@ -110,6 +110,17 @@ void Instance_DidChangeFocus(PP_Instance pp_instance, PP_Bool has_focus) {
   instance->DidChangeFocus(PP_ToBool(has_focus));
 }
 
+PP_Bool Instance_HandleInputEvent(PP_Instance pp_instance,
+                                  const PP_InputEvent* event) {
+  Module* module_singleton = Module::Get();
+  if (!module_singleton)
+    return PP_FALSE;
+  Instance* instance = module_singleton->InstanceForPPInstance(pp_instance);
+  if (!instance)
+    return PP_FALSE;
+  return PP_FromBool(instance->HandleInputEvent(*event));
+}
+
 PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance,
                                     PP_Resource pp_url_loader) {
   Module* module_singleton = Module::Get();
@@ -126,6 +137,7 @@ static PPP_Instance instance_interface = {
   &Instance_DidDestroy,
   &Instance_DidChangeView,
   &Instance_DidChangeFocus,
+  &Instance_HandleInputEvent,
   &Instance_HandleDocumentLoad
 };