| Index: tools/viewer/sk_app/Window.h
|
| diff --git a/tools/viewer/sk_app/Window.h b/tools/viewer/sk_app/Window.h
|
| index 9ca4231c80d41f273d4fca9e5c767e0c62aaaaa8..29c85b9e789bb9d6b79a72b88b21a436494db38d 100644
|
| --- a/tools/viewer/sk_app/Window.h
|
| +++ b/tools/viewer/sk_app/Window.h
|
| @@ -111,7 +111,7 @@ public:
|
| typedef bool(*OnCharFunc)(SkUnichar c, uint32_t modifiers, void* userData);
|
| typedef bool(*OnKeyFunc)(Key key, InputState state, uint32_t modifiers, void* userData);
|
| typedef bool(*OnMouseFunc)(int x, int y, InputState state, uint32_t modifiers, void* userData);
|
| - typedef bool(*OnTouchFunc)(int owner, InputState state, float x, float y, void* userData);
|
| + typedef bool(*OnTouchFunc)(intptr_t owner, InputState state, float x, float y, void* userData);
|
| typedef void(*OnUIStateChangedFunc)(
|
| const SkString& stateName, const SkString& stateValue, void* userData);
|
| typedef void(*OnPaintFunc)(SkCanvas*, void* userData);
|
| @@ -149,7 +149,7 @@ public:
|
| bool onChar(SkUnichar c, uint32_t modifiers);
|
| bool onKey(Key key, InputState state, uint32_t modifiers);
|
| bool onMouse(int x, int y, InputState state, uint32_t modifiers);
|
| - bool onTouch(int owner, InputState state, float x, float y); // multi-owner = multi-touch
|
| + bool onTouch(intptr_t owner, InputState state, float x, float y); // multi-owner = multi-touch
|
| void onUIStateChanged(const SkString& stateName, const SkString& stateValue);
|
| void onPaint();
|
| void onResize(uint32_t width, uint32_t height);
|
|
|