Proxy PPB_Input_Event, PPP_Input_Event, and associated IFs.

src/trusted/plugin/ppapi/plugin_ppapi.cc

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "native_client/src/trusted/plugin/ppapi/plugin_ppapi.h"
 
 #include <stdio.h>
 #include <algorithm>
 #include <deque>
 #include <vector>
 
 #include "native_client/src/include/nacl_base.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_time.h"
 #include "native_client/src/shared/ppapi_proxy/browser_ppp.h"
+#include "native_client/src/third_party/ppapi/c/ppp_input_event.h"
+#include "native_client/src/third_party/ppapi/cpp/input_event.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/handle_pass/browser_handle.h"
 #include "native_client/src/trusted/plugin/desc_based_handle.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/nexe_arch.h"
 #include "native_client/src/trusted/plugin/ppapi/async_receive.h"
 #include "native_client/src/trusted/plugin/ppapi/browser_interface_ppapi.h"
 #include "native_client/src/trusted/plugin/ppapi/manifest.h"
 #include "native_client/src/trusted/plugin/ppapi/scriptable_handle_ppapi.h"
 #include "native_client/src/trusted/plugin/scriptable_handle.h"
@@ skipping 653 matching lines @@
   PLUGIN_PRINTF(("PluginPpapi::DidChangeFocus (this=%p)\n",
                  static_cast<void*>(this)));
   if (ppapi_proxy_ == NULL) {
     return;
   } else {
     ppapi_proxy_->ppp_instance_interface()->DidChangeFocus(
         pp_instance(), PP_FromBool(has_focus));
   }
 }
 
-
 bool PluginPpapi::HandleInputEvent(const PP_InputEvent& event) {
   PLUGIN_PRINTF(("PluginPpapi::HandleInputEvent (this=%p)\n",
                  static_cast<void*>(this)));
   if (ppapi_proxy_ == NULL) {
     return false;  // event is not handled here.
   } else {
     bool handled = pp::PPBoolToBool(
-      ppapi_proxy_->ppp_instance_interface()->HandleInputEvent(
-          pp_instance(), &event));
+        ppapi_proxy_->ppp_instance_interface()->HandleInputEvent(
+            pp_instance(), &event));
+    PLUGIN_PRINTF(("PluginPpapi::HandleInputEvent (old) (handled=%d)\n",
+                   handled));
+    return handled;
+  }
+}
+
+bool PluginPpapi::HandleInputEvent(const pp::InputEvent& event) {
+  PLUGIN_PRINTF(("PluginPpapi::HandleInputEvent (this=%p)\n",
+                 static_cast<void*>(this)));
+  if ((ppapi_proxy_ == NULL) || !(ppapi_proxy_->ppp_input_event_interface())) {
+    return false;  // event is not handled here.
+  } else {
+    bool handled = pp::PPBoolToBool(
+        ppapi_proxy_->ppp_input_event_interface()->HandleInputEvent(
+            pp_instance(), event.pp_resource()));
     PLUGIN_PRINTF(("PluginPpapi::HandleInputEvent (handled=%d)\n", handled));
     return handled;
   }
 }
 
-
 bool PluginPpapi::HandleDocumentLoad(const pp::URLLoader& url_loader) {
   PLUGIN_PRINTF(("PluginPpapi::HandleDocumentLoad (this=%p)\n",
                  static_cast<void*>(this)));
   if (ppapi_proxy_ == NULL) {
     // Store this event and replay it when the proxy becomes available.
     replayHandleDocumentLoad = true;
     replayHandleDocumentLoadURLLoader = url_loader;
     // Return true so that the browser keeps servicing this loader so we can
     // perform requests on it later.
     return true;
@@ skipping 812 matching lines @@
   std::string scheme = canonicalized.AsString().substr(comps.scheme.begin,
                                                        comps.scheme.len);
   if (scheme == kChromeExtensionUriScheme)
     return SCHEME_CHROME_EXTENSION;
   if (scheme == kDataUriScheme)
     return SCHEME_DATA;
   return SCHEME_OTHER;
 }
 
 }  // namespace plugin