remove non-static uses of SkOncePtr

src/core/SkBigPicture.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxHierarchy.h"
 #include "SkBigPicture.h"
 #include "SkPictureCommon.h"
@@ skipping 40 matching lines @@
     SkRecordPartialDraw(*fRecord,
                         canvas,
                         this->drawablePicts(),
                         this->drawableCount(),
                         start,
                         stop,
                         initialCTM);
 }
 
 const SkBigPicture::Analysis& SkBigPicture::analysis() const {
-    return *fAnalysis.get([&]{ return new Analysis(*fRecord); });
+    fAnalysisOnce([this] { fAnalysis.init(*fRecord); });
+    return fAnalysis;
 }
 
 SkRect SkBigPicture::cullRect()            const { return fCullRect; }
 bool   SkBigPicture::hasText()             const { return this->analysis().fHasText; }
 bool   SkBigPicture::willPlayBackBitmaps() const { return this->analysis().fWillPlaybackBitmaps; }
 int    SkBigPicture::numSlowPaths() const { return this->analysis().fNumSlowPathsAndDashEffects; }
 int    SkBigPicture::approximateOpCount()   const { return fRecord->count(); }
 size_t SkBigPicture::approximateBytesUsed() const {
     size_t bytes = sizeof(*this) + fRecord->bytesUsed() + fApproxBytesUsedBySubPictures;
     if (fBBH) { bytes += fBBH->bytesUsed(); }
     return bytes;
 }
 
 int SkBigPicture::drawableCount() const {
     return fDrawablePicts ? fDrawablePicts->count() : 0;
 }
 
 SkPicture const* const* SkBigPicture::drawablePicts() const {
     return fDrawablePicts ? fDrawablePicts->begin() : nullptr;
 }
 
-SkBigPicture::Analysis::Analysis(const SkRecord& record) {
-    TRACE_EVENT0("disabled-by-default-skia", "SkBigPicture::Analysis::Analysis()");
+void SkBigPicture::Analysis::init(const SkRecord& record) {
+    TRACE_EVENT0("disabled-by-default-skia", "SkBigPicture::Analysis::init()");
     SkTextHunter   text;
     SkBitmapHunter bitmap;
     SkPathCounter  path;
 
     bool hasText = false, hasBitmap = false;
     for (int i = 0; i < record.count(); i++) {
         hasText   = hasText   || record.visit(i,   text);
         hasBitmap = hasBitmap || record.visit(i, bitmap);
         record.visit(i, path);
     }
 
     fHasText                    = hasText;
     fWillPlaybackBitmaps        = hasBitmap;
     fNumSlowPathsAndDashEffects = SkTMin<int>(path.fNumSlowPathsAndDashEffects, 255);
 }