Work around failing multicol tests on Mac introduced by enabling HarfBuzz.
Two tests fixed: list-item.html and table-cell.html
BUG=334269
R=andersr@opera.com
Review URL: https://codereview.chromium.org/845683003
git-svn-id: svn://svn.chromium.org/blink/trunk@188212 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 5d73b11..e13e84e 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -808,8 +808,6 @@
crbug.com/334269 [ Mac ] svg/transforms/transformed-text-fill-gradient.html [ ImageOnlyFailure ]
crbug.com/334269 [ Mac ] virtual/antialiasedtext/fast/text/international/complex-text-missing-glyph-fallback.html [ ImageOnlyFailure ]
crbug.com/334269 [ Mac ] virtual/antialiasedtext/fast/text/international/vertical-positioning-with-combining-marks.html [ ImageOnlyFailure ]
-crbug.com/334269 [ Mac ] virtual/regionbasedmulticol/fast/multicol/newmulticol/list-item.html [ ImageOnlyFailure ]
-crbug.com/334269 [ Mac ] virtual/regionbasedmulticol/fast/multicol/newmulticol/table-cell.html [ ImageOnlyFailure ]
crbug.com/334269 [ Mac ] fast/css/word-spacing-characters-complex-text.html [ Skip ]
crbug.com/334269 [ Mac ] fast/multicol/multicol-with-child-renderLayer-for-input.html [ ImageOnlyFailure Crash ]
@@ -1073,8 +1071,6 @@
crbug.com/386567 virtual/slimmingpaint/fast/multicol/vertical-rl/image-inside-nested-blocks-with-border.html [ Skip ]
crbug.com/386567 virtual/slimmingpaint/fast/multicol/vertical-rl/nested-columns.html [ Skip ]
crbug.com/396823 [ Mac ] virtual/slimmingpaint/fast/multicol/multicol-with-child-renderLayer-for-input.html [ ImageOnlyFailure ]
-crbug.com/334269 [ Mac ] virtual/slimmingpaint/fast/multicol/newmulticol/list-item.html [ ImageOnlyFailure ]
-crbug.com/334269 [ Mac ] virtual/slimmingpaint/fast/multicol/newmulticol/table-cell.html [ ImageOnlyFailure ]
# New multicol tests which should currently only run in virtual/regionbasedmulticol, because
# the baseline is based on the region based multicol implementation.
diff --git a/LayoutTests/fast/multicol/newmulticol/list-item-expected.html b/LayoutTests/fast/multicol/newmulticol/list-item-expected.html
index a9f04a7..49f641f 100644
--- a/LayoutTests/fast/multicol/newmulticol/list-item-expected.html
+++ b/LayoutTests/fast/multicol/newmulticol/list-item-expected.html
@@ -2,12 +2,15 @@
<html>
<head>
<title>List-item as multicol</title>
+ <style>
+ .c { display:inline-block; width:1em; }
+ </style>
</head>
<body style="margin:5em;">
<p>You should see the word 'PASS' below.</p>
<div style="font-family:monospace; float:left;">
<div style="display:list-item;">
- PASS
+ <div class="c">P</div><div class="c">A</div><div class="c">S</div><div class="c">S</div>
</div>
</div>
</body>
diff --git a/LayoutTests/fast/multicol/newmulticol/list-item.html b/LayoutTests/fast/multicol/newmulticol/list-item.html
index c5929c2..c952e84 100644
--- a/LayoutTests/fast/multicol/newmulticol/list-item.html
+++ b/LayoutTests/fast/multicol/newmulticol/list-item.html
@@ -6,7 +6,7 @@
<body style="margin:5em;">
<p>You should see the word 'PASS' below.</p>
<div style="font-family:monospace; float:left;">
- <div style="display:list-item; -webkit-columns:4; columns:4; -webkit-column-gap:0; column-gap:0; orphans:1; widows:1;">
+ <div style="display:list-item; width:4em; -webkit-columns:4; columns:4; -webkit-column-gap:0; column-gap:0; orphans:1; widows:1;">
P<br>
A<br>
S<br>
diff --git a/LayoutTests/fast/multicol/newmulticol/table-cell-expected.html b/LayoutTests/fast/multicol/newmulticol/table-cell-expected.html
index 766f997..850cbf9 100644
--- a/LayoutTests/fast/multicol/newmulticol/table-cell-expected.html
+++ b/LayoutTests/fast/multicol/newmulticol/table-cell-expected.html
@@ -6,7 +6,10 @@
<body>
<p>You should see the word 'PASS' below.</p>
<div style="font-family:monospace;">
- PASS
+ <div style="float:left; overflow:hidden; width:1em;">P</div>
+ <div style="float:left; overflow:hidden; width:1em;">A</div>
+ <div style="float:left; overflow:hidden; width:1em;">S</div>
+ <div style="float:left; overflow:hidden; width:1em;">S</div>
</div>
</body>
</html>
diff --git a/LayoutTests/fast/multicol/newmulticol/table-cell.html b/LayoutTests/fast/multicol/newmulticol/table-cell.html
index b1e1eaf..5eedc4c 100644
--- a/LayoutTests/fast/multicol/newmulticol/table-cell.html
+++ b/LayoutTests/fast/multicol/newmulticol/table-cell.html
@@ -6,8 +6,8 @@
<body>
<p>You should see the word 'PASS' below.</p>
<div style="font-family:monospace;">
- <div style="display:table-cell;">P</div>
- <div style="display:table-cell; -webkit-columns:3; columns:3; -webkit-column-gap:0; column-gap:0; orphans:1; widows:1;">
+ <div style="display:table-cell; width:1em;">P</div>
+ <div style="display:table-cell; width:3em; -webkit-columns:3; columns:3; -webkit-column-gap:0; column-gap:0; orphans:1; widows:1;">
A<br>
S<br>
S<br>
