Speculative fix for http://crbug.com/515966

src/gpu/GrDrawTarget.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawTarget.h"
 
@@ skipping 427 matching lines @@
                                    srcRect,
                                    dstPoint,
                                    &clippedSrcRect,
                                    &clippedDstPoint)) {
         return;
     }
 
     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));
 }
 ///////////////////////////////////////////////////////////////////////////////
 
 GrDrawTarget::PipelineInfo::PipelineInfo(const GrPipelineBuilder& pipelineBuilder,
                                          GrScissorState* scissor,
                                          const GrPrimitiveProcessor* primProc,
                                          const SkRect* devBounds,
                                          GrDrawTarget* target)
     : fPipelineBuilder(&pipelineBuilder)
     , fScissor(scissor) {
@@ skipping 38 matching lines @@
                                            ars,
                                            scissorState,
                                            devBounds);
 }
 
 void GrClipTarget::purgeResources() {
     // The clip mask manager can rebuild all its clip masks so just
     // get rid of them all.
     fClipMaskManager->purgeResources();
 };