Allow non-atlasable layer to still be hoisted

src/gpu/GrLayerHoister.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.
  */
 
 #include "GrLayerCache.h"
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
@@ skipping 64 matching lines @@
     
     layerCache->addUse(layer);
     hl->fLayer = layer;
     hl->fPicture = pict;
     hl->fLocalMat = info.fLocalMat;
     hl->fInitialMat = initialMat;
     hl->fPreMat = initialMat;
     hl->fPreMat.preConcat(info.fPreMat);
 }
 
-// Compute the source rect if possible and return false if further processing 
-// on the layer should be abandoned based on its source rect.
+// Compute the source rect and return false if it is empty.
 static bool compute_source_rect(const SkLayerInfo::BlockInfo& info, const SkMatrix& initialMat,
                                 const SkIRect& dstIR, SkIRect* srcIR) {
     SkIRect clipBounds = dstIR;
 
     SkMatrix totMat = initialMat;
     totMat.preConcat(info.fPreMat);
     totMat.preConcat(info.fLocalMat);
 
     if (info.fPaint && info.fPaint->getImageFilter()) {
         info.fPaint->getImageFilter()->filterBounds(clipBounds, totMat, &clipBounds);
     }
 
     if (!info.fSrcBounds.isEmpty()) {
         SkRect r;
 
         totMat.mapRect(&r, info.fSrcBounds);
         r.roundOut(srcIR);
 
         if (!srcIR->intersect(clipBounds)) {
             return false;
         }
     } else {
         *srcIR = clipBounds;
     }
 
-    if (!GrLayerCache::PlausiblyAtlasable(srcIR->width(), srcIR->height())) {
-        return false;
-    }
-
     return true;
 }
 
 // Atlased layers must be small enough to fit in the atlas, not have a
 // paint with an image filter and be neither nested nor nesting.
 // TODO: allow leaf nested layers to appear in the atlas.
 void GrLayerHoister::FindLayersToAtlas(GrContext* context,
                                        const SkPicture* topLevelPicture,
                                        const SkMatrix& initialMat,
                                        const SkRect& query,
@@ skipping 37 matching lines @@
         SkRect layerRect;
         initialMat.mapRect(&layerRect, info.fBounds);
         if (!layerRect.intersect(query)) {
             continue;
         }
 
         const SkIRect dstIR = layerRect.roundOut();
 
         SkIRect srcIR;
 
-        if (!compute_source_rect(info, initialMat, dstIR, &srcIR)) {
+        if (!compute_source_rect(info, initialMat, dstIR, &srcIR) ||
+            !GrLayerCache::PlausiblyAtlasable(srcIR.width(), srcIR.height())) {
             continue;
         }
 
         prepare_for_hoisting(layerCache, topLevelPicture, initialMat,
                              info, srcIR, dstIR, atlased, recycled, true, 0);
     }
 
 }
 
 void GrLayerHoister::FindLayersToHoist(GrContext* context,
@@ skipping 190 matching lines @@
 void GrLayerHoister::PurgeCache(GrContext* context) {
 #if !GR_CACHE_HOISTED_LAYERS
     GrLayerCache* layerCache = context->getLayerCache();
 
     // This code completely clears out the atlas. It is required when
     // caching is disabled so the atlas doesn't fill up and force more
     // free floating layers
     layerCache->purgeAll();
 #endif
 }