From 9e2a319a1bdb8175efb499645846fbbaf27cbf00 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 6 Feb 2017 13:03:36 -0500 Subject: SK_USE_SDL is never defined This CL also removes dead code, SkOSWindow_SDL.cpp. Change-Id: I659dc271a4bcceba7fe29ac5ac6e79d684153870 Reviewed-on: https://skia-review.googlesource.com/8070 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- include/views/SkOSWindow_SDL.h | 54 ------------------------------------------ include/views/SkWindow.h | 4 +--- 2 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 include/views/SkOSWindow_SDL.h (limited to 'include/views') diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h deleted file mode 100644 index 65685d1d21..0000000000 --- a/include/views/SkOSWindow_SDL.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2006 The Android Open Source Project - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkOSWindow_SDL_DEFINED -#define SkOSWindow_SDL_DEFINED - -#include "SDL.h" -#include "SDL_opengl.h" -#include "SkWindow.h" - -class SkOSWindow : public SkWindow { -public: - SkOSWindow(void*); - virtual ~SkOSWindow(); - - enum SkBackEndTypes { - kNone_BackEndType, // TODO: remove this, it's not a real option. - kNativeGL_BackEndType, -#if SK_ANGLE - kANGLE_BackEndType, -#endif // SK_ANGLE - }; - - void release(); - bool attach(SkBackEndTypes attachType, int msaaSampleCount, bool deepColor, AttachmentInfo*); - void present(); - bool makeFullscreen(); - void setVsync(bool); - void closeWindow(); - static void RunEventLoop(); - -protected: - void onSetTitle(const char title[]) override; - -private: - void createWindow(int msaaSampleCount); - void destroyWindow(); - void updateWindowTitle(); - static SkOSWindow* GetInstanceForWindowID(Uint32 windowID); - static bool HasDirtyWindows(); - static void UpdateDirtyWindows(); - static void HandleEvent(const SDL_Event&); - - SDL_Window* fWindow; - SDL_GLContext fGLContext; - int fWindowMSAASampleCount; - typedef SkWindow INHERITED; -}; - -#endif diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h index e34bbb6e2f..8b6c29186b 100644 --- a/include/views/SkWindow.h +++ b/include/views/SkWindow.h @@ -122,9 +122,7 @@ private: //////////////////////////////////////////////////////////////////////////////// -#if defined(SK_USE_SDL) - #include "SkOSWindow_SDL.h" -#elif defined(SK_BUILD_FOR_MAC) +#if defined(SK_BUILD_FOR_MAC) #include "SkOSWindow_Mac.h" #elif defined(SK_BUILD_FOR_WIN) #include "SkOSWindow_Win.h" -- cgit v1.2.3