OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2012 The Android Open Source Project | 3 * Copyright 2012 The Android Open Source Project |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 #ifdef SK_BUILD_FOR_ANDROID | 9 #ifdef SK_BUILD_FOR_ANDROID |
10 | 10 |
(...skipping 17 matching lines...) Expand all Loading... |
28 } | 28 } |
29 | 29 |
30 void SkPaintOptionsAndroid::flatten(SkFlattenableWriteBuffer& buffer) const { | 30 void SkPaintOptionsAndroid::flatten(SkFlattenableWriteBuffer& buffer) const { |
31 buffer.writeUInt(fFontVariant); | 31 buffer.writeUInt(fFontVariant); |
32 buffer.writeString(fLanguage.getTag().c_str()); | 32 buffer.writeString(fLanguage.getTag().c_str()); |
33 buffer.writeBool(fUseFontFallbacks); | 33 buffer.writeBool(fUseFontFallbacks); |
34 } | 34 } |
35 | 35 |
36 void SkPaintOptionsAndroid::unflatten(SkFlattenableReadBuffer& buffer) { | 36 void SkPaintOptionsAndroid::unflatten(SkFlattenableReadBuffer& buffer) { |
37 fFontVariant = (FontVariant)buffer.readUInt(); | 37 fFontVariant = (FontVariant)buffer.readUInt(); |
38 char* tag = buffer.readString(); | 38 SkString tag; |
| 39 buffer.readString(&tag); |
39 fLanguage = SkLanguage(tag); | 40 fLanguage = SkLanguage(tag); |
40 sk_free(tag); | |
41 fUseFontFallbacks = buffer.readBool(); | 41 fUseFontFallbacks = buffer.readBool(); |
42 } | 42 } |
43 | 43 |
44 #endif | 44 #endif |
OLD | NEW |