From ec9767f8c6889b40494ec8aab55f0cd913f97746 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Fri, 27 Mar 2009 22:27:25 +0000 Subject: 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 --- skia/ports/SkFontHost_fontconfig.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'skia') 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(style); } -- cgit v1.1