Revert "Revert of Workaround for assertion in NVPR config in bench. (https://codereview.chromium.org

bench/HairlinePathBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
+#if SK_SUPPORT_GPU
+#include "GrTest.h"
+#include "GrDrawTargetCaps.h"
+#endif
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 
 enum Flags {
     kBig_Flag = 1 << 0,
     kAA_Flag = 1 << 1
@@ skipping 146 matching lines @@
             float weight = randWeight.nextRangeF(0.0f, 2.0f);
             path->moveTo(SkIntToScalar(points[base1] + xTrans),
                          SkIntToScalar(points[base1+1] + yTrans));
             path->conicTo(SkIntToScalar(points[base2] + xTrans),
                           SkIntToScalar(points[base2+1] + yTrans),
                          SkIntToScalar(points[base3] + xTrans),
                          SkIntToScalar(points[base3+1] + yTrans),
                          weight);
         }
     }
+
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+#if SK_SUPPORT_GPU
+        GrContext* context = canvas->getGrContext();
+        // This is a workaround for skbug.com/2078. See also skbug.com/2033.
+        if (NULL != context) {
+            GrTestTarget tt;
+            context->getTestTarget(&tt);
+            if (tt.target()->caps()->pathRenderingSupport()) {
+                return;
+            }
+        }
+#endif
+        INHERITED::onDraw(loops, canvas);
+    }
+
 private:
     typedef HairlinePathBench INHERITED;
 };
 
 class CubicPathBench : public HairlinePathBench {
 public:
     CubicPathBench(Flags flags) : INHERITED(flags) {}
 
     virtual void appendName(SkString* name) SK_OVERRIDE {
         name->append("cubic");
@@ skipping 44 matching lines @@
 // Don't have default path renderer for conics yet on GPU, so must use AA
 // DEF_BENCH( return new ConicPathBench(FLAGS00); )
 // DEF_BENCH( return new ConicPathBench(FLAGS01); )
 DEF_BENCH( return new ConicPathBench(FLAGS10); )
 DEF_BENCH( return new ConicPathBench(FLAGS11); )
 
 DEF_BENCH( return new CubicPathBench(FLAGS00); )
 DEF_BENCH( return new CubicPathBench(FLAGS01); )
 DEF_BENCH( return new CubicPathBench(FLAGS10); )
 DEF_BENCH( return new CubicPathBench(FLAGS11); )