projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
skia
/
src
/
core
/
SkPaintOptionsAndroid.cpp
diff --git
a/src/third_party/skia/src/core/SkPaintOptionsAndroid.cpp
b/src/third_party/skia/src/core/SkPaintOptionsAndroid.cpp
index
f8a65e9
..
56f1bd1
100644
(file)
--- a/
src/third_party/skia/src/core/SkPaintOptionsAndroid.cpp
+++ b/
src/third_party/skia/src/core/SkPaintOptionsAndroid.cpp
@@
-7,7
+7,8
@@
*/
#include "SkPaintOptionsAndroid.h"
*/
#include "SkPaintOptionsAndroid.h"
-#include "SkFlattenableBuffers.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
#include "SkTDict.h"
#include "SkThread.h"
#include <cstring>
#include "SkTDict.h"
#include "SkThread.h"
#include <cstring>
@@
-25,13
+26,13
@@
SkLanguage SkLanguage::getParent() const {
return SkLanguage(tag, parentTagLen);
}
return SkLanguage(tag, parentTagLen);
}
-void SkPaintOptionsAndroid::flatten(Sk
Flattenable
WriteBuffer& buffer) const {
+void SkPaintOptionsAndroid::flatten(SkWriteBuffer& buffer) const {
buffer.writeUInt(fFontVariant);
buffer.writeString(fLanguage.getTag().c_str());
buffer.writeBool(fUseFontFallbacks);
}
buffer.writeUInt(fFontVariant);
buffer.writeString(fLanguage.getTag().c_str());
buffer.writeBool(fUseFontFallbacks);
}
-void SkPaintOptionsAndroid::unflatten(Sk
Flattenable
ReadBuffer& buffer) {
+void SkPaintOptionsAndroid::unflatten(SkReadBuffer& buffer) {
fFontVariant = (FontVariant)buffer.readUInt();
SkString tag;
buffer.readString(&tag);
fFontVariant = (FontVariant)buffer.readUInt();
SkString tag;
buffer.readString(&tag);