remove dead code
Use code coverage and a new '-c' flag to find
and remove unneeded code.
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2397593002
patch from issue 2397593002 at patchset 1 (http://crrev.com/2397593002#ps1)
Change-Id: I741a82de9191146c10457d4c0b9cb9605dff2069
Reviewed-on: https://skia-review.googlesource.com/2983
Reviewed-by: Cary Clark <caryclark@google.com>
diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index c913289..e744c75 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -437,7 +437,6 @@
case kMarkCoinInsert_Glitch: SkDebugf(" MarkCoinInsert"); break;
case kMarkCoinMissing_Glitch: SkDebugf(" MarkCoinMissing"); break;
case kMarkCoinStart_Glitch: SkDebugf(" MarkCoinStart"); break;
- case kMergeContained_Glitch: SkDebugf(" MergeContained"); break;
case kMergeMatches_Glitch: SkDebugf(" MergeMatches"); break;
case kMissingCoin_Glitch: SkDebugf(" MissingCoin"); break;
case kMissingDone_Glitch: SkDebugf(" MissingDone"); break;
@@ -2307,11 +2306,7 @@
const SkOpSegment* segment = &fHead;
// bool result = false;
do {
- if (fState->angleCoincidence()) {
-// #if DEBUG_ANGLE
-// segment->debugCheckAngleCoin();
-// #endif
- } else if (segment->debugMissingCoincidence(log), false) {
+ if (segment->debugMissingCoincidence(log), false) {
// result = true;
}
segment = segment->next();
@@ -2468,42 +2463,6 @@
debugValidate();
}
-// Commented-out lines keep this in sync with mergeContained()
-void SkOpSpanBase::debugMergeContained(SkPathOpsDebug::GlitchLog* log, const SkPathOpsBounds& bounds, bool* deleted) const {
- // while adjacent spans' points are contained by the bounds, merge them
- const SkOpSpanBase* prev = this;
- const SkOpSegment* seg = this->segment();
- while ((prev = prev->prev()) && bounds.contains(prev->pt()) && !seg->ptsDisjoint(prev, this)) {
- if (prev->prev()) {
- log->record(SkPathOpsDebug::kMergeContained_Glitch, this, prev);
- } else if (this->final()) {
- log->record(SkPathOpsDebug::kMergeContained_Glitch, this, prev);
- // return;
- } else {
- log->record(SkPathOpsDebug::kMergeContained_Glitch, prev, this);
- }
- }
- const SkOpSpanBase* current = this;
- const SkOpSpanBase* next = this;
- while (next->upCastable() && (next = next->upCast()->next())
- && bounds.contains(next->pt()) && !seg->ptsDisjoint(this, next)) {
- if (!current->prev() && next->final()) {
- log->record(SkPathOpsDebug::kMergeContained_Glitch, next, current);
- current = next;
- }
- if (current->prev()) {
- log->record(SkPathOpsDebug::kMergeContained_Glitch, next, current);
- current = next;
- } else {
- log->record(SkPathOpsDebug::kMergeContained_Glitch, next, current);
- current = next;
- }
- }
-#if DEBUG_COINCIDENCE
- // this->globalState()->coincidence()->debugValidate();
-#endif
-}
-
// Commented-out lines keep this in sync with mergeMatches()
// Look to see if pt-t linked list contains same segment more than once
// if so, and if each pt-t is directly pointed to by spans in that segment,