Diff
Modified: trunk/LayoutTests/ChangeLog (116657 => 116658)
--- trunk/LayoutTests/ChangeLog 2012-05-10 17:15:55 UTC (rev 116657)
+++ trunk/LayoutTests/ChangeLog 2012-05-10 17:26:32 UTC (rev 116658)
@@ -1,3 +1,27 @@
+2012-05-10 Dave Tharp <[email protected]>
+
+ Integrate IETC CSS : values and units tests
+ https://bugs.webkit.org/show_bug.cgi?id=85307
+
+ Reviewed by Adam Barth.
+
+ Added the IETC values and unit tests and associated reference tests.
+
+ Also removed two "file not found" test entries in the mac test_expectations.txt
+ file that were causing a style check failure.
+
+ * ietestcenter/css3/valuesandunits/units-000-expected.htm: Added.
+ * ietestcenter/css3/valuesandunits/units-000.htm: Added.
+ * ietestcenter/css3/valuesandunits/units-010-expected.htm: Added.
+ * ietestcenter/css3/valuesandunits/units-010.htm: Added.
+ * ietestcenter/css3/valuesandunits/units-020-expected.htm: Added.
+ * ietestcenter/css3/valuesandunits/units-020.htm: Added.
+ * platform/chromium/test_expectations.txt:
+ * platform/efl/test_expectations.txt:
+ * platform/gtk/test_expectations.txt:
+ * platform/mac/test_expectations.txt:
+ * platform/qt/test_expectations.txt:
+
2012-05-10 Dominik Röttsches <[email protected]>
[EFL][DRT] ewk_view_paint_contents may trigger assertion failure
Added: trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-000-expected.htm (0 => 116658)
--- trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-000-expected.htm (rev 0)
+++ trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-000-expected.htm 2012-05-10 17:26:32 UTC (rev 116658)
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Test: All unit and function values - Reference</title>
+ <link rel="author" title="Codeaurora" href="" />
+ <link rel="help" href="" />
+ <style type="text/css">
+ #parent
+ {
+ height: 272px;
+ width: 1in;
+ background: green;
+ position: relative;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if there is no red visible on the page.</p>
+ <div id="parent">
+ </div>
+ </body>
+</html>
Added: trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-000.htm (0 => 116658)
--- trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-000.htm (rev 0)
+++ trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-000.htm 2012-05-10 17:26:32 UTC (rev 116658)
@@ -0,0 +1,182 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ Neither the name of the Microsoft Corporation nor the names of its contributors may be
+ used to endorse or promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Test: All unit and function values</title>
+ <link rel="author" title="Microsoft" href="" />
+ <link rel="help" href="" />
+ <meta name="flags" content="" />
+ <meta name="assert" content="Verifying that all unit values and functions are supported." />
+ <style type="text/css">
+ body div
+ {
+ font: 16px/1em ahem;
+ color: green;
+ height: 16px;
+ }
+ #parent
+ {
+ height: 272px;
+ }
+ #parent
+ {
+ background: red;
+ position: relative;
+ overflow: hidden;
+ width: 1in;
+ }
+ #div1:before
+ {
+ color: green;
+ counter-increment: div1 123456;
+ content: counter(div1);
+ }
+ #div2
+ {
+ border-right: solid green 2.54cm;
+ height: 16px;
+ width: 0;
+ }
+ #div3
+ {
+ border-right: solid green 25.4mm;
+ height: 16px;
+ width: 0;
+ }
+ #div4
+ {
+ border-right: solid green 1in;
+ height: 16px;
+ width: 0;
+ }
+ #div5
+ {
+ border-right: solid green 72pt;
+ height: 16px;
+ width: 0;
+ }
+ #div6
+ {
+ border-right: solid green 6pc;
+ height: 16px;
+ width: 0;
+ }
+ #div7
+ {
+ border-right: solid green 6em;
+ height: 16px;
+ width: 0;
+ }
+ #div8
+ {
+ border-right: solid green 7.5ex;
+ height: 16px;
+ width: 0;
+ }
+ #div9
+ {
+ border-right: solid green 6rem;
+ height: 16px;
+ width: 0;
+ }
+ #div10
+ {
+ border-right: solid green 100vw;
+ height: 16px;
+ width: 0;
+ }
+ #div11
+ {
+ border-right: solid green 100vh;
+ height: 16px;
+ width: 0;
+ }
+ #div12
+ {
+ border-right: solid green 100vm;
+ height: 16px;
+ width: 0;
+ }
+ #div13
+ {
+ border-right: solid green 6ch;
+ height: 16px;
+ width: 0;
+ }
+ #div14
+ {
+ border-right: solid green calc(0.5in*2);
+ height: 16px;
+ width: 0;
+ }
+ #div15:before
+ {
+ color: green;
+ content: "123456";
+ }
+ #div16
+ {
+ width: 0.5in;
+ }
+ #div16 div
+ {
+ background: green;
+ height: 16px;
+ width: 200%;
+ }
+ #div17:before
+ {
+ color: green;
+ content: attr(align);
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if there is no red visible on the page.</p>
+ <div id="parent">
+ <div id="div1"></div>
+ <div id="div2"></div>
+ <div id="div3"></div>
+ <div id="div4"></div>
+ <div id="div5"></div>
+ <div id="div6"></div>
+ <div id="div7"></div>
+ <div id="div8"></div>
+ <div id="div9"></div>
+ <div id="div10"></div>
+ <div id="div11"></div>
+ <div id="div12"></div>
+ <div id="div13"></div>
+ <div id="div14"></div>
+ <div id="div15"></div>
+ <div id="div16"><div></div></div>
+ <div align="div17a" id="div17"></div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-010-expected.htm (0 => 116658)
--- trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-010-expected.htm (rev 0)
+++ trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-010-expected.htm 2012-05-10 17:26:32 UTC (rev 116658)
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Test: Basic calc() function tests - Reference</title>
+ <link rel="author" title="Codeaurora" href="" />
+ <link rel="help" href=""
+ <style type="text/css">
+ div
+ {
+ background: green;
+ font: 20px ahem;
+ width: 6em;
+ height: 4em;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if there is no red visible on the page.</p>
+ <div>
+ </div>
+ </body>
+</html>
Added: trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-010.htm (0 => 116658)
--- trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-010.htm (rev 0)
+++ trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-010.htm 2012-05-10 17:26:32 UTC (rev 116658)
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ Neither the name of the Microsoft Corporation nor the names of its contributors may be
+ used to endorse or promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Test: Basic calc() function tests</title>
+ <link rel="author" title="Microsoft" href="" />
+ <link rel="help" href=""
+ <meta name="flags" content="ahem" />
+ <meta name="assert" content="The Calc() function works with addition, multiplication, subtraction and division."/>
+ <style type="text/css">
+ #container
+ {
+ background: red;
+ font: 20px ahem;
+ overflow: hidden;
+ width: 6em;
+ }
+ div div
+ {
+ background: green;
+ height: 1em;
+ width: 0;
+ }
+
+ .percentContainer
+ {
+ background: red;
+ width: 12em;
+ }
+ #calc1
+ {
+ background: green;
+ width: calc(25% + 3em);
+ }
+ #calc2
+ {
+ background: green;
+ width: calc(200% - 18em);
+ }
+ #calc3
+ {
+ background: green;
+ width: calc(10% * 5);
+ }
+ #calc4
+ {
+ background: green;
+ width: calc(200% / 4);
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if there is no red visible on the page.</p>
+ <div id="container">
+ <div class="percentContainer">
+ <div id="calc1"></div>
+ </div>
+ <div class="percentContainer">
+ <div id="calc2"></div>
+ </div>
+ <div class="percentContainer">
+ <div id="calc3"></div>
+ </div>
+ <div class="percentContainer">
+ <div id="calc4"></div>
+ </div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-020-expected.htm (0 => 116658)
--- trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-020-expected.htm (rev 0)
+++ trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-020-expected.htm 2012-05-10 17:26:32 UTC (rev 116658)
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Test: Empty calc() function - Reference</title>
+ <link rel="author" title="Codeaurora" href="" />
+ <link rel="help" href=""
+ <style type="text/css">
+ div
+ {
+ background: green;
+ height: 100px;
+ width: 100px;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if there is a green square below.</p>
+ <div></div>
+ </body>
+</html>
Added: trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-020.htm (0 => 116658)
--- trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-020.htm (rev 0)
+++ trunk/LayoutTests/ietestcenter/css3/valuesandunits/units-020.htm 2012-05-10 17:26:32 UTC (rev 116658)
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Internet Explorer Test Pages Copyright © 2012 Microsoft Corporation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+ Neither the name of the Microsoft Corporation nor the names of its contributors may be
+ used to endorse or promote products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY MICROSOFT CORPORATION "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICROSOFT CORPORATION
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>CSS Test: Empty calc() function</title>
+ <link rel="author" title="Microsoft" href="" />
+ <link rel="help" href=""
+ <meta name="flags" content="" />
+ <meta name="assert" content="Empty calc functions should be invalid and ignored."/>
+ <style type="text/css">
+ div
+ {
+ background: green;
+ height: 100px;
+ width: 100px;
+ width: calc();
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if there is a green square below.</p>
+ <div></div>
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (116657 => 116658)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-10 17:15:55 UTC (rev 116657)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-10 17:26:32 UTC (rev 116658)
@@ -3978,7 +3978,7 @@
BUGNOEL : tables/mozilla_expected_failures/bugs/bug6933.html = IMAGE
BUGNOEL : tables/mozilla_expected_failures/other/test4.html = IMAGE
-// Skip until SUBPIXEL_LAYOUT is enabled
+// Skip until SUBPIXEL_LAYOUT is enabled
BUGWK85532 SKIP : fast/sub-pixel/client-width-height-snapping.html = FAIL
BUGWK85532 SKIP : fast/sub-pixel/layout-boxes-with-zoom.html = FAIL
BUGWK85532 SKIP : fast/sub-pixel/size-of-box-with-zoom.html = FAIL
@@ -4053,3 +4053,6 @@
BUGWK85950 LINUX DEBUG : compositing/geometry/limit-layer-bounds-transformed-overflow.html = PASS TEXT
BUGWK81416 : fast/dom/wrapper-scope.html = TEXT
+
+BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
+BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE
Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (116657 => 116658)
--- trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-10 17:15:55 UTC (rev 116657)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-10 17:26:32 UTC (rev 116658)
@@ -319,7 +319,7 @@
BUGWK84835 : editing/execCommand/switch-list-type.html = TEXT
BUGWK84835 : editing/execCommand/unlink.html = TEXT
-// Needs baselines
+// Needs baselines
BUGWK84839 : editing/execCommand/4580583-1.html = MISSING
BUGWK84839 : editing/execCommand/4580583-2.html = MISSING
BUGWK84839 : editing/execCommand/4641880-1.html = MISSING
@@ -419,3 +419,6 @@
BUGWK86081 : loader/navigation-while-deferring-loads.html = TEXT PASS
BUGWK86082 : security/block-test.html = TEXT PASS
BUGWK86084 : svg/dom/SVGScriptElement/script-onerror-bubbling.svg = TEXT PASS
+
+BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
+BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE
Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (116657 => 116658)
--- trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-10 17:15:55 UTC (rev 116657)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-10 17:26:32 UTC (rev 116658)
@@ -1339,6 +1339,8 @@
BUGWK86062 : svg/text/add-tspan-position-bug.html = IMAGE
BUGWK86062 : svg/text/modify-tspan-position-bug.html = IMAGE
+BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
+BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE
//////////////////////////////////////////////////////////////////////////////////////////
// End of Tests failing
//////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/mac/test_expectations.txt (116657 => 116658)
--- trunk/LayoutTests/platform/mac/test_expectations.txt 2012-05-10 17:15:55 UTC (rev 116657)
+++ trunk/LayoutTests/platform/mac/test_expectations.txt 2012-05-10 17:26:32 UTC (rev 116658)
@@ -203,3 +203,6 @@
// Interferes with the tests that should pass
BUGWK85689 SKIP : fast/animation/request-animation-frame-disabled.html = TEXT
+
+BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
+BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE
Modified: trunk/LayoutTests/platform/qt/test_expectations.txt (116657 => 116658)
--- trunk/LayoutTests/platform/qt/test_expectations.txt 2012-05-10 17:15:55 UTC (rev 116657)
+++ trunk/LayoutTests/platform/qt/test_expectations.txt 2012-05-10 17:26:32 UTC (rev 116658)
@@ -1,4 +1,4 @@
-T// These are the layout test expectations for the Qt port of WebKit.
+// These are the layout test expectations for the Qt port of WebKit.
//
// See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
@@ -57,3 +57,6 @@
// Interferes with the tests that should pass
BUGWK85689 SKIP : fast/animation/request-animation-frame-disabled.html = TEXT
+
+BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
+BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE
