diff options
Diffstat (limited to 'tools/viewer/sk_app/Window.h')
-rw-r--r-- | tools/viewer/sk_app/Window.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tools/viewer/sk_app/Window.h b/tools/viewer/sk_app/Window.h index 9ca4231c80..65e1542e2c 100644 --- a/tools/viewer/sk_app/Window.h +++ b/tools/viewer/sk_app/Window.h @@ -12,7 +12,6 @@ #include "SkRect.h" #include "SkTouchGesture.h" #include "SkTypes.h" -#include "SkJSONCPP.h" class SkCanvas; @@ -28,7 +27,6 @@ public: virtual void setTitle(const char*) = 0; virtual void show() = 0; - virtual void setUIState(const Json::Value& state) {} // do nothing in default // Shedules an invalidation event for window if one is not currently pending. // Make sure that either onPaint or markInvalReceived is called when the client window consumes @@ -112,8 +110,6 @@ public: 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 void(*OnUIStateChangedFunc)( - const SkString& stateName, const SkString& stateValue, void* userData); typedef void(*OnPaintFunc)(SkCanvas*, void* userData); void registerCharFunc(OnCharFunc func, void* userData) { @@ -141,16 +137,10 @@ public: fTouchUserData = userData; } - void registerUIStateChangedFunc(OnUIStateChangedFunc func, void* userData) { - fUIStateChangedFunc = func; - fUIStateChangedUserData = userData; - } - 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 - void onUIStateChanged(const SkString& stateName, const SkString& stateValue); void onPaint(); void onResize(uint32_t width, uint32_t height); @@ -174,9 +164,6 @@ protected: void* fMouseUserData; OnTouchFunc fTouchFunc; void* fTouchUserData; - OnUIStateChangedFunc - fUIStateChangedFunc; - void* fUIStateChangedUserData; OnPaintFunc fPaintFunc; void* fPaintUserData; |