Make color-filter affect caret-color

[WebKit-https.git] / LayoutTests / css3 / flexbox / flex-flow-orientations.html
diff --git a/LayoutTests/css3/flexbox/flex-flow-orientations.html b/LayoutTests/css3/flexbox/flex-flow-orientations.html

index 6360fd2..c96424b 100644 (file)
--- a/LayoutTests/css3/flexbox/flex-flow-orientations.html
+++ b/LayoutTests/css3/flexbox/flex-flow-orientations.html
@@ -8,11 +8,14 @@
      display: inline-block;
  }
  .flexbox {
-    display: -webkit-flex;
+    display: flex;
      background-color: grey;
      width: 100px;
      height: 100px;
  }
+.flexbox > * {
+    flex: none;
+}
  .title {
      margin-top: 1em;
  }
@@ -23,28 +26,25 @@
      direction: rtl;
  }
  .horizontal-tb {
-    -webkit-writing-mode: horizontal-tb;
-}
-.horizontal-bt {
-    -webkit-writing-mode: horizontal-bt;
+    writing-mode: horizontal-tb;
  }
  .vertical-rl {
-    -webkit-writing-mode: vertical-rl;
+    writing-mode: vertical-rl;
  }
  .vertical-lr {
-    -webkit-writing-mode: vertical-lr;
+    writing-mode: vertical-lr;
  }
  .row {
-    -webkit-flex-flow: row;    
+    flex-flow: row;
  }
  .row-reverse {
-    -webkit-flex-flow: row-reverse;
+    flex-flow: row-reverse;
  }
  .column {
-    -webkit-flex-flow: column;
+    flex-flow: column;
  }
  .column-reverse {
-    -webkit-flex-flow: column-reverse;
+    flex-flow: column-reverse;
  }
  .flexbox > :nth-child(1) {
      background-color: blue;
@@ -56,12 +56,11 @@
      background-color: red;
  }
  </style>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-</script>
-<script src="resources/flexbox.js"></script>
-<body onload="checkFlexBoxen()">
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../../resources/check-layout-th.js"></script>
+<body onload="checkLayout('.flexbox')">
+<div id=log></div>
  
  <script>
  function asString(position)
@@ -88,24 +87,6 @@ var expectations = {
              ltr: [[80, 0], [60, 0]]
          }
      },
-    'horizontal-bt': {
-        column: {
-            rtl: [[80, 80], [80, 60]],
-            ltr: [[0, 80], [0, 60]]
-        },
-        'column-reverse': {
-            rtl: [[80, 0], [80, 20]],
-            ltr: [[0, 0], [0, 20]]
-        },
-        row: {
-            rtl: [[80, 80], [60, 80]],
-            ltr: [[0, 80], [20, 80]]
-        },
-        'row-reverse': {
-            rtl: [[0, 80], [20, 80]],
-            ltr: [[80, 80], [60, 80]]
-        }
-    },
      'vertical-lr': {
          column: {
              rtl: [[0, 80], [20, 80]],
@@ -144,26 +125,10 @@ var expectations = {
      }
  };
  
-var writingModes = ['horizontal-tb', 'horizontal-bt', 'vertical-lr', 'vertical-rl'];
+var writingModes = ['horizontal-tb', 'vertical-lr', 'vertical-rl'];
  var flexFlows = ['row', 'column', 'row-reverse', 'column-reverse'];
  var directions = ['rtl', 'ltr'];
  
-function physicalWritingMode(writingMode, flexFlow, direction)
-{
-    if (flexFlow.indexOf('column') == -1)
-        return writingMode;
-
-    var isReverse = flexFlow.indexOf('reverse') != -1;
-    switch (writingMode) {
-    case 'horizontal-tb':
-    case 'horizontal-bt':
-        return isReverse ? 'vertical-rl' : 'vertical-lr';
-    case 'vertical-lr':
-    case 'vertical-rl':
-        return isReverse ? 'horizontal-bt' : 'horizontal-tb';
-    }
-}
-
  writingModes.forEach(function(writingMode) {
      flexFlows.forEach(function(flexFlow) {
          directions.forEach(function(direction) {
@@ -189,4 +154,4 @@ writingModes.forEach(function(writingMode) {
  })
  </script>
  </body>
-</html>
-\ No newline at end of file
+</html>