summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil A Eklund <eae@chromium.org>2015-11-25 10:54:10 -0800
committerEmil A Eklund <eae@chromium.org>2015-11-25 18:56:37 +0000
commitdf73be0124cc071e8258afc8572140427d404347 (patch)
tree65ca56fbabc5d2b117125b36126967ac7bc3da34
parentd9180c129883eb572c7e1ff6ab53a1ddb1973e6a (diff)
downloadchromium_src-df73be0124cc071e8258afc8572140427d404347.zip
chromium_src-df73be0124cc071e8258afc8572140427d404347.tar.gz
chromium_src-df73be0124cc071e8258afc8572140427d404347.tar.bz2
Attempt to deflake fast/forms/text/text-font-height-mismatch.html
BUG=558574 R=szager@chromium.org Review URL: https://codereview.chromium.org/1476953002 . Cr-Commit-Position: refs/heads/master@{#361711}
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations2
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/text/text-font-height-mismatch.html9
2 files changed, 9 insertions, 2 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 6bd697e..ce1fd78 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1331,6 +1331,8 @@ crbug.com/525296 fast/css/font-load-while-styleresolver-missing.html [ Crash Fai
crbug.com/240576 fullscreen/api/element-ready-check-containing-iframe.html [ Timeout Failure Pass ]
crbug.com/240576 virtual/android/fullscreen/api/element-ready-check-containing-iframe.html [ Timeout Failure Pass ]
+crbug.com/558574 [ XP Win10 Linux Android Mac ] fast/forms/text/text-font-height-mismatch.html [ NeedsRebaseline ]
+
crbug.com/525903 inspector/sources/debugger-ui/watch-expressions-preserve-expansion.html [ Failure Pass ]
crbug.com/457273 [ Mac ] http/tests/websocket/close.html [ Pass Timeout ]
diff --git a/third_party/WebKit/LayoutTests/fast/forms/text/text-font-height-mismatch.html b/third_party/WebKit/LayoutTests/fast/forms/text/text-font-height-mismatch.html
index 3b00b6b..168dea3 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/text/text-font-height-mismatch.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/text/text-font-height-mismatch.html
@@ -7,7 +7,7 @@
}
</style>
<p>Editable text should be centered vertically.</p>
-<div><input style="border: solid 1px black; line-height:18px; height:18px; font-size:16px; font-family:NotoSansCJK;" value="&#x3075; ABCgjy"></div>
+<div id="webfont"><input style="font-family:NotoSansCJK;"value="ABCgjy"></div>
<div><input style="border: solid 1px black; line-height:16px; height:24px; font-size:24px;" value="ABCgjy"></div>
<!-- crbug.com/539858 -->
@@ -15,7 +15,12 @@
<script>
if (window.testRunner)
testRunner.waitUntilDone();
+
document.fonts.ready.then(function() {
- testRunner.notifyDone();
+ document.getElementById('webfont').innerHTML = '<input style="border:' +
+ 'solid 1px black; font-size:16px; font-family:NotoSansCJK;"' +
+ 'value="&#x3075; ABCgjy">';
+ if (window.testRunner)
+ testRunner.notifyDone();
});
</script>