Revert of Alter gpu veto

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"
 #include "SkPictureData.h"
@@ skipping 221 matching lines @@
         if (record.visit<bool>(i, text)) {
             fHasText = true;
             break;
         }
     }
 }
 
 bool SkPicture::Analysis::suitableForGpuRasterization(const char** reason,
                                                       int sampleCount) const {
     // TODO: the heuristic used here needs to be refined
-    static const int kNumSlowPathsTol = 6;
+    static const int kNumPaintWithPathEffectsUsesTol = 1;
+    static const int kNumAAConcavePathsTol = 5;
 
-    int numSlowPathDashedPaths = fNumPaintWithPathEffectUses;
-    if (0 == sampleCount) {
-        // The fast dashing path only works when MSAA is disabled
-        numSlowPathDashedPaths -= fNumFastPathDashEffects;
-    }
+    int numNonDashedPathEffects = fNumPaintWithPathEffectUses -
+                                  fNumFastPathDashEffects;
+    bool suitableForDash = (0 == fNumPaintWithPathEffectUses) ||
+                           (numNonDashedPathEffects < kNumPaintWithPathEffectsUsesTol
+                               && 0 == sampleCount);
 
-    int numSlowPaths = fNumAAConcavePaths - 
-                       fNumAAHairlineConcavePaths -
-                       fNumAADFEligibleConcavePaths;
-
-    bool ret = numSlowPathDashedPaths + numSlowPaths < kNumSlowPathsTol;
+    bool ret = suitableForDash &&
+               (fNumAAConcavePaths - fNumAAHairlineConcavePaths - fNumAADFEligibleConcavePaths)
+                   < kNumAAConcavePathsTol;
 
     if (!ret && reason) {
-        *reason = "Too many slow paths (either concave or dashed).";
+        if (!suitableForDash) {
+            if (0 != sampleCount) {
+                *reason = "Can't use multisample on dash effect.";
+            } else {
+                *reason = "Too many non dashed path effects.";
+            }
+        } else if ((fNumAAConcavePaths - fNumAAHairlineConcavePaths - fNumAADFEligibleConcavePaths)
+                    >= kNumAAConcavePathsTol)
+            *reason = "Too many anti-aliased concave paths.";
+        else
+            *reason = "Unknown reason for GPU unsuitability.";
     }
     return ret;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkPicture::drawableCount() const {
     return fDrawablePicts.get() ? fDrawablePicts->count() : 0;
 }
 
@@ skipping 220 matching lines @@
 
 SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SnapshotArray* drawablePicts,
                      SkBBoxHierarchy* bbh)
     : fUniqueID(next_picture_generation_id())
     , fCullRect(cullRect)
     , fRecord(SkRef(record))
     , fBBH(SkSafeRef(bbh))
     , fDrawablePicts(drawablePicts)     // take ownership
     , fAnalysis(*fRecord)
 {}