diff options
author | bsalomon <bsalomon@google.com> | 2016-07-08 09:14:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-08 09:14:07 -0700 |
commit | 8e9e45a69b804ee6b817baf1657e5efa0636ff52 (patch) | |
tree | b57086855fba32d2c3c77fb27f75dd17c5a3186d /src/gpu/batches/GrMSAAPathRenderer.cpp | |
parent | 66ad44a3f1df2547981b97c51d24f6881ba328e0 (diff) |
Revert change of bounds computation in MSAA path renderer.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2133773002
Review-Url: https://codereview.chromium.org/2133773002
Diffstat (limited to 'src/gpu/batches/GrMSAAPathRenderer.cpp')
-rw-r--r-- | src/gpu/batches/GrMSAAPathRenderer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp index 51389ecddb..5b49e6b138 100644 --- a/src/gpu/batches/GrMSAAPathRenderer.cpp +++ b/src/gpu/batches/GrMSAAPathRenderer.cpp @@ -225,11 +225,12 @@ class MSAAPathBatch : public GrVertexBatch { public: DEFINE_BATCH_CLASS_ID - MSAAPathBatch(GrColor color, const SkPath& path, const SkMatrix& viewMatrix) + MSAAPathBatch(GrColor color, const SkPath& path, const SkMatrix& viewMatrix, + const SkRect& devBounds) : INHERITED(ClassID()) , fViewMatrix(viewMatrix) { fPaths.emplace_back(PathInfo{color, path}); - this->setTransformedBounds(path.getBounds(), viewMatrix, HasAABloat::kNo, IsZeroArea::kNo); + this->setBounds(devBounds, HasAABloat::kNo, IsZeroArea::kNo); int contourCount; this->computeWorstCasePointCount(path, &contourCount, &fMaxLineVertices, &fMaxQuadVertices); fMaxLineIndices = fMaxLineVertices * 3; @@ -668,7 +669,7 @@ bool GrMSAAPathRenderer::internalDrawPath(GrDrawContext* drawContext, drawContext->drawBatch(pipelineBuilder, clip, batch); } else { SkAutoTUnref<MSAAPathBatch> batch(new MSAAPathBatch(paint.getColor(), path, - viewMatrix)); + viewMatrix, devBounds)); if (!batch->isValid()) { return false; } |