From 41bb5b40e71411ee39538399ea125986ec760a90 Mon Sep 17 00:00:00 2001 From: liyuqian Date: Thu, 23 Jun 2016 12:08:06 -0700 Subject: Remove Android SampleApp BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2096683002 Review-Url: https://codereview.chromium.org/2096683002 --- include/views/SkOSWindow_Android.h | 53 -------------------------------------- include/views/SkWindow.h | 2 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 include/views/SkOSWindow_Android.h (limited to 'include/views') diff --git a/include/views/SkOSWindow_Android.h b/include/views/SkOSWindow_Android.h deleted file mode 100644 index 234e65c256..0000000000 --- a/include/views/SkOSWindow_Android.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2011 Skia - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SkOSWindow_Android_DEFINED -#define SkOSWindow_Android_DEFINED - -#include "SkWindow.h" - -#include - -struct SkAndroidWindow { - EGLDisplay fDisplay; - EGLSurface fSurface; - EGLContext fContext; -}; - -class SkOSWindow : public SkWindow { -public: - SkOSWindow(void*); - ~SkOSWindow(); - - enum SkBackEndTypes { - kNone_BackEndType, - kNativeGL_BackEndType, - }; - - bool attach(SkBackEndTypes attachType, int msaaSampleCount, bool deepColor, - AttachmentInfo* info); - void release(); - void present(); - bool makeFullscreen() { return true; } - void closeWindow(); - void setVsync(bool); - bool destroyRequested() { return fDestroyRequested; } - -protected: - // overrides from SkWindow - virtual void onHandleInval(const SkIRect&); - virtual void onSetTitle(const char title[]); - -private: - SkAndroidWindow fWindow; - ANativeWindow* fNativeWindow; - bool fDestroyRequested; - - typedef SkWindow INHERITED; -}; - -#endif diff --git a/include/views/SkWindow.h b/include/views/SkWindow.h index 50774849a6..f81ec5d06e 100644 --- a/include/views/SkWindow.h +++ b/include/views/SkWindow.h @@ -129,7 +129,7 @@ private: #elif defined(SK_BUILD_FOR_WIN) #include "SkOSWindow_Win.h" #elif defined(SK_BUILD_FOR_ANDROID) - #include "SkOSWindow_Android.h" + #error Android does not support SkOSWindow and SampleApp. Please use Viewer instead. #elif defined(SK_BUILD_FOR_UNIX) #include "SkOSWindow_Unix.h" #elif defined(SK_BUILD_FOR_IOS) -- cgit v1.2.3