Some small refactoring and renaming of sel_universel pepper emulation components.

src/trusted/sel_universal/sdl_ppapi_event_translator.cc

Index: src/trusted/sel_universal/sdl_ppapi_event_translator.cc
===================================================================
--- src/trusted/sel_universal/sdl_ppapi_event_translator.cc	(revision 5599)
+++ src/trusted/sel_universal/sdl_ppapi_event_translator.cc	(working copy)
@@ -14,72 +14,8 @@
 #include <SDL/SDL_events.h>
 #include "ppapi/c/pp_input_event.h"
 
-#include "native_client/src/trusted/sel_universal/multimedia.h"
+#include "native_client/src/trusted/sel_universal/primitives.h"
 
-const int PP_INPUTEVENT_USER = 88;
-const int PP_INPUTEVENT_TERMINATION = 90;
-
-// ppapi does not have a user defined event notion.
-// c.f. ppapi/c/pp_input_event.h
-typedef struct {
-  int code;
-  int data1;
-  int data2;
-}  PP_InputEvent_User;
-
-static PP_InputEvent_User* GetUserEvent(PP_InputEvent* event) {
-  return reinterpret_cast<PP_InputEvent_User*>(&event->u);
-}
-
-bool IsInvalidEvent(PP_InputEvent* event) {
-  return event->type == PP_INPUTEVENT_TYPE_UNDEFINED;
-}
-
-
-void MakeInvalidEvent(PP_InputEvent* event) {
-  event->type = PP_INPUTEVENT_TYPE_UNDEFINED;
-}
-
-
-bool IsTerminationEvent(PP_InputEvent* event) {
-  return event->type == PP_INPUTEVENT_TERMINATION;
-}
-
-
-void MakeTerminationEvent(PP_InputEvent* event) {
-  event->type = (PP_InputEvent_Type) PP_INPUTEVENT_TERMINATION;
-}
-
-
-bool IsUserEvent(PP_InputEvent* event) {
-  return event->type == PP_INPUTEVENT_USER;
-}
-
-
-int GetCodeFromUserEvent(PP_InputEvent* event) {
-  return GetUserEvent(event)->code;
-}
-
-
-int GetData1FromUserEvent(PP_InputEvent* event) {
-  return  GetUserEvent(event)->data1;
-}
-
-
-int GetData2FromUserEvent(PP_InputEvent* event) {
-  return  GetUserEvent(event)->data2;
-}
-
-
-void MakeUserEvent(PP_InputEvent* event, int code, int data1, int data2) {
-  event->type = (PP_InputEvent_Type) PP_INPUTEVENT_USER;
-  PP_InputEvent_User* user = GetUserEvent(event);
-  user->code = code;
-  user->data1 = data1;
-  user->data2 = data2;
-}
-
-
 static PP_InputEvent_MouseButton SDLButtonToPPButton(uint32_t button) {
   switch (button) {
     case SDL_BUTTON_LEFT:
@@ -235,7 +171,7 @@
                     ptr2int(sdl_event.user.data2));
       return true;
     case SDL_QUIT:
-      pp_event->type = (PP_InputEvent_Type) PP_INPUTEVENT_TERMINATION;
+      MakeTerminationEvent(pp_event);
       return true;
     case SDL_ACTIVEEVENT:
     case SDL_SYSWMEVENT: