Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Side by Side Diff: src/core/SkPaintOptionsAndroid.cpp

Issue 434623002: Remove ALL font fallback logic from Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix win font host Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/core/SkScalerContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "SkPaintOptionsAndroid.h" 9 #include "SkPaintOptionsAndroid.h"
10 #include "SkReadBuffer.h" 10 #include "SkReadBuffer.h"
(...skipping 11 matching lines...) Expand all
22 if (parentTagEnd == NULL) { 22 if (parentTagEnd == NULL) {
23 return SkLanguage(); 23 return SkLanguage();
24 } 24 }
25 size_t parentTagLen = parentTagEnd - tag; 25 size_t parentTagLen = parentTagEnd - tag;
26 return SkLanguage(tag, parentTagLen); 26 return SkLanguage(tag, parentTagLen);
27 } 27 }
28 28
29 void SkPaintOptionsAndroid::flatten(SkWriteBuffer& buffer) const { 29 void SkPaintOptionsAndroid::flatten(SkWriteBuffer& buffer) const {
30 buffer.writeUInt(fFontVariant); 30 buffer.writeUInt(fFontVariant);
31 buffer.writeString(fLanguage.getTag().c_str()); 31 buffer.writeString(fLanguage.getTag().c_str());
32 buffer.writeBool(fUseFontFallbacks); 32 // to maintain picture compatibility for the old fUseFontFallbacks variable
33 buffer.writeBool(false);
33 } 34 }
34 35
35 void SkPaintOptionsAndroid::unflatten(SkReadBuffer& buffer) { 36 void SkPaintOptionsAndroid::unflatten(SkReadBuffer& buffer) {
36 fFontVariant = (FontVariant)buffer.readUInt(); 37 fFontVariant = (FontVariant)buffer.readUInt();
37 SkString tag; 38 SkString tag;
38 buffer.readString(&tag); 39 buffer.readString(&tag);
39 fLanguage = SkLanguage(tag); 40 fLanguage = SkLanguage(tag);
40 fUseFontFallbacks = buffer.readBool(); 41 // to maintain picture compatibility for the old fUseFontFallbacks variable
42 buffer.readBool();
41 } 43 }
OLDNEW
« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/core/SkScalerContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698