Commit 21636e52 authored by vollick@chromium.org's avatar vollick@chromium.org

Disable layer hole unit tests when using the WebKit compositor.

BUG=None
TEST=compositor_unittests

Review URL: http://codereview.chromium.org/8585034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110650 0039d316-1c4b-4281-b951-d872f2087c98
parent b228f6bb
...@@ -604,7 +604,8 @@ TEST_F(LayerWithNullDelegateTest, ...@@ -604,7 +604,8 @@ TEST_F(LayerWithNullDelegateTest,
} }
// Verifies that when there are many potential holes, the largest one is picked. // Verifies that when there are many potential holes, the largest one is picked.
TEST_F(LayerWithNullDelegateTest, LargestHole) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(LargestHole)) {
scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400))); scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400)));
scoped_ptr<Layer> child1(CreateTextureLayer(gfx::Rect(50, 50, 100, 100))); scoped_ptr<Layer> child1(CreateTextureLayer(gfx::Rect(50, 50, 100, 100)));
...@@ -619,7 +620,8 @@ TEST_F(LayerWithNullDelegateTest, LargestHole) { ...@@ -619,7 +620,8 @@ TEST_F(LayerWithNullDelegateTest, LargestHole) {
} }
// Verifies that the largest hole in the draw order is picked // Verifies that the largest hole in the draw order is picked
TEST_F(LayerWithNullDelegateTest, HoleGeneratedFromLeaf) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(HoleGeneratedFromLeaf)) {
// Layer tree looks like: // Layer tree looks like:
// node 1 // node 1
// |_ node 11 // |_ node 11
...@@ -649,7 +651,8 @@ TEST_F(LayerWithNullDelegateTest, HoleGeneratedFromLeaf) { ...@@ -649,7 +651,8 @@ TEST_F(LayerWithNullDelegateTest, HoleGeneratedFromLeaf) {
} }
// Verifies that a hole can only punched into a layer with opacity = 1.0f. // Verifies that a hole can only punched into a layer with opacity = 1.0f.
TEST_F(LayerWithNullDelegateTest, NoHoleWhenPartialOpacity) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(NoHoleWhenPartialOpacity)) {
// Layer tree looks like: // Layer tree looks like:
// node 1 // node 1
// |_ node 11 // |_ node 11
...@@ -675,7 +678,8 @@ TEST_F(LayerWithNullDelegateTest, NoHoleWhenPartialOpacity) { ...@@ -675,7 +678,8 @@ TEST_F(LayerWithNullDelegateTest, NoHoleWhenPartialOpacity) {
} }
// Verifies that a non visible layer or any of its children is not a hole. // Verifies that a non visible layer or any of its children is not a hole.
TEST_F(LayerWithNullDelegateTest, NonVisibleLayerCannotBeHole) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(NonVisibleLayerCannotBeHole)) {
// Layer tree looks like: // Layer tree looks like:
// node 1 // node 1
// |_ node 11 // |_ node 11
...@@ -702,7 +706,9 @@ TEST_F(LayerWithNullDelegateTest, NonVisibleLayerCannotBeHole) { ...@@ -702,7 +706,9 @@ TEST_F(LayerWithNullDelegateTest, NonVisibleLayerCannotBeHole) {
// Verifies that a layer which doesn't fill its bounds opaquely cannot punch a // Verifies that a layer which doesn't fill its bounds opaquely cannot punch a
// hole. However its children should still be able to punch a hole. // hole. However its children should still be able to punch a hole.
TEST_F(LayerWithNullDelegateTest, LayerNotFillingBoundsOpaquelyCannotBeHole) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(
LayerNotFillingBoundsOpaquelyCannotBeHole)) {
// Layer tree looks like: // Layer tree looks like:
// node 1 // node 1
// |_ node 11 // |_ node 11
...@@ -728,7 +734,8 @@ TEST_F(LayerWithNullDelegateTest, LayerNotFillingBoundsOpaquelyCannotBeHole) { ...@@ -728,7 +734,8 @@ TEST_F(LayerWithNullDelegateTest, LayerNotFillingBoundsOpaquelyCannotBeHole) {
} }
// Verifies that the hole is with respect to the local bounds of its parent. // Verifies that the hole is with respect to the local bounds of its parent.
TEST_F(LayerWithNullDelegateTest, HoleLocalBounds) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(HoleLocalBounds)) {
scoped_ptr<Layer> parent(CreateTextureRootLayer( scoped_ptr<Layer> parent(CreateTextureRootLayer(
gfx::Rect(100, 100, 150, 150))); gfx::Rect(100, 100, 150, 150)));
...@@ -742,7 +749,8 @@ TEST_F(LayerWithNullDelegateTest, HoleLocalBounds) { ...@@ -742,7 +749,8 @@ TEST_F(LayerWithNullDelegateTest, HoleLocalBounds) {
// Verifies that there is no hole present when one of the child layers has a // Verifies that there is no hole present when one of the child layers has a
// transform. // transform.
TEST_F(LayerWithNullDelegateTest, NoHoleWithTransform) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(NoHoleWithTransform)) {
scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400))); scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400)));
scoped_ptr<Layer> child(CreateTextureLayer(gfx::Rect(50, 50, 100, 100))); scoped_ptr<Layer> child(CreateTextureLayer(gfx::Rect(50, 50, 100, 100)));
parent->Add(child.get()); parent->Add(child.get());
...@@ -764,7 +772,8 @@ TEST_F(LayerWithNullDelegateTest, NoHoleWithTransform) { ...@@ -764,7 +772,8 @@ TEST_F(LayerWithNullDelegateTest, NoHoleWithTransform) {
// Verifies that if the child layer is rotated by a multiple of ninety degrees // Verifies that if the child layer is rotated by a multiple of ninety degrees
// we punch a hole // we punch a hole
TEST_F(LayerWithNullDelegateTest, HoleWithNinetyDegreeTransforms) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(HoleWithNinetyDegreeTransforms)) {
scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400))); scoped_ptr<Layer> parent(CreateTextureRootLayer(gfx::Rect(0, 0, 400, 400)));
scoped_ptr<Layer> child(CreateTextureLayer(gfx::Rect(50, 50, 50, 50))); scoped_ptr<Layer> child(CreateTextureLayer(gfx::Rect(50, 50, 50, 50)));
parent->Add(child.get()); parent->Add(child.get());
...@@ -795,7 +804,9 @@ TEST_F(LayerWithNullDelegateTest, HoleWithNinetyDegreeTransforms) { ...@@ -795,7 +804,9 @@ TEST_F(LayerWithNullDelegateTest, HoleWithNinetyDegreeTransforms) {
// Verifies that a layer which doesn't have a texture cannot punch a // Verifies that a layer which doesn't have a texture cannot punch a
// hole. However its children should still be able to punch a hole. // hole. However its children should still be able to punch a hole.
TEST_F(LayerWithNullDelegateTest, HoleWithRelativeNinetyDegreeTransforms) { TEST_F(LayerWithNullDelegateTest,
NOT_APPLICABLE_TO_WEBKIT_COMPOSITOR(
HoleWithRelativeNinetyDegreeTransforms)) {
// Layer tree looks like: // Layer tree looks like:
// node 1 // node 1
// |_ node 11 // |_ node 11
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment