diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-23 04:39:59 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-23 04:39:59 +0000 |
| commit | 5f37a7f2e06e6ceb846f7c7dfd1e08da344f7da2 (patch) | |
| tree | a54c514e697589fc633d6f0c9d44577e147d61bc | |
| parent | cd3cd78cf587852d8ad2b244b3cfb8d3433265fa (diff) | |
| download | chromium_src-5f37a7f2e06e6ceb846f7c7dfd1e08da344f7da2.zip chromium_src-5f37a7f2e06e6ceb846f7c7dfd1e08da344f7da2.tar.gz chromium_src-5f37a7f2e06e6ceb846f7c7dfd1e08da344f7da2.tar.bz2 | |
Revert r24085 and r24086, restoring skia asserts to debug-only (test complete).
BUG=http://crbug.com/17569
TEST=none
TBR=maruel
Review URL: http://codereview.chromium.org/173257
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24087 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | skia/config/SkUserConfig.h | 7 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index b66b8cf..e88e80c8 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -76,11 +76,8 @@ based on the presence or absence of NDEBUG, but that decision can be changed here. */ - -// Force SK_DEBUG even in release, so we get SkASSERTs. -// TODO(senorblanco): Remove this after a few reliability runs. -#define SK_DEBUG -#undef SK_RELEASE +//#define SK_DEBUG +//#define SK_RELEASE /* If, in debugging mode, Skia needs to stop (presumably to invoke a debugger) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 1024b6b..8d31f77 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2705,13 +2705,13 @@ BUG18794 WIN MAC : LayoutTests/http/tests/mime/standard-mode-does-not-load-style BUG18802 WIN : LayoutTests/http/tests/misc/referrer.html = TIMEOUT PASS // Test failures caused by re-enabling skia asserts. -BUG18896 WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL -BUG18896 WIN LINUX : LayoutTests/svg/batik/paints/gradientLimit.svg = FAIL -BUG18896 WIN : LayoutTests/svg/carto.net/window.svg = FAIL -BUG18896 LINUX : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = FAIL -BUG18896 MAC WIN : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = PASS CRASH -BUG18896 LINUX : LayoutTests/svg/dynamic-updates/SVGClipPathElement-svgdom-clipPathUnits-prop.html = FAIL -BUG18896 LINUX : LayoutTests/svg/css/crash-css-generated-content.xhtml = FAIL +BUG18896 WIN DEBUG : LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL +BUG18896 WIN LINUX DEBUG : LayoutTests/svg/batik/paints/gradientLimit.svg = FAIL +BUG18896 WIN DEBUG : LayoutTests/svg/carto.net/window.svg = FAIL +BUG18896 LINUX DEBUG : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = FAIL +BUG18896 MAC WIN DEBUG : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = PASS CRASH +BUG18896 LINUX DEBUG : LayoutTests/svg/dynamic-updates/SVGClipPathElement-svgdom-clipPathUnits-prop.html = FAIL +BUG18896 LINUX DEBUG : LayoutTests/svg/css/crash-css-generated-content.xhtml = FAIL // Test failures from WebKit merge 46894 to 46977 BUG18939 : LayoutTests/fast/js/JSON-stringify-replacer.html = FAIL |