AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull non-substantive changes out of omnibus CL

Browse Source 
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:
Robert Phillips 2018-02-21 12:10:41 -05:00 committed by Skia Commit-Bot
parent 038c608a86
commit e4fda6c70d
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/atlastext/SkInternalAtlasTextContext.h
View File

@ -13,11 +13,12 @@
#include "SkArenaAllocList.h"
#include "SkRefCnt.h"
class GrAtlasGlyphCache;
class GrContext;
class GrTextBlobCache;
class SkAtlasTextRenderer;
class SkMatrix;
class GrContext;
class GrAtlasGlyphCache;
class GrTextBlobCache;
/**
* The implementation of SkAtlasTextContext. This exists to hide the details from the public class.

2
src/gpu/GrDistanceFieldGenFromVector.h
View File

@ -32,7 +32,7 @@ bool GrGenerateDistanceFieldFromPath(unsigned char* distanceField,
inline bool IsDistanceFieldSupportedFillType(SkPath::FillType fFillType)
{
return (SkPath::kEvenOdd_FillType == fFillType ||
return (SkPath::kEvenOdd_FillType == fFillType ||
SkPath::kInverseEvenOdd_FillType == fFillType);
}

14
src/gpu/ops/GrAtlasTextOp.cpp
View File

@ -6,6 +6,7 @@
*/
#include "GrAtlasTextOp.h"
#include "GrContext.h"
#include "GrOpFlushState.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 str;

13
src/gpu/ops/GrAtlasTextOp.h
View File

@ -92,18 +92,7 @@ public:
const char* name() const override { return "AtlasTextOp"; }
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());
}
}
}
void visitProxies(const VisitProxyFunc& func) const override;
SkString dumpInfo() const override;