commit aa3b2917173006861ab935ece048257b51cf48b8
author Cary Clark <caryclark@skia.org> Tue Dec 11 11:38:58 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 11 17:10:09 2018 +0000
tree c5783e962083e9d903d70f5f4e50603b41be68b8
parent dfa432cb06472520252884feae945e0748fbec4c

bracket SkPath pathRefIsValid with define

Add defines around the places calls
SkPath::pathRefIsValid()

R=fmalita@chromium.org

Bug:913930
Change-Id: Iffaa85cecf127cf8cb405dffe76666f9184de76e
Reviewed-on: https://skia-review.googlesource.com/c/176583
Commit-Queue: Cary Clark <caryclark@skia.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Auto-Submit: Cary Clark <caryclark@skia.org>
Reviewed-by: Florin Malita <fmalita@chromium.org>

fuzz/FuzzCommon.cpp

diff --git a/fuzz/FuzzCommon.cpp b/fuzz/FuzzCommon.cpp
index 695ef74..eb2ad92 100644
--- a/fuzz/FuzzCommon.cpp
+++ b/fuzz/FuzzCommon.cpp
@@ -214,7 +214,9 @@
                 break;
         }
         SkASSERTF(       path->isValid(),        "path->isValid() failed at op %d, case %d", i, op);
+#ifndef SK_SUPPORT_DIRECT_PATHREF_VALIDATION
         SkASSERTF(path->pathRefIsValid(), "path->pathRefIsValid() failed at op %d, case %d", i, op);
+#endif
     }
 }
 

tests/PathTest.cpp

diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index ec60206..7bd33d6 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -5189,7 +5189,9 @@
     REPORTER_ASSERT(r, p.getBounds() == SkRect::MakeLTRB(0,0, 30,10));  // was {0,0, 20,61}
 
     REPORTER_ASSERT(r, p.isValid());
+#ifndef SK_SUPPORT_DIRECT_PATHREF_VALIDATION
     REPORTER_ASSERT(r, p.pathRefIsValid());
+#endif
 }
 
 DEF_TEST(Path_increserve_handle_neg_crbug_883666, r) {