Romain Guy 19d4f1806a resolved conflicts for merge of c88c60be to master-chromium ...

Change-Id: I3b4b42443312068e942aa779dfdc928afa7569fd

2013-01-08 17:38:15 -08:00

..

CachedGlyphInfo.h

Refactor FontRenderer.cpp

2012-09-04 12:55:44 -07:00

CacheTexture.cpp

Update framework to support r5967 of Skia.

2012-12-12 15:28:54 -05:00

CacheTexture.h

Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev

2012-09-23 15:00:46 -07:00

Font.cpp

Add plumbing for better text scaling

2013-01-08 15:21:42 -08:00

Font.h

Add plumbing for better text scaling

2013-01-08 15:21:42 -08:00

FontUtil.h

Add plumbing for better text scaling

2013-01-08 15:21:42 -08:00