Diff
Modified: trunk/LayoutTests/ChangeLog (154756 => 154757)
--- trunk/LayoutTests/ChangeLog 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/ChangeLog 2013-08-28 17:11:40 UTC (rev 154757)
@@ -1,3 +1,26 @@
+2013-08-28 Niklas Nielsen <[email protected]>
+
+ [CSS Exclusions] Differentiate names in the simple rectangle test script
+ https://bugs.webkit.org/show_bug.cgi?id=105208
+
+ Reviewed by Alexandru Chiculita.
+
+ Rename createRectangleTest and createRectangleTestResult to drawTestRectangle and drawExpectedRectangle respectively.
+
+ * fast/shapes/resources/simple-rectangle.js:
+ (drawTextRectangle):
+ (drawExpectedRectangle):
+ * fast/shapes/shape-inside/shape-inside-floats-simple-expected.html:
+ * fast/shapes/shape-inside/shape-inside-floats-simple.html:
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html:
+ * fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html:
+ * fast/shapes/shape-inside/shape-inside-outside-shape-expected.html:
+ * fast/shapes/shape-inside/shape-inside-outside-shape.html:
+ * fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html:
+ * fast/shapes/shape-inside/shape-inside-recursive-layout.html:
+ * fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html:
+ * fast/shapes/shape-inside/shape-inside-subsequent-blocks.html:
+
2013-08-28 Sergio Villar Senin <[email protected]>
[CSS Grid Layout] Handle 'span' positions during layout
Modified: trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/resources/simple-rectangle.js 2013-08-28 17:11:40 UTC (rev 154757)
@@ -1,4 +1,4 @@
-function createRectangleTest(elementId, stylesheetId, bounds, shapeBounds, units, content) {
+function drawTextRectangle(elementId, stylesheetId, bounds, shapeBounds, units, content) {
var elem;
if (elementId)
elem = document.getElementById(elementId);
@@ -27,7 +27,7 @@
elem.innerHTML = content;
}
-function createRectangleTestResult(elementId, stylesheetId, bounds, shapeBounds, units, content) {
+function drawExpectedRectangle(elementId, stylesheetId, bounds, shapeBounds, units, content) {
var elem;
if (elementId)
elem = document.getElementById(elementId);
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple-expected.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple-expected.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple-expected.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -21,9 +21,9 @@
<script>
window._onload_ = function () {
var content = 'XXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\n<div class="spacer" style="float:right"></div>\n<div class="spacer" style="float:left"></div>\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX';
- createRectangleTestResult('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
- createRectangleTestResult('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
- createRectangleTestResult('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
+ drawExpectedRectangle('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
+ drawExpectedRectangle('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
+ drawExpectedRectangle('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
};
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -21,9 +21,9 @@
<script>
window._onload_ = function () {
var content = 'XXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\n<div class="spacer" style="float:right"></div>\n<div class="spacer" style="float:left"></div>\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX\nXXXXXXXXXXXXXXX';
- createRectangleTest('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
- createRectangleTest('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
- createRectangleTest('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
+ drawTextRectangle('base', 'stylesheet', { height: 200, width: 200 }, { x: 25, y: 0, width: 150, height: 150 }, 'px', content);
+ drawTextRectangle('rl', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
+ drawTextRectangle('lr', 'stylesheet', { height: 200, width: 200 }, { x: 0, y: 25, width: 150, height: 150 }, 'px', content);
};
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -13,8 +13,8 @@
<script src=''></script>
<script>
window._onload_ = function() {
- createRectangleTestResult('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
- createRectangleTestResult('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
+ drawExpectedRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
+ drawExpectedRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
};
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -13,8 +13,8 @@
<script src=''></script>
<script>
window._onload_ = function() {
- createRectangleTest('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
- createRectangleTest('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
+ drawTextRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
+ drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', null);
};
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape-expected.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape-expected.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape-expected.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -15,7 +15,7 @@
<script src=''></script>
<script>
window._onload_ = function() {
- createRectangleTestResult('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
+ drawExpectedRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
};
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -16,7 +16,7 @@
<script src=''></script>
<script>
window._onload_ = function() {
- createRectangleTest('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
+ drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px');
var inlineStyle = document.getElementById('shape-inside2').style;
inlineStyle.setProperty('-webkit-shape-inside', 'outside-shape');
inlineStyle.setProperty('-webkit-shape-outside', 'rectangle(50px, 50px, 100px, 100px)');
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -43,12 +43,12 @@
window._onload_ = function() {
var elementBounds = { width: 200, height: 200 };
var shapeBounds = { x: 50, y: 50, width: 100, height: 100 };
- createRectangleTestResult('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTestResult('float', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTestResult('list', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTestResult('table', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTestResult('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTestResult('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawExpectedRectangle('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawExpectedRectangle('float', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawExpectedRectangle('list', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawExpectedRectangle('table', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawExpectedRectangle('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawExpectedRectangle('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
}
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -43,12 +43,12 @@
window._onload_ = function() {
var elementBounds = { width: 200, height: 200 };
var shapeBounds = { x: 50, y: 50, width: 100, height: 100 };
- createRectangleTest('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTest('float', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTest('list', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTest('table', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTest('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
- createRectangleTest('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawTextRectangle('inline-block', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawTextRectangle('float', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawTextRectangle('list', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawTextRectangle('table', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawTextRectangle('old-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
+ drawTextRectangle('new-flexbox', 'stylesheet', elementBounds, shapeBounds, 'px');
}
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -13,8 +13,8 @@
<script src=''></script>
<script>
window._onload_ = function() {
- createRectangleTestResult('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
- createRectangleTestResult('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
+ drawExpectedRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
+ drawExpectedRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
};
</script>
</head>
Modified: trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks.html (154756 => 154757)
--- trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks.html 2013-08-28 17:05:20 UTC (rev 154756)
+++ trunk/LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks.html 2013-08-28 17:11:40 UTC (rev 154757)
@@ -13,8 +13,8 @@
<script src=''></script>
<script>
window._onload_ = function() {
- createRectangleTest('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
- createRectangleTest('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
+ drawTextRectangle('shape-inside1', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
+ drawTextRectangle('shape-inside2', 'stylesheet', { width: 200, height: 200 }, { x: 50, y: 50, width: 100, height: 100 }, 'px', '<p>XX</p><p>XX</p>');
};
</script>
</head>
