Merge remote-tracking branch remotes/aosp/upstream-skqp/release into aosp/master

Exempt-From-Owner-Approval: The fast-forward merge does not require owner approval.
Change-Id: I81b5f83ef702dba61ac22958e973c05976fdd3fe

21 files changed, 13 insertions, 4 deletions

diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/max.png
deleted file mode 100644
index 4fe036a987..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/min.png
deleted file mode 100644
index c9753e30bb..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bigblurs/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/max.png
deleted file mode 100644
index b05340fe3a..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/min.png
deleted file mode 100644
index 9e4ca26598..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/bug530095/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/max.png
deleted file mode 100644
index fe4580705c..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/min.png
deleted file mode 100644
index 19e4149d61..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/circular_arcs_hairline/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/max.png
deleted file mode 100644
index f212f00bb5..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/min.png
deleted file mode 100644
index d0d712bd1e..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/gradients_local_perspective_nodither/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/max.png
deleted file mode 100644
index 130bb01331..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/min.png
deleted file mode 100644
index 10a680bb1a..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largecircle/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/max.png
deleted file mode 100644
index 651f023d98..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/min.png
deleted file mode 100644
index 2ec52c7828..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/largeglyphblur/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/max.png
deleted file mode 100644
index 4423ab4bcb..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/min.png
deleted file mode 100644
index 423c0877cd..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/manyarcs/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/max.png
deleted file mode 100644
index fcda507c17..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/min.png
deleted file mode 100644
index 7468706b5d..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/radial_gradient_precision/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/max.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/max.png
deleted file mode 100644
index 2e9b546ca1..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/max.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/min.png b/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/min.png
deleted file mode 100644
index f6b270c5b7..0000000000
--- a/platform_tools/android/apps/skqp/src/main/assets/gmkb/skbug_257/min.png
+++ /dev/null
diff --git a/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt
index c7cce8f84b..5eaed843bf 100644
--- a/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/DoNotScoreInCompatibilityTestMode.txt
@@ -7,6 +7,7 @@ animated-image-blurs
 anisotropic_hq
 arcs_as_paths
 bezier_quad_effects
+bigblurs
 bitmapfilters
 bleed
 bleed_alpha_bmp
@@ -19,7 +20,9 @@ blurcircles2
 blurimagevmask
 blurs
 bmp_filter_quality_repeat
+bug530095
 circles
+circular_arcs_hairline
 circular_arcs_stroke_and_fill_butt
 circular_arcs_stroke_butt
 circular_arcs_stroke_round
@@ -97,6 +100,7 @@ gradients_2pt_conical_outside_nodither
 gradients_2pt_conical_outside_repeat
 gradients_degenerate_2pt
 gradients_local_perspective
+gradients_local_perspective_nodither
 gradients_many
 gradients_no_texture
 gradients_no_texture_nodither
@@ -119,9 +123,12 @@ imagefiltersscaled
 imagefiltersstroked
 imagefilterstransformed
 imagemagnifier
+largecircle
+largeglyphblur
 linear_gradient
 longpathdash
 lumafilter
+manyarcs
 manycircles
 mipmap
 mipmap_srgb
@@ -139,6 +146,7 @@ persp_shaders_aa
 persp_shaders_bw
 pictureshader
 polygons
+radial_gradient_precision
 rects
 repeated_bitmap_jpg
 rrect
@@ -151,6 +159,7 @@ shadertext2
 shadertext3
 shadow_utils_occl
 simple-offsetimagefilter
+skbug_257
 smallpaths
 spritebitmap
 srcmode
diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java
index 58e09ec982..886d06dc8d 100644
--- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java
+++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java
@@ -61,7 +61,7 @@ public class SkQP {
               } else if (value != 0) {
                 // Record failure and carry on.
                   // SkQPRunner.Fail(desc, notifier, String.format(
-                  //             "Image mismatch: max channel diff = %f", value));
+                  //             "Image mismatch: error metric = %f", value));
               } else {
                 // Record success for this test.
               }
diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
index 138d0be0f0..b2ec2de8f9 100644
--- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
+++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
@@ -64,12 +64,12 @@ public class SkQPRunner extends Runner implements Filterable {
         for (int backend = 0; backend < impl.mBackends.length; backend++) {
             for (int gm = 0; gm < impl.mGMs.length; gm++) {
                 mTests[index++] = Description.createTestDescription(SkQPRunner.class,
-                    impl.mBackends[backend] + "/" + impl.mGMs[gm]);
+                    impl.mBackends[backend] + "_" + impl.mGMs[gm]);
             }
         }
         for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) {
             mTests[index++] = Description.createTestDescription(SkQPRunner.class,
-                    "unitTest/" + impl.mUnitTests[unitTest]);
+                    "unitTest_" + impl.mUnitTests[unitTest]);
         }
         assert(index == mTests.length);
         mShouldRunTestCount = mTests.length;
@@ -130,7 +130,7 @@ public class SkQPRunner extends Runner implements Filterable {
                     Log.w(TAG, String.format("[ERROR] '%s': %s", name, error));
                 } else if (value != 0) {
                     SkQPRunner.Fail(desc, notifier, String.format(
-                                "Image mismatch: max channel diff = %f", value));
+                                "Image mismatch: error metric = %f", value));
                     Log.w(TAG, String.format("[FAIL] '%s': %f > 0", name, value));
                 } else {
                     Log.i(TAG, String.format("Rendering Test '%s' passed", name));