Remove platform/mac-mac10.13 and move baselines to correct place

Some baselines for mac-mac10.13 were mistakenly manually put under
platform/mac-mac10.13 directory after some automatic rebaseline-cl
failures. They are moved to platform/mac. The original baselines
under platform/mac are moved to platform/mac-mac10.10 and
platform/mac-mac10.11 if the baselines under platform/mac-mac10.12
and platform/mac-mac10.13 were the same (which become the new
mac baseline).

Remove the stale mac-mac10.13 directory.

Bug: 1010946
Change-Id: I050cae84bb3d535f9fd5869fedd8fb7778d7b473
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1837096Reviewed-by: Robert Ma <robertma@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702607}

third_party/blink/web_tests/TestExpectations

@@ -345,9 +345,6 @@ crbug.com/981719 external/wpt/css/css-ui/appearance-textfield-001.html [ Failure
 crbug.com/981719 [ Linux ] external/wpt/css/css-ui/webkit-appearance-textfield-001.html [ Failure ]
 crbug.com/981719 [ Win ] external/wpt/css/css-ui/webkit-appearance-textfield-001.html [ Failure ]
 
-crbug.com/1010946 [ Mac10.13 ] paint/invalidation/svg/use-clipped-hit.svg [ Failure ]
-crbug.com/1010946 [ Mac10.13 ] paint/invalidation/svg/svg-background-partial-redraw.html [ Failure ]
-
 # ====== Paint team owned tests to here ======
 
 crbug.com/922249 virtual/android/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html [ Failure Pass ]
@@ -1145,14 +1142,8 @@ crbug.com/591099 [ Mac10.13 ] media/video-colorspace-yuv420.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] virtual/audio-service/media/video-colorspace-yuv420.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] media/video-empty-source.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] virtual/audio-service/media/video-empty-source.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/background/background-misaligned.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/block-no-inflow-children.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/bugzilla-7235.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/clip/outline-clip-change.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/compositing/iframe-inside-squashed-layer.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/compositing/layer-repaint-rects.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/compositing/should-not-clip-composited-viewport-scrolling-layer.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/crbug-371640.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/flexbox/repaint.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/float-new-in-block.html [ Failure ]
@@ -1160,22 +1151,17 @@ crbug.com/591099 [ Mac10.13 ] paint/invalidation/forms/details-marker-color-chan
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/line-flow-with-floats-7.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/line-flow-with-floats-9.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/list-marker-2.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/multicol/column-rules-fixed-height.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/outline/focus-continuations.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/outline/focus-ring-on-child-move.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/outline/focus-ring-on-continuation-move.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/outline/outline-continuations.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/overflow/flexible-box-overflow-horizontal.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/overflow/inline-overflow.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/overflow/inline-vertical-lr-overflow.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/overflow/inline-vertical-rl-overflow.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/overflow/vertical-overflow-child.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/position/layout-state-relative.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/position/positioned-document-element.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/position/positioned-great-grandparent-change-location.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/push-block-with-first-line.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/reflection/reflection-redraw.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/repaint-across-writing-mode-boundary.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/scale-page-shrink.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/scroll/layout-state-scrolloffset.html [ Failure ]
@@ -1188,7 +1174,6 @@ crbug.com/591099 [ Mac10.13 ] paint/invalidation/selection/text-selection-rect-i
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/stacked-diacritics.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/svg/absolute-sized-content-with-resources.xhtml [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/svg/embedded-svg-size-changes.html [ Failure ]
-crbug.com/591099 [ Mac10.13 ] paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size.xhtml [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol.xhtml [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/transform/transform-inline-layered-child.html [ Failure ]
 crbug.com/591099 [ Mac10.13 ] paint/invalidation/vertical-align2.html [ Failure ]

third_party/blink/web_tests/platform/mac-mac10.13/paint/invalidation/push-block-with-first-line-expected.txt → third_party/blink/web_tests/platform/mac-mac10.10/paint/invalidation/push-block-with-first-line-expected.txt

@@ -2,18 +2,18 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
+      "bounds": [500, 400],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
           "object": "NGPhysicalLineBoxFragment",
-          "rect": [8, 68, 784, 20],
+          "rect": [8, 68, 484, 20],
           "reason": "geometry"
         },
         {
           "object": "NGPhysicalLineBoxFragment",
-          "rect": [8, 8, 784, 20],
+          "rect": [8, 8, 484, 20],
           "reason": "geometry"
         },
         {

third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/push-block-with-first-line-expected.txt → third_party/blink/web_tests/platform/mac-mac10.11/paint/invalidation/push-block-with-first-line-expected.txt

@@ -2,18 +2,18 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
+      "bounds": [500, 400],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
           "object": "NGPhysicalLineBoxFragment",
-          "rect": [8, 68, 784, 20],
+          "rect": [8, 68, 484, 20],
           "reason": "geometry"
         },
         {
           "object": "NGPhysicalLineBoxFragment",
-          "rect": [8, 8, 784, 20],
+          "rect": [8, 8, 484, 20],
           "reason": "geometry"
         },
         {

third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/svg/svg-background-partial-redraw-expected.txt

-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'",
-          "rect": [8, 50, 200, 200],
-          "reason": "appeared"
-        },
-        {
-          "object": "NGPhysicalBoxFragment LayoutNGBlockFlow (relative positioned) DIV id='test'",
-          "rect": [8, 50, 200, 200],
-          "reason": "disappeared"
-        },
-        {
-          "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'",
-          "rect": [9, 151, 200, 100],
-          "reason": "disappeared"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-mac10.12/paint/invalidation/svg/use-clipped-hit-expected.txt

-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "InlineTextBox 'Unknown'",
-          "rect": [90, 116, 64, 18],
-          "reason": "chunk disappeared"
-        },
-        {
-          "object": "InlineTextBox 'Passed'",
-          "rect": [90, 116, 44, 18],
-          "reason": "chunk appeared"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-mac10.13/paint/invalidation/svg/svg-background-partial-redraw-expected.txt

-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'",
-          "rect": [8, 50, 200, 200],
-          "reason": "appeared"
-        },
-        {
-          "object": "NGPhysicalBoxFragment LayoutNGBlockFlow (relative positioned) DIV id='test'",
-          "rect": [8, 50, 200, 200],
-          "reason": "disappeared"
-        },
-        {
-          "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'",
-          "rect": [9, 151, 200, 100],
-          "reason": "disappeared"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-mac10.13/paint/invalidation/svg/use-clipped-hit-expected.txt

-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "InlineTextBox 'Unknown'",
-          "rect": [90, 116, 64, 18],
-          "reason": "chunk disappeared"
-        },
-        {
-          "object": "InlineTextBox 'Passed'",
-          "rect": [90, 116, 44, 18],
-          "reason": "chunk appeared"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-retina/paint/invalidation/svg/svg-background-partial-redraw-expected.txt

-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'",
-          "rect": [8, 50, 200, 200],
-          "reason": "appeared"
-        },
-        {
-          "object": "NGPhysicalBoxFragment LayoutNGBlockFlow (relative positioned) DIV id='test'",
-          "rect": [8, 50, 200, 200],
-          "reason": "disappeared"
-        },
-        {
-          "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'",
-          "rect": [9, 151, 200, 100],
-          "reason": "disappeared"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac-retina/paint/invalidation/svg/use-clipped-hit-expected.txt

-{
-  "layers": [
-    {
-      "name": "Scrolling Contents Layer",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "backgroundColor": "#FFFFFF",
-      "paintInvalidations": [
-        {
-          "object": "InlineTextBox 'Unknown'",
-          "rect": [90, 116, 64, 18],
-          "reason": "chunk disappeared"
-        },
-        {
-          "object": "InlineTextBox 'Passed'",
-          "rect": [90, 116, 44, 18],
-          "reason": "chunk appeared"
-        }
-      ]
-    }
-  ]
-}
-

third_party/blink/web_tests/platform/mac/paint/invalidation/position/layout-state-relative-expected.txt

@@ -2,13 +2,13 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [500, 400],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
           "object": "NGPhysicalTextFragment 'PASS'",
-          "rect": [8, 168, 37, 18],
+          "rect": [8, 150, 37, 18],
           "reason": "full"
         }
       ]

third_party/blink/web_tests/platform/mac/paint/invalidation/push-block-with-first-line-expected.txt

@@ -2,18 +2,18 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [500, 400],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
           "object": "NGPhysicalLineBoxFragment",
-          "rect": [8, 68, 484, 20],
+          "rect": [8, 68, 784, 20],
           "reason": "geometry"
         },
         {
           "object": "NGPhysicalLineBoxFragment",
-          "rect": [8, 8, 484, 20],
+          "rect": [8, 8, 784, 20],
           "reason": "geometry"
         },
         {

third_party/blink/web_tests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.txt

@@ -2,23 +2,23 @@
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [500, 400],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
           "object": "LayoutNGBlockFlow (relative positioned) DIV id='test' class='revealed'",
-          "rect": [8, 68, 200, 200],
+          "rect": [8, 50, 200, 200],
           "reason": "appeared"
         },
         {
           "object": "NGPhysicalBoxFragment LayoutNGBlockFlow (relative positioned) DIV id='test'",
-          "rect": [8, 68, 200, 200],
+          "rect": [8, 50, 200, 200],
           "reason": "disappeared"
         },
         {
           "object": "LayoutNGBlockFlow (positioned) DIV id='revealer'",
-          "rect": [9, 169, 200, 100],
+          "rect": [9, 151, 200, 100],
           "reason": "disappeared"
         }
       ]

third_party/blink/web_tests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt

-ALERT: was: ,false
-ALERT: shouldBe: true,false
 {
   "layers": [
     {
       "name": "Scrolling Contents Layer",
-      "bounds": [500, 400],
+      "bounds": [800, 600],
       "contentsOpaque": true,
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
@@ -14,8 +12,8 @@ ALERT: shouldBe: true,false
           "reason": "chunk disappeared"
         },
         {
-          "object": "InlineTextBox 'Failed'",
-          "rect": [90, 116, 40, 18],
+          "object": "InlineTextBox 'Passed'",
+          "rect": [90, 116, 44, 18],
           "reason": "chunk appeared"
         }
       ]