Copy layer-hoisting related SkPaints

src/gpu/SkGpuDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "effects/GrBicubicEffect.h"
@@ skipping 152 matching lines @@
 
 SkGpuDevice* SkGpuDevice::Create(GrContext* context, const SkImageInfo& origInfo,
                                  int sampleCount) {
     if (kUnknown_SkColorType == origInfo.colorType() ||
         origInfo.width() < 0 || origInfo.height() < 0) {
         return NULL;
     }
 
     SkColorType ct = origInfo.colorType();
     SkAlphaType at = origInfo.alphaType();
-    // TODO: perhas we can loosen this check now that colortype is more detailed
+    // TODO: perhaps we can loosen this check now that colortype is more detailed
     // e.g. can we support both RGBA and BGRA here?
     if (kRGB_565_SkColorType == ct) {
         at = kOpaque_SkAlphaType;  // force this setting
     } else {
         ct = kN32_SkColorType;
         if (kOpaque_SkAlphaType != at) {
             at = kPremul_SkAlphaType;  // force this setting
         }
     }
     const SkImageInfo info = SkImageInfo::Make(origInfo.width(), origInfo.height(), ct, at);
@@ skipping 1669 matching lines @@
 
         SkBitmap bm;
         wrap_texture(layers[i]->texture(),
                      !layers[i]->isAtlased() ? layers[i]->rect().width()
                                              : layers[i]->texture()->width(),
                      !layers[i]->isAtlased() ? layers[i]->rect().height()
                                              : layers[i]->texture()->height(),
                      &bm);
         layerInfo->fImage = SkImage::NewTexture(bm);
 
-        // TODO: copy this?
-        layerInfo->fPaint = layers[i]->paint();
+        layerInfo->fPaint = layers[i]->paint() ? SkNEW_ARGS(SkPaint, (*layers[i]->paint())) : NULL;
 
         layerInfo->fSrcRect = SkIRect::MakeXYWH(layers[i]->rect().fLeft,
                                                 layers[i]->rect().fTop,
                                                 layers[i]->rect().width(),
                                                 layers[i]->rect().height());
     }
 }
 
 bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture* picture,
                                            const SkMatrix* matrix, const SkPaint* paint) {
@@ skipping 79 matching lines @@
     GrLayerHoister::UnlockLayers(fContext->getLayerCache(), picture);
 
     return true;
 }
 
 SkImageFilter::Cache* SkGpuDevice::getImageFilterCache() {
     // We always return a transient cache, so it is freed after each
     // filter traversal.
     return SkImageFilter::Cache::Create(kDefaultImageFilterCacheSize);
 }