diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 22:27:25 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-27 22:27:25 +0000 |
| commit | ec9767f8c6889b40494ec8aab55f0cd913f97746 (patch) | |
| tree | df564eef10906a055300d30bd72054f165c1f87a /skia/ports | |
| parent | a79c9827be11cfc6efb2ee82f85a0b241daa3852 (diff) | |
| download | chromium_src-ec9767f8c6889b40494ec8aab55f0cd913f97746.zip chromium_src-ec9767f8c6889b40494ec8aab55f0cd913f97746.tar.gz chromium_src-ec9767f8c6889b40494ec8aab55f0cd913f97746.tar.bz2 | |
Linux: enable assertion in fontconfig code.
This doesn't trigger locally for me. I think it's safe to enable.
(Although the try servers are down for me, so I guess we'll find out.)
BUG=6291
Review URL: http://codereview.chromium.org/55036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ports')
| -rw-r--r-- | skia/ports/SkFontHost_fontconfig.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/skia/ports/SkFontHost_fontconfig.cpp b/skia/ports/SkFontHost_fontconfig.cpp index 02c6cbb..9998a39 100644 --- a/skia/ports/SkFontHost_fontconfig.cpp +++ b/skia/ports/SkFontHost_fontconfig.cpp @@ -74,9 +74,7 @@ static SkTypeface::Style UniqueIdToStyle(unsigned uniqueid) static unsigned FileIdAndStyleToUniqueId(unsigned fileid, SkTypeface::Style style) { - // TODO(agl/brettw) bug 6291: This assertion fails for unknown reasons - // on ChromeFontTest.LoadArial. This should be fixed. - //SkASSERT(style & 0xff == style); + SkASSERT(style & 0xff == style); return (fileid << 8) | static_cast<int>(style); } |