diff options
Diffstat (limited to 'chromium/third_party/skia/gm/samplelocations.cpp')
| -rw-r--r-- | chromium/third_party/skia/gm/samplelocations.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/third_party/skia/gm/samplelocations.cpp b/chromium/third_party/skia/gm/samplelocations.cpp index 8ae5e0327cd..108fa3de13e 100644 --- a/chromium/third_party/skia/gm/samplelocations.cpp +++ b/chromium/third_party/skia/gm/samplelocations.cpp @@ -22,7 +22,6 @@ #include "include/private/SkColorData.h" #include "src/gpu/GrBuffer.h" #include "src/gpu/GrCaps.h" -#include "src/gpu/GrClip.h" #include "src/gpu/GrColorSpaceXform.h" #include "src/gpu/GrContextPriv.h" #include "src/gpu/GrGeometryProcessor.h" @@ -275,7 +274,7 @@ private: SkArenaAlloc* arena = context->priv().recordTimeAllocator(); // This is equivalent to a GrOpFlushState::detachAppliedClip - GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip(); + GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip::Disabled(); fProgramInfo = this->createProgramInfo(context->priv().caps(), arena, writeView, std::move(appliedClip), dstProxyView); @@ -354,7 +353,7 @@ DrawResult SampleLocationsGM::onDraw( 0xffff>() ); - offscreenRTC->clear(nullptr, {0,1,0,1}, GrRenderTargetContext::CanClearFullscreen::kYes); + offscreenRTC->clear({0,1,0,1}); // Stencil. offscreenRTC->priv().testingOnly_addDrawOp( @@ -364,11 +363,11 @@ DrawResult SampleLocationsGM::onDraw( GrPaint coverPaint; coverPaint.setColor4f({1,0,0,1}); coverPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrcOver)); - rtc->priv().stencilRect(GrNoClip(), &kStencilCover, std::move(coverPaint), GrAA::kNo, + rtc->priv().stencilRect(nullptr, &kStencilCover, std::move(coverPaint), GrAA::kNo, SkMatrix::I(), SkRect::MakeWH(200, 200)); // Copy offscreen texture to canvas. - rtc->drawTexture(GrNoClip(), offscreenRTC->readSurfaceView(), + rtc->drawTexture(nullptr, offscreenRTC->readSurfaceView(), offscreenRTC->colorInfo().alphaType(), GrSamplerState::Filter::kNearest, SkBlendMode::kSrc, SK_PMColor4fWHITE, {0,0,200,200}, {0,0,200,200}, GrAA::kNo, GrQuadAAFlags::kNone, |