| Index: LayoutTests/fast/multicol/vertical-rl/break-properties.html
|
| diff --git a/LayoutTests/fast/multicol/vertical-rl/break-properties.html b/LayoutTests/fast/multicol/vertical-rl/break-properties.html
|
| index 8fb3e76abca9dcb120b6f444d9eede44b5e4d87b..23fa834cddf9c2d4e380034561c7326dd88264ba 100644
|
| --- a/LayoutTests/fast/multicol/vertical-rl/break-properties.html
|
| +++ b/LayoutTests/fast/multicol/vertical-rl/break-properties.html
|
| @@ -1,13 +1,11 @@
|
| -<html style="-webkit-writing-mode:horizontal-tb">
|
| -<head>
|
| +<!DOCTYPE html>
|
| <style>
|
| + body { margin: 8px; -webkit-writing-mode: vertical-rl; }
|
| div.box { -webkit-box-sizing: border; border: solid blue; }
|
| div.shorter { width: 54px; }
|
| div.taller { width: 72px; }
|
| </style>
|
| -</head>
|
| -<body style="-webkit-writing-mode:vertical-rl; width:800px;">
|
| -<div style="width: 100px; height: 630px; -webkit-columns:6; -webkit-column-gap:5px; columns:6; column-gap:5px; column-fill:auto;">
|
| +<div style="width: 100px; height: 325px; -webkit-columns:6; -webkit-column-gap:5px; columns:6; column-gap:5px; column-fill:auto;">
|
| <div class="taller box"></div>
|
| <div class="taller box"></div>
|
| <div id="break-before" class="shorter box" style="-webkit-column-break-before: always;"></div>
|
| @@ -25,15 +23,18 @@
|
| document.getElementById("console").appendChild(document.createTextNode(message + "\n"));
|
| }
|
|
|
| - function testBoxPosition(id, expectedLeft, expectedTop)
|
| - {
|
| + function testBoxColumn(id, expectedColumn) {
|
| var rect = document.getElementById(id).getBoundingClientRect();
|
| - if (Math.round(rect.left) === expectedLeft && Math.round(rect.top) === expectedTop)
|
| - log("PASS: '" + id + "' is at (" + expectedLeft + ", " + expectedTop + ")");
|
| + var actualPosition = Math.round(rect.top);
|
| + var expectedPosition = 8 + (50 + 5) * expectedColumn;
|
| +
|
| + if (actualPosition == expectedPosition)
|
| + log("PASS: '" + id + "' is in column " + expectedColumn);
|
| else
|
| - log("FAIL: '" + id + "' is at (" + Math.round(rect.left) + ", " + Math.round(rect.top) + ") instead of (" + expectedLeft + " ," + expectedTop + ")");
|
| + log("FAIL: '" + id + "' is at position " + actualPosition + " instead of " + expectedPosition);
|
| }
|
|
|
| - testBoxPosition("break-before", 748, 220);
|
| - testBoxPosition("after-break", 748, 431);
|
| + testBoxColumn("break-before", 2);
|
| + testBoxColumn("after-break", 4);
|
| + testBoxColumn("no-break", 5);
|
| </script>
|
|
|