aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/core/SkFlattenableBuffers.h2
-rw-r--r--include/core/SkPaintOptionsAndroid.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkFlattenableBuffers.h b/include/core/SkFlattenableBuffers.h
index f5b853c5ac..03c03f3877 100644
--- a/include/core/SkFlattenableBuffers.h
+++ b/include/core/SkFlattenableBuffers.h
@@ -60,7 +60,7 @@ public:
virtual int32_t read32() = 0;
// strings -- the caller is responsible for freeing the string contents
- virtual char* readString() = 0;
+ virtual void readString(SkString* string) = 0;
virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) = 0;
// common data structures
diff --git a/include/core/SkPaintOptionsAndroid.h b/include/core/SkPaintOptionsAndroid.h
index de2b281f21..23e3d0d390 100644
--- a/include/core/SkPaintOptionsAndroid.h
+++ b/include/core/SkPaintOptionsAndroid.h
@@ -27,6 +27,7 @@ class SkFlattenableWriteBuffer;
class SkLanguage {
public:
SkLanguage() { }
+ SkLanguage(const SkString& tag) : fTag(tag) { }
SkLanguage(const char* tag) : fTag(tag) { }
SkLanguage(const char* tag, size_t len) : fTag(tag, len) { }
SkLanguage(const SkLanguage& b) : fTag(b.fTag) { }