Unreviewed, rolling out r238220.
authortsavell@apple.com <tsavell@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Nov 2018 20:40:42 +0000 (20:40 +0000)
committertsavell@apple.com <tsavell@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Nov 2018 20:40:42 +0000 (20:40 +0000)
Introduced failing tests to iOS and is slowing down EWS

Reverted changeset:

"[css-grid] Consider scrollbars in
populateGridPositionsForDirection()"
https://bugs.webkit.org/show_bug.cgi?id=191656
https://trac.webkit.org/changeset/238220

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001-expected.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-expected.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-expected.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html [deleted file]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/w3c-import.log
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderGrid.cpp

index c2efe7d..76c0890 100644 (file)
@@ -1,3 +1,16 @@
+2018-11-15  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r238220.
+
+        Introduced failing tests to iOS and is slowing down EWS
+
+        Reverted changeset:
+
+        "[css-grid] Consider scrollbars in
+        populateGridPositionsForDirection()"
+        https://bugs.webkit.org/show_bug.cgi?id=191656
+        https://trac.webkit.org/changeset/238220
+
 2018-11-15  Youenn Fablet  <youenn@apple.com>
 
         Update RTCPeerConnection JS built-ins to be closer to specWe
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001-expected.html
deleted file mode 100644 (file)
index 31a9ef3..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS container Layout Test Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  .container {
-    margin: 10px;
-    background: grey;
-  }
-
-  .scrollX {
-    overflow-x: scroll;
-  }
-
-  .scrollY {
-    overflow-y: scroll;
-  }
-
-  .fixedSize {
-    width: 200px;
-    height: 50px;
-  }
-
-  .container > div {
-    background: cyan;
-    width: 100%;
-    height: 100%;
-  }
-
-  .directionRTL {
-    direction: rtl;
-  }
-</style>
-
-<p>The test passes if it has the same output than the reference.</p>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: ltr;</h2>
-
-  <div class="container scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="container scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: rtl;</h2>
-
-  <div class="directionRTL container scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html
deleted file mode 100644 (file)
index 1b3c6ee..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Grid Layout Test: Grid container with scrollbars</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
-<link rel="match" href="grid-container-scrollbar-001-ref.html">
-<meta name="assert" content="This test verifes that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
-<link href="support/grid.css" rel="stylesheet">
-<style>
-  .grid {
-    margin: 10px;
-  }
-
-  .scrollX {
-    overflow-x: scroll;
-  }
-
-  .scrollY {
-    overflow-y: scroll;
-  }
-
-  .fixedSize {
-    width: 200px;
-    height: 50px;
-  }
-
-  .grid > div {
-    background: cyan;
-  }
-</style>
-
-<p>The test passes if it has the same output than the reference.</p>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: ltr;</h2>
-
-  <div class="grid scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="grid scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: rtl;</h2>
-
-  <div class="directionRTL grid scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-expected.html
deleted file mode 100644 (file)
index 512fb8a..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS container Layout Test Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  .container {
-    margin: 10px;
-    background: grey;
-    writing-mode: vertical-lr;
-  }
-
-  .scrollX {
-    overflow-x: scroll;
-  }
-
-  .scrollY {
-    overflow-y: scroll;
-  }
-
-  .fixedSize {
-    width: 200px;
-    height: 50px;
-  }
-
-  .container > div {
-    background: cyan;
-    width: 100%;
-    height: 100%;
-  }
-
-  .directionRTL {
-    direction: rtl;
-  }
-</style>
-
-<p>The test passes if it has the same output than the reference.</p>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: ltr;</h2>
-
-  <div class="container scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="container scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: rtl;</h2>
-
-  <div class="directionRTL container scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
deleted file mode 100644 (file)
index ecdc7b7..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Grid Layout Test: Grid container with scrollbars</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
-<link rel="match" href="grid-container-scrollbar-vertical-lr-001-ref.html">
-<meta name="assert" content="This test verifes that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
-<link href="support/grid.css" rel="stylesheet">
-<style>
-  .grid {
-    margin: 10px;
-    writing-mode: vertical-lr;
-  }
-
-  .scrollX {
-    overflow-x: scroll;
-  }
-
-  .scrollY {
-    overflow-y: scroll;
-  }
-
-  .fixedSize {
-    width: 200px;
-    height: 50px;
-  }
-
-  .grid > div {
-    background: cyan;
-  }
-</style>
-
-<p>The test passes if it has the same output than the reference.</p>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: ltr;</h2>
-
-  <div class="grid scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="grid scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: rtl;</h2>
-
-  <div class="directionRTL grid scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-expected.html
deleted file mode 100644 (file)
index d8eeedf..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS container Layout Test Reference</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<style>
-  .container {
-    margin: 10px;
-    background: grey;
-    writing-mode: vertical-rl;
-  }
-
-  .scrollX {
-    overflow-x: scroll;
-  }
-
-  .scrollY {
-    overflow-y: scroll;
-  }
-
-  .fixedSize {
-    width: 200px;
-    height: 50px;
-  }
-
-  .container > div {
-    background: cyan;
-    width: 100%;
-    height: 100%;
-  }
-
-  .directionRTL {
-    direction: rtl;
-  }
-</style>
-
-<p>The test passes if it has the same output than the reference.</p>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: ltr;</h2>
-
-  <div class="container scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="container scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="container fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: rtl;</h2>
-
-  <div class="directionRTL container scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL container fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
deleted file mode 100644 (file)
index f2ab39f..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Grid Layout Test: Grid container with scrollbars</title>
-<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
-<link rel="match" href="grid-container-scrollbar-vertical-rl-001-ref.html">
-<meta name="assert" content="This test verifes that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
-<link href="support/grid.css" rel="stylesheet">
-<style>
-  .grid {
-    margin: 10px;
-    writing-mode: vertical-rl;
-  }
-
-  .scrollX {
-    overflow-x: scroll;
-  }
-
-  .scrollY {
-    overflow-y: scroll;
-  }
-
-  .fixedSize {
-    width: 200px;
-    height: 50px;
-  }
-
-  .grid > div {
-    background: cyan;
-  }
-</style>
-
-<p>The test passes if it has the same output than the reference.</p>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: ltr;</h2>
-
-  <div class="grid scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="grid scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="grid fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
-
-<div style="float: left; width: 350px;">
-
-  <h2>direction: rtl;</h2>
-
-  <div class="directionRTL grid scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid scrollX scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollX">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollY">
-    <div>item</div>
-  </div>
-
-  <div class="directionRTL grid fixedSize scrollX scrollY">
-    <div>item</div>
-  </div>
-
-</div>
index 0edec3a..e242bd0 100644 (file)
@@ -24,12 +24,6 @@ List of files:
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002-expected.html
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001-expected.html
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-expected.html
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-expected.html
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-display-grid-001-expected.xht
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-display-grid-001.html
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-display-inline-grid-001-expected.xht
index 702b28a..a39d5f7 100644 (file)
@@ -1,3 +1,16 @@
+2018-11-15  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r238220.
+
+        Introduced failing tests to iOS and is slowing down EWS
+
+        Reverted changeset:
+
+        "[css-grid] Consider scrollbars in
+        populateGridPositionsForDirection()"
+        https://bugs.webkit.org/show_bug.cgi?id=191656
+        https://trac.webkit.org/changeset/238220
+
 2018-11-15  Jiewen Tan  <jiewen_tan@apple.com>
 
         [WebAuthN] PublicKeyCredentialCreationOptions::AuthenticatorSelectionCriteria::AuthenticatorAttachment should be optional
index 51a28f1..653b343 100644 (file)
@@ -1003,13 +1003,7 @@ void RenderGrid::populateGridPositionsForDirection(GridTrackSizingDirection dire
     const auto& offset = direction == ForColumns ? m_offsetBetweenColumns : m_offsetBetweenRows;
     auto& positions = isRowAxis ? m_columnPositions : m_rowPositions;
     positions.resize(numberOfLines);
-
     auto borderAndPadding = isRowAxis ? borderAndPaddingLogicalLeft() : borderAndPaddingBefore();
-    // If we are in horizontal writing mode and RTL direction the scrollbar is painted on the left,
-    // so we need to take into account when computing the position of the columns.
-    if (isRowAxis && style().isHorizontalWritingMode() && !style().isLeftToRightDirection())
-        borderAndPadding += scrollbarLogicalWidth();
-
     positions[0] = borderAndPadding + offset.positionOffset;
     if (numberOfLines > 1) {
         // If we have collapsed tracks we just ignore gaps here and add them later as we might not