Changeset 215222 in webkit

Timestamp:

Apr 11, 2017 2:20:16 AM (7 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] Fix fast/css-grid-layout/grid-simplified-layout-positioned.html
​https://bugs.webkit.org/show_bug.cgi?id=167538

Reviewed by Darin Adler.

fast/css-grid-layout/grid-simplified-layout-positioned.html was flacky
as the caret was not always painted in the test runner.
The test was checking for a crash in simplified layout (see bug #163450)
and has nothing to do with the caret or "autofocus" behavior.
"autofocus" was needed to get the crash, so this change modifies
the test to blur the element, so the caret is not painted anymore.

• fast/css-grid-layout/grid-simplified-layout-positioned-expected.html:

Don't focus the input element.

• fast/css-grid-layout/grid-simplified-layout-positioned.html: Blur

the input element to avoid showing the caret.

• platform/mac-wk2/TestExpectations: Remove file from expectations.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/css-grid-layout/grid-simplified-layout-positioned-expected.html (modified) (1 diff)
• fast/css-grid-layout/grid-simplified-layout-positioned.html (modified) (1 diff)
• platform/mac-wk2/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-11  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Fix fast/css-grid-layout/grid-simplified-layout-positioned.html
+        https://bugs.webkit.org/show_bug.cgi?id=167538
+
+        Reviewed by Darin Adler.
+
+        fast/css-grid-layout/grid-simplified-layout-positioned.html was flacky
+        as the caret was not always painted in the test runner.
+        The test was checking for a crash in simplified layout (see bug #163450)
+        and has nothing to do with the caret or "autofocus" behavior.
+        "autofocus" was needed to get the crash, so this change modifies
+        the test to blur the element, so the caret is not painted anymore.
+
+        * fast/css-grid-layout/grid-simplified-layout-positioned-expected.html:
+        Don't focus the input element.
+        * fast/css-grid-layout/grid-simplified-layout-positioned.html: Blur
+        the input element to avoid showing the caret.
+        * platform/mac-wk2/TestExpectations: Remove file from expectations.
+
 2017-04-10  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/LayoutTests/fast/css-grid-layout/grid-simplified-layout-positioned-expected.html

@@ -10 +10 @@
 This text and input should appear at 100x100 position.
 Like if they have a left and top margin of 100px.
-<input autofocus>
+<input>

trunk/LayoutTests/fast/css-grid-layout/grid-simplified-layout-positioned.html

@@ -16 +16 @@
 Like if they have a left and top margin of 100px.
 <input autofocus>
+<script>
+  if (window.testRunner)
+    window.testRunner.waitUntilDone();
+  // "autofocus" is needed to force the simplified layout call.
+  // We are removing the focus here to match the expected file and avoid issues with the caret.
+  // We need a small timeout so "blur()" is run after "autofocus".
+  setTimeout(function() {
+    document.querySelector("input").blur();
+    if (window.testRunner)
+      window.testRunner.notifyDone();
+  }, 100);
+</script>

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -614 +614 @@
 webkit.org/b/168065 inspector/unit-tests/heap-snapshot.html [ Pass Failure Timeout ]
 
-webkit.org/b/167538 [ Sierra ] fast/css-grid-layout/grid-simplified-layout-positioned.html [ Pass ImageOnlyFailure ]
-
 webkit.org/b/168235 [ Debug ] imported/w3c/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click.html [ Pass Failure ]