Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: src/gpu/GrDrawTarget.cpp

Issue 1268723005: Speculative fix for http://crbug.com/515966 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comment Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrDrawTarget.h ('k') | src/gpu/GrImmediateDrawTarget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawTarget.cpp
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 37faacf38347af03fa4230178a9973c250350a44..60dd58693a35ccbe5a0b585e559c63d7e91beda1 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -445,14 +445,14 @@ void GrDrawTarget::copySurface(GrSurface* dst,
this->onCopySurface(dst, src, clippedSrcRect, clippedDstPoint);
}
-void GrDrawTarget::setupPipeline(const PipelineInfo& pipelineInfo,
- GrPipeline* pipeline) {
- SkNEW_PLACEMENT_ARGS(pipeline, GrPipeline, (*pipelineInfo.fPipelineBuilder,
- pipelineInfo.fColorPOI,
- pipelineInfo.fCoveragePOI,
- *this->caps(),
- *pipelineInfo.fScissor,
- &pipelineInfo.fDstTexture));
+const GrPipeline* GrDrawTarget::setupPipeline(const PipelineInfo& pipelineInfo,
+ void* pipelineAddr) {
+ return SkNEW_PLACEMENT_ARGS(pipelineAddr, GrPipeline, (*pipelineInfo.fPipelineBuilder,
+ pipelineInfo.fColorPOI,
+ pipelineInfo.fCoveragePOI,
+ *this->caps(),
+ *pipelineInfo.fScissor,
+ &pipelineInfo.fDstTexture));
}
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « src/gpu/GrDrawTarget.h ('k') | src/gpu/GrImmediateDrawTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698