Enable use-zoom-for-dsf on Android on M70

This CL makes use-zoom-for-dsf enabled by default on Android

This marks Test NoResizeAfterIframeLoad disabled on Android
because it's failing on Android.

This also rebaseline 22 gpu_tests: they are failing on Android
after enabling the flag because the new result are one pixel off
the original reference image. Will test expectations in a followup
CL.

Bug: 737777, 485650
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: If06cf325a831e229fd6bb1889fe1e40ed4bbe764
Reviewed-on: https://chromium-review.googlesource.com/1055812Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: David Bokan <bokan@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579542}

content/browser/site_per_process_browsertest.cc

@@ -1176,9 +1176,16 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
             rwhv_nested->GetCompositorViewportPixelSize());
 }
 
+// Disable on Android: crbug/851049
+#if defined(OS_ANDROID)
+#define MAYBE_NoResizeAfterIframeLoad DISABLED_NoResizeAfterIframeLoad
+#else
+#define MAYBE_NoResizeAfterIframeLoad NoResizeAfterIframeLoad
+#endif
 // Verify an OOPIF resize handler doesn't fire immediately after load without
 // the frame having been resized. See https://crbug.com/826457.
-IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NoResizeAfterIframeLoad) {
+IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
+                       MAYBE_NoResizeAfterIframeLoad) {
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(a)"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
@@ -1190,6 +1197,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NoResizeAfterIframeLoad) {
   GURL site_url =
       embedded_test_server()->GetURL("b.com", "/page_with_resize_handler.html");
   NavigateFrameToURL(iframe, site_url);
+  base::RunLoop().RunUntilIdle();
 
   int resizes = -1;
   EXPECT_TRUE(ExecuteScriptAndExtractInt(

content/public/common/use_zoom_for_dsf_policy.cc

@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_ANDROID)
 #include "base/feature_list.h"
 #endif
 
@@ -19,10 +19,15 @@ const base::Feature kUseZoomForDsfEnabledByDefault{
     "use-zoom-for-dsf enabled by default", base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
+#if defined(OS_ANDROID)
+const base::Feature kUseZoomForDsfEnabledByDefault{
+    "use-zoom-for-dsf enabled by default", base::FEATURE_ENABLED_BY_DEFAULT};
+#endif
+
 bool IsUseZoomForDSFEnabledByDefault() {
 #if defined(OS_LINUX) || defined(OS_FUCHSIA)
   return true;
-#elif defined(OS_WIN)
+#elif defined(OS_WIN) || defined(OS_ANDROID)
   return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault);
 #else
   return false;

content/test/gpu/gpu_tests/pixel_expectations.py

@@ -58,14 +58,14 @@ class PixelExpectations(GpuTestExpectations):
     # TODO(kbr): flakily timing out on this configuration.
     self.Flaky('*', ['linux', 'intel', 'debug'], bug=648369)
 
-    self.Flaky('Pixel_Video_MP4', ['android', 'nvidia'], bug=716564)
-    self.Flaky('Pixel_Video_MP4', ['linux', 'nvidia'], bug=819635)
+    # self.Flaky('Pixel_Video_MP4', ['android', 'nvidia'], bug=716564)
+    # self.Flaky('Pixel_Video_MP4', ['linux', 'nvidia'], bug=819635)
 
     # TODO(junov): rebaselining
-    self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing',
-              ['mac', 'linux', 'win', 'android', 'chromeos'], bug=788439)
-    self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositingWorker',
-              ['mac', 'linux', 'win', 'android', 'chromeos'], bug=788439)
+    # self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing',
+    #          ['mac', 'linux', 'win', 'android', 'chromeos'], bug=788439)
+    # self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositingWorker',
+    #          ['mac', 'linux', 'win', 'android', 'chromeos'], bug=788439)
 
     # Flaky for unknown reasons only on macOS. Not planning to investigate
     # further.
@@ -82,14 +82,14 @@ class PixelExpectations(GpuTestExpectations):
         ['android', ('qualcomm', 'Adreno (TM) 330')], bug=773293)
 
     # Failing on Mac Intel HighSierra
-    self.Fail('Pixel_Video_MP4',
-        ['highsierra', ('intel', 0xa2e)], bug=774809)
-    self.Fail('Pixel_Video_VP9',
-        ['highsierra', ('intel', 0xa2e)], bug=774809)
+    # self.Fail('Pixel_Video_MP4',
+    #    ['highsierra', ('intel', 0xa2e)], bug=774809)
+    # self.Fail('Pixel_Video_VP9',
+    #     ['highsierra', ('intel', 0xa2e)], bug=774809)
     self.Fail('Pixel_WebGLGreenTriangle_NonChromiumImage_NoAA_NoAlpha',
         ['highsierra', ('intel', 0xa2e)], bug=774809)
