Commit c927178b authored by zmo@google.com's avatar zmo@google.com

Mark tex-image-and-sub-image-with-video.html as passing after webkit roll over r101472.

BUG=104772
TEST=gpu waterfall
TBR=kbr
Review URL: http://codereview.chromium.org/8775043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112626 0039d316-1c4b-4281-b951-d872f2087c98
parent 8c38058b
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
103759 MAC WIN LINUX : conformance_more_functions_texImage2DHTML = FAIL 103759 MAC WIN LINUX : conformance_more_functions_texImage2DHTML = FAIL
103759 MAC WIN LINUX : conformance_more_functions_texSubImage2DHTML = FAIL 103759 MAC WIN LINUX : conformance_more_functions_texSubImage2DHTML = FAIL
104772 MAC WIN LINUX : conformance_textures_tex_image_and_sub_image_2d_with_video = FAIL
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// FLAKY TESTS // FLAKY TESTS
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
......
...@@ -281,7 +281,7 @@ CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_image_data ...@@ -281,7 +281,7 @@ CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_image_data
"conformance/textures/tex-image-and-sub-image-2d-with-image-data.html"); "conformance/textures/tex-image-and-sub-image-2d-with-image-data.html");
CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_image, CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_image,
"conformance/textures/tex-image-and-sub-image-2d-with-image.html"); "conformance/textures/tex-image-and-sub-image-2d-with-image.html");
CONFORMANCE_TEST(FAILS_conformance_textures_tex_image_and_sub_image_2d_with_video, CONFORMANCE_TEST(conformance_textures_tex_image_and_sub_image_2d_with_video,
"conformance/textures/tex-image-and-sub-image-2d-with-video.html"); "conformance/textures/tex-image-and-sub-image-2d-with-video.html");
CONFORMANCE_TEST(conformance_textures_tex_image_and_uniform_binding_bugs, CONFORMANCE_TEST(conformance_textures_tex_image_and_uniform_binding_bugs,
"conformance/textures/tex-image-and-uniform-binding-bugs.html"); "conformance/textures/tex-image-and-uniform-binding-bugs.html");
......
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