Always enable layer hoisting in Skia

src/core/SkMultiPictureDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
@@ skipping 53 matching lines @@
                              const SkPaint* paint) {
     if (NULL == canvas || NULL == picture) {
         SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-NULL");
         return;
     }
 
     SkTDArray<DrawData>& array = canvas->getGrContext() ? fGPUDrawData : fThreadSafeDrawData;
     array.append()->init(canvas, picture, matrix, paint);
 }
 
-#undef SK_IGNORE_GPU_LAYER_HOISTING
-#define SK_IGNORE_GPU_LAYER_HOISTING 1
-
 class AutoMPDReset : SkNoncopyable {
     SkMultiPictureDraw* fMPD;
 public:
     AutoMPDReset(SkMultiPictureDraw* mpd) : fMPD(mpd) {}
     ~AutoMPDReset() { fMPD->reset(); }
 };
 
 void SkMultiPictureDraw::draw() {
     AutoMPDReset mpdreset(this);
     // we place the taskgroup after the MPDReset, to ensure that we don't delete the DrawData
     // objects until after we're finished the tasks (which have pointers to the data).
 
 #if 0
     SkTaskGroup group;
     group.batch(DrawData::Draw, fThreadSafeDrawData.begin(), fThreadSafeDrawData.count());
     // we deliberately don't call wait() here, since the destructor will do that, this allows us
     // to continue processing gpu-data without having to wait on the cpu tasks.
 #else
     for (int i = 0; i < fThreadSafeDrawData.count(); i++) {
         DrawData::Draw(&fThreadSafeDrawData[i]);
     }
 #endif
 
     const int count = fGPUDrawData.count();
     if (0 == count) {
         return;
     }
 
-#ifndef SK_IGNORE_GPU_LAYER_HOISTING
+#if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
     GrContext* context = fGPUDrawData[0].fCanvas->getGrContext();
     SkASSERT(context);
 
     // Start by collecting all the layers that are going to be atlased and render
     // them (if necessary). Hoisting the free floating layers is deferred until
     // drawing the canvas that requires them.
     SkTDArray<GrHoistedLayer> atlasedNeedRendering, atlasedRecycled;
 
     for (int i = 0; i < count; ++i) {
         const DrawData& data = fGPUDrawData[i];
@@ skipping 23 matching lines @@
     GrLayerHoister::DrawLayersToAtlas(context, atlasedNeedRendering);
 
     SkTDArray<GrHoistedLayer> needRendering, recycled;
 #endif
 
     for (int i = 0; i < count; ++i) {
         const DrawData& data = fGPUDrawData[i];
         SkCanvas* canvas = data.fCanvas;
         const SkPicture* picture = data.fPicture;
 
-#ifndef SK_IGNORE_GPU_LAYER_HOISTING
+#if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
         if (!data.fPaint && data.fMatrix.isIdentity()) {
 
             SkRect clipBounds;
             if (!canvas->getClipBounds(&clipBounds)) {
                 continue;
             }
 
             // Find the layers required by this canvas. It will return atlased
             // layers in the 'recycled' list since they have already been drawn.
             GrLayerHoister::FindLayersToHoist(context, picture,
@@ skipping 16 matching lines @@
 
             needRendering.rewind();
             recycled.rewind();
         } else
 #endif
         {
             canvas->drawPicture(picture, &data.fMatrix, data.fPaint);
         }
     }
 
-#ifndef SK_IGNORE_GPU_LAYER_HOISTING
+#if !defined(SK_IGNORE_GPU_LAYER_HOISTING) && SK_SUPPORT_GPU
     GrLayerHoister::UnlockLayers(context, atlasedNeedRendering);
     GrLayerHoister::UnlockLayers(context, atlasedRecycled);
 #if !GR_CACHE_HOISTED_LAYERS
     GrLayerHoister::PurgeCache(context);
 #endif
 #endif
 }