<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168838] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168838">168838</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-05-14 09:41:46 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix line ending style for the test (as an experiment).
* css3/calc/simple-calcs-prefixed.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3calcsimplecalcsprefixedhtml">trunk/LayoutTests/css3/calc/simple-calcs-prefixed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168837 => 168838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-14 15:38:34 UTC (rev 168837)
+++ trunk/LayoutTests/ChangeLog 2014-05-14 16:41:46 UTC (rev 168838)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2014-05-14 Alexey Proskuryakov <ap@apple.com>
+
+ Fix line ending style for the test (as an experiment).
+
+ * css3/calc/simple-calcs-prefixed.html:
+
</ins><span class="cx"> 2014-05-13 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Assertion failure in some cases with inline blocks
</span></span></pre></div>
<a id="trunkLayoutTestscss3calcsimplecalcsprefixedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/calc/simple-calcs-prefixed.html (168837 => 168838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/calc/simple-calcs-prefixed.html 2014-05-14 15:38:34 UTC (rev 168837)
+++ trunk/LayoutTests/css3/calc/simple-calcs-prefixed.html 2014-05-14 16:41:46 UTC (rev 168838)
</span><span class="lines">@@ -1,121 +1,121 @@
</span><del>-<!DOCTYPE HTML>
-<style>
-.width-test {
- height: 100px;
- width: 256px;
- background-color: red;
-}
-
-.height-test {
- width: 100px;
- height: 50px;
- background-color: red;
-}
-</style>
-
-<p>
- This file tests legacy support for the -webkit prefixed version of calc (ie -webkit-calc()).
-</p>
-<p>
- All boxes below should be 100px * 100px and green.
-</p>
-
-<div id="test">
-<div style="width:100px; height:100px;">control</div>
-<div class="width-test" style="width: -webkit-calc(50px + 50px);">50px + 50px</div>
-<div class="width-test" style="width: -webkit-calc(150px - 50px);">150px - 50px</div>
-<div class="width-test" style="width: -webkit-calc(50px + 50px);">50px + 50px (2 spaces around operator)</div>
-<div class="width-test" style="width: -webkit-calc(150px - 50px);">150px - 50px (2 spaces around operator)</div>
-<div class="width-test" style="width: -webkit-calc(50px*2);">50px*2</div>
-<div class="width-test" style="width: -webkit-calc(50px *2);">50px *2</div>
-<div class="width-test" style="width: -webkit-calc(50px* 2);">50px* 2</div>
-<div class="width-test" style="width: -webkit-calc(200px/2);">200px/2</div>
-<div class="width-test" style="width: -webkit-calc(200px /2);">200px /2</div>
-<div class="width-test" style="width: -webkit-calc(200px/ 2);">200px/ 2</div>
-<div class="width-test" style="width: -webkit-calc(50px*(2));">50px*(2)</div>
-<div class="width-test" style="width: -webkit-calc(50px *(2));">50px *(2)</div>
-<div class="width-test" style="width: -webkit-calc(50px* (2));">50px* (2)</div>
-<div class="width-test" style="width: -webkit-calc(50px*(1 + 1));">50px*(1 + 1)</div>
-<div class="width-test" style="width: -webkit-calc(50px*(12 - 10));">50px*(12 - 10)</div>
-<div class="width-test" style="width: -webkit-calc(50px*(10 / 5));">50px*(10 / 5)</div>
-<div class="width-test" style="width: -webkit-calc(10px* (5 * 2));">10px* (5 * 2)</div>
-<div class="width-test" style="width: -webkit-calc(50px + 10px * 5);">50px + 10px * 5 (operation order)</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(100%/2);">100%/2 (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(100% + -100px);">100% + -100px (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(80% - 60px);">80% - 60px (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(300px - 100%);">300px - 100% (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(-100px + 100%);">-100px + 100% (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(20% + 30%);">20% + 30% (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(80% - 30%);">80% - 30% (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(10% * 5);">10% * 5 (where 100% is 200px)</div>
-</div>
-<div style="width: 200px; background-color: white;" class="wrapper">
- <div class="width-test" style="width: -webkit-calc(5 * 10%);">5 * 10% (where 100% is 200px)</div>
-</div>
-<div class="width-test" style="width: -webkit-calc((100px));">(100px)</div>
-<div class="width-test" style="width: -webkit-calc((50px + 50px));">(50px + 50px)</div>
-<div class="width-test" style="width: -webkit-calc((50px) + 50px);">(50px) + 50px</div>
-<div class="width-test" style="width: -webkit-calc(50px + (50px));">50px + (50px)</div>
-<div class="width-test" style="width: -webkit-calc( 50px + 50px );"> 50px + 50px </div>
-<div class="width-test" style="width: -webkit-calc( 50px + 25px * 2 );"> 50px + 25px * 2 </div>
-<div class="width-test" style="width: -webkit-calc( (25px + 25px) * 2 );"> (25px + 25px) * 2 </div>
-<div class="width-test" style="width: -webkit-calc(2 * 50px);">2 * 50px</div>
-<div class="width-test" style="width: -webkit-calc(2 * 100px / 2);">2 * 100px / 2</div>
-<div class="width-test" style="width: -webkit-calc((1em - 1em) + 100px);">(1em - 1em) + 100px</div>
-<div class="width-test" style="width: -webkit-calc(50px + +50px);">50px + +50px</div>
-<div class="width-test" style="width: -webkit-calc(-50px + 150px);">-50px + 150px</div>
-<div class="width-test" style="width: -webkit-calc(-50px - -150px);">-50px - -150px</div>
-<div class="width-test" style="width: -webkit-calc((((((((100px))))))));">(((((((100px)))))))</div>
-<div class="height-test" style="height: -webkit-calc(100px);">100px</div>
-<div style="height: 50px; background-color: white;" class="wrapper">
- <div class="height-test" style="height: -webkit-calc(100% * 2);">100% * 2</div>
-</div>
-</div>
-
-<script>
-if (window.testRunner)
- testRunner.dumpAsText();
-
-zoomLevels = [1, 1.2, 2];
-var test = document.getElementById("test");
-for (var child = test.firstChild; child; child = child.nextSibling) {
- var element = child;
- if (element.className == "wrapper") {
- element = element.firstChild;
- while (element.tagName != "DIV") element = element.nextSibling;
- }
-
- var error = [];
- for (var z = 0; z < zoomLevels.length; z++) {
- var zoom = zoomLevels[z];
- document.body.style.zoom = zoom;
- var width = element.offsetWidth;
- if (width != 100)
- error.push("@zoom=" + zoom + " expected width of 100, but was " + width);
- var height = element.offsetHeight;
- if (height != 100)
- error.push("@zoom=" + zoom + " expected height of 100, but was " + height);
- }
- if (error == "") {
- element.style.backgroundColor = "green";
- element.innerHTML += " => PASS";
- } else
- element.innerHTML += " => FAIL: " + error.join("; ");
-}
-document.body.style.zoom = 1;
-</script>
</del><ins>+<!DOCTYPE HTML>
+<style>
+.width-test {
+ height: 100px;
+ width: 256px;
+ background-color: red;
+}
+
+.height-test {
+ width: 100px;
+ height: 50px;
+ background-color: red;
+}
+</style>
+
+<p>
+ This file tests legacy support for the -webkit prefixed version of calc (ie -webkit-calc()).
+</p>
+<p>
+ All boxes below should be 100px * 100px and green.
+</p>
+
+<div id="test">
+<div style="width:100px; height:100px;">control</div>
+<div class="width-test" style="width: -webkit-calc(50px + 50px);">50px + 50px</div>
+<div class="width-test" style="width: -webkit-calc(150px - 50px);">150px - 50px</div>
+<div class="width-test" style="width: -webkit-calc(50px + 50px);">50px + 50px (2 spaces around operator)</div>
+<div class="width-test" style="width: -webkit-calc(150px - 50px);">150px - 50px (2 spaces around operator)</div>
+<div class="width-test" style="width: -webkit-calc(50px*2);">50px*2</div>
+<div class="width-test" style="width: -webkit-calc(50px *2);">50px *2</div>
+<div class="width-test" style="width: -webkit-calc(50px* 2);">50px* 2</div>
+<div class="width-test" style="width: -webkit-calc(200px/2);">200px/2</div>
+<div class="width-test" style="width: -webkit-calc(200px /2);">200px /2</div>
+<div class="width-test" style="width: -webkit-calc(200px/ 2);">200px/ 2</div>
+<div class="width-test" style="width: -webkit-calc(50px*(2));">50px*(2)</div>
+<div class="width-test" style="width: -webkit-calc(50px *(2));">50px *(2)</div>
+<div class="width-test" style="width: -webkit-calc(50px* (2));">50px* (2)</div>
+<div class="width-test" style="width: -webkit-calc(50px*(1 + 1));">50px*(1 + 1)</div>
+<div class="width-test" style="width: -webkit-calc(50px*(12 - 10));">50px*(12 - 10)</div>
+<div class="width-test" style="width: -webkit-calc(50px*(10 / 5));">50px*(10 / 5)</div>
+<div class="width-test" style="width: -webkit-calc(10px* (5 * 2));">10px* (5 * 2)</div>
+<div class="width-test" style="width: -webkit-calc(50px + 10px * 5);">50px + 10px * 5 (operation order)</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(100%/2);">100%/2 (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(100% + -100px);">100% + -100px (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(80% - 60px);">80% - 60px (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(300px - 100%);">300px - 100% (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(-100px + 100%);">-100px + 100% (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(20% + 30%);">20% + 30% (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(80% - 30%);">80% - 30% (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(10% * 5);">10% * 5 (where 100% is 200px)</div>
+</div>
+<div style="width: 200px; background-color: white;" class="wrapper">
+ <div class="width-test" style="width: -webkit-calc(5 * 10%);">5 * 10% (where 100% is 200px)</div>
+</div>
+<div class="width-test" style="width: -webkit-calc((100px));">(100px)</div>
+<div class="width-test" style="width: -webkit-calc((50px + 50px));">(50px + 50px)</div>
+<div class="width-test" style="width: -webkit-calc((50px) + 50px);">(50px) + 50px</div>
+<div class="width-test" style="width: -webkit-calc(50px + (50px));">50px + (50px)</div>
+<div class="width-test" style="width: -webkit-calc( 50px + 50px );"> 50px + 50px </div>
+<div class="width-test" style="width: -webkit-calc( 50px + 25px * 2 );"> 50px + 25px * 2 </div>
+<div class="width-test" style="width: -webkit-calc( (25px + 25px) * 2 );"> (25px + 25px) * 2 </div>
+<div class="width-test" style="width: -webkit-calc(2 * 50px);">2 * 50px</div>
+<div class="width-test" style="width: -webkit-calc(2 * 100px / 2);">2 * 100px / 2</div>
+<div class="width-test" style="width: -webkit-calc((1em - 1em) + 100px);">(1em - 1em) + 100px</div>
+<div class="width-test" style="width: -webkit-calc(50px + +50px);">50px + +50px</div>
+<div class="width-test" style="width: -webkit-calc(-50px + 150px);">-50px + 150px</div>
+<div class="width-test" style="width: -webkit-calc(-50px - -150px);">-50px - -150px</div>
+<div class="width-test" style="width: -webkit-calc((((((((100px))))))));">(((((((100px)))))))</div>
+<div class="height-test" style="height: -webkit-calc(100px);">100px</div>
+<div style="height: 50px; background-color: white;" class="wrapper">
+ <div class="height-test" style="height: -webkit-calc(100% * 2);">100% * 2</div>
+</div>
+</div>
+
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+zoomLevels = [1, 1.2, 2];
+var test = document.getElementById("test");
+for (var child = test.firstChild; child; child = child.nextSibling) {
+ var element = child;
+ if (element.className == "wrapper") {
+ element = element.firstChild;
+ while (element.tagName != "DIV") element = element.nextSibling;
+ }
+
+ var error = [];
+ for (var z = 0; z < zoomLevels.length; z++) {
+ var zoom = zoomLevels[z];
+ document.body.style.zoom = zoom;
+ var width = element.offsetWidth;
+ if (width != 100)
+ error.push("@zoom=" + zoom + " expected width of 100, but was " + width);
+ var height = element.offsetHeight;
+ if (height != 100)
+ error.push("@zoom=" + zoom + " expected height of 100, but was " + height);
+ }
+ if (error == "") {
+ element.style.backgroundColor = "green";
+ element.innerHTML += " => PASS";
+ } else
+ element.innerHTML += " => FAIL: " + error.join("; ");
+}
+document.body.style.zoom = 1;
+</script>
</ins></span></pre>
</div>
</div>
</body>
</html>