Reenable downscaled VideoPathTraceTest_DirectComposition_* on Intel HD 630

Change downscaled video trace_test expectations to no zero_copy,
because zero_copy is only used for fullsize or upscaled video.

Bug: 1079393
Change-Id: If3bc6283621ce7d566a78f685549b138b71cb17b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545260Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828608}

content/test/gpu/gpu_tests/pixel_test_pages.py

@@ -712,10 +712,12 @@ class PixelTestPages(object):
                       base_name + '_DirectComposition_Video_MP4',
                       test_rect=[0, 0, 240, 135],
                       browser_args=browser_args,
+                      other_args={'zero_copy': False},
                       matching_algorithm=permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_mp4.html',
                       base_name + '_DirectComposition_Video_MP4_DXVA',
                       browser_args=browser_args_DXVA,
+                      other_args={'zero_copy': False},
                       test_rect=[0, 0, 240, 135],
                       matching_algorithm=permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_mp4_fullsize.html',
@@ -727,7 +729,10 @@ class PixelTestPages(object):
                       base_name + '_DirectComposition_Video_MP4_NV12',
                       test_rect=[0, 0, 240, 135],
                       browser_args=browser_args_NV12,
-                      other_args={'pixel_format': 'NV12'},
+                      other_args={
+                          'pixel_format': 'NV12',
+                          'zero_copy': False
+                      },
                       matching_algorithm=permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_mp4.html',
                       base_name + '_DirectComposition_Video_MP4_YUY2',
@@ -752,6 +757,7 @@ class PixelTestPages(object):
                       '_DirectComposition_Video_MP4_FourColors_Aspect_4x3',
                       test_rect=[0, 0, 240, 135],
                       browser_args=browser_args,
+                      other_args={'zero_copy': False},
                       matching_algorithm=permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_mp4_four_colors_rot_90.html',
                       base_name +
@@ -778,10 +784,12 @@ class PixelTestPages(object):
                       base_name + '_DirectComposition_Video_VP9',
                       test_rect=[0, 0, 240, 135],
                       browser_args=browser_args,
+                      other_args={'zero_copy': False},
                       matching_algorithm=very_permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_vp9.html',
                       base_name + '_DirectComposition_Video_VP9_DXVA',
                       browser_args=browser_args_DXVA,
+                      other_args={'zero_copy': False},
                       test_rect=[0, 0, 240, 135],
                       matching_algorithm=very_permissive_dc_sobel_algorithm),
         PixelTestPage(
@@ -800,7 +808,10 @@ class PixelTestPages(object):
                       base_name + '_DirectComposition_Video_VP9_NV12',
                       test_rect=[0, 0, 240, 135],
                       browser_args=browser_args_NV12,
-                      other_args={'pixel_format': 'NV12'},
+                      other_args={
+                          'pixel_format': 'NV12',
+                          'zero_copy': False
+                      },
                       matching_algorithm=very_permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_vp9.html',
                       base_name + '_DirectComposition_Video_VP9_YUY2',
@@ -830,11 +841,13 @@ class PixelTestPages(object):
                       base_name + '_DirectComposition_Underlay',
                       test_rect=[0, 0, 240, 136],
                       browser_args=browser_args,
+                      other_args={'zero_copy': False},
                       matching_algorithm=permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_underlay.html',
                       base_name + '_DirectComposition_Underlay_DXVA',
                       test_rect=[0, 0, 240, 136],
                       browser_args=browser_args_DXVA,
+                      other_args={'zero_copy': False},
                       matching_algorithm=permissive_dc_sobel_algorithm),
         PixelTestPage('pixel_video_underlay_fullsize.html',
                       base_name + '_DirectComposition_Underlay_Fullsize',

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

@@ -154,20 +154,10 @@ crbug.com/1079393 [ win10 intel-0x3e92 ] VideoPathTraceTest_DirectComposition_Vi
 # showing up as SOFTWARE which causes zero copy to fail.
 crbug.com/1079393 [ win10 intel-0x5912 ] OverlayModeTraceTest_DirectComposition_Video_MP4_NV12 [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] OverlayModeTraceTest_DirectComposition_Video_VP9_NV12 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay_DXVA [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Underlay_Fullsize [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_DXVA [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Aspect_4x3 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Rot_180 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Rot_270 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_FourColors_Rot_90 [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_Fullsize [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_NV12 [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_MP4_VP_SCALING [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9 [ Failure ]
-crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9_DXVA [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9_NV12 [ Failure ]
 crbug.com/1079393 [ win10 intel-0x5912 ] VideoPathTraceTest_DirectComposition_Video_VP9_VP_SCALING [ Failure ]