-    self.Flaky('Pixel_OffscreenCanvasTransferBeforeStyleResize',
-        ['highsierra', ('intel', 0xa2e)], bug=857578)
+    # self.Flaky('Pixel_OffscreenCanvasTransferBeforeStyleResize',
+    #    ['highsierra', ('intel', 0xa2e)], bug=857578)
 
     # Failing on NVIDIA Shield TV; not sure why yet.
     self.Fail('Pixel_WebGL_PremultipliedAlpha_False',
@@ -103,8 +103,8 @@ class PixelExpectations(GpuTestExpectations):
               ['linux', 'mac', 'win'], bug=744658)
 
     # TODO(fserb): temporarily suppress this test.
-    self.Flaky('Pixel_OffscreenCanvas2DResizeOnWorker',
-        ['linux', 'mac'], bug=840394)
+    # self.Flaky('Pixel_OffscreenCanvas2DResizeOnWorker',
+    #    ['linux', 'mac'], bug=840394)
     self.Fail('Pixel_WorkerRAF_OOPD', ['android', 'nvidia'], bug=833902)
     self.Fail('Pixel_WorkerRAF_OOPD', ['mac'], bug=851213)
 
@@ -113,8 +113,32 @@ class PixelExpectations(GpuTestExpectations):
     self.Fail('Pixel_WebGLSadCanvas', ['android'], bug=575305)
 
     # Flaky on Android: crbug.com/860548
-    self.Flaky('Pixel_Video_VP9', ['android'], bug=860548)
+    # self.Flaky('Pixel_Video_VP9', ['android'], bug=860548)
 
     self.Fail('Pixel_CanvasLowLatencyWebGL', ['android', 'nvidia'], bug=868596)
     self.Fail('Pixel_OffscreenCanvasWebGLPaintAfterResize',
               ['android', 'nvidia'], bug=868596)
