<!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>[197450] trunk</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/197450">197450</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-03-02 09:16:05 -0800 (Wed, 02 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: Enable vertical/horizontal subpixel spacing for tables.
https://bugs.webkit.org/show_bug.cgi?id=154899
Reviewed by Simon Fraser.
This patch enables authors to specify device pixel values for table border spacing.
(see border-spacing)
Source/WebCore:
Test: fast/table/hidpi-vertical-and-horizontal-spacing.html
* css/CSSPropertyNames.in:
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::offsetLeftForColumn):
(WebCore::RenderTable::offsetWidthForColumn):
(WebCore::RenderTable::RenderTable): Deleted.
* rendering/RenderTable.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::horizontalBorderSpacing):
(WebCore::RenderStyle::verticalBorderSpacing):
(WebCore::RenderStyle::setHorizontalBorderSpacing):
(WebCore::RenderStyle::setVerticalBorderSpacing):
* rendering/style/RenderStyle.h:
* rendering/style/StyleInheritedData.h:
LayoutTests:
* fast/table/hidpi-vertical-and-horizontal-spacing-expected.html: Added.
* fast/table/hidpi-vertical-and-horizontal-spacing.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttransformsboundingrectzoomexpectedtxt">trunk/LayoutTests/platform/mac/fast/transforms/bounding-rect-zoom-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgzoompagezoomimgpreserveAspectRatiosupport1expectedtxt">trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgzoompagezoomsvgthroughobjectwithabsolutesize2expectedtxt">trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgzoompagezoomsvgthroughobjectwithabsolutesizeexpectedtxt">trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgzoompagezoomsvgthroughobjectwithpercentagesizeexpectedtxt">trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleInheritedDatah">trunk/Source/WebCore/rendering/style/StyleInheritedData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttablehidpiverticalandhorizontalspacingexpectedhtml">trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttablehidpiverticalandhorizontalspacinghtml">trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/ChangeLog 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-02 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Enable vertical/horizontal subpixel spacing for tables.
+ https://bugs.webkit.org/show_bug.cgi?id=154899
+
+ Reviewed by Simon Fraser.
+
+ This patch enables authors to specify device pixel values for table border spacing.
+ (see border-spacing)
+
+ * fast/table/hidpi-vertical-and-horizontal-spacing-expected.html: Added.
+ * fast/table/hidpi-vertical-and-horizontal-spacing.html: Added.
+
</ins><span class="cx"> 2016-03-02 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [AX][GTK] Position-related tests need new baseline after r196439
</span></span></pre></div>
<a id="trunkLayoutTestsfasttablehidpiverticalandhorizontalspacingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing-expected.html (0 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing-expected.html (rev 0)
+++ trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing-expected.html 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<html>
+<head>
+<title>This tests if border spacing works properly with subpixel values.</title>
+<style>
+ div {
+ width: 12px;
+ height: 10px;
+ background-color: green;
+ position: absolute;
+ }
+
+</style>
+</head>
+<body>
+<div style="left: 0.5px; top: 1.5px;"></div><div style="left: 13px; top: 1.5px;"></div><div style="left: 25.5px; top: 1.5px;"></div>
+<div style="left: 0.5px; top: 13px;"></div><div style="left: 13px; top: 13px;"></div><div style="left: 25.5px; top: 13px;"></div>
+<div style="left: 0.5px; top: 24.5px;"></div><div style="left: 13px; top: 24.5px;"></div><div style="left: 25.5px; top: 24.5px;"></div>
+
+<div style="left: 1.5px; top: 36.5px;"></div><div style="left: 15px; top: 36.5px;"></div><div style="left: 28.5px; top: 36.5px;"></div>
+<div style="left: 1.5px; top: 47px;"></div><div style="left: 15px; top: 47px;"></div><div style="left: 28.5px; top: 47px;"></div>
+<div style="left: 1.5px; top: 57.5px;"></div><div style="left: 15px; top: 57.5px;"></div><div style="left: 28.5px; top: 57.5px;"></div>
+
+<div style="left: 2.5px; top: 70.5px;"></div><div style="left: 17px; top: 70.5px;"></div><div style="left: 31.5px; top: 70.5px;"></div>
+<div style="left: 2.5px; top: 83px;"></div><div style="left: 17px; top: 83px;"></div><div style="left: 31.5px; top: 83px;"></div>
+<div style="left: 2.5px; top: 95.5px;"></div><div style="left: 17px; top: 95.5px;"></div><div style="left: 31.5px; top: 95.5px;"></div>
+
+<div style="left: 3.5px; top: 111.5px;"></div><div style="left: 19px; top: 111.5px;"></div><div style="left: 34.5px; top: 111.5px;"></div>
+<div style="left: 3.5px; top: 125px;"></div><div style="left: 19px; top: 125px;"></div><div style="left: 34.5px; top: 125px;"></div>
+<div style="left: 3.5px; top: 138.5px;"></div><div style="left: 19px; top: 138.5px;"></div><div style="left: 34.5px; top: 138.5px;"></div>
+
+<div style="left: 4.5px; top: 152.5px;"></div><div style="left: 21px; top: 152.5px;"></div><div style="left: 37.5px; top: 152.5px;"></div>
+<div style="left: 4.5px; top: 163px;"></div><div style="left: 21px; top: 163px;"></div><div style="left: 37.5px; top: 163px;"></div>
+<div style="left: 4.5px; top: 173.5px;"></div><div style="left: 21px; top: 173.5px;"></div><div style="left: 37.5px; top: 173.5px;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttablehidpiverticalandhorizontalspacinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing.html (0 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing.html (rev 0)
+++ trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing.html 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<html>
+<head>
+<title>This tests if border spacing works properly with subpixel values.</title>
+<style>
+ body {
+ margin: 0px;
+ }
+
+ table {
+ border-spacing: 0.5px;
+ }
+
+ td {
+ background-color: green;
+ height: auto;
+ width: 10px;
+ height: 10px;
+ }
+</style>
+</head>
+<body>
+<table style="border-spacing: 0.5px 1.5px;">
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+</table>
+
+<table style="border-spacing: 1.5px 0.5px;">
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+</table>
+
+<table style="border-spacing: 2.5px 2.5px">
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+</table>
+
+<table style="border-spacing: 3.5px 3.5px;">
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+</table>
+
+<table style="border-spacing: 4.5px 0.5px;">
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+ <tr><td></td><td></td><td></td></tr>
+</table>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttransformsboundingrectzoomexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/transforms/bounding-rect-zoom-expected.txt (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/transforms/bounding-rect-zoom-expected.txt 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/platform/mac/fast/transforms/bounding-rect-zoom-expected.txt 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -9,16 +9,16 @@
</span><span class="cx"> RenderBR {BR} at (298,13) size 1x0
</span><span class="cx"> RenderText {#text} at (0,17) size 174x17
</span><span class="cx"> text run at (0,17) width 174: "There should be no red visible."
</span><del>- RenderTable {TABLE} at (0,48) size 786x22
- RenderTableSection {TBODY} at (0,0) size 786x21
- RenderTableRow {TR} at (0,1) size 786x19
- RenderTableCell {TD} at (1,1) size 182x19 [r=0 c=0 rs=1 cs=1]
</del><ins>+ RenderTable {TABLE} at (0,48) size 786x23
+ RenderTableSection {TBODY} at (0,0) size 786x23
+ RenderTableRow {TR} at (0,1) size 786x20
+ RenderTableCell {TD} at (1,1) size 183x20 [r=0 c=0 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (0,1) size 147x17
</span><span class="cx"> text run at (0,1) width 147: "getClientBoundingRect():"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (183,1) size 602x19 [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (185,1) size 599x20 [r=0 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (0,1) size 97x17
</span><span class="cx"> text run at (0,1) width 97: "getClientRects():"
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgzoompagezoomimgpreserveAspectRatiosupport1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1,32 +1,32 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x342
- RenderBlock {HTML} at (0,0) size 800x343
- RenderBody {BODY} at (5,5) size 790x332
- RenderTable {TABLE} at (0,0) size 461x332
- RenderTableSection {TBODY} at (0,0) size 461x332
- RenderTableRow {TR} at (0,1) size 461x15
- RenderTableCell {TH} at (1,1) size 64x15 [bgcolor=#DDDD99] [r=0 c=0 rs=1 cs=1]
</del><ins>+layer at (0,0) size 800x346
+ RenderBlock {HTML} at (0,0) size 800x347
+ RenderBody {BODY} at (5,5) size 790x336
+ RenderTable {TABLE} at (0,0) size 463x336
+ RenderTableSection {TBODY} at (0,0) size 463x336
+ RenderTableRow {TR} at (0,1) size 463x15
+ RenderTableCell {TH} at (1,1) size 65x15 [bgcolor=#DDDD99] [r=0 c=0 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (6,1) size 52x13
</span><span class="cx"> text run at (6,1) width 52: "viewBox?"
</span><del>- RenderTableCell {TH} at (65,1) size 113x15 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {TH} at (66,1) size 112x15 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (0,1) size 111x13
</span><span class="cx"> text run at (0,1) width 111: "preserve\x{AD}Aspect\x{AD}Ratio"
</span><del>- RenderTableCell {TH} at (178,1) size 141x15 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TH} at (179,1) size 141x15 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (53,1) size 34x13
</span><span class="cx"> text run at (53,1) width 34: "<img>"
</span><del>- RenderTableCell {TH} at (319,1) size 141x15 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TH} at (320,1) size 142x15 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (47,1) size 46x13
</span><span class="cx"> text run at (47,1) width 46: "<object>"
</span><del>- RenderTableRow {TR} at (0,16) size 461x39
- RenderTableCell {TH} at (1,87) size 64x15 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,17) size 463x39
+ RenderTableCell {TH} at (1,88) size 65x16 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
</ins><span class="cx"> RenderText {#text} at (0,0) size 64x14
</span><span class="cx"> text run at (0,1) width 64: "No viewBox"
</span><del>- RenderTableCell {TH} at (65,34) size 113x3 [bgcolor=#DDDD99] [r=1 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (178,16) size 141x39 [r=1 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TH} at (66,35) size 112x2 [bgcolor=#DDDD99] [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (179,17) size 141x39 [r=1 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,16) size 141x39 [r=1 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,17) size 142x39 [r=1 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -34,14 +34,14 @@
</span><span class="cx"> RenderSVGRoot {svg} at (0,0) size 133x29
</span><span class="cx"> RenderSVGEllipse {circle} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [cx=110.00] [cy=110.00] [r=110.00]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,55) size 461x40
- RenderTableCell {TH} at (65,67) size 113x16 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,56) size 463x40
+ RenderTableCell {TH} at (66,68) size 112x16 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (42,1) size 27x13
</span><span class="cx"> text run at (42,1) width 27: "none"
</span><del>- RenderTableCell {TD} at (178,55) size 141x40 [r=2 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (179,56) size 141x40 [r=2 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,55) size 141x40 [r=2 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,56) size 142x40 [r=2 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -51,14 +51,14 @@
</span><span class="cx"> RenderSVGContainer {g} at (0,0) size 133x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
</span><span class="cx"> RenderSVGPath {path} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,95) size 461x39
- RenderTableCell {TH} at (65,107) size 113x15 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,96) size 463x39
+ RenderTableCell {TH} at (66,108) size 112x15 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (42,1) size 27x13
</span><span class="cx"> text run at (42,1) width 27: "meet"
</span><del>- RenderTableCell {TD} at (178,95) size 141x39 [r=3 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (179,96) size 141x39 [r=3 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,95) size 141x39 [r=3 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,96) size 142x39 [r=3 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -68,14 +68,14 @@
</span><span class="cx"> RenderSVGContainer {g} at (0,0) size 133x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
</span><span class="cx"> RenderSVGPath {path} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,134) size 461x39
- RenderTableCell {TH} at (65,146) size 113x15 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,136) size 463x39
+ RenderTableCell {TH} at (66,148) size 112x15 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (43,1) size 25x13
</span><span class="cx"> text run at (43,1) width 25: "slice"
</span><del>- RenderTableCell {TD} at (178,134) size 141x39 [r=4 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (179,136) size 141x39 [r=4 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,134) size 141x39 [r=4 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,136) size 142x39 [r=4 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -85,15 +85,15 @@
</span><span class="cx"> RenderSVGContainer {g} at (0,0) size 133x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
</span><span class="cx"> RenderSVGPath {path} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,173) size 461x40
- RenderTableCell {TH} at (1,244) size 64x16 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,176) size 463x39
+ RenderTableCell {TH} at (1,247) size 65x16 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
</ins><span class="cx"> RenderText {#text} at (9,0) size 46x14
</span><span class="cx"> text run at (9,1) width 46: "viewBox"
</span><del>- RenderTableCell {TH} at (65,192) size 113x2 [bgcolor=#DDDD99] [r=5 c=1 rs=1 cs=1]
- RenderTableCell {TD} at (178,173) size 141x40 [r=5 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TH} at (66,194) size 112x2 [bgcolor=#DDDD99] [r=5 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (179,176) size 141x39 [r=5 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,173) size 141x40 [r=5 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,176) size 142x39 [r=5 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -103,14 +103,14 @@
</span><span class="cx"> RenderSVGContainer {g} at (52,0) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
</span><span class="cx"> RenderSVGPath {path} at (52,0) size 22x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,213) size 461x39
- RenderTableCell {TH} at (65,225) size 113x15 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,215) size 463x40
+ RenderTableCell {TH} at (66,227) size 112x16 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (42,1) size 27x13
</span><span class="cx"> text run at (42,1) width 27: "none"
</span><del>- RenderTableCell {TD} at (178,213) size 141x39 [r=6 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (179,215) size 141x40 [r=6 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,213) size 141x39 [r=6 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,215) size 142x40 [r=6 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -120,14 +120,14 @@
</span><span class="cx"> RenderSVGContainer {g} at (0,0) size 97x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
</span><span class="cx"> RenderSVGPath {path} at (0,0) size 97x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,252) size 461x39
- RenderTableCell {TH} at (65,264) size 113x15 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,255) size 463x39
+ RenderTableCell {TH} at (66,267) size 112x15 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (42,1) size 27x13
</span><span class="cx"> text run at (42,1) width 27: "meet"
</span><del>- RenderTableCell {TD} at (178,252) size 141x39 [r=7 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (179,255) size 141x39 [r=7 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,252) size 141x39 [r=7 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,255) size 142x39 [r=7 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span><span class="lines">@@ -137,14 +137,14 @@
</span><span class="cx"> RenderSVGContainer {g} at (52,0) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
</span><span class="cx"> RenderSVGPath {path} at (52,0) size 22x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="M 525.714 585.219 C 525.714 685.419 444.486 766.648 344.286 766.648 C 244.085 766.648 162.857 685.42 162.857 585.219 C 162.857 485.019 244.085 403.791 344.286 403.791 C 444.486 403.791 525.714 485.019 525.714 585.219 Z"]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableRow {TR} at (0,292) size 461x39
- RenderTableCell {TH} at (65,304) size 113x15 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
</del><ins>+ RenderTableRow {TR} at (0,295) size 463x39
+ RenderTableCell {TH} at (66,307) size 112x15 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (43,1) size 25x13
</span><span class="cx"> text run at (43,1) width 25: "slice"
</span><del>- RenderTableCell {TD} at (178,292) size 141x39 [r=8 c=2 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (179,295) size 141x39 [r=8 c=2 rs=1 cs=1]
</ins><span class="cx"> RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {TD} at (319,292) size 141x39 [r=8 c=3 rs=1 cs=1]
</del><ins>+ RenderTableCell {TD} at (320,295) size 142x39 [r=8 c=3 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
</span><span class="cx"> layer at (0,0) size 133x29
</span><span class="cx"> RenderView at (0,0) size 133x29
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgzoompagezoomsvgthroughobjectwithabsolutesize2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1,29 +1,28 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x229
- RenderBlock {html} at (0,0) size 800x229
- RenderBody {body} at (5,5) size 790x219
- RenderTable {table} at (143,0) size 503x218
- RenderTableSection (anonymous) at (0,0) size 502x218
- RenderTableRow {tr} at (0,0) size 502x218
- RenderTableCell {td} at (0,0) size 502x218 [r=0 c=0 rs=1 cs=3]
- RenderTable {table} at (6,6) size 489x205
- RenderTableSection (anonymous) at (0,0) size 488x205
- RenderTableRow {tr} at (0,1) size 488x93
- RenderTableCell {td} at (1,1) size 486x93 [r=0 c=0 rs=1 cs=2]
- RenderBlock {h1} at (5,20) size 475x53
- RenderText {#text} at (42,0) size 390x52
- text run at (42,0) width 390: "Both sides should have identical size after"
- text run at (197,26) width 80: "zooming"
- RenderTableRow {tr} at (0,94) size 488x25
- RenderTableCell {td} at (1,94) size 243x25 [r=1 c=0 rs=1 cs=1]
- RenderText {#text} at (95,6) size 53x13
- text run at (95,6) width 53: "SVG Image"
- RenderTableCell {td} at (244,94) size 243x25 [r=1 c=1 rs=1 cs=1]
- RenderText {#text} at (95,6) size 53x13
- text run at (95,6) width 53: "PNG Image"
- RenderTableRow {tr} at (0,119) size 488x85
- RenderTableCell {td} at (1,119) size 243x85 [r=2 c=0 rs=1 cs=1]
</del><ins>+layer at (0,0) size 800x205
+ RenderBlock {html} at (0,0) size 800x205
+ RenderBody {body} at (5,5) size 790x194
+ RenderTable {table} at (143,0) size 503x194
+ RenderTableSection (anonymous) at (0,0) size 503x194
+ RenderTableRow {tr} at (0,0) size 503x194
+ RenderTableCell {td} at (0,0) size 503x194 [r=0 c=0 rs=1 cs=3]
+ RenderTable {table} at (6,6) size 490x181
+ RenderTableSection (anonymous) at (0,0) size 489x180
+ RenderTableRow {tr} at (0,1) size 489x68
+ RenderTableCell {td} at (1,1) size 486x68 [r=0 c=0 rs=1 cs=2]
+ RenderBlock {h1} at (5,20) size 475x27
+ RenderText {#text} at (0,0) size 475x26
+ text run at (0,0) width 475: "Both sides should have identical size after zooming"
+ RenderTableRow {tr} at (0,69) size 489x25
+ RenderTableCell {td} at (1,69) size 243x25 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (94,6) size 54x13
+ text run at (94,6) width 54: "SVG Image"
+ RenderTableCell {td} at (244,69) size 243x25 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (94,6) size 54x13
+ text run at (94,6) width 54: "PNG Image"
+ RenderTableRow {tr} at (0,95) size 489x84
+ RenderTableCell {td} at (1,95) size 243x84 [r=2 c=0 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {object} at (97,5) size 140x70
</span><span class="cx"> layer at (0,0) size 139x69
</span><span class="cx"> RenderView at (0,0) size 139x69
</span><span class="lines">@@ -43,6 +42,6 @@
</span><span class="cx"> chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 274.79: "$Revision: 1.7 $"
</span><span class="cx"> RenderSVGRect {rect} at (23,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {td} at (244,119) size 243x85 [r=2 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {td} at (244,95) size 243x84 [r=2 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderImage {img} at (5,5) size 140x70
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgzoompagezoomsvgthroughobjectwithabsolutesizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1,29 +1,28 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x229
- RenderBlock {html} at (0,0) size 800x229
- RenderBody {body} at (5,5) size 790x219
- RenderTable {table} at (143,0) size 503x218
- RenderTableSection (anonymous) at (0,0) size 502x218
- RenderTableRow {tr} at (0,0) size 502x218
- RenderTableCell {td} at (0,0) size 502x218 [r=0 c=0 rs=1 cs=3]
- RenderTable {table} at (6,6) size 489x205
- RenderTableSection (anonymous) at (0,0) size 488x205
- RenderTableRow {tr} at (0,1) size 488x93
- RenderTableCell {td} at (1,1) size 486x93 [r=0 c=0 rs=1 cs=2]
- RenderBlock {h1} at (5,20) size 475x53
- RenderText {#text} at (42,0) size 390x52
- text run at (42,0) width 390: "Both sides should have identical size after"
- text run at (197,26) width 80: "zooming"
- RenderTableRow {tr} at (0,94) size 488x25
- RenderTableCell {td} at (1,94) size 243x25 [r=1 c=0 rs=1 cs=1]
- RenderText {#text} at (95,6) size 53x13
- text run at (95,6) width 53: "SVG Image"
- RenderTableCell {td} at (244,94) size 243x25 [r=1 c=1 rs=1 cs=1]
- RenderText {#text} at (95,6) size 53x13
- text run at (95,6) width 53: "PNG Image"
- RenderTableRow {tr} at (0,119) size 488x85
- RenderTableCell {td} at (1,119) size 243x85 [r=2 c=0 rs=1 cs=1]
</del><ins>+layer at (0,0) size 800x205
+ RenderBlock {html} at (0,0) size 800x205
+ RenderBody {body} at (5,5) size 790x194
+ RenderTable {table} at (143,0) size 503x194
+ RenderTableSection (anonymous) at (0,0) size 503x194
+ RenderTableRow {tr} at (0,0) size 503x194
+ RenderTableCell {td} at (0,0) size 503x194 [r=0 c=0 rs=1 cs=3]
+ RenderTable {table} at (6,6) size 490x181
+ RenderTableSection (anonymous) at (0,0) size 489x180
+ RenderTableRow {tr} at (0,1) size 489x68
+ RenderTableCell {td} at (1,1) size 486x68 [r=0 c=0 rs=1 cs=2]
+ RenderBlock {h1} at (5,20) size 475x27
+ RenderText {#text} at (0,0) size 475x26
+ text run at (0,0) width 475: "Both sides should have identical size after zooming"
+ RenderTableRow {tr} at (0,69) size 489x25
+ RenderTableCell {td} at (1,69) size 243x25 [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (94,6) size 54x13
+ text run at (94,6) width 54: "SVG Image"
+ RenderTableCell {td} at (244,69) size 243x25 [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (94,6) size 54x13
+ text run at (94,6) width 54: "PNG Image"
+ RenderTableRow {tr} at (0,95) size 489x84
+ RenderTableCell {td} at (1,95) size 243x84 [r=2 c=0 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {object} at (97,5) size 140x70
</span><span class="cx"> layer at (0,0) size 139x69
</span><span class="cx"> RenderView at (0,0) size 139x69
</span><span class="lines">@@ -43,6 +42,6 @@
</span><span class="cx"> chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 274.79: "$Revision: 1.7 $"
</span><span class="cx"> RenderSVGRect {rect} at (23,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {td} at (244,119) size 243x85 [r=2 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {td} at (244,95) size 243x84 [r=2 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderImage {img} at (5,5) size 140x70
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgzoompagezoomsvgthroughobjectwithpercentagesizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1,28 +1,28 @@
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span><del>-layer at (0,0) size 800x383
- RenderBlock {html} at (0,0) size 800x383
- RenderBody {body} at (5,5) size 790x373
- RenderTable {table} at (41,0) size 707x372
- RenderTableSection (anonymous) at (0,0) size 706x372
- RenderTableRow {tr} at (0,0) size 706x372
- RenderTableCell {td} at (0,0) size 706x372 [r=0 c=0 rs=1 cs=3]
- RenderTable {table} at (6,6) size 693x359
- RenderTableSection (anonymous) at (0,0) size 692x359
- RenderTableRow {tr} at (0,1) size 692x67
- RenderTableCell {td} at (1,1) size 690x67 [r=0 c=0 rs=1 cs=2]
</del><ins>+layer at (0,0) size 800x385
+ RenderBlock {html} at (0,0) size 800x385
+ RenderBody {body} at (5,5) size 790x374
+ RenderTable {table} at (41,0) size 707x374
+ RenderTableSection (anonymous) at (0,0) size 707x374
+ RenderTableRow {tr} at (0,0) size 707x374
+ RenderTableCell {td} at (0,0) size 707x374 [r=0 c=0 rs=1 cs=3]
+ RenderTable {table} at (6,6) size 694x361
+ RenderTableSection (anonymous) at (0,0) size 693x360
+ RenderTableRow {tr} at (0,1) size 693x68
+ RenderTableCell {td} at (1,1) size 691x68 [r=0 c=0 rs=1 cs=2]
</ins><span class="cx"> RenderBlock {h1} at (5,20) size 680x27
</span><span class="cx"> RenderText {#text} at (102,0) size 475x26
</span><span class="cx"> text run at (102,0) width 475: "Both sides should have identical size after zooming"
</span><del>- RenderTableRow {tr} at (0,68) size 692x25
- RenderTableCell {td} at (1,68) size 345x25 [r=1 c=0 rs=1 cs=1]
</del><ins>+ RenderTableRow {tr} at (0,69) size 693x25
+ RenderTableCell {td} at (1,69) size 345x25 [r=1 c=0 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (146,6) size 53x13
</span><span class="cx"> text run at (146,6) width 53: "SVG Image"
</span><del>- RenderTableCell {td} at (346,68) size 345x25 [r=1 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {td} at (347,69) size 345x25 [r=1 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderText {#text} at (146,6) size 53x13
</span><span class="cx"> text run at (146,6) width 53: "PNG Image"
</span><del>- RenderTableRow {tr} at (0,93) size 692x265
- RenderTableCell {td} at (1,93) size 345x265 [r=2 c=0 rs=1 cs=1]
</del><ins>+ RenderTableRow {tr} at (0,95) size 693x264
+ RenderTableCell {td} at (1,95) size 345x264 [r=2 c=0 rs=1 cs=1]
</ins><span class="cx"> RenderEmbeddedObject {object} at (5,5) size 334x251
</span><span class="cx"> layer at (0,0) size 333x250
</span><span class="cx"> RenderView at (0,0) size 333x250
</span><span class="lines">@@ -42,6 +42,6 @@
</span><span class="cx"> chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 265.71: "$Revision: 1.7 $"
</span><span class="cx"> RenderSVGRect {rect} at (0,0) size 333x250 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><del>- RenderTableCell {td} at (346,93) size 345x265 [r=2 c=1 rs=1 cs=1]
</del><ins>+ RenderTableCell {td} at (347,95) size 345x264 [r=2 c=1 rs=1 cs=1]
</ins><span class="cx"> RenderImage {img} at (5,5) size 334x251
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/ChangeLog 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-03-02 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Enable vertical/horizontal subpixel spacing for tables.
+ https://bugs.webkit.org/show_bug.cgi?id=154899
+
+ Reviewed by Simon Fraser.
+
+ This patch enables authors to specify device pixel values for table border spacing.
+ (see border-spacing)
+
+ Test: fast/table/hidpi-vertical-and-horizontal-spacing.html
+
+ * css/CSSPropertyNames.in:
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::offsetLeftForColumn):
+ (WebCore::RenderTable::offsetWidthForColumn):
+ (WebCore::RenderTable::RenderTable): Deleted.
+ * rendering/RenderTable.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::horizontalBorderSpacing):
+ (WebCore::RenderStyle::verticalBorderSpacing):
+ (WebCore::RenderStyle::setHorizontalBorderSpacing):
+ (WebCore::RenderStyle::setVerticalBorderSpacing):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleInheritedData.h:
+
</ins><span class="cx"> 2016-03-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Have parseHTMLInteger() / parseHTMLNonNegativeInteger() use WTF::Optional
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> -webkit-border-end-style [SkipBuilder]
</span><span class="cx"> -webkit-border-end-width [SkipBuilder]
</span><span class="cx"> -webkit-border-fit
</span><del>--webkit-border-horizontal-spacing [Inherited, NameForMethods=HorizontalBorderSpacing, Converter=ComputedLength<short>]
</del><ins>+-webkit-border-horizontal-spacing [Inherited, NameForMethods=HorizontalBorderSpacing, Converter=ComputedLength<float>]
</ins><span class="cx"> -webkit-border-image [Initial=initialNinePieceImage, Converter=BorderImage<CSSPropertyWebkitBorderImage>]
</span><span class="cx"> // -webkit-border-radius differs from border-radius only in the interpretation of
</span><span class="cx"> // a value consisting of two lengths: "-webkit-border-radius: l1 l2;" is equivalent
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> -webkit-border-start-color [SkipBuilder]
</span><span class="cx"> -webkit-border-start-style [SkipBuilder]
</span><span class="cx"> -webkit-border-start-width [SkipBuilder]
</span><del>--webkit-border-vertical-spacing [Inherited, NameForMethods=VerticalBorderSpacing, Converter=ComputedLength<short>]
</del><ins>+-webkit-border-vertical-spacing [Inherited, NameForMethods=VerticalBorderSpacing, Converter=ComputedLength<float>]
</ins><span class="cx"> -webkit-box-align
</span><span class="cx"> -webkit-box-direction [Inherited]
</span><span class="cx"> -webkit-box-flex
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -1286,8 +1286,8 @@
</span><span class="cx"> new PropertyWrapper<float>(CSSPropertyColumnGap, &RenderStyle::columnGap, &RenderStyle::setColumnGap),
</span><span class="cx"> new PropertyWrapper<unsigned short>(CSSPropertyColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount),
</span><span class="cx"> new PropertyWrapper<float>(CSSPropertyColumnWidth, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth),
</span><del>- new PropertyWrapper<short>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
- new PropertyWrapper<short>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
</del><ins>+ new PropertyWrapper<float>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
+ new PropertyWrapper<float>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
</ins><span class="cx"> new PropertyWrapper<int>(CSSPropertyZIndex, &RenderStyle::zIndex, &RenderStyle::setZIndex),
</span><span class="cx"> new PropertyWrapper<short>(CSSPropertyOrphans, &RenderStyle::orphans, &RenderStyle::setOrphans),
</span><span class="cx"> new PropertyWrapper<short>(CSSPropertyWidows, &RenderStyle::widows, &RenderStyle::setWidows),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -63,8 +63,6 @@
</span><span class="cx"> , m_columnLogicalWidthChanged(false)
</span><span class="cx"> , m_columnRenderersValid(false)
</span><span class="cx"> , m_hasCellColspanThatDeterminesTableWidth(false)
</span><del>- , m_hSpacing(0)
- , m_vSpacing(0)
</del><span class="cx"> , m_borderStart(0)
</span><span class="cx"> , m_borderEnd(0)
</span><span class="cx"> , m_columnOffsetTop(-1)
</span><span class="lines">@@ -87,8 +85,6 @@
</span><span class="cx"> , m_columnLogicalWidthChanged(false)
</span><span class="cx"> , m_columnRenderersValid(false)
</span><span class="cx"> , m_hasCellColspanThatDeterminesTableWidth(false)
</span><del>- , m_hSpacing(0)
- , m_vSpacing(0)
</del><span class="cx"> , m_borderStart(0)
</span><span class="cx"> , m_borderEnd(0)
</span><span class="cx"> {
</span><span class="lines">@@ -928,7 +924,7 @@
</span><span class="cx"> unsigned columnIndex = effectiveIndexOfColumn(column);
</span><span class="cx"> if (columnIndex >= numEffCols())
</span><span class="cx"> return 0;
</span><del>- return m_columnPos[columnIndex] + LayoutUnit(m_hSpacing) + borderLeft();
</del><ins>+ return m_columnPos[columnIndex] + m_hSpacing + borderLeft();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTable::offsetWidthForColumn(const RenderTableCol& column) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -360,8 +360,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- short m_hSpacing;
- short m_vSpacing;
</del><ins>+ LayoutUnit m_hSpacing;
+ LayoutUnit m_vSpacing;
</ins><span class="cx"> LayoutUnit m_borderStart;
</span><span class="cx"> LayoutUnit m_borderEnd;
</span><span class="cx"> mutable LayoutUnit m_columnOffsetTop;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -385,8 +385,8 @@
</span><span class="cx"> hash ^= rareInheritedData->lineBreak;
</span><span class="cx"> hash ^= WTF::FloatHash<float>::hash(inherited->specifiedLineHeight.value());
</span><span class="cx"> hash ^= computeFontHash(inherited->fontCascade);
</span><del>- hash ^= inherited->horizontal_border_spacing;
- hash ^= inherited->vertical_border_spacing;
</del><ins>+ hash ^= WTF::FloatHash<float>::hash(inherited->horizontal_border_spacing);
+ hash ^= WTF::FloatHash<float>::hash(inherited->vertical_border_spacing);
</ins><span class="cx"> hash ^= inherited_flags._box_direction;
</span><span class="cx"> hash ^= inherited_flags.m_rtlOrdering;
</span><span class="cx"> hash ^= noninherited_flags.position();
</span><span class="lines">@@ -1164,10 +1164,10 @@
</span><span class="cx"> void RenderStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); }
</span><span class="cx"> void RenderStyle::setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v); }
</span><span class="cx">
</span><del>-short RenderStyle::horizontalBorderSpacing() const { return inherited->horizontal_border_spacing; }
-short RenderStyle::verticalBorderSpacing() const { return inherited->vertical_border_spacing; }
-void RenderStyle::setHorizontalBorderSpacing(short v) { SET_VAR(inherited, horizontal_border_spacing, v); }
-void RenderStyle::setVerticalBorderSpacing(short v) { SET_VAR(inherited, vertical_border_spacing, v); }
</del><ins>+float RenderStyle::horizontalBorderSpacing() const { return inherited->horizontal_border_spacing; }
+float RenderStyle::verticalBorderSpacing() const { return inherited->vertical_border_spacing; }
+void RenderStyle::setHorizontalBorderSpacing(float v) { SET_VAR(inherited, horizontal_border_spacing, v); }
+void RenderStyle::setVerticalBorderSpacing(float v) { SET_VAR(inherited, vertical_border_spacing, v); }
</ins><span class="cx">
</span><span class="cx"> RoundedRect RenderStyle::getRoundedBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -822,8 +822,8 @@
</span><span class="cx"> StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_maskBoxImage.image(); }
</span><span class="cx">
</span><span class="cx"> EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse>(inherited_flags._border_collapse); }
</span><del>- short horizontalBorderSpacing() const;
- short verticalBorderSpacing() const;
</del><ins>+ float horizontalBorderSpacing() const;
+ float verticalBorderSpacing() const;
</ins><span class="cx"> EEmptyCell emptyCells() const { return static_cast<EEmptyCell>(inherited_flags._empty_cells); }
</span><span class="cx"> ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_flags._caption_side); }
</span><span class="cx">
</span><span class="lines">@@ -1423,8 +1423,8 @@
</span><span class="cx"> void setMaskSize(LengthSize size) { SET_VAR(rareNonInheritedData, m_mask.m_sizeLength, WTFMove(size)); }
</span><span class="cx">
</span><span class="cx"> void setBorderCollapse(EBorderCollapse collapse) { inherited_flags._border_collapse = collapse; }
</span><del>- void setHorizontalBorderSpacing(short);
- void setVerticalBorderSpacing(short);
</del><ins>+ void setHorizontalBorderSpacing(float);
+ void setVerticalBorderSpacing(float);
</ins><span class="cx"> void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
</span><span class="cx"> void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
</span><span class="cx">
</span><span class="lines">@@ -1897,8 +1897,8 @@
</span><span class="cx"> static ETextTransform initialTextTransform() { return TTNONE; }
</span><span class="cx"> static EVisibility initialVisibility() { return VISIBLE; }
</span><span class="cx"> static EWhiteSpace initialWhiteSpace() { return NORMAL; }
</span><del>- static short initialHorizontalBorderSpacing() { return 0; }
- static short initialVerticalBorderSpacing() { return 0; }
</del><ins>+ static float initialHorizontalBorderSpacing() { return 0; }
+ static float initialVerticalBorderSpacing() { return 0; }
</ins><span class="cx"> static ECursor initialCursor() { return CursorAuto; }
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> static CursorVisibility initialCursorVisibility() { return CursorVisibilityAuto; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleInheritedData.h (197449 => 197450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleInheritedData.h 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/Source/WebCore/rendering/style/StyleInheritedData.h 2016-03-02 17:16:05 UTC (rev 197450)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> return !(*this == o);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- short horizontal_border_spacing;
- short vertical_border_spacing;
</del><ins>+ float horizontal_border_spacing;
+ float vertical_border_spacing;
</ins><span class="cx">
</span><span class="cx"> // could be packed in a short but doesn't
</span><span class="cx"> // make a difference currently because of padding
</span></span></pre>
</div>
</div>
</body>
</html>