aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/svg
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-20 13:48:42 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-20 13:48:42 -0700
commit02f46cf878535fb79317d15ebed66dfa3f2cd772 (patch)
treea1a4c7994b395cd2ef88b4df62057d728d61fb4d /src/svg
parentce6acc91085c4b6d87d4bac84e66193908e648f9 (diff)
Some usability ideas around SkTHash.
- By default, use new SkGoodHash to hash keys, which is: * for 4 byte values, use SkChecksum::Mix, * for SkStrings, use SkChecksum::Murmur3 on the data, * for other structs, shallow hash the struct with Murmur3. - Expand SkChecksum::Murmur3 to support non-4-byte-aligned data. - Add const foreach() methods. - Have foreach() take a functor, which allows lambdas. BUG=skia: Review URL: https://codereview.chromium.org/1021033002
Diffstat (limited to 'src/svg')
-rw-r--r--src/svg/SkSVGDevice.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index 45e616b3f6..8d2f18a486 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -103,12 +103,6 @@ static SkString svg_transform(const SkMatrix& t) {
return tstr;
}
-uint32_t hash_family_string(const SkString& family) {
- // This is a lame hash function, but we don't really expect to see more than 1-2
- // family names under normal circumstances.
- return SkChecksum::Mix(SkToU32(family.size()));
-}
-
struct Resources {
Resources(const SkPaint& paint)
: fPaintServer(svg_color(paint.getColor())) {}
@@ -538,7 +532,7 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) {
}
SkString familyName;
- SkTHashSet<SkString, hash_family_string> familySet;
+ SkTHashSet<SkString> familySet;
SkAutoTUnref<const SkTypeface> tface(paint.getTypeface() ?
SkRef(paint.getTypeface()) : SkTypeface::RefDefault());