Chromium Code Reviews| Index: ppapi/examples/2d/paint_manager_example.cc |
| diff --git a/ppapi/examples/2d/paint_manager_example.cc b/ppapi/examples/2d/paint_manager_example.cc |
| index 8a5a2f5fe2815329126ae72c71b3c5efe294d92d..4accccda5ede18ea05b30c29ef0f94588223542f 100644 |
| --- a/ppapi/examples/2d/paint_manager_example.cc |
| +++ b/ppapi/examples/2d/paint_manager_example.cc |
| @@ -5,6 +5,7 @@ |
| #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" |
| @@ -41,25 +42,26 @@ class MyInstance : public pp::Instance, public pp::PaintManager::Client { |
| last_x_(0), |
| last_y_(0) { |
| paint_manager_.Initialize(this, this, false); |
| + RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_MOUSE); |
|
brettw
2011/07/20 04:18:48
Can you remove "Filtering" here? I'd like to encou
|
| } |
| - virtual bool HandleInputEvent(const PP_InputEvent& event) { |
| - switch (event.type) { |
| + virtual bool HandleInputEvent(const pp::InputEvent& event) { |
| + switch (event.GetType()) { |
| case PP_INPUTEVENT_TYPE_MOUSEDOWN: { |
| - const PP_InputEvent_Mouse& mouse_event = event.u.mouse; |
| + pp::MouseInputEvent mouse_event(event); |
| // Update the square on a mouse down. |
| - if (mouse_event.button == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { |
| - UpdateSquare(static_cast<int>(mouse_event.x), |
| - static_cast<int>(mouse_event.y)); |
| + if (mouse_event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { |
| + UpdateSquare(static_cast<int>(mouse_event.GetMousePosition().x()), |
| + static_cast<int>(mouse_event.GetMousePosition().y())); |
| } |
| return true; |
| } |
| case PP_INPUTEVENT_TYPE_MOUSEMOVE: { |
| - const PP_InputEvent_Mouse& mouse_event = event.u.mouse; |
| + pp::MouseInputEvent mouse_event(event); |
| // Update the square on a drag. |
| - if (mouse_event.button == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { |
| - UpdateSquare(static_cast<int>(mouse_event.x), |
| - static_cast<int>(mouse_event.y)); |
| + if (mouse_event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) { |
| + UpdateSquare(static_cast<int>(mouse_event.GetMousePosition().x()), |
| + static_cast<int>(mouse_event.GetMousePosition().y())); |
| } |
| return true; |
| } |