Make skpaint->grpaint flow work for composing draws

src/gpu/batches/GrDrawAtlasBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawAtlasBatch.h"
 #include "GrBatchFlushState.h"
 #include "GrBatchTest.h"
 #include "SkGr.h"
 #include "SkRandom.h"
 #include "SkRSXform.h"
 
 void GrDrawAtlasBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
+    SkASSERT(fGeoData.count() == 1);
     // Handle any color overrides
     if (!opt.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
-    
+    if (opt.getOverrideColorIfSet(&fGeoData[0].fColor) && fHasColors) {
+        size_t vertexStride = sizeof(SkPoint) + sizeof(SkPoint) +
+                             (this->hasColors() ? sizeof(GrColor) : 0);
+        uint8_t* currVertex = fGeoData[0].fVerts.begin();
+        for (int i = 0; i < 4*fQuadCount; ++i) {
+            *(reinterpret_cast<GrColor*>(currVertex + sizeof(SkPoint))) = fGeoData[0].fColor;
+            currVertex += vertexStride;
+        }
+    }
+
     // setup batch properties
     fColorIgnored = !opt.readsColor();
     fColor = fGeoData[0].fColor;
     // We'd like to assert this, but we can't because of GLPrograms test
     //SkASSERT(init.readsLocalCoords());
     fCoverageIgnored = !opt.readsCoverage();
 }
 
 static const GrGeometryProcessor* set_vertex_attributes(bool hasColors,
                                                         GrColor color,
@@ skipping 78 matching lines @@
         const SkRect& currRect = rects[spriteIndex];
         xforms[spriteIndex].toQuad(currRect.width(), currRect.height(), quad);
  
         // Copy colors if necessary
         if (colors) {
             // convert to GrColor
             SkColor color = colors[spriteIndex];
             if (paintAlpha != 255) {
                 color = SkColorSetA(color, SkMulDiv255Round(SkColorGetA(color), paintAlpha));
             }
-            GrColor grColor = SkColor2GrColor(color);
+            GrColor grColor = SkColorToPremulGrColor(color);
             
             *(reinterpret_cast<GrColor*>(currVertex+sizeof(SkPoint))) = grColor;
             *(reinterpret_cast<GrColor*>(currVertex+vertexStride+sizeof(SkPoint))) = grColor;
             *(reinterpret_cast<GrColor*>(currVertex+2*vertexStride+sizeof(SkPoint))) = grColor;
             *(reinterpret_cast<GrColor*>(currVertex+3*vertexStride+sizeof(SkPoint))) = grColor;
         }
         
         // Copy position and uv to verts
         *(reinterpret_cast<SkPoint*>(currVertex)) = quad[0];
         *(reinterpret_cast<SkPoint*>(currVertex+texOffset)) = SkPoint::Make(currRect.fLeft,
@@ skipping 118 matching lines @@
     
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     
     GrDrawAtlasBatch::Geometry geometry;
     geometry.fColor = GrRandomColor(random);
     return GrDrawAtlasBatch::Create(geometry, viewMatrix, spriteCount, xforms.begin(),
                                     texRects.begin(), hasColors ? colors.begin() : nullptr);
 }
 
 #endif