Diff
Modified: trunk/LayoutTests/ChangeLog (192969 => 192970)
--- trunk/LayoutTests/ChangeLog 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/ChangeLog 2015-12-02 22:52:54 UTC (rev 192970)
@@ -1,3 +1,17 @@
+2015-12-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r192955.
+ https://bugs.webkit.org/show_bug.cgi?id=151776
+
+ A large number of the tests added with this change are failing
+ on Windows (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "[css border] border-image doesn't honor border-style"
+ https://bugs.webkit.org/show_bug.cgi?id=99922
+ http://trac.webkit.org/changeset/192955
+
2015-12-02 Yoav Weiss <y...@yoav.ws>
Fix preloader issue with srcdoc documents.
Modified: trunk/LayoutTests/animations/cross-fade-border-image-source.html (192969 => 192970)
--- trunk/LayoutTests/animations/cross-fade-border-image-source.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/animations/cross-fade-border-image-source.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,7 +8,6 @@
height: 100px;
width: 100px;
background-color: green;
- border-style: solid;
-webkit-animation: anim 1s linear infinite;
border-image: url() 5 5 5 5 /20px stretch stretch;
}
@@ -19,7 +18,6 @@
height: 100px;
width: 100px;
background-color: green;
- border-style: solid;
-webkit-animation: animShorthand 1s linear infinite;
}
#boxStatic {
@@ -29,7 +27,6 @@
height: 100px;
width: 100px;
background-color: green;
- border-style: solid;
border-image: -webkit-cross-fade(url(resources/stripes-100.png), url(resources/green-100.png), 50%) 5 5 5 5 /20px stretch stretch;
}
@-webkit-keyframes anim {
Modified: trunk/LayoutTests/fast/borders/border-image-01.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-01.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-01.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
height: 75px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-border-radius.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-border-radius.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-border-radius.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,7 +8,6 @@
margin: 10px;
display: inline-block;
-webkit-border-radius: 10px;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-fill-no-intrinsic-size.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-fill-no-intrinsic-size.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-fill-no-intrinsic-size.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -58,5 +58,5 @@
<div class="box no-border border-image-no-intrinsic"></div>
<div class="box border-20"></div>
<div class="box no-border border-image-no-intrinsic-slice"></div>
- <div class="box no-border border-image-no-intrinsic"></div>
+ <div class="box border-20 border-image-no-intrinsic-slice"></div>
</body>
Modified: trunk/LayoutTests/fast/borders/border-image-longhand.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-longhand.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-longhand.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -10,7 +10,6 @@
border-image-source: url("resources/border-image.png");
border-image-slice: 21 30 30 21 fill;
border-image-width: 1;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-massive-scale.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-massive-scale.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-massive-scale.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
height: 75px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-omit-right-slice.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-omit-right-slice.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-omit-right-slice.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -17,7 +17,6 @@
-webkit-border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
border-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAUFJREFUGNMBNgHJ/gPcUkznH/n8lGR5YkMIIMDXFhgoVNnfqeM5dbre55MDGkF/U6tMmi12K6QBpfkB4H3NyPZAiyjm6kp//uPtAA4pZhHPJ8xbkSop4chy5ecPsVSqkC03ozAmk77SOwOHR+fDXmoF5UUJU9YsnVfehg/iLC7p3etC3w3LEA8D0eGf/DZozPPzoSSX6gTVlQ/L4Ylt4SrFiOgqNDQPAPvl/JQuLv33xK66eAgGCn+OAIUu1Fugs2hsZNIB6gPhrZ80q7sXNUEuIE7EGNC5Dc2ExcIe9tseb4r7usAAralzLgdas9URX21wGUqSgDnf/jMydhxMIEx4w9TtAfCQPsbi30EEVABXFJYnOZgfbQK3CLkwg6PDGG27KwOYF7jD+sIHhdwoUyILAF5sv/6bI6S56fbULB5OToUjFpS7UHGrVgAAAABJRU5ErkJggg==) 1 2 3;
border-width: 100px;
- border-style: solid;
}
body > div > div {
Modified: trunk/LayoutTests/fast/borders/border-image-outset-in-shorthand.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-outset-in-shorthand.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-outset-in-shorthand.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,7 +8,6 @@
display: inline-block;
-webkit-border-image: url("resources/border-image.png") 21 30 30 21 / 1 / 21px 30px 30px 21px stretch;
margin:30px;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-outset-split-inline-expected.txt (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-outset-split-inline-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-outset-split-inline-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,7 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x350
- RenderInline {SPAN} at (0,0) size 37x230 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderInline {SPAN} at (0,0) size 37x230 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (46,85) size 7x29
text run at (46,85) width 7: " "
RenderBR {BR} at (52,108) size 1x0
Modified: trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,7 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 350x584
- RenderInline {SPAN} at (0,0) size 230x37 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderInline {SPAN} at (0,0) size 230x37 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (85,46) size 29x7
text run at (85,46) width 7: " "
RenderBR {BR} at (108,52) size 0x1
Modified: trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,7 +4,6 @@
span {
border-width: 21px 30px 30px 21px;
-webkit-border-image: url("resources/border-image.png") 21 30 30 21 / 1 / 21px 30px 30px 21px repeat;
- border-style: solid;
}
</style>
</head>
Modified: trunk/LayoutTests/fast/borders/border-image-outset-split-inline.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-outset-split-inline.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-outset-split-inline.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,7 +4,6 @@
span {
border-width: 21px 30px 30px 21px;
-webkit-border-image: url("resources/border-image.png") 21 30 30 21 / 1 / 21px 30px 30px 21px repeat;
- border-style: solid;
}
</style>
</head>
Modified: trunk/LayoutTests/fast/borders/border-image-outset.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-outset.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-outset.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -11,7 +11,6 @@
border-image-width: 1;
border-image-outset: 1;
margin:30px;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-repeat.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-repeat.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-repeat.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
height: 75px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-rotate-transform.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-rotate-transform.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-rotate-transform.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
height: 75px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-scale-transform.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-scale-transform.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-scale-transform.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
height: 75px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-scaled.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-scaled.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-scaled.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -6,7 +6,6 @@
height: 150px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-scrambled.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-scrambled.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-scrambled.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
height: 75px;
margin: 10px;
display: inline-block;
- border-style: solid;
}
div.rr {
Deleted: trunk/LayoutTests/fast/borders/border-image-should-not-display-expected.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-should-not-display-expected.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-should-not-display-expected.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -1,15 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<style>
-div {
- background-color: green;
- width: 100px;
- height: 100px;
-}
-</style>
-</head>
-<body>
-<div></div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/borders/border-image-should-not-display.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-should-not-display.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-should-not-display.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -1,21 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<style>
-div {
- background-color: green;
- width: 100px;
- height: 100px;
- /* If border style is not set (default is None), border-image
- should be ignored.
- border-style: solid;
- */
- border-image: url(resources/red.png) 30 round;
- border-width: 100px;
-}
-</style>
-</head>
-<body>
-<div></div>
-</body>
-</html>
Modified: trunk/LayoutTests/fast/borders/border-image-side-reduction.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-side-reduction.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-side-reduction.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -10,7 +10,6 @@
border-image-source: url("resources/border-image.png");
border-image-slice: 21 30 30 21 fill;
border-image-width: 30;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-slice-constrained.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-slice-constrained.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-slice-constrained.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -9,7 +9,6 @@
border-image-source: url("resources/border-image.png");
border-image-repeat: repeat;
display: inline-block;
- border-style: solid;
}
div.tl {
Modified: trunk/LayoutTests/fast/borders/border-image-slice-missing-right.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-slice-missing-right.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-slice-missing-right.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,7 +8,6 @@
border-width: 0px 66px 0px 0px;
width: 0px;
height: 26px;
- border-style: solid;
}
</style>
</head>
Modified: trunk/LayoutTests/fast/borders/border-image-slices.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-slices.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-slices.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -9,7 +9,6 @@
display: inline-block;
border-image-source: url("resources/border-image.png") !important;
border-image-slice: 21 30 30 21 fill !important;
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-source.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-source.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-source.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,7 +8,6 @@
margin: 10px;
display: inline-block;
border-image-source: url("resources/border-image.png") !important
- border-style: solid;
}
div.rr {
Modified: trunk/LayoutTests/fast/borders/border-image-trumps-radius-expected.txt (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-trumps-radius-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-trumps-radius-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,4 +4,4 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
- RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000] [border: (10px solid #0000FF7F)]
+ RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000] [border: (10px none #0000FF7F)]
Modified: trunk/LayoutTests/fast/borders/border-image-trumps-radius.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/border-image-trumps-radius.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/border-image-trumps-radius.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,6 +7,5 @@
height: 80px;
border-width: 10px;
border-color: rgba(0, 0, 255, 0.5);
- border-style: solid;
-webkit-border-image: -webkit-linear-gradient(green, green) 10 10 10 10;
"></div>
Modified: trunk/LayoutTests/fast/borders/hidpi-border-image-gradient-on-subpixels.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/hidpi-border-image-gradient-on-subpixels.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/hidpi-border-image-gradient-on-subpixels.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,7 +7,6 @@
border-width:0px 0px 0px 0.5px;
position: fixed;
-webkit-border-image: -webkit-linear-gradient(black, black) 1 100%;
- border-style: solid;
}
</style>
</head>
Deleted: trunk/LayoutTests/fast/borders/resources/red.png
(Binary files differ)
Modified: trunk/LayoutTests/fast/borders/scaled-border-image.html (192969 => 192970)
--- trunk/LayoutTests/fast/borders/scaled-border-image.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/borders/scaled-border-image.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,7 +8,6 @@
border-image-slice: 21 30 30 21 fill;
border-image-width: 1;
border-image-repeat: repeat;
- border-style: solid;
}
</style>
<div></div>
Modified: trunk/LayoutTests/fast/css/image-set-value-not-removed-crash.html (192969 => 192970)
--- trunk/LayoutTests/fast/css/image-set-value-not-removed-crash.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/css/image-set-value-not-removed-crash.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -15,7 +15,6 @@
-webkit-animation-duration: 1s;
}
.class1 {
- border-style: solid;
border-image: -webkit-image-set(url(#does-not-exist) 25x, url("does-not-exist.gif") 206x) 2 126 158 166 fill;
}
</style>
@@ -39,4 +38,4 @@
}
document.addEventListener("DOMContentLoaded", crash, false);
</script>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/LayoutTests/fast/gradients/border-image-gradient-expected.txt (192969 => 192970)
--- trunk/LayoutTests/fast/gradients/border-image-gradient-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/gradients/border-image-gradient-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,4 +3,4 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,10) size 784x580
- RenderBlock {DIV} at (10,0) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,0) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
Modified: trunk/LayoutTests/fast/gradients/border-image-gradient.html (192969 => 192970)
--- trunk/LayoutTests/fast/gradients/border-image-gradient.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/gradients/border-image-gradient.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -6,7 +6,6 @@
width: 75px;
height: 75px;
margin: 10px;
- border-style: solid;
-webkit-border-image: -webkit-gradient(linear, left top, left bottom, from(#00abeb), to(#fff), color-stop(0.5, #fff), color-stop(0.5, #66cc00)) 21 30 30 21 repeat repeat;
}
</style>
@@ -14,4 +13,4 @@
<body>
<div></div>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: trunk/LayoutTests/fast/hidpi/image-set-border-image-comparison.html (192969 => 192970)
--- trunk/LayoutTests/fast/hidpi/image-set-border-image-comparison.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/hidpi/image-set-border-image-comparison.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -15,10 +15,9 @@
<style>
div {
- box-sizing: border-box;
+ box-sizing: border-box;
width: 40px;
height: 13px;
- border-style: solid;
}
.test1 {
Modified: trunk/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html (192969 => 192970)
--- trunk/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -20,7 +20,6 @@
#foo {
width:100px;
height:100px;
- border-style: solid;
-webkit-border-image: -webkit-image-set(url('resources/blue-100-px-square.png') 1x, url('resources/green-200-px-square.png') 2x) 10 10 10 10 stretch stretch;
}
</style>
Modified: trunk/LayoutTests/fast/hidpi/image-set-border-image-simple.html (192969 => 192970)
--- trunk/LayoutTests/fast/hidpi/image-set-border-image-simple.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/hidpi/image-set-border-image-simple.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -34,7 +34,6 @@
width:100px;
height:100px;
border-width: 10px;
- border-style: solid;
-webkit-border-image: -webkit-image-set(url('resources/blue-100-px-square.png') 1x, url('resources/green-200-px-square.png') 2x) 10 10 10 10 stretch stretch;
}
</style>
Modified: trunk/LayoutTests/fast/writing-mode/border-image-horizontal-bt.html (192969 => 192970)
--- trunk/LayoutTests/fast/writing-mode/border-image-horizontal-bt.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/writing-mode/border-image-horizontal-bt.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -5,7 +5,6 @@
border-width: 21px 30px 30px 21px;
font-size:86px;
margin: 30px;
- border-style: solid;
-webkit-border-image: url("../borders/resources/border-image.png") 21 30 30 21 repeat repeat;
}
</style>
Modified: trunk/LayoutTests/fast/writing-mode/border-image-vertical-lr.html (192969 => 192970)
--- trunk/LayoutTests/fast/writing-mode/border-image-vertical-lr.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/writing-mode/border-image-vertical-lr.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -5,7 +5,6 @@
border-width: 21px 30px 30px 21px;
font-size:86px;
margin: 30px;
- border-style: solid;
-webkit-border-image: url("../borders/resources/border-image.png") 21 30 30 21 repeat repeat;
}
</style>
Modified: trunk/LayoutTests/fast/writing-mode/border-image-vertical-rl.html (192969 => 192970)
--- trunk/LayoutTests/fast/writing-mode/border-image-vertical-rl.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/fast/writing-mode/border-image-vertical-rl.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -5,7 +5,6 @@
border-width: 21px 30px 30px 21px;
font-size:86px;
margin: 30px;
- border-style: solid;
-webkit-border-image: url("../borders/resources/border-image.png") 21 30 30 21 repeat repeat;
}
</style>
Modified: trunk/LayoutTests/platform/mac/animations/cross-fade-border-image-source-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/animations/cross-fade-border-image-source-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/animations/cross-fade-border-image-source-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -16,8 +16,8 @@
text run at (0,72) width 33: "other"
RenderBR {BR} at (32,86) size 1x0
layer at (100,100) size 106x106
- RenderBlock (positioned) {DIV} at (100,100) size 106x106 [bgcolor=#008000] [border: (3px solid #000000)]
+ RenderBlock (positioned) {DIV} at (100,100) size 106x106 [bgcolor=#008000] [border: (3px none #000000)]
layer at (100,250) size 106x106
- RenderBlock (positioned) {DIV} at (100,250) size 106x106 [bgcolor=#008000] [border: (3px solid #000000)]
+ RenderBlock (positioned) {DIV} at (100,250) size 106x106 [bgcolor=#008000] [border: (3px none #000000)]
layer at (100,400) size 106x106
- RenderBlock (positioned) {DIV} at (100,400) size 106x106 [bgcolor=#008000] [border: (3px solid #000000)]
+ RenderBlock (positioned) {DIV} at (100,400) size 106x106 [bgcolor=#008000] [border: (3px none #000000)]
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-01-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-01-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-01-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -5,14 +5,14 @@
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,132) size 532x18
text run at (0,132) width 532: "This test checks to make sure the border-image is not clipped by the border radius. "
- RenderBlock {DIV} at (541,10) size 127x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (541,10) size 127x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,310) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,310) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,432) size 4x18
text run at (146,432) width 4: " "
- RenderBlock {DIV} at (160,310) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,310) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-longhand-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-longhand-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-longhand-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-massive-scale-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-massive-scale-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-massive-scale-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 785x724
RenderBlock {HTML} at (0,0) size 785x724
RenderBody {BODY} at (8,8) size 769x708
- RenderBlock {DIV} at (10,10) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
RenderText {#text} at (350,336) size 4x18
text run at (350,336) width 4: " "
- RenderBlock {DIV} at (364,10) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
+ RenderBlock {DIV} at (364,10) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
RenderText {#text} at (704,336) size 4x18
text run at (704,336) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,364) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
+ RenderBlock {DIV} at (10,364) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
RenderText {#text} at (350,690) size 4x18
text run at (350,690) width 4: " "
- RenderBlock {DIV} at (364,364) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
+ RenderBlock {DIV} at (364,364) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-omit-right-slice-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-omit-right-slice-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-omit-right-slice-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,5 +3,5 @@
layer at (0,0) size 800x416
RenderBlock {HTML} at (0,0) size 800x416
RenderBody {BODY} at (8,8) size 784x400
- RenderBlock {DIV} at (0,0) size 400x400 [border: (100px solid #000000)]
+ RenderBlock {DIV} at (0,0) size 400x400 [border: (100px none #000000)]
RenderBlock {DIV} at (100,100) size 200x200 [bgcolor=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (30,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (30,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (186,172) size 4x18
text run at (186,172) width 4: " "
- RenderBlock {DIV} at (220,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (220,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (376,172) size 4x18
text run at (376,172) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (30,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (30,220) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (186,362) size 4x18
text run at (186,362) width 4: " "
- RenderBlock {DIV} at (220,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (220,220) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (30,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (30,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (186,172) size 4x18
text run at (186,172) width 4: " "
- RenderBlock {DIV} at (220,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (220,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (376,172) size 4x18
text run at (376,172) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (30,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (30,220) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (186,362) size 4x18
text run at (186,362) width 4: " "
- RenderBlock {DIV} at (220,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (220,220) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-repeat-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-repeat-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-repeat-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-rotate-transform-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-rotate-transform-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-rotate-transform-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,15 +4,15 @@
RenderBlock {HTML} at (0,0) size 785x585
layer at (8,8) size 769x569
RenderBody {BODY} at (8,8) size 769x569
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-scale-transform-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-scale-transform-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-scale-transform-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -4,15 +4,15 @@
RenderBlock {HTML} at (0,0) size 785x585
layer at (8,8) size 769x569
RenderBody {BODY} at (8,8) size 769x569
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-scaled-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-scaled-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-scaled-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,15 +8,15 @@
text run at (0,0) width 750: "The purpose of this test case is to illustrate the legacy behavior of -webkit-border-image. The specified border widths"
text run at (0,18) width 715: "actually end up becoming the real border widths. The border-image property in the specification doesn't do this."
RenderBlock (anonymous) at (0,52) size 769x552
- RenderBlock {DIV} at (10,10) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
RenderText {#text} at (272,258) size 4x18
text run at (272,258) width 4: " "
- RenderBlock {DIV} at (286,10) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
+ RenderBlock {DIV} at (286,10) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
RenderText {#text} at (548,258) size 4x18
text run at (548,258) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,286) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
+ RenderBlock {DIV} at (10,286) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
RenderText {#text} at (272,534) size 4x18
text run at (272,534) width 4: " "
- RenderBlock {DIV} at (286,286) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
+ RenderBlock {DIV} at (286,286) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-scrambled-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-scrambled-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-scrambled-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-side-reduction-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-side-reduction-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-side-reduction-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-slice-constrained-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-slice-constrained-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-slice-constrained-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,8 +3,8 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 171x171 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 171x171 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (191,177) size 4x18
text run at (191,177) width 4: " "
- RenderBlock {DIV} at (205,10) size 171x171 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (205,10) size 171x171 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-slices-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-slices-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-slices-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,132) size 4x18
text run at (146,132) width 4: " "
- RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (296,132) size 4x18
text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (146,282) size 4x18
text run at (146,282) width 4: " "
- RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/border-image-source-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/border-image-source-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/border-image-source-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,15 +3,15 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (10,10) size 75x75
- RenderText {#text} at (95,81) size 4x18
- text run at (95,81) width 4: " "
- RenderBlock {DIV} at (109,10) size 75x75
- RenderText {#text} at (194,81) size 4x18
- text run at (194,81) width 4: " "
+ RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+ RenderText {#text} at (146,132) size 4x18
+ text run at (146,132) width 4: " "
+ RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+ RenderText {#text} at (296,132) size 4x18
+ text run at (296,132) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,109) size 75x75
- RenderText {#text} at (95,180) size 4x18
- text run at (95,180) width 4: " "
- RenderBlock {DIV} at (109,109) size 75x75
+ RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+ RenderText {#text} at (146,282) size 4x18
+ text run at (146,282) width 4: " "
+ RenderBlock {DIV} at (160,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/fast/borders/scaled-border-image-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/borders/scaled-border-image-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/borders/scaled-border-image-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,8 +3,8 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,10) size 784x570
- RenderBlock {DIV} at (10,0) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderBlock {DIV} at (10,0) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderBlock (anonymous) at (0,136) size 784x18
RenderText {#text} at (0,0) size 408x18
text run at (0,0) width 408: "This should look like the above, only scaled up by a factor of 2:"
- RenderBlock {DIV} at (20,174) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
+ RenderBlock {DIV} at (20,174) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,15 +8,15 @@
text run at (0,0) width 286: "The first two tests should match the last two."
RenderBR {BR} at (285,14) size 1x0
RenderBR {BR} at (0,18) size 0x18
- RenderBlock {DIV} at (0,36) size 40x13 [border: (3px solid #000000)]
+ RenderBlock {DIV} at (0,36) size 40x13 [border: (3px none #000000)]
RenderBlock (anonymous) at (0,49) size 784x18
RenderBR {BR} at (0,0) size 0x18
- RenderBlock {DIV} at (0,67) size 40x13 [border: (3px solid #000000) (7px solid #000000) (3px solid #000000)]
+ RenderBlock {DIV} at (0,67) size 40x13 [border: (3px none #000000) (7px none #000000) (3px none #000000)]
RenderBlock (anonymous) at (0,80) size 784x18
RenderBR {BR} at (0,0) size 0x18
- RenderBlock {DIV} at (0,98) size 40x13 [border: (3px solid #000000)]
+ RenderBlock {DIV} at (0,98) size 40x13 [border: (3px none #000000)]
RenderBlock (anonymous) at (0,111) size 784x18
RenderBR {BR} at (0,0) size 0x18
- RenderBlock {DIV} at (0,129) size 40x13 [border: (3px solid #000000) (7px solid #000000) (3px solid #000000)]
+ RenderBlock {DIV} at (0,129) size 40x13 [border: (3px none #000000) (7px none #000000) (3px none #000000)]
RenderBlock (anonymous) at (0,142) size 784x18
RenderBR {BR} at (0,0) size 0x18
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,6 +8,6 @@
text run at (0,0) width 775: "This test passes if the div below is a blue 100px square when the deviceScaleFactor is 1, and if it is a 100px green square"
text run at (0,18) width 779: "when the deviceScaleFactor is 2. When run in the test harness, this test is distinct from image-set-as-background, because"
text run at (0,36) width 515: "it ensures that the green image loads dynamically when the scale factor changes."
- RenderBlock {DIV} at (0,54) size 106x106 [border: (3px solid #000000)]
+ RenderBlock {DIV} at (0,54) size 106x106 [border: (3px none #000000)]
RenderText {#text} at (3,3) size 8x18
text run at (3,3) width 8: "2"
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -7,4 +7,4 @@
RenderText {#text} at (0,0) size 775x36
text run at (0,0) width 775: "This test passes if the div below is a blue 100px square when the deviceScaleFactor is 1, and if it is a 100px green square"
text run at (0,18) width 211: "when the deviceScaleFactor is 2."
- RenderBlock {DIV} at (0,36) size 120x120 [border: (10px solid #000000)]
+ RenderBlock {DIV} at (0,36) size 120x120 [border: (10px none #000000)]
Modified: trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,7 +3,7 @@
layer at (0,140) size 800x460
RenderBlock {HTML} at (0,0) size 800x460
RenderBody {BODY} at (8,8) size 784x444
- RenderInline {SPAN} at (0,0) size 80x323 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderInline {SPAN} at (0,0) size 80x323 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderBlock {DIV} at (101,117) size 25x0
RenderBR {BR} at (126,95) size 0x100
RenderBlock {DIV} at (50,289) size 50x0
Modified: trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,7 +3,7 @@
layer at (0,0) size 460x600
RenderBlock {HTML} at (0,0) size 460x600
RenderBody {BODY} at (8,8) size 444x584
- RenderInline {SPAN} at (0,0) size 323x80 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderInline {SPAN} at (0,0) size 323x80 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderBlock {DIV} at (99,101) size 0x25
RenderBR {BR} at (77,126) size 100x0
RenderBlock {DIV} at (271,50) size 0x50
Modified: trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -3,7 +3,7 @@
layer at (340,0) size 460x600
RenderBlock {HTML} at (0,0) size 460x600
RenderBody {BODY} at (8,8) size 444x584
- RenderInline {SPAN} at (0,0) size 323x80 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
+ RenderInline {SPAN} at (0,0) size 323x80 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
RenderBlock {DIV} at (164,101) size 0x25
RenderBR {BR} at (86,126) size 100x0
RenderBlock {DIV} at (336,50) size 0x50
Modified: trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-2-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-2-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-2-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,17 +8,17 @@
RenderText {#text} at (0,0) size 195x28
text run at (0,0) width 195: "SVG border-image"
RenderBlock (anonymous) at (1,68) size 368x369
- RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
- RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
- RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (370,418) size 4x18
text run at (370,418) width 4: " "
@@ -27,16 +27,16 @@
RenderText {#text} at (0,0) size 196x28
text run at (0,0) width 196: "PNG border-image"
RenderBlock (anonymous) at (1,68) size 368x369
- RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
- RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
- RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.txt (192969 => 192970)
--- trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.txt 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.txt 2015-12-02 22:52:54 UTC (rev 192970)
@@ -8,17 +8,17 @@
RenderText {#text} at (0,0) size 195x28
text run at (0,0) width 195: "SVG border-image"
RenderBlock (anonymous) at (1,68) size 368x369
- RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
- RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
- RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (370,418) size 4x18
text run at (370,418) width 4: " "
@@ -27,16 +27,16 @@
RenderText {#text} at (0,0) size 196x28
text run at (0,0) width 196: "PNG border-image"
RenderBlock (anonymous) at (1,68) size 368x369
- RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
- RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
RenderBR {BR} at (0,0) size 0x0
- RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (10,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
- RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
+ RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/svg/as-border-image/svg-as-border-image-2.html (192969 => 192970)
--- trunk/LayoutTests/svg/as-border-image/svg-as-border-image-2.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/svg/as-border-image/svg-as-border-image-2.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -16,42 +16,34 @@
}
.svg > .rr {
- border-style: solid;
-webkit-border-image: url("resources/tiles-relative-size.svg") 30 30 30 30 repeat repeat;
}
.svg > .rs {
- border-style: solid;
-webkit-border-image: url("resources/tiles-relative-size.svg") 30 30 30 30 repeat stretch;
}
.svg > .sr {
- border-style: solid;
-webkit-border-image: url("resources/tiles-relative-size.svg") 30 30 30 30 stretch repeat;
}
.svg > .ss {
- border-style: solid;
-webkit-border-image: url("resources/tiles-relative-size.svg") 30 30 30 30 stretch stretch;
}
.image > .rr {
- border-style: solid;
-webkit-border-image: url("resources/large-tiles.png") 30 30 30 30 repeat repeat;
}
.image > .rs {
- border-style: solid;
-webkit-border-image: url("resources/large-tiles.png") 30 30 30 30 repeat stretch;
}
.image > .sr {
- border-style: solid;
-webkit-border-image: url("resources/large-tiles.png") 30 30 30 30 stretch repeat;
}
.image > .ss {
- border-style: solid;
-webkit-border-image: url("resources/large-tiles.png") 30 30 30 30 stretch stretch;
}
</style>
Modified: trunk/LayoutTests/svg/as-border-image/svg-as-border-image.html (192969 => 192970)
--- trunk/LayoutTests/svg/as-border-image/svg-as-border-image.html 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/LayoutTests/svg/as-border-image/svg-as-border-image.html 2015-12-02 22:52:54 UTC (rev 192970)
@@ -15,43 +15,35 @@
}
.svg > .rr {
- border-style: solid;
-webkit-border-image: url("resources/tiles-fixed-size.svg") 30 30 30 30 repeat repeat;
}
.svg > .rs {
- border-style: solid;
-webkit-border-image: url("resources/tiles-fixed-size.svg") 30 30 30 30 repeat stretch;
}
.svg > .sr {
- border-style: solid;
-webkit-border-image: url("resources/tiles-fixed-size.svg") 30 30 30 30 stretch repeat;
}
.svg > .ss {
- border-style: solid;
-webkit-border-image: url("resources/tiles-fixed-size.svg") 30 30 30 30 stretch stretch;
}
.image > .rr {
- border-style: solid;
-webkit-border-image: url("resources/tiles.png") 30 30 30 30 repeat repeat;
}
.image > .rs {
- border-style: solid;
-webkit-border-image: url("resources/tiles.png") 30 30 30 30 repeat stretch;
}
.image > .sr {
- border-style: solid;
-webkit-border-image: url("resources/tiles.png") 30 30 30 30 stretch repeat;
}
.image > .ss {
- border-style: solid;
-webkit-border-image: url("resources/tiles.png") 30 30 30 30 stretch stretch;
}
</style>
Modified: trunk/Source/WebCore/ChangeLog (192969 => 192970)
--- trunk/Source/WebCore/ChangeLog 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/Source/WebCore/ChangeLog 2015-12-02 22:52:54 UTC (rev 192970)
@@ -1,3 +1,17 @@
+2015-12-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r192955.
+ https://bugs.webkit.org/show_bug.cgi?id=151776
+
+ A large number of the tests added with this change are failing
+ on Windows (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "[css border] border-image doesn't honor border-style"
+ https://bugs.webkit.org/show_bug.cgi?id=99922
+ http://trac.webkit.org/changeset/192955
+
2015-12-02 Yoav Weiss <y...@yoav.ws>
Fix preloader issue with srcdoc documents.
Modified: trunk/Source/WebCore/rendering/style/BorderData.h (192969 => 192970)
--- trunk/Source/WebCore/rendering/style/BorderData.h 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/Source/WebCore/rendering/style/BorderData.h 2015-12-02 22:52:54 UTC (rev 192970)
@@ -43,7 +43,8 @@
}
bool hasBorder() const
{
- return m_left.nonZero() || m_right.nonZero() || m_top.nonZero() || m_bottom.nonZero();
+ bool haveImage = m_image.hasImage();
+ return m_left.nonZero(!haveImage) || m_right.nonZero(!haveImage) || m_top.nonZero(!haveImage) || m_bottom.nonZero(!haveImage);
}
bool hasFill() const
@@ -63,31 +64,31 @@
return true;
return false;
}
-
+
float borderLeftWidth() const
{
- if (m_left.style() == BNONE || m_left.style() == BHIDDEN)
- return 0;
+ if (!m_image.hasImage() && (m_left.style() == BNONE || m_left.style() == BHIDDEN))
+ return 0;
return m_left.width();
}
-
+
float borderRightWidth() const
{
- if (m_right.style() == BNONE || m_right.style() == BHIDDEN)
+ if (!m_image.hasImage() && (m_right.style() == BNONE || m_right.style() == BHIDDEN))
return 0;
return m_right.width();
}
-
+
float borderTopWidth() const
{
- if (m_top.style() == BNONE || m_top.style() == BHIDDEN)
+ if (!m_image.hasImage() && (m_top.style() == BNONE || m_top.style() == BHIDDEN))
return 0;
return m_top.width();
}
-
+
float borderBottomWidth() const
{
- if (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN)
+ if (!m_image.hasImage() && (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN))
return 0;
return m_bottom.width();
}
@@ -96,25 +97,25 @@
{
return FloatBoxExtent(borderTopWidth(), borderRightWidth(), borderBottomWidth(), borderLeftWidth());
}
-
+
bool operator==(const BorderData& o) const
{
return m_left == o.m_left && m_right == o.m_right && m_top == o.m_top && m_bottom == o.m_bottom && m_image == o.m_image
&& m_topLeft == o.m_topLeft && m_topRight == o.m_topRight && m_bottomLeft == o.m_bottomLeft && m_bottomRight == o.m_bottomRight;
}
-
+
bool operator!=(const BorderData& o) const
{
return !(*this == o);
}
-
+
const BorderValue& left() const { return m_left; }
const BorderValue& right() const { return m_right; }
const BorderValue& top() const { return m_top; }
const BorderValue& bottom() const { return m_bottom; }
-
+
const NinePieceImage& image() const { return m_image; }
-
+
const LengthSize& topLeft() const { return m_topLeft; }
const LengthSize& topRight() const { return m_topRight; }
const LengthSize& bottomLeft() const { return m_bottomLeft; }
Modified: trunk/Source/WebCore/rendering/style/BorderValue.h (192969 => 192970)
--- trunk/Source/WebCore/rendering/style/BorderValue.h 2015-12-02 22:41:21 UTC (rev 192969)
+++ trunk/Source/WebCore/rendering/style/BorderValue.h 2015-12-02 22:52:54 UTC (rev 192970)
@@ -42,9 +42,9 @@
{
}
- bool nonZero() const
+ bool nonZero(bool checkStyle = true) const
{
- return width() && (m_style != BNONE);
+ return width() && (!checkStyle || m_style != BNONE);
}
bool isTransparent() const
@@ -52,9 +52,9 @@
return m_colorIsValid && !alphaChannel(m_color);
}
- bool isVisible() const
+ bool isVisible(bool checkStyle = true) const
{
- return nonZero() && !isTransparent() && (m_style != BHIDDEN);
+ return nonZero(checkStyle) && !isTransparent() && (!checkStyle || m_style != BHIDDEN);
}
bool operator==(const BorderValue& o) const
