diff options
| author |  mtklein <mtklein@chromium.org> | 2016-03-16 13:53:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-16 13:53:35 -0700 |
| commit | 18300a3aa7cb6eb55d21bb0450dffa58b6fc062c (patch) | |
| tree | d1c0f54567937ed7dd44fb17842c6c1b544815d0 /src/android/SkBitmapRegionDecoder.cpp | |
| parent | 830dfd87a7707f687e13da5be645e75c746a2cf5 (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/android/SkBitmapRegionDecoder.cpp')
| -rw-r--r-- | src/android/SkBitmapRegionDecoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/android/SkBitmapRegionDecoder.cpp b/src/android/SkBitmapRegionDecoder.cpp index a153282b09..712034ba44 100644 --- a/src/android/SkBitmapRegionDecoder.cpp +++ b/src/android/SkBitmapRegionDecoder.cpp @@ -24,7 +24,7 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( SkAutoTDelete<SkStreamRewindable> streamDeleter(stream); switch (strategy) { case kCanvas_Strategy: { - SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(streamDeleter.detach())); + SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(streamDeleter.release())); if (nullptr == codec) { SkCodecPrintf("Error: Failed to create decoder.\n"); return nullptr; @@ -47,11 +47,11 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( SkASSERT(SkCodec::kTopDown_SkScanlineOrder == codec->getScanlineOrder() || SkCodec::kNone_SkScanlineOrder == codec->getScanlineOrder()); - return new SkBitmapRegionCanvas(codec.detach()); + return new SkBitmapRegionCanvas(codec.release()); } case kAndroidCodec_Strategy: { SkAutoTDelete<SkAndroidCodec> codec = - SkAndroidCodec::NewFromStream(streamDeleter.detach()); + SkAndroidCodec::NewFromStream(streamDeleter.release()); if (nullptr == codec) { SkCodecPrintf("Error: Failed to create codec.\n"); return NULL; @@ -67,7 +67,7 @@ SkBitmapRegionDecoder* SkBitmapRegionDecoder::Create( return nullptr; } - return new SkBitmapRegionCodec(codec.detach()); + return new SkBitmapRegionCodec(codec.release()); } default: SkASSERT(false); |