summaryrefslogtreecommitdiffstats
path: root/skia/config
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 14:23:34 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 14:23:34 +0000
commit58d518b6820b4a73b7f2d8ab4233687e0ea952ad (patch)
treeec26057af2ddbe4574f992fc17c867ce64d3ac3e /skia/config
parent54f11545dabe73d353b14475bf0ca4ee74bec4ea (diff)
downloadchromium_src-58d518b6820b4a73b7f2d8ab4233687e0ea952ad.zip
chromium_src-58d518b6820b4a73b7f2d8ab4233687e0ea952ad.tar.gz
chromium_src-58d518b6820b4a73b7f2d8ab4233687e0ea952ad.tar.bz2
Enable skia asserts. They were disabled some time ago due to
http://crbug.com/6372, which has since been fixed. Some existing asserts were failing due to having been untested, and were fixed in this CL. BUG=http://crbug.com/6373. TEST=unit tests, layout tests, etc do not assert Review URL: http://codereview.chromium.org/165223 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/config')
-rw-r--r--skia/config/SkUserConfig.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 09c99f0..e88e80c8 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -203,20 +203,6 @@ typedef unsigned uint32_t;
// assertion.
#define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
-// TODO(brettw) bug 6373: Re-enable Skia assertions. This is blocked on fixing
-// some of our transparency handling which generates purposely-invalid colors,
-// in turn causing assertions.
-//#ifndef NDEBUG
-// #define SK_DEBUG
-// #undef SK_RELEASE
- #undef SK_SUPPORT_UNITTEST // This is only necessary in debug mode since
- // we've disabled assertions. When we re-enable
- // them, this line can be removed.
-//#else
- #define SK_RELEASE
- #undef SK_DEBUG
-//#endif
-
// For now (and to avoid rebaselining 1700+ tests), we'll use the old version
// of SkAlpha255To256.
#define SK_USE_OLD_255_TO_256