diff options
author | Brian Osman <brianosman@google.com> | 2016-10-27 15:13:22 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-27 20:01:05 +0000 |
commit | 693a540272a771c6b0830094c461397cb77543b1 (patch) | |
tree | 5509e7c05e8e12ae9f59d0e0018fe4c0f148f2d0 /gm/windowrectangles.cpp | |
parent | 130863ef51a2a94e5bdf87f344c0e892b2403985 (diff) |
Rename renderTargetContextPriv to priv, and some more leftover DCs
API change is for non-public API.
TBR=bsalomon@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4060
Change-Id: I5011d753c3c6d1145ff242eab6baff2ae0647ba3
Reviewed-on: https://skia-review.googlesource.com/4060
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm/windowrectangles.cpp')
-rw-r--r-- | gm/windowrectangles.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp index bb914d5844..47bc3c92e7 100644 --- a/gm/windowrectangles.cpp +++ b/gm/windowrectangles.cpp @@ -204,27 +204,24 @@ void WindowRectanglesMaskGM::onCoverClipStack(const SkClipStack& stack, SkCanvas void WindowRectanglesMaskGM::visualizeAlphaMask(GrContext* ctx, GrRenderTargetContext* rtc, const GrReducedClip& reducedClip, const GrPaint& paint) { - sk_sp<GrRenderTargetContext> maskDC( + sk_sp<GrRenderTargetContext> maskRTC( ctx->makeRenderTargetContextWithFallback(SkBackingFit::kExact, kLayerRect.width(), kLayerRect.height(), kAlpha_8_GrPixelConfig, nullptr)); - if (!maskDC || - !ctx->resourceProvider()->attachStencilAttachment(maskDC->accessRenderTarget())) { + if (!maskRTC || + !ctx->resourceProvider()->attachStencilAttachment(maskRTC->accessRenderTarget())) { return; } // Draw a checker pattern into the alpha mask so we can visualize the regions left untouched by // the clip mask generation. - this->stencilCheckerboard(maskDC.get(), true); - maskDC->clear(nullptr, GrColorPackA4(0xff), true); - maskDC->renderTargetContextPriv().drawAndStencilRect(StencilOnlyClip(), - &GrUserStencilSettings::kUnused, - SkRegion::kDifference_Op, false, false, - SkMatrix::I(), - SkRect::MakeIWH(maskDC->width(), - maskDC->height())); - reducedClip.drawAlphaClipMask(maskDC.get()); - sk_sp<GrTexture> mask(maskDC->asTexture()); + this->stencilCheckerboard(maskRTC.get(), true); + maskRTC->clear(nullptr, GrColorPackA4(0xff), true); + maskRTC->priv().drawAndStencilRect(StencilOnlyClip(), &GrUserStencilSettings::kUnused, + SkRegion::kDifference_Op, false, false, SkMatrix::I(), + SkRect::MakeIWH(maskRTC->width(), maskRTC->height())); + reducedClip.drawAlphaClipMask(maskRTC.get()); + sk_sp<GrTexture> mask(maskRTC->asTexture()); int x = kCoverRect.x() - kLayerRect.x(), y = kCoverRect.y() - kLayerRect.y(); @@ -266,14 +263,14 @@ void WindowRectanglesMaskGM::stencilCheckerboard(GrRenderTargetContext* rtc, boo 0>() ); - rtc->renderTargetContextPriv().clearStencilClip(GrFixedClip::Disabled(), false); + rtc->priv().clearStencilClip(GrFixedClip::Disabled(), false); for (int y = 0; y < kLayerRect.height(); y += kMaskCheckerSize) { for (int x = (y & 1) == flip ? 0 : kMaskCheckerSize; x < kLayerRect.width(); x += 2 * kMaskCheckerSize) { SkIRect checker = SkIRect::MakeXYWH(x, y, kMaskCheckerSize, kMaskCheckerSize); - rtc->renderTargetContextPriv().stencilRect(GrNoClip(), &kSetClip, false, SkMatrix::I(), - SkRect::Make(checker)); + rtc->priv().stencilRect(GrNoClip(), &kSetClip, false, SkMatrix::I(), + SkRect::Make(checker)); } } } |