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 /samplecode | |
| 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 'samplecode')
| -rw-r--r-- | samplecode/SampleApp.cpp | 4 | ||||
| -rw-r--r-- | samplecode/SamplePictFile.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 6d5f647b15..72122234d9 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -261,7 +261,7 @@ public: fCurIntf = nullptr; SkDebugf("Failed to setup 3D"); - win->detach(); + win->release(); } #endif // SK_SUPPORT_GPU // call windowSizeChanged to create the render target @@ -283,7 +283,7 @@ public: SkSafeUnref(fCurRenderTarget); fCurRenderTarget = nullptr; #endif - win->detach(); + win->release(); fBackend = kNone_BackEndType; } diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index 43e7cf49e5..9203cbad77 100644 --- a/samplecode/SamplePictFile.cpp +++ b/samplecode/SamplePictFile.cpp @@ -191,7 +191,7 @@ private: switch (bbox) { case kNo_BBoxType: // no bbox playback necessary - return pic.detach(); + return pic.release(); case kRTree_BBoxType: factory.reset(new SkRTreeFactory); break; |