aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrGlyph.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-17 10:51:27 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-17 10:51:27 -0700
commit852f15da7ceb53cfb49b9f728baa6dbc53b27694 (patch)
tree31449f58fc3d72056c5661ca81c43d6055237ebe /src/gpu/GrGlyph.h
parent9ce9d6772df650ceb0511f275e1a83dffa78ff72 (diff)
free -> reset
The C++ standard library uses ".reset()" where we sometimes write ".free()". We also use ".reset()" quite a lot. This standardizes on ".reset()". This is one more step towards dropping SkAutoTDelete in favor of the standard std::unique_ptr. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811723002 Committed: https://skia.googlesource.com/skia/+/0e3738db89e86035ed5d4f629bf58b817b1e5274 Review URL: https://codereview.chromium.org/1811723002
Diffstat (limited to 'src/gpu/GrGlyph.h')
-rw-r--r--src/gpu/GrGlyph.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrGlyph.h b/src/gpu/GrGlyph.h
index 55e925f09d..fb998a4947 100644
--- a/src/gpu/GrGlyph.h
+++ b/src/gpu/GrGlyph.h
@@ -28,7 +28,7 @@ struct GrGlyph {
kCoverage_MaskStyle,
kDistance_MaskStyle
};
-
+
typedef uint32_t PackedID;
GrBatchAtlas::AtlasID fID;
@@ -49,7 +49,7 @@ struct GrGlyph {
fTooLargeForAtlas = GrBatchAtlas::GlyphTooLargeForAtlas(bounds.width(), bounds.height());
}
- void free() {
+ void reset() {
if (fPath) {
delete fPath;
fPath = nullptr;
@@ -86,7 +86,7 @@ struct GrGlyph {
static inline MaskStyle UnpackMaskStyle(PackedID packed) {
return ((packed >> 20) & 1) ? kDistance_MaskStyle : kCoverage_MaskStyle;
}
-
+
static inline uint16_t UnpackID(PackedID packed) {
return (uint16_t)packed;
}