Change where layer hoisting data is gathered

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.
  */
 
 // Need to include something before #if SK_SUPPORT_GPU so that the Android
 // framework build, which gets its defines from SkTypes rather than a makefile,
 // has the definition before checking it.
@@ skipping 94 matching lines @@
     // 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];
         // we only expect 1 context for all the canvases
         SkASSERT(data.fCanvas->getGrContext() == context);
 
         if (!data.fPaint && data.fMatrix.isIdentity()) {
-            // TODO: this path always tries to optimize pictures. Should we
-            // switch to this API approach (vs. SkCanvas::EXPERIMENTAL_optimize)?
-            data.fCanvas->EXPERIMENTAL_optimize(data.fPicture);
-
             SkRect clipBounds;
             if (!data.fCanvas->getClipBounds(&clipBounds)) {
                 continue;
             }
 
             GrRenderTarget* rt = data.fCanvas->internal_private_accessTopLayerRenderTarget();
             SkASSERT(rt);
 
             // TODO: sorting the cacheable layers from smallest to largest
             // would improve the packing and reduce the number of swaps
@@ skipping 59 matching lines @@
 
 #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
 }