firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated API

Browse Source 
It has been unused outside minikin.

Change-Id: Iaa2237767d81c77f90d0264e633375e601dd72f1
This commit is contained in:
Behdad Esfahbod
2014-07-24 19:18:14 -04:00
parent 7043f8f1fc
commit ded72d1e4a
4 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/src/flutter/include/minikin/Layout.h
View File

@@ -68,19 +68,13 @@ public:
void dump() const;
void setFontCollection(const FontCollection* collection);
// deprecated - missing functionality
void doLayout(const uint16_t* buf, size_t nchars);
void doLayout(const uint16_t* buf, size_t start, size_t count, size_t bufSize,
const std::string& css);
void draw(Bitmap*, int x0, int y0, float size) const;
// deprecated - pass as argument to doLayout instead
void setProperties(const std::string& css);
// This must be called before any invocations.
// TODO: probably have a factory instead
// TODO: probably have a factory instead
static void init();
// public accessors
@@ -122,9 +116,6 @@ private:
// Append another layout (for example, cached value) into this one
void appendLayout(Layout* src, size_t start);
// deprecated - remove when setProperties is removed
std::string mCssString;
std::vector<LayoutGlyph> mGlyphs;
std::vector<float> mAdvances;

9
engine/src/flutter/libs/minikin/Layout.cpp
View File

@@ -490,11 +490,6 @@ static size_t getNextWordBreak(const uint16_t* chars, size_t offset, size_t len)
return len;
}
// deprecated API, to avoid breaking client
void Layout::doLayout(const uint16_t* buf, size_t nchars) {
doLayout(buf, 0, nchars, nchars, mCssString);
}
static void clearHbFonts(LayoutContext* ctx) {
for (size_t i = 0; i < ctx->hbFonts.size(); i++) {
hb_font_destroy(ctx->hbFonts[i]);
@@ -803,10 +798,6 @@ void Layout::draw(Bitmap* surface, int x0, int y0, float size) const {
}
}
void Layout::setProperties(const string& css) {
mCssString = css;
}
size_t Layout::nGlyphs() const {
return mGlyphs.size();
}

4
engine/src/flutter/sample/example.cpp
View File

@@ -83,10 +83,10 @@ int runMinikinTest() {
FontCollection *collection = makeFontCollection();
Layout layout;
layout.setFontCollection(collection);
layout.setProperties("font-size: 32;");
const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87";
const char *style = "font-size: 32;";
icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text);
layout.doLayout(icuText.getBuffer(), icuText.length());
layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style);
layout.dump();
Bitmap bitmap(250, 50);
layout.draw(&bitmap, 10, 40, 32);

4
engine/src/flutter/sample/example_skia.cpp
View File

@@ -117,10 +117,10 @@ int runMinikinTest() {
FontCollection *collection = makeFontCollection();
Layout layout;
layout.setFontCollection(collection);
layout.setProperties("font-size: 32; font-weight: 700;");
const char *text = "fine world \xe0\xa4\xa8\xe0\xa4\xae\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\xa4\xe0\xa5\x87";
const char *style = "font-size: 32; font-weight: 700;";
icu::UnicodeString icuText = icu::UnicodeString::fromUTF8(text);
layout.doLayout(icuText.getBuffer(), icuText.length());
layout.doLayout(icuText.getBuffer(), 0, icuText.length(), icuText.length(), style);
layout.dump();
SkAutoGraphics ag;