Pull non-substantive changes out of omnibus CL
These come from: https://skia-review.googlesource.com/c/skia/+/108001 (Fission GrAtlasGlyphCache in two) Bug: skia: Change-Id: Ife15cad018f9ddedec578fcd6aa07da00a77196e Reviewed-on: https://skia-review.googlesource.com/109026 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
parent
038c608a86
commit
e4fda6c70d
@ -13,11 +13,12 @@
|
|||||||
#include "SkArenaAllocList.h"
|
#include "SkArenaAllocList.h"
|
||||||
#include "SkRefCnt.h"
|
#include "SkRefCnt.h"
|
||||||
|
|
||||||
|
class GrAtlasGlyphCache;
|
||||||
|
class GrContext;
|
||||||
|
class GrTextBlobCache;
|
||||||
|
|
||||||
class SkAtlasTextRenderer;
|
class SkAtlasTextRenderer;
|
||||||
class SkMatrix;
|
class SkMatrix;
|
||||||
class GrContext;
|
|
||||||
class GrAtlasGlyphCache;
|
|
||||||
class GrTextBlobCache;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The implementation of SkAtlasTextContext. This exists to hide the details from the public class.
|
* The implementation of SkAtlasTextContext. This exists to hide the details from the public class.
|
||||||
|
@ -32,7 +32,7 @@ bool GrGenerateDistanceFieldFromPath(unsigned char* distanceField,
|
|||||||
|
|
||||||
inline bool IsDistanceFieldSupportedFillType(SkPath::FillType fFillType)
|
inline bool IsDistanceFieldSupportedFillType(SkPath::FillType fFillType)
|
||||||
{
|
{
|
||||||
return (SkPath::kEvenOdd_FillType == fFillType ||
|
return (SkPath::kEvenOdd_FillType == fFillType ||
|
||||||
SkPath::kInverseEvenOdd_FillType == fFillType);
|
SkPath::kInverseEvenOdd_FillType == fFillType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "GrAtlasTextOp.h"
|
#include "GrAtlasTextOp.h"
|
||||||
|
|
||||||
#include "GrContext.h"
|
#include "GrContext.h"
|
||||||
#include "GrOpFlushState.h"
|
#include "GrOpFlushState.h"
|
||||||
#include "GrResourceProvider.h"
|
#include "GrResourceProvider.h"
|
||||||
@ -49,6 +50,19 @@ void GrAtlasTextOp::init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GrAtlasTextOp::visitProxies(const VisitProxyFunc& func) const {
|
||||||
|
fProcessors.visitProxies(func);
|
||||||
|
|
||||||
|
unsigned int numProxies;
|
||||||
|
const sk_sp<GrTextureProxy>* proxies = fFontCache->getProxies(this->maskFormat(),
|
||||||
|
&numProxies);
|
||||||
|
for (unsigned int i = 0; i < numProxies; ++i) {
|
||||||
|
if (proxies[i]) {
|
||||||
|
func(proxies[i].get());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
SkString GrAtlasTextOp::dumpInfo() const {
|
SkString GrAtlasTextOp::dumpInfo() const {
|
||||||
SkString str;
|
SkString str;
|
||||||
|
|
||||||
|
@ -92,18 +92,7 @@ public:
|
|||||||
|
|
||||||
const char* name() const override { return "AtlasTextOp"; }
|
const char* name() const override { return "AtlasTextOp"; }
|
||||||
|
|
||||||
void visitProxies(const VisitProxyFunc& func) const override {
|
void visitProxies(const VisitProxyFunc& func) const override;
|
||||||
fProcessors.visitProxies(func);
|
|
||||||
|
|
||||||
unsigned int numProxies;
|
|
||||||
const sk_sp<GrTextureProxy>* proxies = fFontCache->getProxies(this->maskFormat(),
|
|
||||||
&numProxies);
|
|
||||||
for (unsigned int i = 0; i < numProxies; ++i) {
|
|
||||||
if (proxies[i]) {
|
|
||||||
func(proxies[i].get());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
SkString dumpInfo() const override;
|
SkString dumpInfo() const override;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user