Change where layer hoisting data is gathered

src/core/SkPicture.cpp

Index: src/core/SkPicture.cpp
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 01b315a758a3134069231f5d9fea9872da737325..5231cb9570b3af97c4694b1c859894620c0ba1d2 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -625,23 +625,13 @@ uint32_t SkPicture::uniqueID() const {
     return fUniqueID;
 }
 
-
-static SkRecord* optimized(SkRecord* r) {
-    SkRecordOptimize(r);
-    return r;
-}
-
 // fRecord OK
 SkPicture::SkPicture(SkScalar width, SkScalar height, SkRecord* record, SkBBoxHierarchy* bbh)
     : fCullWidth(width)
     , fCullHeight(height)
-    , fRecord(optimized(record))
+    , fRecord(record)
     , fBBH(SkSafeRef(bbh))
     , fAnalysis(*fRecord) {
-    // TODO: delay as much of this work until just before first playback?
-    if (fBBH.get()) {
-        SkRecordFillBounds(this->cullRect(), *fRecord, fBBH.get());
-    }
     this->needsNewGenID();
 }