Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: src/pathops/SkOpContour.h

Issue 1033803002: Revert of fix destructor order to fix build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/pathops/SkPathOpsCommon.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pathops/SkOpContour.h
diff --git a/src/pathops/SkOpContour.h b/src/pathops/SkOpContour.h
index 495b643fffe7904c967f312279258436d060ff10..be1f59f4bbe2a5fa73f51730c01b646285fe3eea 100644
--- a/src/pathops/SkOpContour.h
+++ b/src/pathops/SkOpContour.h
@@ -20,12 +20,6 @@
reset();
}
- ~SkOpContour() {
- if (fNext) {
- fNext->~SkOpContour();
- }
- }
-
bool operator<(const SkOpContour& rh) const {
return fBounds.fTop == rh.fBounds.fTop
? fBounds.fLeft < rh.fBounds.fLeft
@@ -67,7 +61,7 @@
SkOpContour* appendContour(SkChunkAlloc* allocator) {
SkOpContour* contour = SkOpTAllocator<SkOpContour>::New(allocator);
- contour->setNext(NULL);
+
SkOpContour* prev = this;
SkOpContour* next;
while ((next = prev->next())) {
@@ -279,7 +273,7 @@
}
void setNext(SkOpContour* contour) {
-// SkASSERT(!fNext == !!contour);
+ SkASSERT(!fNext == !!contour);
fNext = contour;
}
« no previous file with comments | « no previous file | src/pathops/SkPathOpsCommon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698