From ec3253472947b0df618261479336a7b50b24f0c8 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 30 Oct 2017 18:02:48 +0000 Subject: Revert "Revert "Fix GrDefaultPathRender inversely wound path bug"" This reverts commit fc28138c0422637741ac2839914ef10c56438054. Reason for revert: Suppression have landed for failing tests Original change's description: > Revert "Fix GrDefaultPathRender inversely wound path bug" > > This reverts commit 511a9d49998ec6a74c375e6cfc55f660f7987c40. > > Reason for revert: vulkan > > Original change's description: > > Fix GrDefaultPathRender inversely wound path bug > > > > Bug: 769898 > > Change-Id: I3b1a43b1e114b35105493a0cfa01a1f01b65fa56 > > Reviewed-on: https://skia-review.googlesource.com/64065 > > Commit-Queue: Robert Phillips > > Reviewed-by: Brian Salomon > > TBR=bsalomon@google.com,robertphillips@google.com > > Change-Id: Ib1a987294d14f0526bf5ff5a8fd90bbd5f6f3a0d > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: 769898 > Reviewed-on: https://skia-review.googlesource.com/65201 > Reviewed-by: Robert Phillips > Commit-Queue: Robert Phillips TBR=bsalomon@google.com,robertphillips@google.com Change-Id: I3a3543c46b3192f1ffd31a5566cf337dc03561a8 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 769898 Reviewed-on: https://skia-review.googlesource.com/65202 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- src/gpu/ops/GrMSAAPathRenderer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gpu/ops/GrMSAAPathRenderer.cpp') diff --git a/src/gpu/ops/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp index 27d78a782c..50741bc537 100644 --- a/src/gpu/ops/GrMSAAPathRenderer.cpp +++ b/src/gpu/ops/GrMSAAPathRenderer.cpp @@ -637,8 +637,10 @@ bool GrMSAAPathRenderer::internalDrawPath(GrRenderTargetContext* renderTargetCon } SkRect devBounds; - GetPathDevBounds(path, renderTargetContext->width(), renderTargetContext->height(), viewMatrix, - &devBounds); + GetPathDevBounds(path, + renderTargetContext->asRenderTargetProxy()->worstCaseWidth(), + renderTargetContext->asRenderTargetProxy()->worstCaseHeight(), + viewMatrix, &devBounds); SkASSERT(passes[0]); { // First pass -- cgit v1.2.3