The font cache should respect the fake bold flag.
Change-Id: Ie4edc9ba46610edde831b55e769944e9a19bdcb5
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 5224689..d1fbfba 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -38,8 +38,8 @@
// Font
///////////////////////////////////////////////////////////////////////////////
-Font::Font(FontRenderer* state, uint32_t fontId, float fontSize) :
- mState(state), mFontId(fontId), mFontSize(fontSize) {
+Font::Font(FontRenderer* state, uint32_t fontId, float fontSize, int flags) :
+ mState(state), mFontId(fontId), mFontSize(fontSize), mFlags(flags) {
}
@@ -275,17 +275,17 @@
return newGlyph;
}
-Font* Font::create(FontRenderer* state, uint32_t fontId, float fontSize) {
+Font* Font::create(FontRenderer* state, uint32_t fontId, float fontSize, int flags) {
Vector<Font*> &activeFonts = state->mActiveFonts;
for (uint32_t i = 0; i < activeFonts.size(); i++) {
Font* font = activeFonts[i];
- if (font->mFontId == fontId && font->mFontSize == fontSize) {
+ if (font->mFontId == fontId && font->mFontSize == fontSize && font->mFlags == flags) {
return font;
}
}
- Font* newFont = new Font(state, fontId, fontSize);
+ Font* newFont = new Font(state, fontId, fontSize, flags);
activeFonts.push(newFont);
return newFont;
}
@@ -634,7 +634,11 @@
void FontRenderer::setFont(SkPaint* paint, uint32_t fontId, float fontSize) {
uint32_t currentNumFonts = mActiveFonts.size();
- mCurrentFont = Font::create(this, fontId, fontSize);
+ int flags = 0;
+ if (paint->isFakeBoldText()) {
+ flags |= Font::kFakeBold;
+ }
+ mCurrentFont = Font::create(this, fontId, fontSize, flags);
const float maxPrecacheFontSize = 40.0f;
bool isNewFont = currentNumFonts != mActiveFonts.size();
@@ -720,7 +724,7 @@
// The larger the radius gets, the more our gaussian blur
// will resemble a box blur since with large sigma
// the gaussian curve begins to lose its shape
- float sigma = 0.3f * (float)radius + 0.6f;
+ float sigma = 0.3f * (float) radius + 0.6f;
// Now compute the coefficints
// We will store some redundant values to save some math during
@@ -730,7 +734,7 @@
float coeff2 = - 1.0f / (2.0f * sigma * sigma);
float normalizeFactor = 0.0f;
- for(int32_t r = -radius; r <= radius; r ++) {
+ for (int32_t r = -radius; r <= radius; r ++) {
float floatR = (float) r;
weights[r + radius] = coeff1 * pow(e, floatR * floatR * coeff2);
normalizeFactor += weights[r + radius];
@@ -738,7 +742,7 @@
//Now we need to normalize the weights because all our coefficients need to add up to one
normalizeFactor = 1.0f / normalizeFactor;
- for(int32_t r = -radius; r <= radius; r ++) {
+ for (int32_t r = -radius; r <= radius; r ++) {
weights[r + radius] *= normalizeFactor;
}
}
@@ -748,35 +752,35 @@
float blurredPixel = 0.0f;
float currentPixel = 0.0f;
- for(int32_t y = 0; y < height; y ++) {
+ for (int32_t y = 0; y < height; y ++) {
const uint8_t* input = source + y * width;
uint8_t* output = dest + y * width;
- for(int32_t x = 0; x < width; x ++) {
+ for (int32_t x = 0; x < width; x ++) {
blurredPixel = 0.0f;
const float* gPtr = weights;
// Optimization for non-border pixels
- if ((x > radius) && (x < (width - radius))) {
+ if (x > radius && x < (width - radius)) {
const uint8_t *i = input + (x - radius);
- for(int r = -radius; r <= radius; r ++) {
+ for (int r = -radius; r <= radius; r ++) {
currentPixel = (float) (*i);
blurredPixel += currentPixel * gPtr[0];
gPtr++;
i++;
}
} else {
- for(int32_t r = -radius; r <= radius; r ++) {
+ for (int32_t r = -radius; r <= radius; r ++) {
// Stepping left and right away from the pixel
int validW = x + r;
- if(validW < 0) {
+ if (validW < 0) {
validW = 0;
}
- if(validW > width - 1) {
+ if (validW > width - 1) {
validW = width - 1;
}
- currentPixel = (float)(input[validW]);
+ currentPixel = (float) input[validW];
blurredPixel += currentPixel * gPtr[0];
gPtr++;
}
@@ -792,41 +796,41 @@
float blurredPixel = 0.0f;
float currentPixel = 0.0f;
- for(int32_t y = 0; y < height; y ++) {
+ for (int32_t y = 0; y < height; y ++) {
uint8_t* output = dest + y * width;
- for(int32_t x = 0; x < width; x ++) {
+ for (int32_t x = 0; x < width; x ++) {
blurredPixel = 0.0f;
const float* gPtr = weights;
const uint8_t* input = source + x;
// Optimization for non-border pixels
- if ((y > radius) && (y < (height - radius))) {
+ if (y > radius && y < (height - radius)) {
const uint8_t *i = input + ((y - radius) * width);
- for(int32_t r = -radius; r <= radius; r ++) {
+ for (int32_t r = -radius; r <= radius; r ++) {
currentPixel = (float)(*i);
blurredPixel += currentPixel * gPtr[0];
gPtr++;
i += width;
}
} else {
- for(int32_t r = -radius; r <= radius; r ++) {
+ for (int32_t r = -radius; r <= radius; r ++) {
int validH = y + r;
// Clamp to zero and width
- if(validH < 0) {
+ if (validH < 0) {
validH = 0;
}
- if(validH > height - 1) {
+ if (validH > height - 1) {
validH = height - 1;
}
const uint8_t *i = input + validH * width;
- currentPixel = (float)(*i);
+ currentPixel = (float) (*i);
blurredPixel += currentPixel * gPtr[0];
gPtr++;
}
}
- *output = (uint8_t)blurredPixel;
+ *output = (uint8_t) blurredPixel;
output ++;
}
}
diff --git a/libs/hwui/FontRenderer.h b/libs/hwui/FontRenderer.h
index 7e749ca..40572c6 100644
--- a/libs/hwui/FontRenderer.h
+++ b/libs/hwui/FontRenderer.h
@@ -41,6 +41,10 @@
*/
class Font {
public:
+ enum Style {
+ kFakeBold
+ };
+
~Font();
/**
@@ -53,7 +57,7 @@
/**
* Creates a new font associated with the specified font state.
*/
- static Font* create(FontRenderer* state, uint32_t fontId, float fontSize);
+ static Font* create(FontRenderer* state, uint32_t fontId, float fontSize, int flags);
protected:
friend class FontRenderer;
@@ -99,7 +103,7 @@
SkFixed mRsbDelta;
};
- Font(FontRenderer* state, uint32_t fontId, float fontSize);
+ Font(FontRenderer* state, uint32_t fontId, float fontSize, int flags);
DefaultKeyedVector<int32_t, CachedGlyphInfo*> mCachedGlyphs;
@@ -117,6 +121,7 @@
FontRenderer* mState;
uint32_t mFontId;
float mFontSize;
+ int mFlags;
};
class FontRenderer {