Fix Mac Retina detection and reenable some previously disabled tests

Starting from 10.12, system_profiler no longer contains the line
"Retina: Yes" (or No), so we need to detect Retina by looking at the
Resolution field instead.

Besides, we now realize that our Retina bots are actually running 10.12
(despite their names saying 10.11, which will be fixed in other CLs),
so Retina is changed to fall back to Mac 10.12 instead of 10.11.

Lastly, rebaseline.

Bug: 818558, 819851
Change-Id: Ie3ed6ef7d090590f411a1701b72be920498c9769
Reviewed-on: https://chromium-review.googlesource.com/957306
Commit-Queue: Robert Ma <robertma@chromium.org>
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542306}

third_party/WebKit/LayoutTests/NeverFixTests

@@ -45,8 +45,8 @@ fast/harness/results.html [ WontFix ]
 [ Win Linux ] fast/dom/partial-layout-overlay-scrollbars.html [ WontFix ]
 
 # Tests trak table support / letter spacing specific to Mac system font
-# Only maintain this for latest Mac OS
-[ Win Linux Android Mac10.10 Mac10.11 Mac10.12 ] fast/text/mac-system-ui-trak.html [ WontFix ]
+# Only maintain this for the latest macOS (and Retina is currently 10.12).
+[ Win Linux Android Mac10.10 Mac10.11 Mac10.12 Retina ] fast/text/mac-system-ui-trak.html [ WontFix ]
 
  # Mac's popup behavior is different.
 [ Mac ] fast/forms/select/menulist-onchange-fired-with-key-up-down.html [ WontFix ]

third_party/WebKit/LayoutTests/TestExpectations

@@ -1319,9 +1319,9 @@ crbug.com/736319 [ Linux Mac ] external/wpt/css/vendor-imports/mozilla/mozilla-c
 crbug.com/736319 [ Linux Mac ] external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-006a.html [ Failure Pass ]
 crbug.com/736319 [ Linux Mac ] external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/text-combine-upright-compression-007.html [ Failure Pass ]
 
-crbug.com/752449 [ Mac10.12 Mac10.13 ] external/wpt/css/css-fonts/matching/fixed-stretch-style-over-weight.html [ Failure ]
-crbug.com/752449 [ Mac10.12 Mac10.13 ] external/wpt/css/css-fonts/matching/stretch-distance-over-weight-distance.html [ Failure ]
-crbug.com/752449 [ Mac10.12 ] external/wpt/css/css-fonts/matching/style-ranges-over-weight-direction.html [ Failure ]
+crbug.com/752449 [ Mac10.12 Mac10.13 Retina ] external/wpt/css/css-fonts/matching/fixed-stretch-style-over-weight.html [ Failure ]
+crbug.com/752449 [ Mac10.12 Retina ] external/wpt/css/css-fonts/matching/stretch-distance-over-weight-distance.html [ Failure ]
+crbug.com/752449 [ Mac10.12 Retina ] external/wpt/css/css-fonts/matching/style-ranges-over-weight-direction.html [ Failure ]
 crbug.com/796619 [ Win10 ] external/wpt/css/css-fonts/matching/fixed-stretch-style-over-weight.html [ Failure ]
 crbug.com/796619 [ Win10 ] external/wpt/css/css-fonts/matching/stretch-distance-over-weight-distance.html [ Failure ]
 crbug.com/796619 [ Win10 ] external/wpt/css/css-fonts/matching/style-ranges-over-weight-direction.html [ Failure ]
@@ -3408,8 +3408,6 @@ crbug.com/681919 [ Linux Debug ] http/tests/media/media-src-suspend-before-have-
 
 # Sheriff 2018-03-07
 crbug.com/819591 virtual/threaded/animations/hit-testing/composited-with-hit-testing.html [ Failure Pass ]
-crbug.com/819851 [ Mac ] paint/invalidation/forms/checkbox-focus-by-mouse-then-keydown.html [ Skip ]
-crbug.com/819851 [ Mac ] paint/invalidation/forms/radio-focus-by-mouse-then-keydown.html [ Skip ]
 crbug.com/819778 [ Linux ] external/wpt/css/cssom-view/interfaces.html [ Pass Timeout ]
 
 # Sheriff 2018-03-08

