diff --git a/gn/gpu.gni b/gn/gpu.gni index 6c494a2182..0cab8a645c 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -22,7 +22,6 @@ skia_gpu_sources = [ "$_include/gpu/GrYUVABackendTextures.h", # Private includes - "$_include/private/GrContext.h", "$_include/private/GrContext_Base.h", "$_include/private/GrGLTypesPriv.h", "$_include/private/GrImageContext.h", @@ -72,7 +71,6 @@ skia_gpu_sources = [ "$_src/gpu/GrColorInfo.h", "$_src/gpu/GrColorSpaceXform.cpp", "$_src/gpu/GrColorSpaceXform.h", - "$_src/gpu/GrContext.cpp", "$_src/gpu/GrContextThreadSafeProxy.cpp", "$_src/gpu/GrContextThreadSafeProxyPriv.h", "$_src/gpu/GrContext_Base.cpp", diff --git a/include/gpu/GrDirectContext.h b/include/gpu/GrDirectContext.h index 9de9ca38c1..e05fb78057 100644 --- a/include/gpu/GrDirectContext.h +++ b/include/gpu/GrDirectContext.h @@ -8,7 +8,7 @@ #ifndef GrDirectContext_DEFINED #define GrDirectContext_DEFINED -#include "include/private/GrContext.h" +#include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrBackendSurface.h" @@ -43,7 +43,7 @@ class SkSurfaceProps; class SkTaskGroup; class SkTraceMemoryDump; -class SK_API GrDirectContext : public GrContext { +class SK_API GrDirectContext : public GrRecordingContext { public: #ifdef SK_GL /** @@ -756,7 +756,7 @@ private: friend class GrDirectContextPriv; - using INHERITED = GrContext; + using INHERITED = GrRecordingContext; }; diff --git a/include/private/GrContext.h b/include/private/GrContext.h deleted file mode 100644 index 220b00b939..0000000000 --- a/include/private/GrContext.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef GrContext_DEFINED -#define GrContext_DEFINED - -#include "include/core/SkTypes.h" -#include "include/gpu/GrRecordingContext.h" - -/** - * This deprecated class is being merged into GrDirectContext and removed. - * Do not add new subclasses, new API, or attempt to instantiate one. - * If new API requires direct GPU access, add it to GrDirectContext. - * Otherwise, add it to GrRecordingContext. - */ -class SK_API GrContext : public GrRecordingContext { -public: - ~GrContext() override; - -protected: - GrContext(sk_sp); - -private: - using INHERITED = GrRecordingContext; -}; - -#endif diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp deleted file mode 100644 index 929f0e8a29..0000000000 --- a/src/gpu/GrContext.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "include/gpu/GrDirectContext.h" - -#include "include/gpu/GrContextThreadSafeProxy.h" -#include "src/core/SkTaskGroup.h" -#include "src/gpu/GrClientMappedBufferManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/text/GrStrikeCache.h" - -GrContext::GrContext(sk_sp proxy) : INHERITED(std::move(proxy)) { } - -GrContext::~GrContext() = default;