aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ProcessorTest.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-06-15 15:59:38 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-15 15:59:45 +0000
commit4f6ba2e522bcc3f84c02c9b7dd834b9b5476968b (patch)
tree790f98d53f60cdef293fa2788ac02ec4722c33c1 /tests/ProcessorTest.cpp
parent0513dd8675534afdd605cea32778a4b4671b2c3d (diff)
Revert "Move op memory storage to GrContext"
This reverts commit c8cee446bf9c07da8848bbd032abf26e79966ac1. Reason for revert: TSAN issues Original change's description: > Move op memory storage to GrContext > > TBR=bsalomon@google.com > Change-Id: Ifa95bf0073b9d948f2c937d10088b7734b971f90 > Reviewed-on: https://skia-review.googlesource.com/131500 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Ia0d2b7408314d9b67d57388315376bbea23d3780 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/135181 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ProcessorTest.cpp')
-rw-r--r--tests/ProcessorTest.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index e52070b7d2..3916436cfc 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -29,9 +29,7 @@ public:
DEFINE_OP_CLASS_ID
static std::unique_ptr<GrDrawOp> Make(GrContext* context,
std::unique_ptr<GrFragmentProcessor> fp) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
-
- return pool->allocate<TestOp>(std::move(fp));
+ return std::unique_ptr<GrDrawOp>(new TestOp(std::move(fp)));
}
const char* name() const override { return "TestOp"; }