diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-11-05 08:35:31 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-05 08:35:31 -0800 |
| commit | a4d3797c3b0f0cac8493c46cb334ca88a5d6ccf6 (patch) | |
| tree | a977a92cb47423f2a284174a462b9f5c22aa203a /include/views | |
| parent | d975fc9599e2e6f909d3a11913ce1ab63525ab31 (diff) | |
Wire up SDL on Android
BUG=skia:
Review URL: https://codereview.chromium.org/1415453009
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkOSWindow_SDL.h | 11 | ||||
| -rw-r--r-- | include/views/SkWindow.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h index 532cf74728..c40ec2e301 100644 --- a/include/views/SkOSWindow_SDL.h +++ b/include/views/SkOSWindow_SDL.h @@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -6,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkOSWindow_SDL_DEFINED #define SkOSWindow_SDL_DEFINED @@ -14,14 +12,14 @@ #include "SDL_opengl.h" #include "SkWindow.h" - class SkOSWindow : public SkWindow { public: SkOSWindow(void* screen); virtual ~SkOSWindow(); - static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay) { SkFAIL("not implemented\n"); - return false; + static bool PostEvent(SkEvent* evt, SkEventSinkID, SkMSec delay) { + SkFAIL("not implemented\n"); + return false; } enum SkBackEndTypes { @@ -50,10 +48,13 @@ public: protected: void onSetTitle(const char title[]) override; + void onHandleInval(const SkIRect&) override; + void onPDFSaved(const char title[], const char desc[], const char path[]) override; private: void handleEvents(); bool fQuit; + uint32_t fWindowFlags; SDL_Window* fWindow; SDL_GLContext fGLContext; diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h index 70241b5ff6..f56c27c022 100644 --- a/include/views/SkWindow.h +++ b/include/views/SkWindow.h @@ -127,7 +127,7 @@ private: #elif defined(SK_BUILD_FOR_ANDROID) #include "SkOSWindow_Android.h" #elif defined(SK_BUILD_FOR_UNIX) - #include "SkOSWindow_Unix.h" + #include "SkOSWindow_Unix.h" #elif defined(SK_BUILD_FOR_IOS) #include "SkOSWindow_iOS.h" #endif |