[CSS Exclusions] Differentiate names in the simple rectangle test script
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Aug 2013 17:11:40 +0000 (17:11 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Aug 2013 17:11:40 +0000 (17:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105208

Patch by Niklas Nielsen <nnielsen@adobe.com> on 2013-08-28
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:

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

12 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/shapes/resources/simple-rectangle.js
LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple-expected.html
LayoutTests/fast/shapes/shape-inside/shape-inside-floats-simple.html
LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic-expected.html
LayoutTests/fast/shapes/shape-inside/shape-inside-multiple-blocks-dynamic.html
LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape-expected.html
LayoutTests/fast/shapes/shape-inside/shape-inside-outside-shape.html
LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout-expected.html
LayoutTests/fast/shapes/shape-inside/shape-inside-recursive-layout.html
LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks-expected.html
LayoutTests/fast/shapes/shape-inside/shape-inside-subsequent-blocks.html

index b3ff865c5a3894bee19ce37300c627e09388a990..df8b7f72006ad2b6d76b2f6b1904691562d29f46 100644 (file)
@@ -1,3 +1,26 @@
+2013-08-28  Niklas Nielsen  <nnielsen@adobe.com>
+
+        [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  <svillar@igalia.com>
 
         [CSS Grid Layout] Handle 'span' positions during layout
index b28ade6cb8ce117cb6e73573d4b33213fbd7dffc..3b3edf729d434826a39b9c388ac8d75dde4d0e0d 100644 (file)
@@ -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 @@ function createRectangleTest(elementId, stylesheetId, bounds, shapeBounds, units
         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);
index b478a2f544316ed1301615dd23a3757fa489d7c0..d0ff0ce176f52484cb1bfb3d53e7d8a52ed7e28c 100644 (file)
@@ -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>
index 34f5a13b5d9e6e82754a2cd735d1e580761dd332..67483acadf35498f8e9c8f57cda1196f117fcdc4 100644 (file)
@@ -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>
index 2b9fa74f26f08585aeb836a972c66b5f0fdaad03..bf706d91b22e5500d6d74e94f3efcf7096aad70e 100644 (file)
@@ -13,8 +13,8 @@ p {
 <script src='../resources/simple-rectangle.js'></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>
index 2158fb32bb19845a727bb113ea1f033534fe73ee..a6870b2719791e96a4865b5e7679e55598e92d4c 100644 (file)
@@ -13,8 +13,8 @@ p {
 <script src='../resources/simple-rectangle.js'></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>
index 5d71be5fee77dfab9dbf5cefaee0886b1b3527cf..fce44b89d77456d2cc3e80a3fdbb4c75cedd9936 100644 (file)
@@ -15,7 +15,7 @@ div {
 <script src='../resources/simple-rectangle.js'></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>
index 976e340a8cc5a88f06481b562739d70ac657ed53..aee5af4966dac19a87bbe62375846e482e58aa84 100644 (file)
@@ -16,7 +16,7 @@ div {
 <script src='../resources/simple-rectangle.js'></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)');
index 9b5d7f61b6548743a4a39bd10694ff1f44d4fb98..6698333b7f7444be4a7390f772118c82dcaf7ab4 100644 (file)
 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>
index 91f1e9c094125e74a12c5c852e72ed59e6f8d78e..79b547e31ab9b6610f94614704a0dedc6e5bf6ef 100644 (file)
 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>
index 40dcbbc3fa32d36cde9e8b5ba57c4b825b128671..29931c34ad2b1e942072f73a77453df431af08e7 100644 (file)
@@ -13,8 +13,8 @@ p {
 <script src='../resources/simple-rectangle.js'></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>
index ccf51aebc04f95d3571efdefa3c6176e64c23c98..bb935cfdb74245d84022b4a96ba608e9cf44c625 100644 (file)
@@ -13,8 +13,8 @@ p {
 <script src='../resources/simple-rectangle.js'></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>