+
+    # Rebaseline tests for enabling use-zoom-for-dsf on Android
+    self.Fail('Pixel_2DCanvasWebGL', bug=737777)
+    self.Fail('Pixel_CSS3DBlueBox', bug=737777)
+    self.Fail('Pixel_Canvas2DRedBox', bug=737777)
+    self.Fail('Pixel_CanvasDisplayLinearRGBAccelerated2D', bug=737777)
+    self.Fail('Pixel_CanvasDisplayLinearRGBUnaccelerated2DGPUCompositing', bug=737777)
+    self.Fail('Pixel_OffscreenCanvas2DResizeOnWorker', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasTransferAfterStyleResize', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasTransferBeforeStyleResize', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasTransferToImageBitmap', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasTransferToImageBitmapWorker', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositingWorker', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasWebGLDefault', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasWebGLDefaultWorker', bug=737777)
+    self.Fail('Pixel_OffscreenCanvasWebglResizeOnWorker', bug=737777)
+    self.Fail('Pixel_Video_MP4', bug=737777)
+    self.Fail('Pixel_Video_VP9', bug=737777)
+    self.Fail('Pixel_WebGLGreenTriangle_AA_Alpha', bug=737777)
+    self.Fail('Pixel_WebGLGreenTriangle_AA_NoAlpha', bug=737777)
+    self.Fail('Pixel_WebGLGreenTriangle_NoAA_Alpha', bug=737777)
+    self.Fail('Pixel_WebGLGreenTriangle_NoAA_NoAlpha', bug=737777)
+    self.Fail('Pixel_WebGLTransparentGreenTriangle_NoAlpha_ImplicitClear', bug=737777)

content/test/gpu/gpu_tests/pixel_test_pages.py

@@ -96,7 +96,7 @@ def DefaultPages(base_name):
       'pixel_canvas2d.html',
       base_name + '_Canvas2DRedBox',
       test_rect=[0, 0, 300, 300],
-      revision=7),
+      revision=8),
 
     PixelTestPage(
       'pixel_canvas2d_untagged.html',
@@ -108,37 +108,37 @@ def DefaultPages(base_name):
       'pixel_css3d.html',
       base_name + '_CSS3DBlueBox',
       test_rect=[0, 0, 300, 300],
-      revision=18),
+      revision=19),
 
     PixelTestPage(
       'pixel_webgl_aa_alpha.html',
       base_name + '_WebGLGreenTriangle_AA_Alpha',
       test_rect=[0, 0, 300, 300],
-      revision=4),
+      revision=5),
 
     PixelTestPage(
       'pixel_webgl_noaa_alpha.html',
       base_name + '_WebGLGreenTriangle_NoAA_Alpha',
       test_rect=[0, 0, 300, 300],
-      revision=1),
+      revision=2),
 
     PixelTestPage(
       'pixel_webgl_aa_noalpha.html',
       base_name + '_WebGLGreenTriangle_AA_NoAlpha',
       test_rect=[0, 0, 300, 300],
-      revision=5),
+      revision=6),
 
     PixelTestPage(
       'pixel_webgl_noaa_noalpha.html',
       base_name + '_WebGLGreenTriangle_NoAA_NoAlpha',
       test_rect=[0, 0, 300, 300],
-      revision=1),
+      revision=2),
 
     PixelTestPage(
       'pixel_webgl_noalpha_implicit_clear.html',
       base_name + '_WebGLTransparentGreenTriangle_NoAlpha_ImplicitClear',
       test_rect=[0, 0, 300, 300],
-      revision=1),
+      revision=2),
 
     PixelTestPage(
       'pixel_webgl_sad_canvas.html',
@@ -180,7 +180,7 @@ def DefaultPages(base_name):
       'pixel_canvas2d_webgl.html',
       base_name + '_2DCanvasWebGL',
       test_rect=[0, 0, 300, 300],
-      revision=7),
+      revision=8),
 
     PixelTestPage(
       'pixel_background.html',
@@ -192,13 +192,13 @@ def DefaultPages(base_name):
       'pixel_video_mp4.html',
       base_name + '_Video_MP4',
       test_rect=[0, 0, 300, 300],
-      revision=8),
+      revision=9),
 
     PixelTestPage(
       'pixel_video_vp9.html',
       base_name + '_Video_VP9',
       test_rect=[0, 0, 300, 300],
-      revision=8),
+      revision=9),
 
     PixelTestPage(
       'pixel_webgl_premultiplied_alpha_false.html',
@@ -404,14 +404,14 @@ def ExperimentalCanvasFeaturesPages(base_name):
       'pixel_offscreenCanvas_transfer_after_style_resize.html',
       base_name + '_OffscreenCanvasTransferAfterStyleResize',
       test_rect=[0, 0, 350, 350],
-      revision=6,
+      revision=7,
       browser_args=browser_args),
 
     PixelTestPage(
       'pixel_offscreenCanvas_transfer_before_style_resize.html',
       base_name + '_OffscreenCanvasTransferBeforeStyleResize',
       test_rect=[0, 0, 350, 350],
-      revision=6,
+      revision=7,
       browser_args=browser_args),
 
     PixelTestPage(
@@ -450,28 +450,28 @@ def ExperimentalCanvasFeaturesPages(base_name):
       'pixel_offscreenCanvas_transferToImageBitmap_main.html',
       base_name + '_OffscreenCanvasTransferToImageBitmap',
       test_rect=[0, 0, 300, 300],
-      revision=2,
+      revision=3,
       browser_args=browser_args),
 
     PixelTestPage(
       'pixel_offscreenCanvas_transferToImageBitmap_worker.html',
       base_name + '_OffscreenCanvasTransferToImageBitmapWorker',
       test_rect=[0, 0, 300, 300],
-      revision=2,
+      revision=3,
       browser_args=browser_args),
 
     PixelTestPage(
       'pixel_offscreenCanvas_webgl_commit_main.html',
       base_name + '_OffscreenCanvasWebGLDefault',
       test_rect=[0, 0, 360, 200],
-      revision=8,
+      revision=9,
       browser_args=browser_args),
 
     PixelTestPage(
       'pixel_offscreenCanvas_webgl_commit_worker.html',
       base_name + '_OffscreenCanvasWebGLDefaultWorker',
       test_rect=[0, 0, 360, 200],
-      revision=8,
+      revision=9,
       browser_args=browser_args),
 
     PixelTestPage(
@@ -520,35 +520,35 @@ def ExperimentalCanvasFeaturesPages(base_name):
       'pixel_offscreenCanvas_2d_commit_main.html',
       base_name + '_OffscreenCanvasUnaccelerated2DGPUCompositing',
       test_rect=[0, 0, 360, 200],
-      revision=12,
+      revision=13,
       browser_args=browser_args + ['--disable-accelerated-2d-canvas']),
 
     PixelTestPage(
       'pixel_offscreenCanvas_2d_commit_worker.html',
       base_name + '_OffscreenCanvasUnaccelerated2DGPUCompositingWorker',
       test_rect=[0, 0, 360, 200],
-      revision=12,
+      revision=13,
       browser_args=browser_args + ['--disable-accelerated-2d-canvas']),
 
     PixelTestPage(
       'pixel_offscreenCanvas_2d_resize_on_worker.html',
       base_name + '_OffscreenCanvas2DResizeOnWorker',
       test_rect=[0, 0, 200, 200],
-      revision=4,
+      revision=5,
       browser_args=browser_args),
 
     PixelTestPage(
       'pixel_offscreenCanvas_webgl_resize_on_worker.html',
       base_name + '_OffscreenCanvasWebglResizeOnWorker',
       test_rect=[0, 0, 200, 200],
-      revision=6,
+      revision=7,
       browser_args=browser_args),
 
     PixelTestPage(
       'pixel_canvas_display_linear-rgb.html',
       base_name + '_CanvasDisplayLinearRGBAccelerated2D',
       test_rect=[0, 0, 140, 140],
-      revision=1,
+      revision=2,
       browser_args=browser_args),
 
     PixelTestPage(
@@ -562,7 +562,7 @@ def ExperimentalCanvasFeaturesPages(base_name):
       'pixel_canvas_display_linear-rgb.html',
       base_name + '_CanvasDisplayLinearRGBUnaccelerated2DGPUCompositing',
       test_rect=[0, 0, 140, 140],
-      revision=1,
+      revision=2,
       browser_args=browser_args + ['--disable-accelerated-2d-canvas']),
 
     PixelTestPage(