diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-02 08:53:12 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-02 08:53:12 -0800 |
| commit | 8b8f36fc49b88ed369523730a4f1f26bb2094a75 (patch) | |
| tree | ee476586e0a78df4bae5223ae9ec459d97241d9f /tests | |
| parent | 86c60758e9e4f9e203d7462cb22b2a245a0f51bd (diff) | |
Revert of Begin weaning GrClipMaskManager off of GrDrawTarget (take 2) (patchset #7 id:120001 of https://codereview.chromium.org/1754563003/ )
Reason for revert:
fAuditTrail
Original issue's description:
> Begin weaning GrClipMaskManager off of GrDrawTarget (take 2)
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1754563003
>
> Committed: https://skia.googlesource.com/skia/+/86c60758e9e4f9e203d7462cb22b2a245a0f51bd
TBR=joshualitt@chromium.org,bsalomon@google.com,joshualitt@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1754353002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 6b8efeb193..7440608d77 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -15,7 +15,7 @@ #include "GrAutoLocaleSetter.h" #include "GrBatchTest.h" #include "GrContextFactory.h" -#include "GrDrawContextPriv.h" +#include "GrDrawContext.h" #include "GrDrawingManager.h" #include "GrInvariantOutput.h" #include "GrPipeline.h" @@ -361,7 +361,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { return false; } - drawContext->drawContextPriv().testingOnly_drawBatch(pipelineBuilder, batch); + drawContext->internal_drawBatch(pipelineBuilder, batch); } // Flush everything, test passes if flush is successful(ie, no asserts are hit, no crashes) drawingManager->flush(); @@ -398,7 +398,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { return false; } - drawContext->drawContextPriv().testingOnly_drawBatch(builder, batch); + drawContext->internal_drawBatch(builder, batch); drawingManager->flush(); } } |