aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/pathops/SkOpCoincidence.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-16 13:53:35 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-16 13:53:35 -0700
commit18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch)
treed1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/pathops/SkOpCoincidence.cpp
parent830dfd87a7707f687e13da5be645e75c746a2cf5 (diff)
detach -> release
The C++ standard library uses the name "release" for the operation we call "detach". Rewriting each "detach(" to "release(" brings us a step closer to using standard library types directly (e.g. std::unique_ptr instead of SkAutoTDelete). This was a fairly blind transformation. There may have been unintentional conversions in here, but it's probably for the best to have everything uniformly say "release". BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1809733002 Review URL: https://codereview.chromium.org/1809733002
Diffstat (limited to 'src/pathops/SkOpCoincidence.cpp')
-rwxr-xr-xsrc/pathops/SkOpCoincidence.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp
index 5687dd415f..c0147bcfd9 100755
--- a/src/pathops/SkOpCoincidence.cpp
+++ b/src/pathops/SkOpCoincidence.cpp
@@ -481,7 +481,7 @@ bool SkOpCoincidence::apply() {
return true;
}
-void SkOpCoincidence::detach(SkCoincidentSpans* remove) {
+void SkOpCoincidence::release(SkCoincidentSpans* remove) {
SkCoincidentSpans* coin = fHead;
SkCoincidentSpans* prev = nullptr;
SkCoincidentSpans* next;
@@ -604,28 +604,28 @@ void SkOpCoincidence::fixUp(SkOpPtT* deleted, SkOpPtT* kept) {
do {
if (coin->fCoinPtTStart == deleted) {
if (coin->fCoinPtTEnd->span() == kept->span()) {
- this->detach(coin);
+ this->release(coin);
continue;
}
coin->fCoinPtTStart = kept;
}
if (coin->fCoinPtTEnd == deleted) {
if (coin->fCoinPtTStart->span() == kept->span()) {
- this->detach(coin);
+ this->release(coin);
continue;
}
coin->fCoinPtTEnd = kept;
}
if (coin->fOppPtTStart == deleted) {
if (coin->fOppPtTEnd->span() == kept->span()) {
- this->detach(coin);
+ this->release(coin);
continue;
}
coin->fOppPtTStart = kept;
}
if (coin->fOppPtTEnd == deleted) {
if (coin->fOppPtTStart->span() == kept->span()) {
- this->detach(coin);
+ this->release(coin);
continue;
}
coin->fOppPtTEnd = kept;