diff options
| author |  joshualitt <joshualitt@google.com> | 2015-11-05 10:48:41 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-05 10:48:41 -0800 |
| commit | 5d7a7fe5631d87ca3c18d2f75d8402906616c17b (patch) | |
| tree | 6a1faf90ee04fd3471f80866c15cedf4c00e0082 /include/views | |
| parent | a2e69fcdedbd9a7762620e0e9dcdd86596369cff (diff) | |
Revert of Wire up SDL on Android (patchset #4 id:60001 of https://codereview.chromium.org/1415453009/ )
Reason for revert:
breaks appurify
Original issue's description:
> Wire up SDL on Android
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/a4d3797c3b0f0cac8493c46cb334ca88a5d6ccf6
TBR=bsalomon@google.com,robertphillips@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1410703009
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, 6 insertions, 7 deletions
diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h index c40ec2e301..532cf74728 100644 --- a/include/views/SkOSWindow_SDL.h +++ b/include/views/SkOSWindow_SDL.h @@ -1,3 +1,4 @@ + /* * Copyright 2006 The Android Open Source Project * @@ -5,6 +6,7 @@ * found in the LICENSE file. */ + #ifndef SkOSWindow_SDL_DEFINED #define SkOSWindow_SDL_DEFINED @@ -12,14 +14,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 { @@ -48,13 +50,10 @@ 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 f56c27c022..70241b5ff6 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 |