diff options
Diffstat (limited to 'ppapi/examples/2d/paint_manager_example.cc')
| -rw-r--r-- | ppapi/examples/2d/paint_manager_example.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ppapi/examples/2d/paint_manager_example.cc b/ppapi/examples/2d/paint_manager_example.cc index c129f07..8a5a2f5 100644 --- a/ppapi/examples/2d/paint_manager_example.cc +++ b/ppapi/examples/2d/paint_manager_example.cc @@ -5,7 +5,6 @@ #include "ppapi/c/pp_input_event.h" #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/image_data.h" -#include "ppapi/cpp/input_event.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/paint_manager.h" @@ -42,26 +41,25 @@ class MyInstance : public pp::Instance, public pp::PaintManager::Client { last_x_(0), last_y_(0) { paint_manager_.Initialize(this, this, false); - RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE); } - virtual bool HandleInputEvent(const pp::InputEvent& event) { - switch (event.GetType()) { + virtual bool HandleInputEvent(const PP_InputEvent& event) { + switch (event.type) { case PP_INPUTEVENT_TYPE_MOUSEDOWN: { - pp::MouseInputEvent mouse_event(event); + const PP_InputEvent_Mouse& mouse_event = event.u.mouse; // Update the square on a mouse down. - if (mouse_event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { - UpdateSquare(static_cast<int>(mouse_event.GetMousePosition().x()), - static_cast<int>(mouse_event.GetMousePosition().y())); + if (mouse_event.button == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { + UpdateSquare(static_cast<int>(mouse_event.x), + static_cast<int>(mouse_event.y)); } return true; } case PP_INPUTEVENT_TYPE_MOUSEMOVE: { - pp::MouseInputEvent mouse_event(event); + const PP_InputEvent_Mouse& mouse_event = event.u.mouse; // Update the square on a drag. - if (mouse_event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { - UpdateSquare(static_cast<int>(mouse_event.GetMousePosition().x()), - static_cast<int>(mouse_event.GetMousePosition().y())); + if (mouse_event.button == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { + UpdateSquare(static_cast<int>(mouse_event.x), + static_cast<int>(mouse_event.y)); } return true; } |