Pull non-substantive changes out of omnibus CL

https://skia-review.googlesource.com/c/skia/+/131500 (Move op memory
storage to GrContext) is still a bit of a monster. Offload the trivial
stuff.

Change-Id: I27eb0c441d08111491b3cfee3b93d260c26c2790
Reviewed-on: https://skia-review.googlesource.com/134501
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2018-06-13 09:01:36 -04:00 committed by Skia Commit-Bot
parent da86e2822a
commit f18c756360
4 changed files with 4 additions and 8 deletions

View File

@ -234,8 +234,6 @@ private:
// This value is also the index in fFragmentProcessors where coverage processors begin.
int fNumColorProcessors;
typedef SkRefCnt INHERITED;
};
#endif

View File

@ -215,8 +215,7 @@ public:
bool instantiate(GrResourceProvider* resourceProvider) const;
protected:
GrResourceIOProcessor(ClassID classID)
: INHERITED(classID) {}
GrResourceIOProcessor(ClassID classID) : INHERITED(classID) {}
/**
* Subclasses call these from their constructor to register sampler sources. The processor

View File

@ -648,7 +648,7 @@ SkPMColor SkPerlinNoiseShaderImpl::PerlinNoiseShaderContext::shade(
}
SkShaderBase::Context* SkPerlinNoiseShaderImpl::onMakeContext(const ContextRec& rec,
SkArenaAlloc* alloc) const {
SkArenaAlloc* alloc) const {
return alloc->make<PerlinNoiseShaderContext>(*this, rec);
}

View File

@ -128,9 +128,8 @@ void DDLTileHelper::createSKPPerTile(SkData* compressedPictureData,
void DDLTileHelper::createDDLsInParallel() {
#if 1
SkTaskGroup().batch(fTiles.count(), [&](int i) {
fTiles[i].createDDL();
});
SkTaskGroup().batch(fTiles.count(), [&](int i) { fTiles[i].createDDL(); });
SkTaskGroup().wait();
#else
// Use this code path to debug w/o threads
for (int i = 0; i < fTiles.count(); ++i) {