diff -r 000000000000 -r 6474c204b198 gfx/skia/trunk/src/core/SkPaintOptionsAndroid.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/skia/trunk/src/core/SkPaintOptionsAndroid.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,41 @@
+
+/*
+ * Copyright 2012 The Android Open Source Project
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkPaintOptionsAndroid.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+#include "SkTDict.h"
+#include "SkThread.h"
+#include <cstring>
+
+SkLanguage SkLanguage::getParent() const {
+    SkASSERT(!fTag.isEmpty());
+    const char* tag = fTag.c_str();
+
+    // strip off the rightmost "-.*"
+    const char* parentTagEnd = strrchr(tag, '-');
+    if (parentTagEnd == NULL) {
+        return SkLanguage();
+    }
+    size_t parentTagLen = parentTagEnd - tag;
+    return SkLanguage(tag, parentTagLen);
+}
+
+void SkPaintOptionsAndroid::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeUInt(fFontVariant);
+    buffer.writeString(fLanguage.getTag().c_str());
+    buffer.writeBool(fUseFontFallbacks);
+}
+
+void SkPaintOptionsAndroid::unflatten(SkReadBuffer& buffer) {
+    fFontVariant = (FontVariant)buffer.readUInt();
+    SkString tag;
+    buffer.readString(&tag);
+    fLanguage = SkLanguage(tag);
+    fUseFontFallbacks = buffer.readBool();
+}