Diff
Modified: trunk/LayoutTests/ChangeLog (197449 => 197450)
--- trunk/LayoutTests/ChangeLog 2016-03-02 17:12:37 UTC (rev 197449)
+++ trunk/LayoutTests/ChangeLog 2016-03-02 17:16:05 UTC (rev 197450)
@@ -1,3 +1,16 @@
+2016-03-02 Zalan Bujtas <[email protected]>
+
+ 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.
+
2016-03-02 Joanmarie Diggs <[email protected]>
[AX][GTK] Position-related tests need new baseline after r196439
Added: trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing-expected.html (0 => 197450)
--- 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)
@@ -0,0 +1,35 @@
+<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>
Added: trunk/LayoutTests/fast/table/hidpi-vertical-and-horizontal-spacing.html (0 => 197450)
--- 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)
@@ -0,0 +1,52 @@
+<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>
Modified: trunk/LayoutTests/platform/mac/fast/transforms/bounding-rect-zoom-expected.txt (197449 => 197450)
--- 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)
@@ -9,16 +9,16 @@
RenderBR {BR} at (298,13) size 1x0
RenderText {#text} at (0,17) size 174x17
text run at (0,17) width 174: "There should be no red visible."
- 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]
+ 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]
RenderText {#text} at (0,1) size 147x17
text run at (0,1) width 147: "getClientBoundingRect():"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (183,1) size 602x19 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (185,1) size 599x20 [r=0 c=1 rs=1 cs=1]
RenderText {#text} at (0,1) size 97x17
text run at (0,1) width 97: "getClientRects():"
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.txt (197449 => 197450)
--- 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)
@@ -1,32 +1,32 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-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]
+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]
RenderText {#text} at (6,1) size 52x13
text run at (6,1) width 52: "viewBox?"
- RenderTableCell {TH} at (65,1) size 113x15 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TH} at (66,1) size 112x15 [bgcolor=#DDDD99] [r=0 c=1 rs=1 cs=1]
RenderText {#text} at (0,1) size 111x13
text run at (0,1) width 111: "preserve\x{AD}Aspect\x{AD}Ratio"
- RenderTableCell {TH} at (178,1) size 141x15 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TH} at (179,1) size 141x15 [bgcolor=#DDDD99] [r=0 c=2 rs=1 cs=1]
RenderText {#text} at (53,1) size 34x13
text run at (53,1) width 34: "<img>"
- RenderTableCell {TH} at (319,1) size 141x15 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TH} at (320,1) size 142x15 [bgcolor=#DDDD99] [r=0 c=3 rs=1 cs=1]
RenderText {#text} at (47,1) size 46x13
text run at (47,1) width 46: "<object>"
- RenderTableRow {TR} at (0,16) size 461x39
- RenderTableCell {TH} at (1,87) size 64x15 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
+ RenderTableRow {TR} at (0,17) size 463x39
+ RenderTableCell {TH} at (1,88) size 65x16 [bgcolor=#DDDD99] [r=1 c=0 rs=4 cs=1]
RenderText {#text} at (0,0) size 64x14
text run at (0,1) width 64: "No viewBox"
- 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]
+ 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]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,16) size 141x39 [r=1 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,17) size 142x39 [r=1 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -34,14 +34,14 @@
RenderSVGRoot {svg} at (0,0) size 133x29
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]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,55) size 461x40
- RenderTableCell {TH} at (65,67) size 113x16 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,56) size 463x40
+ RenderTableCell {TH} at (66,68) size 112x16 [bgcolor=#DDDD99] [r=2 c=1 rs=1 cs=1]
RenderText {#text} at (42,1) size 27x13
text run at (42,1) width 27: "none"
- RenderTableCell {TD} at (178,55) size 141x40 [r=2 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (179,56) size 141x40 [r=2 c=2 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,55) size 141x40 [r=2 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,56) size 142x40 [r=2 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -51,14 +51,14 @@
RenderSVGContainer {g} at (0,0) size 133x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
RenderSVGPath {path} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="" 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"]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,95) size 461x39
- RenderTableCell {TH} at (65,107) size 113x15 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,96) size 463x39
+ RenderTableCell {TH} at (66,108) size 112x15 [bgcolor=#DDDD99] [r=3 c=1 rs=1 cs=1]
RenderText {#text} at (42,1) size 27x13
text run at (42,1) width 27: "meet"
- RenderTableCell {TD} at (178,95) size 141x39 [r=3 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (179,96) size 141x39 [r=3 c=2 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,95) size 141x39 [r=3 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,96) size 142x39 [r=3 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -68,14 +68,14 @@
RenderSVGContainer {g} at (0,0) size 133x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
RenderSVGPath {path} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="" 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"]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,134) size 461x39
- RenderTableCell {TH} at (65,146) size 113x15 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,136) size 463x39
+ RenderTableCell {TH} at (66,148) size 112x15 [bgcolor=#DDDD99] [r=4 c=1 rs=1 cs=1]
RenderText {#text} at (43,1) size 25x13
text run at (43,1) width 25: "slice"
- RenderTableCell {TD} at (178,134) size 141x39 [r=4 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (179,136) size 141x39 [r=4 c=2 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,134) size 141x39 [r=4 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,136) size 142x39 [r=4 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -85,15 +85,15 @@
RenderSVGContainer {g} at (0,0) size 133x29 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
RenderSVGPath {path} at (0,0) size 133x29 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="" 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"]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,173) size 461x40
- RenderTableCell {TH} at (1,244) size 64x16 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
+ RenderTableRow {TR} at (0,176) size 463x39
+ RenderTableCell {TH} at (1,247) size 65x16 [bgcolor=#DDDD99] [r=5 c=0 rs=4 cs=1]
RenderText {#text} at (9,0) size 46x14
text run at (9,1) width 46: "viewBox"
- 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]
+ 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]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,173) size 141x40 [r=5 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,176) size 142x39 [r=5 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -103,14 +103,14 @@
RenderSVGContainer {g} at (52,0) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
RenderSVGPath {path} at (52,0) size 22x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="" 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"]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,213) size 461x39
- RenderTableCell {TH} at (65,225) size 113x15 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,215) size 463x40
+ RenderTableCell {TH} at (66,227) size 112x16 [bgcolor=#DDDD99] [r=6 c=1 rs=1 cs=1]
RenderText {#text} at (42,1) size 27x13
text run at (42,1) width 27: "none"
- RenderTableCell {TD} at (178,213) size 141x39 [r=6 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (179,215) size 141x40 [r=6 c=2 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,213) size 141x39 [r=6 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,215) size 142x40 [r=6 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -120,14 +120,14 @@
RenderSVGContainer {g} at (0,0) size 97x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
RenderSVGPath {path} at (0,0) size 97x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="" 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"]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,252) size 461x39
- RenderTableCell {TH} at (65,264) size 113x15 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,255) size 463x39
+ RenderTableCell {TH} at (66,267) size 112x15 [bgcolor=#DDDD99] [r=7 c=1 rs=1 cs=1]
RenderText {#text} at (42,1) size 27x13
text run at (42,1) width 27: "meet"
- RenderTableCell {TD} at (178,252) size 141x39 [r=7 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (179,255) size 141x39 [r=7 c=2 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,252) size 141x39 [r=7 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,255) size 142x39 [r=7 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
@@ -137,14 +137,14 @@
RenderSVGContainer {g} at (52,0) size 22x22 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-162.36,-403.29)}]
RenderSVGPath {path} at (52,0) size 22x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#D9BB7A] [fill rule=EVEN-ODD]}] [data="" 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"]
RenderText {#text} at (0,0) size 0x0
- RenderTableRow {TR} at (0,292) size 461x39
- RenderTableCell {TH} at (65,304) size 113x15 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
+ RenderTableRow {TR} at (0,295) size 463x39
+ RenderTableCell {TH} at (66,307) size 112x15 [bgcolor=#DDDD99] [r=8 c=1 rs=1 cs=1]
RenderText {#text} at (43,1) size 25x13
text run at (43,1) width 25: "slice"
- RenderTableCell {TD} at (178,292) size 141x39 [r=8 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (179,295) size 141x39 [r=8 c=2 rs=1 cs=1]
RenderImage {IMG} at (0,0) size 140x36 [border: (1.38px dashed #800000)]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {TD} at (319,292) size 141x39 [r=8 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (320,295) size 142x39 [r=8 c=3 rs=1 cs=1]
RenderEmbeddedObject {OBJECT} at (0,0) size 140x36 [border: (1px dashed #008000)]
layer at (0,0) size 133x29
RenderView at (0,0) size 133x29
Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.txt (197449 => 197450)
--- 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)
@@ -1,29 +1,28 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-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]
+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]
RenderEmbeddedObject {object} at (97,5) size 140x70
layer at (0,0) size 139x69
RenderView at (0,0) size 139x69
@@ -43,6 +42,6 @@
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 274.79: "$Revision: 1.7 $"
RenderSVGRect {rect} at (23,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {td} at (244,119) size 243x85 [r=2 c=1 rs=1 cs=1]
+ RenderTableCell {td} at (244,95) size 243x84 [r=2 c=1 rs=1 cs=1]
RenderImage {img} at (5,5) size 140x70
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.txt (197449 => 197450)
--- 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)
@@ -1,29 +1,28 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-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]
+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]
RenderEmbeddedObject {object} at (97,5) size 140x70
layer at (0,0) size 139x69
RenderView at (0,0) size 139x69
@@ -43,6 +42,6 @@
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 274.79: "$Revision: 1.7 $"
RenderSVGRect {rect} at (23,0) size 93x69 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {td} at (244,119) size 243x85 [r=2 c=1 rs=1 cs=1]
+ RenderTableCell {td} at (244,95) size 243x84 [r=2 c=1 rs=1 cs=1]
RenderImage {img} at (5,5) size 140x70
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.txt (197449 => 197450)
--- 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)
@@ -1,28 +1,28 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-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]
+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]
RenderBlock {h1} at (5,20) size 680x27
RenderText {#text} at (102,0) size 475x26
text run at (102,0) width 475: "Both sides should have identical size after zooming"
- RenderTableRow {tr} at (0,68) size 692x25
- RenderTableCell {td} at (1,68) size 345x25 [r=1 c=0 rs=1 cs=1]
+ RenderTableRow {tr} at (0,69) size 693x25
+ RenderTableCell {td} at (1,69) size 345x25 [r=1 c=0 rs=1 cs=1]
RenderText {#text} at (146,6) size 53x13
text run at (146,6) width 53: "SVG Image"
- RenderTableCell {td} at (346,68) size 345x25 [r=1 c=1 rs=1 cs=1]
+ RenderTableCell {td} at (347,69) size 345x25 [r=1 c=1 rs=1 cs=1]
RenderText {#text} at (146,6) size 53x13
text run at (146,6) width 53: "PNG Image"
- RenderTableRow {tr} at (0,93) size 692x265
- RenderTableCell {td} at (1,93) size 345x265 [r=2 c=0 rs=1 cs=1]
+ RenderTableRow {tr} at (0,95) size 693x264
+ RenderTableCell {td} at (1,95) size 345x264 [r=2 c=0 rs=1 cs=1]
RenderEmbeddedObject {object} at (5,5) size 334x251
layer at (0,0) size 333x250
RenderView at (0,0) size 333x250
@@ -42,6 +42,6 @@
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 265.71: "$Revision: 1.7 $"
RenderSVGRect {rect} at (0,0) size 333x250 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
RenderText {#text} at (0,0) size 0x0
- RenderTableCell {td} at (346,93) size 345x265 [r=2 c=1 rs=1 cs=1]
+ RenderTableCell {td} at (347,95) size 345x264 [r=2 c=1 rs=1 cs=1]
RenderImage {img} at (5,5) size 334x251
RenderText {#text} at (0,0) size 0x0
Modified: trunk/Source/WebCore/ChangeLog (197449 => 197450)
--- 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)
@@ -1,3 +1,31 @@
+2016-03-02 Zalan Bujtas <[email protected]>
+
+ 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:
+
2016-03-02 Chris Dumez <[email protected]>
Have parseHTMLInteger() / parseHTMLNonNegativeInteger() use WTF::Optional
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (197449 => 197450)
--- 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)
@@ -406,7 +406,7 @@
-webkit-border-end-style [SkipBuilder]
-webkit-border-end-width [SkipBuilder]
-webkit-border-fit
--webkit-border-horizontal-spacing [Inherited, NameForMethods=HorizontalBorderSpacing, Converter=ComputedLength<short>]
+-webkit-border-horizontal-spacing [Inherited, NameForMethods=HorizontalBorderSpacing, Converter=ComputedLength<float>]
-webkit-border-image [Initial=initialNinePieceImage, Converter=BorderImage<CSSPropertyWebkitBorderImage>]
// -webkit-border-radius differs from border-radius only in the interpretation of
// a value consisting of two lengths: "-webkit-border-radius: l1 l2;" is equivalent
@@ -416,7 +416,7 @@
-webkit-border-start-color [SkipBuilder]
-webkit-border-start-style [SkipBuilder]
-webkit-border-start-width [SkipBuilder]
--webkit-border-vertical-spacing [Inherited, NameForMethods=VerticalBorderSpacing, Converter=ComputedLength<short>]
+-webkit-border-vertical-spacing [Inherited, NameForMethods=VerticalBorderSpacing, Converter=ComputedLength<float>]
-webkit-box-align
-webkit-box-direction [Inherited]
-webkit-box-flex
Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (197449 => 197450)
--- 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)
@@ -1286,8 +1286,8 @@
new PropertyWrapper<float>(CSSPropertyColumnGap, &RenderStyle::columnGap, &RenderStyle::setColumnGap),
new PropertyWrapper<unsigned short>(CSSPropertyColumnCount, &RenderStyle::columnCount, &RenderStyle::setColumnCount),
new PropertyWrapper<float>(CSSPropertyColumnWidth, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth),
- new PropertyWrapper<short>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
- new PropertyWrapper<short>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
+ new PropertyWrapper<float>(CSSPropertyWebkitBorderHorizontalSpacing, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing),
+ new PropertyWrapper<float>(CSSPropertyWebkitBorderVerticalSpacing, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing),
new PropertyWrapper<int>(CSSPropertyZIndex, &RenderStyle::zIndex, &RenderStyle::setZIndex),
new PropertyWrapper<short>(CSSPropertyOrphans, &RenderStyle::orphans, &RenderStyle::setOrphans),
new PropertyWrapper<short>(CSSPropertyWidows, &RenderStyle::widows, &RenderStyle::setWidows),
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (197449 => 197450)
--- 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)
@@ -63,8 +63,6 @@
, m_columnLogicalWidthChanged(false)
, m_columnRenderersValid(false)
, m_hasCellColspanThatDeterminesTableWidth(false)
- , m_hSpacing(0)
- , m_vSpacing(0)
, m_borderStart(0)
, m_borderEnd(0)
, m_columnOffsetTop(-1)
@@ -87,8 +85,6 @@
, m_columnLogicalWidthChanged(false)
, m_columnRenderersValid(false)
, m_hasCellColspanThatDeterminesTableWidth(false)
- , m_hSpacing(0)
- , m_vSpacing(0)
, m_borderStart(0)
, m_borderEnd(0)
{
@@ -928,7 +924,7 @@
unsigned columnIndex = effectiveIndexOfColumn(column);
if (columnIndex >= numEffCols())
return 0;
- return m_columnPos[columnIndex] + LayoutUnit(m_hSpacing) + borderLeft();
+ return m_columnPos[columnIndex] + m_hSpacing + borderLeft();
}
LayoutUnit RenderTable::offsetWidthForColumn(const RenderTableCol& column) const
Modified: trunk/Source/WebCore/rendering/RenderTable.h (197449 => 197450)
--- 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)
@@ -360,8 +360,8 @@
return false;
}
- short m_hSpacing;
- short m_vSpacing;
+ LayoutUnit m_hSpacing;
+ LayoutUnit m_vSpacing;
LayoutUnit m_borderStart;
LayoutUnit m_borderEnd;
mutable LayoutUnit m_columnOffsetTop;
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (197449 => 197450)
--- 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)
@@ -385,8 +385,8 @@
hash ^= rareInheritedData->lineBreak;
hash ^= WTF::FloatHash<float>::hash(inherited->specifiedLineHeight.value());
hash ^= computeFontHash(inherited->fontCascade);
- hash ^= inherited->horizontal_border_spacing;
- hash ^= inherited->vertical_border_spacing;
+ hash ^= WTF::FloatHash<float>::hash(inherited->horizontal_border_spacing);
+ hash ^= WTF::FloatHash<float>::hash(inherited->vertical_border_spacing);
hash ^= inherited_flags._box_direction;
hash ^= inherited_flags.m_rtlOrdering;
hash ^= noninherited_flags.position();
@@ -1164,10 +1164,10 @@
void RenderStyle::setColor(const Color& v) { SET_VAR(inherited, color, v); }
void RenderStyle::setVisitedLinkColor(const Color& v) { SET_VAR(inherited, visitedLinkColor, v); }
-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); }
+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); }
RoundedRect RenderStyle::getRoundedBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
{
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (197449 => 197450)
--- 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)
@@ -822,8 +822,8 @@
StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_maskBoxImage.image(); }
EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse>(inherited_flags._border_collapse); }
- short horizontalBorderSpacing() const;
- short verticalBorderSpacing() const;
+ float horizontalBorderSpacing() const;
+ float verticalBorderSpacing() const;
EEmptyCell emptyCells() const { return static_cast<EEmptyCell>(inherited_flags._empty_cells); }
ECaptionSide captionSide() const { return static_cast<ECaptionSide>(inherited_flags._caption_side); }
@@ -1423,8 +1423,8 @@
void setMaskSize(LengthSize size) { SET_VAR(rareNonInheritedData, m_mask.m_sizeLength, WTFMove(size)); }
void setBorderCollapse(EBorderCollapse collapse) { inherited_flags._border_collapse = collapse; }
- void setHorizontalBorderSpacing(short);
- void setVerticalBorderSpacing(short);
+ void setHorizontalBorderSpacing(float);
+ void setVerticalBorderSpacing(float);
void setEmptyCells(EEmptyCell v) { inherited_flags._empty_cells = v; }
void setCaptionSide(ECaptionSide v) { inherited_flags._caption_side = v; }
@@ -1897,8 +1897,8 @@
static ETextTransform initialTextTransform() { return TTNONE; }
static EVisibility initialVisibility() { return VISIBLE; }
static EWhiteSpace initialWhiteSpace() { return NORMAL; }
- static short initialHorizontalBorderSpacing() { return 0; }
- static short initialVerticalBorderSpacing() { return 0; }
+ static float initialHorizontalBorderSpacing() { return 0; }
+ static float initialVerticalBorderSpacing() { return 0; }
static ECursor initialCursor() { return CursorAuto; }
#if ENABLE(CURSOR_VISIBILITY)
static CursorVisibility initialCursorVisibility() { return CursorVisibilityAuto; }
Modified: trunk/Source/WebCore/rendering/style/StyleInheritedData.h (197449 => 197450)
--- 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)
@@ -46,8 +46,8 @@
return !(*this == o);
}
- short horizontal_border_spacing;
- short vertical_border_spacing;
+ float horizontal_border_spacing;
+ float vertical_border_spacing;
// could be packed in a short but doesn't
// make a difference currently because of padding
