Merge Chromium at 7.0.540.0 : Initial merge by git

Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.

Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15

1 files changed, 11 insertions, 7 deletions

diff --git a/webkit/glue/plugins/pepper_event_conversion.h b/webkit/glue/plugins/pepper_event_conversion.h
index 2d699cd..9eab3e4 100644
--- a/webkit/glue/plugins/pepper_event_conversion.h
+++ b/webkit/glue/plugins/pepper_event_conversion.h
@@ -5,7 +5,9 @@
 #ifndef WEBKIT_GLUE_PLUGINS_PEPPER_EVENT_H_
 #define WEBKIT_GLUE_PLUGINS_PEPPER_EVENT_H_
 
-typedef struct _pp_Event PP_Event;
+#include <vector>
+
+struct PP_InputEvent;
 
 namespace WebKit {
 class WebInputEvent;
@@ -13,13 +15,15 @@ class WebInputEvent;
 
 namespace pepper {
 
-// Creates a PP_Event from the given WebInputEvent.  If it fails, returns NULL.
-// The caller owns the created object on success.
-PP_Event* CreatePP_Event(const WebKit::WebInputEvent& event);
+// Converts the given WebKit event to one or possibly multiple PP_InputEvents.
+// The generated events will be filled into the given vector. On failure, no
+// events will ge generated and the vector will be empty.
+void CreatePPEvent(const WebKit::WebInputEvent& event,
+                   std::vector<PP_InputEvent>* pp_events);
 
-// Creates a WebInputEvent from the given PP_Event.  If it fails, returns NULL.
-// The caller owns the created object on success.
-WebKit::WebInputEvent* CreateWebInputEvent(const PP_Event& event);
+// Creates a WebInputEvent from the given PP_InputEvent.  If it fails, returns
+// NULL.  The caller owns the created object on success.
+WebKit::WebInputEvent* CreateWebInputEvent(const PP_InputEvent& event);
 
 }  // namespace pepper