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

BUG=chromium:515966

Review URL: https://codereview.chromium.org/1268723005

1 files changed, 5 insertions, 3 deletions

diff --git a/src/gpu/GrImmediateDrawTarget.cpp b/src/gpu/GrImmediateDrawTarget.cpp
index 0c4210ad70..0099b1dc8c 100644
--- a/src/gpu/GrImmediateDrawTarget.cpp
+++ b/src/gpu/GrImmediateDrawTarget.cpp
@@ -27,8 +27,10 @@ GrImmediateDrawTarget::~GrImmediateDrawTarget() {
 void GrImmediateDrawTarget::onDrawBatch(GrBatch* batch,
                                         const PipelineInfo& pipelineInfo) {
     SkAlignedSStorage<sizeof(GrPipeline)> pipelineStorage;
+    bool shouldDraw = this->setupPipelineAndShouldDraw(pipelineStorage.get(), pipelineInfo);
     GrPipeline* pipeline = reinterpret_cast<GrPipeline*>(pipelineStorage.get());
-    if (!this->setupPipelineAndShouldDraw(pipeline, pipelineInfo)) {
+
+    if (!shouldDraw) {
         pipeline->~GrPipeline();
         return;
     }
@@ -82,9 +84,9 @@ void GrImmediateDrawTarget::onFlush() {
 }
 
 bool
-GrImmediateDrawTarget::setupPipelineAndShouldDraw(GrPipeline* pipeline,
+GrImmediateDrawTarget::setupPipelineAndShouldDraw(void* pipelineAddr,
                                                   const GrDrawTarget::PipelineInfo& pipelineInfo) {
-    this->setupPipeline(pipelineInfo, pipeline);
+    const GrPipeline* pipeline = this->setupPipeline(pipelineInfo, pipelineAddr);
 
     if (pipeline->mustSkip()) {
         return false;