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

Unified Diff: gm/fontcache.cpp

Issue 466363009: Restore text alloc optimizations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix crash + clean up. 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 side-by-side diff with in-line comments
Download patch
Index: gm/fontcache.cpp
diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp
index 74ec18a4506c86a9b3192365b43f81d93f9150c5..1260eeb76f3a09428af3ff82da1b1958256d2740 100644
--- a/gm/fontcache.cpp
+++ b/gm/fontcache.cpp
@@ -13,15 +13,15 @@
// GM to stress the GPU font cache
const char* gFamilyNames[] = {
- "sans-serif", "serif", "monospace"
+ "sans-serif", "serif"
};
const SkTypeface::Style gStyles[] = {
- SkTypeface::kNormal, SkTypeface::kItalic
+ SkTypeface::kNormal, SkTypeface::kItalic, SkTypeface::kBold
};
const SkScalar gTextSizes[] = {
- 12, 14, 16, 18, 20, 22, 24, 26, 28, 30
+ 192, 194, 196, 198, 200, 202, 204, 206
};
#define TYPEFACE_COUNT (SK_ARRAY_COUNT(gFamilyNames)*SK_ARRAY_COUNT(gStyles))
@@ -52,7 +52,7 @@ protected:
}
virtual SkISize onISize() SK_OVERRIDE {
- return SkISize::Make(640, 320);
+ return SkISize::Make(1280, 640);
}
virtual void onOnceBeforeDraw() SK_OVERRIDE {
@@ -72,35 +72,19 @@ protected:
paint.setLCDRenderText(true);
paint.setSubpixelText(true);
- SkString text("Ham");
+ SkString text("H");
- // draw some initial text to partially fill the GPU cache
- for (size_t i = 0; i < 2; ++i) {
- paint.setTypeface(fTypefaces[i]);
- SkScalar x = 20;
-
- for (size_t j = 0; j < SK_ARRAY_COUNT(gTextSizes); ++j) {
- paint.setTextSize(gTextSizes[j]);
- x = draw_string(canvas, text, x, y, paint) + 19;
- }
- y += 32;
- }
-
- // force a flush
- canvas->flush();
-
- // draw again, and more to overflow the cache
+ // draw enough to overflow the cache
for (size_t i = 0; i < TYPEFACE_COUNT; ++i) {
paint.setTypeface(fTypefaces[i]);
SkScalar x = 20;
for (size_t j = 0; j < SK_ARRAY_COUNT(gTextSizes); ++j) {
paint.setTextSize(gTextSizes[j]);
- x = draw_string(canvas, text, x, y, paint) + 19;
+ x = draw_string(canvas, text, x, y, paint) + 10;
}
- y += 32;
+ y += 128;
}
-
}
virtual uint32_t onGetFlags() const SK_OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698