third_party/WebKit/LayoutTests/platform/mac-retina/css2.1/t1202-counter-04-b-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x103
-  LayoutBlockFlow {HTML} at (0,0) size 800x103
-    LayoutBlockFlow {BODY} at (8,16) size 784x79
-      LayoutBlockFlow {P} at (0,0) size 784x18
-        LayoutText {#text} at (0,0) size 237x18
-          text run at (0,0) width 237: "The following two lines should look "
-        LayoutInline {EM} at (0,0) size 93x18
-          LayoutText {#text} at (236,0) size 93x18
-            text run at (236,0) width 93: "approximately"
-        LayoutText {#text} at (328,0) size 66x18
-          text run at (328,0) width 66: " the same:"
-      LayoutBlockFlow {DIV} at (0,34) size 784x19
-        LayoutInline {SPAN} at (0,0) size 9x18
-          LayoutInline {<pseudo:before>} at (0,0) size 9x18
-            LayoutCounter (anonymous) at (0,1) size 9x18
-              text run at (0,1) width 9: "\x{25A0}"
-        LayoutText {#text} at (8,1) size 5x18
-          text run at (8,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (12,1) size 10x18
-              text run at (12,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (21,1) size 5x18
-          text run at (21,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (25,1) size 10x18
-              text run at (25,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (34,1) size 5x18
-          text run at (34,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 9x18
-          LayoutInline {<pseudo:before>} at (0,0) size 9x18
-            LayoutCounter (anonymous) at (38,1) size 9x18
-              text run at (38,1) width 9: "\x{25A0}"
-        LayoutText {#text} at (46,1) size 5x18
-          text run at (46,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (50,1) size 10x18
-              text run at (50,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (59,1) size 5x18
-          text run at (59,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (63,1) size 10x18
-              text run at (63,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (72,1) size 5x18
-          text run at (72,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 9x18
-          LayoutInline {<pseudo:before>} at (0,0) size 9x18
-            LayoutCounter (anonymous) at (76,1) size 9x18
-              text run at (76,1) width 9: "\x{25A0}"
-        LayoutText {#text} at (84,1) size 5x18
-          text run at (84,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (88,1) size 10x18
-              text run at (88,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (97,1) size 5x18
-          text run at (97,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (101,1) size 10x18
-              text run at (101,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (110,1) size 5x18
-          text run at (110,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 9x18
-          LayoutInline {<pseudo:before>} at (0,0) size 9x18
-            LayoutCounter (anonymous) at (114,1) size 9x18
-              text run at (114,1) width 9: "\x{25A0}"
-        LayoutText {#text} at (122,1) size 5x18
-          text run at (122,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (126,1) size 10x18
-              text run at (126,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (135,1) size 5x18
-          text run at (135,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 10x18
-          LayoutInline {<pseudo:before>} at (0,0) size 10x18
-            LayoutCounter (anonymous) at (139,1) size 10x18
-              text run at (139,1) width 10: "\x{25A0}"
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,53) size 784x26
-        LayoutText {#text} at (0,6) size 236x18
-          text run at (0,6) width 20: "\x{25FE} "
-          text run at (20,6) width 20: "\x{25FE} "
-          text run at (40,6) width 20: "\x{25FE} "
-          text run at (60,6) width 20: "\x{25FE} "
-          text run at (80,6) width 20: "\x{25FE} "
-          text run at (100,6) width 20: "\x{25FE} "
-          text run at (120,6) width 20: "\x{25FE} "
-          text run at (140,6) width 20: "\x{25FE} "
-          text run at (160,6) width 20: "\x{25FE} "
-          text run at (180,6) width 20: "\x{25FE} "
-          text run at (200,6) width 20: "\x{25FE} "
-          text run at (220,6) width 16: "\x{25FE}"

third_party/WebKit/LayoutTests/platform/mac-retina/css2.1/t1202-counters-04-b-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x103
-  LayoutBlockFlow {HTML} at (0,0) size 800x103
-    LayoutBlockFlow {BODY} at (8,16) size 784x79
-      LayoutBlockFlow {P} at (0,0) size 784x18
-        LayoutText {#text} at (0,0) size 237x18
-          text run at (0,0) width 237: "The following two lines should look "
-        LayoutInline {EM} at (0,0) size 93x18
-          LayoutText {#text} at (236,0) size 93x18
-            text run at (236,0) width 93: "approximately"
-        LayoutText {#text} at (328,0) size 66x18
-          text run at (328,0) width 66: " the same:"
-      LayoutBlockFlow {DIV} at (0,34) size 784x19
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (0,1) size 22x18
-              text run at (0,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (21,1) size 5x18
-          text run at (21,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (25,1) size 22x18
-              text run at (25,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (46,1) size 5x18
-          text run at (46,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 23x18
-          LayoutInline {<pseudo:before>} at (0,0) size 23x18
-            LayoutCounter (anonymous) at (50,1) size 23x18
-              text run at (50,1) width 23: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (72,1) size 5x18
-          text run at (72,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (76,1) size 22x18
-              text run at (76,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (97,1) size 5x18
-          text run at (97,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (101,1) size 22x18
-              text run at (101,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (122,1) size 5x18
-          text run at (122,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 23x18
-          LayoutInline {<pseudo:before>} at (0,0) size 23x18
-            LayoutCounter (anonymous) at (126,1) size 23x18
-              text run at (126,1) width 23: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (148,1) size 5x18
-          text run at (148,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (152,1) size 22x18
-              text run at (152,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (173,1) size 5x18
-          text run at (173,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (177,1) size 22x18
-              text run at (177,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (198,1) size 5x18
-          text run at (198,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 23x18
-          LayoutInline {<pseudo:before>} at (0,0) size 23x18
-            LayoutCounter (anonymous) at (202,1) size 23x18
-              text run at (202,1) width 23: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (224,1) size 5x18
-          text run at (224,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (228,1) size 22x18
-              text run at (228,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (249,1) size 5x18
-          text run at (249,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 22x18
-          LayoutInline {<pseudo:before>} at (0,0) size 22x18
-            LayoutCounter (anonymous) at (253,1) size 22x18
-              text run at (253,1) width 22: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (274,1) size 5x18
-          text run at (274,1) width 5: " "
-        LayoutInline {SPAN} at (0,0) size 23x18
-          LayoutInline {<pseudo:before>} at (0,0) size 23x18
-            LayoutCounter (anonymous) at (278,1) size 23x18
-              text run at (278,1) width 23: "\x{25A0}.\x{25A0}"
-        LayoutText {#text} at (0,0) size 0x0
-      LayoutBlockFlow {DIV} at (0,53) size 784x26
-        LayoutText {#text} at (0,6) size 476x18
-          text run at (0,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (40,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (80,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (120,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (160,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (200,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (240,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (280,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (320,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (360,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (400,6) width 40: "\x{25FE}.\x{25FE} "
-          text run at (440,6) width 36: "\x{25FE}.\x{25FE}"

third_party/WebKit/LayoutTests/platform/mac-retina/external/wpt/battery-status/battery-full-manual.https-expected.txt

-This is a testharness.js-based test.
-FAIL Battery Test: battery full, charger plugged in assert_equals: chargingTime must be set to 0 expected 0 but got Infinity
-Harness: the test ran to completion.
-

third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/search/search-display-none-cancel-button-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutText {#text} at (0,0) size 510x18
-        text run at (0,0) width 510: "This tests that the display:none style will work on a search field's cancel button."
-      LayoutBR {BR} at (509,14) size 1x0
-      LayoutTextControl {INPUT} at (0,18) size 133x19 [bgcolor=#FFFFFF] [border: (2px inset #EEEEEE)]
-        LayoutFlexibleBox {DIV} at (4,3) size 125x13
-          LayoutBlockFlow {DIV} at (0,0) size 125x13
-      LayoutText {#text} at (0,0) size 0x0
-layer at (12,29) size 125x13
-  LayoutBlockFlow {DIV} at (0,0) size 125x13
-    LayoutText {#text} at (0,0) size 20x13
-      text run at (0,0) width 20: "test"

third_party/WebKit/LayoutTests/platform/mac-retina/http/tests/misc/bad-charset-alias-expected.txt

-Test that iso-8859-1 aliases that aren't known to Firefox and IE aren't supported (we should fall back to parent frame charset).
-
-SUCCESS
-
-

third_party/WebKit/LayoutTests/platform/mac-retina/inspector-protocol/layout-fonts/ogham-expected.txt

- ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜
-#oghammonofont:
-"Noto Sans Ogham" : 29
-
- ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜
-#oghamdefaultfont:
-"Noto Sans Ogham" : 29
-
-There should be two lines of Ogham above.
-

third_party/WebKit/LayoutTests/platform/mac-retina/inspector-protocol/layout-fonts/tifinagh-expected.txt

-ⵉⵎⴷⴰⵏⴻⵏ, ⴰⴽⴽⴻⵏ ⵎⴰ ⵍⵍⴰⵏ ⵜⵜⵍⴰⵍⴻⵏ ⴷ ⵉⵍⴻⵍⵍⵉⵢⴻⵏ ⵎⵙⴰⵡⴰⵏ ⴷⵉ ⵍⵃⵡⴻⵕⵎⴰ ⴷ ⵢⵉⵣⴻⵔⴼⴰⵏ-ⵖⵓⵔ ⵙⴻⵏ ⵜⴰⵎⵙⴰⴽⵡⵉⵜ ⴷ ⵍⴰⵇⵓⴻⵍ ⵓ ⵢⴻⵙⵙⴻⴼⴽ ⴰⴷ-ⵜⵉⵍⵉ ⵜⴻⴳⵎⴰⵜⵜ ⴳⴰⵔ ⴰⵙⴻⵏ
-#tifinagh_text:
-"Noto Sans Tifinagh" : 109,
-"Times" : 23
-
-

third_party/WebKit/LayoutTests/platform/mac-retina/svg/W3C-SVG-1.1/struct-use-05-b-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutSVGRoot {svg} at (0,0) size 800x600
-    LayoutSVGContainer {g} at (0,0) size 0x0
-      LayoutSVGHiddenContainer {defs} at (0,0) size 0x0
-        LayoutSVGResourceLinearGradient {linearGradient} [id="linearGrad1"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
-          LayoutSVGGradientStop {stop} [offset=0.00] [color=#4169E1]
-          LayoutSVGGradientStop {stop} [offset=0.33] [color=#FFFFFF]
-          LayoutSVGGradientStop {stop} [offset=0.50] [color=#00008B]
-          LayoutSVGGradientStop {stop} [offset=0.66] [color=#FFFFFF]
-          LayoutSVGGradientStop {stop} [offset=1.00] [color=#4169E1]
-        LayoutSVGResourceRadialGradient {radialGradient} [id="radialGrad1"] [gradientUnits=objectBoundingBox] [center=(0.50,0.50)] [focal=(0.15,0.15)] [radius=0.50] [focalRadius=0.00]
-          LayoutSVGGradientStop {stop} [offset=0.00] [color=#4169E1]
-          LayoutSVGGradientStop {stop} [offset=0.33] [color=#FFFFFF]
-          LayoutSVGGradientStop {stop} [offset=0.50] [color=#00008B]
-          LayoutSVGGradientStop {stop} [offset=0.66] [color=#FFFFFF]
-          LayoutSVGGradientStop {stop} [offset=1.00] [color=#4169E1]
-      LayoutSVGContainer {use} at (0,0) size 0x0
-      LayoutSVGContainer {use} at (0,0) size 0x0
-      LayoutSVGContainer {use} at (0,0) size 0x0
-      LayoutSVGContainer {use} at (0,0) size 0x0
-    LayoutSVGText {text} at (42.75,13.39) size 394.47x27.59 contains 1 chunk(s)
-      LayoutSVGInlineText {#text} at (42.75,13.39) size 394.47x27.59
-        chunk 1 (middle anchor) text run 1 at (42.76,35.00) startOffset 0 endOffset 39 width 394.48: "External references and computed values"
-    LayoutSVGText {text} at (10,304) size 263.31x46.19 contains 1 chunk(s)
-      LayoutSVGInlineText {#text} at (10,304) size 263.31x46.19
-        chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 263.31: "$Revision: 1.6 $"
-    LayoutSVGRect {rect} at (1,1) size 478x358 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]

third_party/WebKit/Tools/Scripts/webkitpy/common/system/platform_info.py

@@ -74,7 +74,7 @@ class PlatformInfo(object):
         if self.is_mac():
             output = self._executive.run_command(['system_profiler', 'SPDisplaysDataType'],
                                                  error_handler=self._executive.ignore_error)
-            if output and 'Retina: Yes' in output:
+            if output and re.search(r'Resolution:.*Retina$', output, re.MULTILINE):
                 return True
         return False
 

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -40,12 +40,12 @@ class MacPort(base.Port):
     SUPPORTED_VERSIONS = ('mac10.10', 'mac10.11', 'mac10.12', 'mac10.13', 'retina')
     port_name = 'mac'
 
-    # FIXME: We treat Retina (High-DPI) devices as if they are running
-    # a different operating system version. This is lame and should be fixed.
-    # Note that the retina versions fallback to the non-retina versions and so no
-    # baselines are shared between retina versions; this keeps the fallback graph as a tree
-    # and maximizes the number of baselines we can share that way.
-    # We also currently only support Retina on 10.11.
+    # FIXME: We treat Retina (High-DPI) devices as if they are running a
+    # different operating system version. This is lame and should be fixed.
+    # Note that the retina versions fallback to the non-retina versions and so
+    # no baselines are shared between retina versions; this keeps the fallback
+    # graph as a tree and maximizes the number of baselines we can share that
+    # way. We also currently only support Retina on 10.12.
 
     FALLBACK_PATHS = {}
 
@@ -53,7 +53,7 @@ class MacPort(base.Port):
     FALLBACK_PATHS['mac10.12'] = ['mac-mac10.12'] + FALLBACK_PATHS['mac10.13']
     FALLBACK_PATHS['mac10.11'] = ['mac-mac10.11'] + FALLBACK_PATHS['mac10.12']
     FALLBACK_PATHS['mac10.10'] = ['mac-mac10.10'] + FALLBACK_PATHS['mac10.11']
-    FALLBACK_PATHS['retina'] = ['mac-retina'] + FALLBACK_PATHS['mac10.11']
+    FALLBACK_PATHS['retina'] = ['mac-retina'] + FALLBACK_PATHS['mac10.12']
 
     CONTENT_SHELL_NAME = 'Content Shell'