diff options
| author |  Mike Klein <mtklein@google.com> | 2017-04-17 18:04:41 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 18:04:46 +0000 |
| commit | e186cfd15f2df43415ae024185bdcf5baa955ec9 (patch) | |
| tree | a595d33b0925711ac5189ecaceb9eb7e015d5e54 /src/gpu/ops/GrClearOp.h | |
| parent | 215989330c1895a8bd4c00ba767dae6cc79b17ba (diff) | |
Revert "Split cleanup changes out of bigger CL"
This reverts commit cd11c809f206af0da3ce1779dee3c91193baa7b0.
Reason for revert: assert(rtp->getLastOpList())
Original change's description:
> Split cleanup changes out of bigger CL
>
> This are split out of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
>
> TBR=bsalomon@google.com
>
> Change-Id: I1239e806a30a93d3c17ad933f118b98a5077dd3a
> Reviewed-on: https://skia-review.googlesource.com/13585
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia3ef7322fe830a6a4dc29226ce931d35d181c6e0
Reviewed-on: https://skia-review.googlesource.com/13641
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu/ops/GrClearOp.h')
| -rw-r--r-- | src/gpu/ops/GrClearOp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/ops/GrClearOp.h b/src/gpu/ops/GrClearOp.h index 4f51796e6c..5340af1172 100644 --- a/src/gpu/ops/GrClearOp.h +++ b/src/gpu/ops/GrClearOp.h @@ -56,7 +56,6 @@ public: SkString dumpInfo() const override { SkString string; - string.append(INHERITED::dumpInfo()); string.appendf("rtID: %d proxyID: %d Scissor [", fRenderTarget.get()->uniqueID().asUInt(), fProxyUniqueID.asUInt()); @@ -66,11 +65,11 @@ public: } else { string.append("disabled"); } - string.appendf("], Color: 0x%08x\n", fColor); + string.appendf("], Color: 0x%08x ", fColor); + string.append(INHERITED::dumpInfo()); return string; } - GrColor color() const { return fColor; } void setColor(GrColor color) { fColor = color; } private: |