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

src/gpu/GrImmediateDrawTarget.cpp

Index: src/gpu/GrImmediateDrawTarget.cpp
diff --git a/src/gpu/GrImmediateDrawTarget.cpp b/src/gpu/GrImmediateDrawTarget.cpp
index 0c4210ad705280cb94dbc4f1c2ce49ed825f485b..926cba11b81633a5410a739b9b9819abf43a2d60 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,10 +84,11 @@ void GrImmediateDrawTarget::onFlush() {
 }
 
 bool
-GrImmediateDrawTarget::setupPipelineAndShouldDraw(GrPipeline* pipeline,
+GrImmediateDrawTarget::setupPipelineAndShouldDraw(void* pipelineAddr,

[krasin, 2015/07/31 18:29:17]

Note: using SkAlignedSStorage<sizeof(GrPipeline)>* instead of void* will allow
to have better compiler time type checks, and still satisfy all the existing
callers.

I am not 100% sure, that this suggestion makes sense, since I don't know the
code.

[bsalomon, 2015/07/31 18:55:11]

My perhaps imperfect understanding is that the purpose of this is to allow
different implementations to make their own decisions about how to allocate
space for the pipeline object so I'm not sure we want to require the use of
SkAlignedSStorage.

                                                   const GrDrawTarget::PipelineInfo& pipelineInfo) {
-    this->setupPipeline(pipelineInfo, pipeline);
+    this->setupPipeline(pipelineInfo, pipelineAddr);
 
+    const GrPipeline* pipeline = reinterpret_cast<GrPipeline*>(pipelineAddr);

[krasin, 2015/07/31 18:24:10]

Proposal: setupPipeline could return GrPipeline*. This will eliminate the casts
in setupPipeline callers and overall simplify the code.

[bsalomon, 2015/07/31 18:55:11]

Done.

     if (pipeline->mustSkip()) {
         return false;
     }