From 6fe7e05f097ba340f33e595754d6eadfc91dee9e Mon Sep 17 00:00:00 2001 From: "yutak@chromium.org" Date: Thu, 23 Feb 2012 02:16:01 +0000 Subject: [PATCH] Unreviewed, rolling out r108590. http://trac.webkit.org/changeset/108590 I mistakenly disabled tests even though the fix was already in. * tests/CCOcclusionTrackerTest.cpp: (WebCore::TEST): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108591 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/chromium/ChangeLog | 11 +++++++++++ Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp | 6 ++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index 4c1a2da..9713749 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,5 +1,16 @@ 2012-02-22 Yuta Kitamura + Unreviewed, rolling out r108590. + http://trac.webkit.org/changeset/108590 + + I mistakenly disabled tests even though the fix was already + in. + + * tests/CCOcclusionTrackerTest.cpp: + (WebCore::TEST): + +2012-02-22 Yuta Kitamura + [Chromium] Unreviewed. Disable two tests from CCOcclusionTrackerTest which cause assertion failures. diff --git a/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp b/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp index 58af76b..ae03626 100644 --- a/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp +++ b/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp @@ -658,8 +658,7 @@ TEST(CCOcclusionTrackerTest, layerAddedToOccludedRegionWithMultipleOpaqueLayers) */ } -// Disabled due to http://webkit.org/b/79314. -TEST(CCOcclusionTrackerTest, DISABLED_surfaceOcclusionWithOverlappingSiblingSurfaces) +TEST(CCOcclusionTrackerTest, surfaceOcclusionWithOverlappingSiblingSurfaces) { // This tests that the right transforms are being used. TestCCOcclusionTracker occlusion; @@ -785,8 +784,7 @@ TEST(CCOcclusionTrackerTest, DISABLED_surfaceOcclusionWithOverlappingSiblingSurf */ } -// Disabled due to http://webkit.org/b/79314. -TEST(CCOcclusionTrackerTest, DISABLED_surfaceOcclusionInScreenSpace) +TEST(CCOcclusionTrackerTest, surfaceOcclusionInScreenSpace) { // This tests that the right transforms are being used. TestCCOcclusionTracker occlusion; -- 2.7.4