Fix Canvas LowLatency PixelIntegrationTest on Android

These tests where marked as Fail: ToT crashed when running e.g. [1]
with chrome://flags/#enable-experimental-web-platform-features.

- Pixel_CanvasUnacceleratedLowLatency2D: is kept disabled on Android
because software compositing doesn't work at all; this test is
changed from Fail() to Skip() and bundled with similar expectations.
Other similar android-sw-compositor expectations are updated and
gathered in the same area for better reference (there are no plans
whatsoever to make this compositor mode work on Android)

- Pixel_CanvasLowLatency2D: I landed a fix recently for a crash
(crrev.com/c/1297469), with that the test works but produces a
sliiiightly different output (see e.g. the first row of [2]), so we
have to rebaseline the reference images. For that, the first step
is to mark the test as disabled for all platforms.

[1] http://htmlpreview.github.io/?https://github.com/chromium/chromium/blob/HEAD/content/test/data/gpu/pixel_canvas_low_latency_2d.html
[2] http://chromium-browser-gpu-tests.commondatastorage.googleapis.com/view_test_results.html?868948046954e7d06d97eb10544ea3b27b320953_android_marshmallow_arm64_rel_telemetry

Bug: 865957
Change-Id: I45ccbc0a674cb6eb51f622d7c7af039162a2c071
Reviewed-on: https://chromium-review.googlesource.com/c/1294870Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603677}

content/test/gpu/gpu_tests/pixel_expectations.py

@@ -20,14 +20,18 @@ class PixelExpectations(GpuTestExpectations):
     self.Fail('Pixel_OffscreenCanvasAccelerated2D')
     self.Fail('Pixel_OffscreenCanvasAccelerated2DWorker')
 
-    # Software compositing is not supported on Android; so we skip these tests
-    # that disables gpu compositing on Android platforms.
+    # Software compositing is not supported on Android: we skip the tests that
+    # disable GPU compositing (--disable-gpu-compositing).
     self.Skip('Pixel_OffscreenCanvasUnaccelerated2D', ['android'])
     self.Skip('Pixel_OffscreenCanvasUnaccelerated2DWorker', ['android'])
+    self.Skip('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing', ['android'])
+    self.Skip('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositingWorker',
+              ['android'])
     self.Skip('Pixel_OffscreenCanvasWebGLSoftwareCompositing', ['android'])
     self.Skip('Pixel_OffscreenCanvasWebGLSoftwareCompositingWorker',
               ['android'])
     self.Skip('Pixel_CanvasDisplayLinearRGBUnaccelerated2D', ['android'])
+    self.Skip('Pixel_CanvasUnacceleratedLowLatency2D', ['android'])
 
     # Tests running with SwiftShader are skipped on platforms where SwiftShader
     # isn't supported.
@@ -45,15 +49,13 @@ class PixelExpectations(GpuTestExpectations):
     self.Fail('Pixel_ScissorTestWithPreserveDrawingBuffer',
         ['android'], bug=521588)
 
-    # Tests crashing on marshmallow bot
-    self.Fail('Pixel_CanvasLowLatency2D', ['android'], bug=865957)
-    self.Fail('Pixel_CanvasUnacceleratedLowLatency2D', ['android'], bug=865957)
+    # TODO(mcasas): Reenable after Android reference images are updated
+    self.Skip('Pixel_CanvasLowLatency2D', bug=865957)
 
     # TODO(vmiura) check / generate reference images for Android devices
     self.Fail('Pixel_SolidColorBackground', ['mac', 'android'], bug=624256)
 
-    self.Fail('Pixel_CSSFilterEffects',
-        ['mac', ('nvidia', 0xfe9)], bug=690277)
+    self.Fail('Pixel_CSSFilterEffects', ['mac', ('nvidia', 0xfe9)], bug=690277)
 
     # Became flaky on 10.13.6. When it flakes, it flakes 3 times, so
     # mark failing, unfortunately.
@@ -74,9 +76,9 @@ class PixelExpectations(GpuTestExpectations):
 
     # TODO(junov): rebaselining
     self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositing',
-              ['mac', 'linux', 'win', 'android', 'chromeos'], bug=788439)
+              ['mac', 'linux', 'win', 'chromeos'], bug=788439)
     self.Fail('Pixel_OffscreenCanvasUnaccelerated2DGPUCompositingWorker',
-              ['mac', 'linux', 'win', 'android', 'chromeos'], bug=788439)
+              ['mac', 'linux', 'win', 'chromeos'], bug=788439)
 
     # Flaky for unknown reasons only on macOS. Not planning to investigate
     # further.

content/test/gpu/gpu_tests/pixel_test_pages.py

@@ -564,7 +564,7 @@ def ExperimentalCanvasFeaturesPages(base_name):
       'pixel_canvas_low_latency_2d.html',
       base_name + '_CanvasLowLatency2D',
       test_rect=[0, 0, 100, 100],
-      revision=2,
+      revision=3,
       browser_args=browser_args),
 
     PixelTestPage(