SkPicture::PathCounter is O(N^2) for pictures nested N deep. Fix that.

src/core/SkPicture.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 124 matching lines @@
 
     PathCounter()
         : numPaintWithPathEffectUses (0)
         , numFastPathDashEffects (0)
         , numAAConcavePaths (0)
         , numAAHairlineConcavePaths (0) {
     }
 
     // Recurse into nested pictures.
     void operator()(const SkRecords::DrawPicture& op) {
-        // If you're not also SkRecord-backed, tough luck.  Get on the bandwagon.
-        if (op.picture->fRecord.get() == NULL) {
-            return;
-        }
-        const SkRecord& nested = *op.picture->fRecord;
-        for (unsigned i = 0; i < nested.count(); i++) {
-            nested.visit<void>(i, *this);
-        }
+        const SkPicture::Analysis& analysis = op.picture->fAnalysis;
+        numPaintWithPathEffectUses += analysis.fNumPaintWithPathEffectUses;
+        numFastPathDashEffects     += analysis.fNumFastPathDashEffects;
+        numAAConcavePaths          += analysis.fNumAAConcavePaths;
+        numAAHairlineConcavePaths  += analysis.fNumAAHairlineConcavePaths;
     }
 
     void checkPaint(const SkPaint* paint) {
         if (paint && paint->getPathEffect()) {
             numPaintWithPathEffectUses++;
         }
     }
 
     void operator()(const SkRecords::DrawPoints& op) {
         this->checkPaint(&op.paint);
@@ skipping 520 matching lines @@
 int SkPicture::approximateOpCount() const {
     SkASSERT(fRecord.get() || fData.get());
     if (fRecord.get()) {
         return fRecord->count();
     }
     if (fData.get()) {
         return fData->opCount();
     }
     return 0;
 }