diff options
author | 2016-06-06 08:48:47 -0700 | |
---|---|---|
committer | 2016-06-06 08:48:47 -0700 | |
commit | 814e38d5c11e4b71b2c87d1e1fe7bc8e8d688288 (patch) | |
tree | 6c7439db15786aefb73f2fe8f8d6c7ce8f5159a7 /tools/viewer/sk_app | |
parent | 11450d5ec107b3b770d27c05b107ed5b187cb777 (diff) |
Use intptr_t for onTouch argument.
On 64-bit platforms, casting int to void* is not valid.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2047443002
Review-Url: https://codereview.chromium.org/2047443002
Diffstat (limited to 'tools/viewer/sk_app')
-rw-r--r-- | tools/viewer/sk_app/Window.cpp | 4 | ||||
-rw-r--r-- | tools/viewer/sk_app/Window.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/viewer/sk_app/Window.cpp b/tools/viewer/sk_app/Window.cpp index 1c798df399..7ec8baae36 100644 --- a/tools/viewer/sk_app/Window.cpp +++ b/tools/viewer/sk_app/Window.cpp @@ -27,7 +27,7 @@ static bool default_mouse_func(int x, int y, Window::InputState state, uint32_t return false; } -static bool default_touch_func(int owner, Window::InputState state, float x, float y, +static bool default_touch_func(intptr_t owner, Window::InputState state, float x, float y, void* userData) { return false; } @@ -62,7 +62,7 @@ bool Window::onMouse(int x, int y, InputState state, uint32_t modifiers) { return fMouseFunc(x, y, state, modifiers, fMouseUserData); } -bool Window::onTouch(int owner, InputState state, float x, float y) { +bool Window::onTouch(intptr_t owner, InputState state, float x, float y) { return fTouchFunc(owner, state, x, y, fTouchUserData); } diff --git a/tools/viewer/sk_app/Window.h b/tools/viewer/sk_app/Window.h index 9ca4231c80..29c85b9e78 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); |