diff options
Diffstat (limited to 'include/gpu/GrContext.h')
| -rw-r--r-- | include/gpu/GrContext.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 116c8bfcd9..c1804e00ff 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -13,7 +13,6 @@ #include "SkTypes.h" #include "../private/GrAuditTrail.h" #include "../private/GrSingleOwner.h" -#include "../private/GrSkSLFPFactoryCache.h" #include "GrContextOptions.h" // We shouldn't need this but currently Android is relying on this being include transitively. @@ -302,7 +301,6 @@ protected: const GrBackend fBackend; sk_sp<const GrCaps> fCaps; sk_sp<GrContextThreadSafeProxy> fThreadSafeProxy; - sk_sp<GrSkSLFPFactoryCache> fFPFactoryCache; private: sk_sp<GrGpu> fGpu; @@ -430,14 +428,12 @@ private: GrContextThreadSafeProxy(sk_sp<const GrCaps> caps, uint32_t uniqueID, GrBackend backend, - const GrContextOptions& options, - sk_sp<GrSkSLFPFactoryCache> cache); - - sk_sp<const GrCaps> fCaps; - const uint32_t fContextUniqueID; - const GrBackend fBackend; - const GrContextOptions fOptions; - sk_sp<GrSkSLFPFactoryCache> fFPFactoryCache; + const GrContextOptions& options); + + sk_sp<const GrCaps> fCaps; + const uint32_t fContextUniqueID; + const GrBackend fBackend; + const GrContextOptions fOptions; friend class GrDirectContext; // To construct this object friend class GrContextThreadSafeProxyPriv; |