aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-05-19 12:51:46 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-19 12:51:46 -0700
commitd1c71fd56c293afb986cb5e7546a3a8e4b190d48 (patch)
tree68942a13b53bdac458f47249b6360e1f61af6b57 /src/core
parent5f2fa47a6ea50653fa1584d6baeabce50698881c (diff)
Attempt to improve lifetime management of SkGlyphCache in Ganesh atlas text code.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkDescriptor.h1
-rw-r--r--src/core/SkGlyphCache.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index 736021953b..71f71336fd 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -102,6 +102,7 @@ public:
} while (aa < stop);
return true;
}
+ bool operator!=(const SkDescriptor& other) const { return !(*this == other); }
uint32_t getChecksum() const { return fChecksum; }
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h
index fd3ef66028..2a96370045 100644
--- a/src/core/SkGlyphCache.h
+++ b/src/core/SkGlyphCache.h
@@ -277,7 +277,7 @@ class SkAutoGlyphCache : public std::unique_ptr<SkGlyphCache, SkGlyphCache::Atta
public:
/** deprecated: use get() */
SkGlyphCache* getCache() const { return this->get(); }
-
+ SkAutoGlyphCache() = default;
SkAutoGlyphCache(SkGlyphCache* cache) : INHERITED(cache) {}
SkAutoGlyphCache(SkTypeface* typeface, const SkScalerContextEffects& effects,
const SkDescriptor* desc)