Changeset 192955 in webkit

Timestamp:

Dec 2, 2015 12:25:55 PM (8 years ago)

Author:

cavalcantii@gmail.com

Message:

[css border] border-image doesn't honor border-style
​https://bugs.webkit.org/show_bug.cgi?id=99922

Reviewed by Simon Fraser.

Source/WebCore:

Ensure that WebKit will be compliant to css-backgrounds spec where a
border with an image will only be rendered if there is a style defined.

Quote: "None: No border. Color and width are ignored (i.e., the border has width 0)".
Reference: ​http://www.w3.org/TR/css3-background/#border-style

From W3C discussion: "The fact that these properties set the style of the border is
normative". Reference: ​https://lists.w3.org/Archives/Public/www-style/2015Nov/0260.html

Test: fast/borders/border-image-should-not-display.html

• rendering/style/BorderData.h:

(WebCore::BorderData::hasBorder):
(WebCore::BorderData::borderLeftWidth):
(WebCore::BorderData::borderRightWidth):
(WebCore::BorderData::borderTopWidth):
(WebCore::BorderData::borderBottomWidth):

• rendering/style/BorderValue.h:

(WebCore::BorderValue::nonZero):
(WebCore::BorderValue::isVisible):

LayoutTests:

Ensure that WebKit will be compliant to css-backgrounds spec where
a border with an image will only be rendered if there is a style defined.

Previous border image tests had to be edited (i.e. define border-style)
to ensure that a decorated border would be rendered.

• fast/borders/border-image-01.html:
• fast/borders/border-image-border-radius.html:
• fast/borders/border-image-fill-no-intrinsic-size.html:
• fast/borders/border-image-longhand.html:
• fast/borders/border-image-massive-scale.html:
• fast/borders/border-image-omit-right-slice.html:
• fast/borders/border-image-outset-in-shorthand.html:
• fast/borders/border-image-outset-split-inline-expected.txt:
• fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt:
• fast/borders/border-image-outset-split-inline-vertical-lr.html:
• fast/borders/border-image-outset-split-inline.html:
• fast/borders/border-image-outset.html:
• fast/borders/border-image-repeat.html:
• fast/borders/border-image-rotate-transform.html:
• fast/borders/border-image-scale-transform.html:
• fast/borders/border-image-scaled.html:
• fast/borders/border-image-scrambled.html:
• fast/borders/border-image-should-not-display-expected.html: Added.
• fast/borders/border-image-should-not-display.html: Added.
• fast/borders/border-image-side-reduction.html:
• fast/borders/border-image-slice-constrained.html:
• fast/borders/border-image-slice-missing-right.html:
• fast/borders/border-image-slices.html:
• fast/borders/border-image-source.html:
• fast/borders/border-image-trumps-radius-expected.txt:
• fast/borders/border-image-trumps-radius.html:
• fast/borders/hidpi-border-image-gradient-on-subpixels.html:
• fast/borders/resources/red.png: Added.
• fast/borders/scaled-border-image.html:
• fast/gradients/border-image-gradient-expected.txt:
• fast/gradients/border-image-gradient.html:
• fast/hidpi/image-set-border-image-comparison.html:
• fast/hidpi/image-set-border-image-dynamic.html:
• fast/hidpi/image-set-border-image-simple.html:
• fast/writing-mode/border-image-horizontal-bt.html:
• fast/writing-mode/border-image-vertical-lr.html:
• fast/writing-mode/border-image-vertical-rl.html:
• platform/mac/fast/borders/border-image-01-expected.txt:
• platform/mac/fast/borders/border-image-border-radius-expected.txt:
• platform/mac/fast/borders/border-image-longhand-expected.txt:
• platform/mac/fast/borders/border-image-massive-scale-expected.txt:
• platform/mac/fast/borders/border-image-omit-right-slice-expected.txt:
• platform/mac/fast/borders/border-image-outset-expected.txt:
• platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt:
• platform/mac/fast/borders/border-image-repeat-expected.txt:
• platform/mac/fast/borders/border-image-rotate-transform-expected.txt:
• platform/mac/fast/borders/border-image-scale-transform-expected.txt:
• platform/mac/fast/borders/border-image-scaled-expected.txt:
• platform/mac/fast/borders/border-image-scrambled-expected.txt:
• platform/mac/fast/borders/border-image-side-reduction-expected.txt:
• platform/mac/fast/borders/border-image-slice-constrained-expected.txt:
• platform/mac/fast/borders/border-image-slices-expected.txt:
• platform/mac/fast/borders/border-image-source-expected.txt:
• platform/mac/fast/borders/scaled-border-image-expected.txt:
• platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt:
• platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt:
• platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt:
• platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt:
• platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt:
• platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/cross-fade-border-image-source.html (modified) (3 diffs)
• LayoutTests/fast/borders/border-image-01.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-border-radius.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-fill-no-intrinsic-size.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-longhand.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-massive-scale.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-omit-right-slice.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-outset-in-shorthand.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-outset-split-inline-expected.txt (modified) (1 diff)
• LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt (modified) (1 diff)
• LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-outset-split-inline.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-outset.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-repeat.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-rotate-transform.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-scale-transform.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-scaled.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-scrambled.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-should-not-display-expected.html (added)
• LayoutTests/fast/borders/border-image-should-not-display.html (added)
• LayoutTests/fast/borders/border-image-side-reduction.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-slice-constrained.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-slice-missing-right.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-slices.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-source.html (modified) (1 diff)
• LayoutTests/fast/borders/border-image-trumps-radius-expected.txt (modified) (1 diff)
• LayoutTests/fast/borders/border-image-trumps-radius.html (modified) (1 diff)
• LayoutTests/fast/borders/hidpi-border-image-gradient-on-subpixels.html (modified) (1 diff)
• LayoutTests/fast/borders/resources/red.png (added)
• LayoutTests/fast/borders/scaled-border-image.html (modified) (1 diff)
• LayoutTests/fast/css/image-set-value-not-removed-crash.html (modified) (1 diff)
• LayoutTests/fast/gradients/border-image-gradient-expected.txt (modified) (1 diff)
• LayoutTests/fast/gradients/border-image-gradient.html (modified) (1 diff)
• LayoutTests/fast/hidpi/image-set-border-image-comparison.html (modified) (1 diff)
• LayoutTests/fast/hidpi/image-set-border-image-dynamic.html (modified) (1 diff)
• LayoutTests/fast/hidpi/image-set-border-image-simple.html (modified) (1 diff)
• LayoutTests/fast/writing-mode/border-image-horizontal-bt.html (modified) (1 diff)
• LayoutTests/fast/writing-mode/border-image-vertical-lr.html (modified) (1 diff)
• LayoutTests/fast/writing-mode/border-image-vertical-rl.html (modified) (1 diff)
• LayoutTests/platform/mac/animations/cross-fade-border-image-source-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-01-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-longhand-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-massive-scale-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-omit-right-slice-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-outset-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-repeat-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-rotate-transform-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-scale-transform-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-scaled-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-scrambled-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-side-reduction-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-slice-constrained-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-slices-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/border-image-source-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/borders/scaled-border-image-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-2-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.txt (modified) (2 diffs)
• LayoutTests/svg/as-border-image/svg-as-border-image-2.html (modified) (1 diff)
• LayoutTests/svg/as-border-image/svg-as-border-image.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/BorderData.h (modified) (4 diffs)
• Source/WebCore/rendering/style/BorderValue.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-02  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        [css border] border-image doesn't honor border-style
+        https://bugs.webkit.org/show_bug.cgi?id=99922
+
+        Reviewed by Simon Fraser.
+
+        Ensure that WebKit will be compliant to css-backgrounds spec where
+        a border with an image will only be rendered if there is a style defined.
+
+        Previous border image tests had to be edited (i.e. define border-style)
+        to ensure that a decorated border would be rendered.
+
+        * fast/borders/border-image-01.html:
+        * fast/borders/border-image-border-radius.html:
+        * fast/borders/border-image-fill-no-intrinsic-size.html:
+        * fast/borders/border-image-longhand.html:
+        * fast/borders/border-image-massive-scale.html:
+        * fast/borders/border-image-omit-right-slice.html:
+        * fast/borders/border-image-outset-in-shorthand.html:
+        * fast/borders/border-image-outset-split-inline-expected.txt:
+        * fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt:
+        * fast/borders/border-image-outset-split-inline-vertical-lr.html:
+        * fast/borders/border-image-outset-split-inline.html:
+        * fast/borders/border-image-outset.html:
+        * fast/borders/border-image-repeat.html:
+        * fast/borders/border-image-rotate-transform.html:
+        * fast/borders/border-image-scale-transform.html:
+        * fast/borders/border-image-scaled.html:
+        * fast/borders/border-image-scrambled.html:
+        * fast/borders/border-image-should-not-display-expected.html: Added.
+        * fast/borders/border-image-should-not-display.html: Added.
+        * fast/borders/border-image-side-reduction.html:
+        * fast/borders/border-image-slice-constrained.html:
+        * fast/borders/border-image-slice-missing-right.html:
+        * fast/borders/border-image-slices.html:
+        * fast/borders/border-image-source.html:
+        * fast/borders/border-image-trumps-radius-expected.txt:
+        * fast/borders/border-image-trumps-radius.html:
+        * fast/borders/hidpi-border-image-gradient-on-subpixels.html:
+        * fast/borders/resources/red.png: Added.
+        * fast/borders/scaled-border-image.html:
+        * fast/gradients/border-image-gradient-expected.txt:
+        * fast/gradients/border-image-gradient.html:
+        * fast/hidpi/image-set-border-image-comparison.html:
+        * fast/hidpi/image-set-border-image-dynamic.html:
+        * fast/hidpi/image-set-border-image-simple.html:
+        * fast/writing-mode/border-image-horizontal-bt.html:
+        * fast/writing-mode/border-image-vertical-lr.html:
+        * fast/writing-mode/border-image-vertical-rl.html:
+        * platform/mac/fast/borders/border-image-01-expected.txt:
+        * platform/mac/fast/borders/border-image-border-radius-expected.txt:
+        * platform/mac/fast/borders/border-image-longhand-expected.txt:
+        * platform/mac/fast/borders/border-image-massive-scale-expected.txt:
+        * platform/mac/fast/borders/border-image-omit-right-slice-expected.txt:
+        * platform/mac/fast/borders/border-image-outset-expected.txt:
+        * platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt:
+        * platform/mac/fast/borders/border-image-repeat-expected.txt:
+        * platform/mac/fast/borders/border-image-rotate-transform-expected.txt:
+        * platform/mac/fast/borders/border-image-scale-transform-expected.txt:
+        * platform/mac/fast/borders/border-image-scaled-expected.txt:
+        * platform/mac/fast/borders/border-image-scrambled-expected.txt:
+        * platform/mac/fast/borders/border-image-side-reduction-expected.txt:
+        * platform/mac/fast/borders/border-image-slice-constrained-expected.txt:
+        * platform/mac/fast/borders/border-image-slices-expected.txt:
+        * platform/mac/fast/borders/border-image-source-expected.txt:
+        * platform/mac/fast/borders/scaled-border-image-expected.txt:
+        * platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt:
+        * platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt:
+        * platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt:
+        * platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt:
+        * platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt:
+        * platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt:
+
 2015-12-02  Eric Carlson  <eric.carlson@apple.com>
 

trunk/LayoutTests/animations/cross-fade-border-image-source.html

@@ -9 +9 @@
         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 +20 @@
         width: 100px;
         background-color: green;
+        border-style: solid;
         -webkit-animation: animShorthand 1s linear infinite;
     }
@@ -28 +30 @@
         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;
     }

trunk/LayoutTests/fast/borders/border-image-01.html

@@ -8 +8 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-border-radius.html

@@ -9 +9 @@
             display: inline-block;
             -webkit-border-radius: 10px;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-fill-no-intrinsic-size.html

@@ -59 +59 @@
   <div class="box border-20"></div>
   <div class="box no-border border-image-no-intrinsic-slice"></div>
-  <div class="box border-20 border-image-no-intrinsic-slice"></div>
+  <div class="box no-border border-image-no-intrinsic"></div>
 </body>

trunk/LayoutTests/fast/borders/border-image-longhand.html

@@ -11 +11 @@
             border-image-slice: 21 30 30 21 fill;
             border-image-width: 1;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-massive-scale.html

@@ -8 +8 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-omit-right-slice.html

@@ -18 +18 @@
         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;
     }
 

trunk/LayoutTests/fast/borders/border-image-outset-in-shorthand.html

@@ -9 +9 @@
             -webkit-border-image: url("resources/border-image.png") 21 30 30 21 / 1 / 21px 30px 30px 21px stretch;
             margin:30px;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-outset-split-inline-expected.txt

@@ -5 +5 @@
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x350
-        RenderInline {SPAN} at (0,0) size 37x230 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+        RenderInline {SPAN} at (0,0) size 37x230 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
           RenderText {#text} at (46,85) size 7x29
             text run at (46,85) width 7: " "

trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr-expected.txt

@@ -5 +5 @@
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 350x584
-        RenderInline {SPAN} at (0,0) size 230x37 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+        RenderInline {SPAN} at (0,0) size 230x37 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
           RenderText {#text} at (85,46) size 29x7
             text run at (85,46) width 7: " "

trunk/LayoutTests/fast/borders/border-image-outset-split-inline-vertical-lr.html

@@ -5 +5 @@
             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>

trunk/LayoutTests/fast/borders/border-image-outset-split-inline.html

@@ -5 +5 @@
             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>

trunk/LayoutTests/fast/borders/border-image-outset.html

@@ -12 +12 @@
             border-image-outset: 1;
             margin:30px;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-repeat.html

@@ -8 +8 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-rotate-transform.html

@@ -8 +8 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-scale-transform.html

@@ -8 +8 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-scaled.html

@@ -7 +7 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-scrambled.html

@@ -8 +8 @@
             margin: 10px;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-side-reduction.html

@@ -11 +11 @@
             border-image-slice: 21 30 30 21 fill;
             border-image-width: 30;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-slice-constrained.html

@@ -10 +10 @@
             border-image-repeat: repeat;
             display: inline-block;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-slice-missing-right.html

@@ -9 +9 @@
       width: 0px; 
       height: 26px;
+      border-style: solid;
     }
   </style>

trunk/LayoutTests/fast/borders/border-image-slices.html

@@ -10 +10 @@
             border-image-source: url("resources/border-image.png") !important;
             border-image-slice: 21 30 30 21 fill !important;
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-source.html

@@ -9 +9 @@
             display: inline-block;
             border-image-source: url("resources/border-image.png") !important
+            border-style: solid;
         }
 

trunk/LayoutTests/fast/borders/border-image-trumps-radius-expected.txt

@@ -5 +5 @@
     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 none #0000FF7F)]
+      RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#FF0000] [border: (10px solid #0000FF7F)]

trunk/LayoutTests/fast/borders/border-image-trumps-radius.html

@@ -8 +8 @@
     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>

trunk/LayoutTests/fast/borders/hidpi-border-image-gradient-on-subpixels.html

@@ -8 +8 @@
     position: fixed;
     -webkit-border-image: -webkit-linear-gradient(black, black) 1 100%;
+    border-style: solid;
   }
 </style>

trunk/LayoutTests/fast/borders/scaled-border-image.html

@@ -9 +9 @@
         border-image-width: 1;
         border-image-repeat: repeat;
+        border-style: solid;
     }
 </style>

trunk/LayoutTests/fast/css/image-set-value-not-removed-crash.html

@@ -16 +16 @@
 }
 .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;
 }

trunk/LayoutTests/fast/gradients/border-image-gradient-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,10) size 784x580
-      RenderBlock {DIV} at (10,0) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,0) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]

trunk/LayoutTests/fast/gradients/border-image-gradient.html

@@ -7 +7 @@
             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;
         }

trunk/LayoutTests/fast/hidpi/image-set-border-image-comparison.html

@@ -16 +16 @@
 <style>
 div {
-        box-sizing: border-box;
+    box-sizing: border-box;
     width: 40px;
     height: 13px;
+    border-style: solid;
 }
 

trunk/LayoutTests/fast/hidpi/image-set-border-image-dynamic.html

@@ -21 +21 @@
         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;
     }

trunk/LayoutTests/fast/hidpi/image-set-border-image-simple.html

@@ -35 +35 @@
         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;
     }

trunk/LayoutTests/fast/writing-mode/border-image-horizontal-bt.html

@@ -6 +6 @@
     font-size:86px;
     margin: 30px;
+    border-style: solid;
     -webkit-border-image: url("../borders/resources/border-image.png") 21 30 30 21 repeat repeat;
 }

trunk/LayoutTests/fast/writing-mode/border-image-vertical-lr.html

@@ -6 +6 @@
     font-size:86px;
     margin: 30px;
+    border-style: solid;
     -webkit-border-image: url("../borders/resources/border-image.png") 21 30 30 21 repeat repeat;
 }

trunk/LayoutTests/fast/writing-mode/border-image-vertical-rl.html

@@ -6 +6 @@
     font-size:86px;
     margin: 30px;
+    border-style: solid;
     -webkit-border-image: url("../borders/resources/border-image.png") 21 30 30 21 repeat repeat;
 }

trunk/LayoutTests/platform/mac/animations/cross-fade-border-image-source-expected.txt

@@ -17 +17 @@
         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 none #000000)]
+  RenderBlock (positioned) {DIV} at (100,100) size 106x106 [bgcolor=#008000] [border: (3px solid #000000)]
 layer at (100,250) size 106x106
-  RenderBlock (positioned) {DIV} at (100,250) size 106x106 [bgcolor=#008000] [border: (3px none #000000)]
+  RenderBlock (positioned) {DIV} at (100,250) size 106x106 [bgcolor=#008000] [border: (3px solid #000000)]
 layer at (100,400) size 106x106
-  RenderBlock (positioned) {DIV} at (100,400) size 106x106 [bgcolor=#008000] [border: (3px none #000000)]
+  RenderBlock (positioned) {DIV} at (100,400) size 106x106 [bgcolor=#008000] [border: (3px solid #000000)]

trunk/LayoutTests/platform/mac/fast/borders/border-image-01-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-border-radius-expected.txt

@@ -6 +6 @@
       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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (541,10) size 127x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0
-      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,310) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (146,432) size 4x18
         text run at (146,432) width 4: " "
-      RenderBlock {DIV} at (160,310) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (160,310) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-longhand-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-massive-scale-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 785x724
     RenderBody {BODY} at (8,8) size 769x708
-      RenderBlock {DIV} at (10,10) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
+      RenderBlock {DIV} at (10,10) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
       RenderText {#text} at (350,336) size 4x18
         text run at (350,336) width 4: " "
-      RenderBlock {DIV} at (364,10) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
+      RenderBlock {DIV} at (364,10) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #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 none #000000) (150px none #000000) (105px none #000000)]
+      RenderBlock {DIV} at (10,364) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
       RenderText {#text} at (350,690) size 4x18
         text run at (350,690) width 4: " "
-      RenderBlock {DIV} at (364,364) size 330x330 [border: (105px none #000000) (150px none #000000) (105px none #000000)]
+      RenderBlock {DIV} at (364,364) size 330x330 [border: (105px solid #000000) (150px solid #000000) (105px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-omit-right-slice-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x416
     RenderBody {BODY} at (8,8) size 784x400
-      RenderBlock {DIV} at (0,0) size 400x400 [border: (100px none #000000)]
+      RenderBlock {DIV} at (0,0) size 400x400 [border: (100px solid #000000)]
         RenderBlock {DIV} at (100,100) size 200x200 [bgcolor=#FFFFFF]

trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (30,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (30,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (186,172) size 4x18
         text run at (186,172) width 4: " "
-      RenderBlock {DIV} at (220,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (220,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (30,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (186,362) size 4x18
         text run at (186,362) width 4: " "
-      RenderBlock {DIV} at (220,220) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (220,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-outset-in-shorthand-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (30,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (30,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (186,172) size 4x18
         text run at (186,172) width 4: " "
-      RenderBlock {DIV} at (220,30) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (220,30) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (30,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (186,362) size 4x18
         text run at (186,362) width 4: " "
-      RenderBlock {DIV} at (220,220) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (220,220) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-repeat-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-rotate-transform-expected.txt

@@ -5 +5 @@
 layer at (8,8) size 769x569
   RenderBody {BODY} at (8,8) size 769x569
-    RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+    RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+    RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+    RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+    RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
     RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-scale-transform-expected.txt

@@ -5 +5 @@
 layer at (8,8) size 769x569
   RenderBody {BODY} at (8,8) size 769x569
-    RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+    RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+    RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+    RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+    RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
     RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-scaled-expected.txt

@@ -9 +9 @@
           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 none #000000) (60px none #000000) (42px none #000000)]
+        RenderBlock {DIV} at (10,10) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
         RenderText {#text} at (272,258) size 4x18
           text run at (272,258) width 4: " "
-        RenderBlock {DIV} at (286,10) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
+        RenderBlock {DIV} at (286,10) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #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 none #000000) (60px none #000000) (42px none #000000)]
+        RenderBlock {DIV} at (10,286) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
         RenderText {#text} at (272,534) size 4x18
           text run at (272,534) width 4: " "
-        RenderBlock {DIV} at (286,286) size 252x252 [border: (42px none #000000) (60px none #000000) (42px none #000000)]
+        RenderBlock {DIV} at (286,286) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]
         RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-scrambled-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-side-reduction-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-slice-constrained-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 171x171 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 171x171 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (191,177) size 4x18
         text run at (191,177) width 4: " "
-      RenderBlock {DIV} at (205,10) size 171x171 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (205,10) size 171x171 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-slices-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,10) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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)]
+      RenderBlock {DIV} at (160,160) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/border-image-source-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      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: " "
+      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: " "
       RenderBR {BR} at (0,0) size 0x0
-      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)]
+      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
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/fast/borders/scaled-border-image-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,10) size 784x570
-      RenderBlock {DIV} at (10,0) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderBlock {DIV} at (10,0) size 126x126 [border: (21px solid #000000) (30px solid #000000) (21px solid #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 none #000000) (60px none #000000) (42px none #000000)]
+      RenderBlock {DIV} at (20,174) size 252x252 [border: (42px solid #000000) (60px solid #000000) (42px solid #000000)]

trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-comparison-expected.txt

@@ -9 +9 @@
         RenderBR {BR} at (285,14) size 1x0
         RenderBR {BR} at (0,18) size 0x18
-      RenderBlock {DIV} at (0,36) size 40x13 [border: (3px none #000000)]
+      RenderBlock {DIV} at (0,36) size 40x13 [border: (3px solid #000000)]
       RenderBlock (anonymous) at (0,49) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {DIV} at (0,67) size 40x13 [border: (3px none #000000) (7px none #000000) (3px none #000000)]
+      RenderBlock {DIV} at (0,67) size 40x13 [border: (3px solid #000000) (7px solid #000000) (3px solid #000000)]
       RenderBlock (anonymous) at (0,80) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {DIV} at (0,98) size 40x13 [border: (3px none #000000)]
+      RenderBlock {DIV} at (0,98) size 40x13 [border: (3px solid #000000)]
       RenderBlock (anonymous) at (0,111) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderBlock {DIV} at (0,129) size 40x13 [border: (3px none #000000) (7px none #000000) (3px none #000000)]
+      RenderBlock {DIV} at (0,129) size 40x13 [border: (3px solid #000000) (7px solid #000000) (3px solid #000000)]
       RenderBlock (anonymous) at (0,142) size 784x18
         RenderBR {BR} at (0,0) size 0x18

trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-dynamic-expected.txt

@@ -9 +9 @@
           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 none #000000)]
+      RenderBlock {DIV} at (0,54) size 106x106 [border: (3px solid #000000)]
         RenderText {#text} at (3,3) size 8x18
           text run at (3,3) width 8: "2"

trunk/LayoutTests/platform/mac/fast/hidpi/image-set-border-image-simple-expected.txt

@@ -8 +8 @@
           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 none #000000)]
+      RenderBlock {DIV} at (0,36) size 120x120 [border: (10px solid #000000)]

trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-horizontal-bt-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 800x460
     RenderBody {BODY} at (8,8) size 784x444
-      RenderInline {SPAN} at (0,0) size 80x323 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderInline {SPAN} at (0,0) size 80x323 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
         RenderBlock {DIV} at (101,117) size 25x0
         RenderBR {BR} at (126,95) size 0x100

trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-lr-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 460x600
     RenderBody {BODY} at (8,8) size 444x584
-      RenderInline {SPAN} at (0,0) size 323x80 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderInline {SPAN} at (0,0) size 323x80 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
         RenderBlock {DIV} at (99,101) size 0x25
         RenderBR {BR} at (77,126) size 100x0

trunk/LayoutTests/platform/mac/fast/writing-mode/border-image-vertical-rl-expected.txt

@@ -4 +4 @@
   RenderBlock {HTML} at (0,0) size 460x600
     RenderBody {BODY} at (8,8) size 444x584
-      RenderInline {SPAN} at (0,0) size 323x80 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
+      RenderInline {SPAN} at (0,0) size 323x80 [border: (21px solid #000000) (30px solid #000000) (21px solid #000000)]
         RenderBlock {DIV} at (164,101) size 0x25
         RenderBR {BR} at (86,126) size 100x0

trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-2-expected.txt

@@ -9 +9 @@
             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 none #000000)]
+          RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,166) size 4x18
             text run at (180,166) width 4: " "
-          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #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 none #000000)]
+          RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,350) size 4x18
             text run at (180,350) width 4: " "
-          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (370,418) size 4x18
@@ -28 +28 @@
             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 none #000000)]
+          RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,166) size 4x18
             text run at (180,166) width 4: " "
-          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #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 none #000000)]
+          RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,350) size 4x18
             text run at (180,350) width 4: " "
-          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.txt

@@ -9 +9 @@
             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 none #000000)]
+          RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,166) size 4x18
             text run at (180,166) width 4: " "
-          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #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 none #000000)]
+          RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,350) size 4x18
             text run at (180,350) width 4: " "
-          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (370,418) size 4x18
@@ -28 +28 @@
             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 none #000000)]
+          RenderBlock {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,166) size 4x18
             text run at (180,166) width 4: " "
-          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,10) size 160x160 [border: (30px solid #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 none #000000)]
+          RenderBlock {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (180,350) size 4x18
             text run at (180,350) width 4: " "
-          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px none #000000)]
+          RenderBlock {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0

trunk/LayoutTests/svg/as-border-image/svg-as-border-image-2.html

@@ -17 +17 @@
     
     .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;
     }

trunk/LayoutTests/svg/as-border-image/svg-as-border-image.html

@@ -16 +16 @@
     
     .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;
     }
@@ -33 +37 @@
 
     .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;
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-02  Adenilson Cavalcanti  <cavalcantii@gmail.com>
+
+        [css border] border-image doesn't honor border-style
+        https://bugs.webkit.org/show_bug.cgi?id=99922
+
+        Reviewed by Simon Fraser.
+
+        Ensure that WebKit will be compliant to css-backgrounds spec where a
+        border with an image will only be rendered if there is a style defined.
+
+        Quote: "None: No border. Color and width are ignored (i.e., the border has width 0)".
+        Reference: http://www.w3.org/TR/css3-background/#border-style
+
+        From W3C discussion: "The fact that these properties set the style of the border is
+        normative". Reference: https://lists.w3.org/Archives/Public/www-style/2015Nov/0260.html
+
+        Test: fast/borders/border-image-should-not-display.html
+
+        * rendering/style/BorderData.h:
+        (WebCore::BorderData::hasBorder):
+        (WebCore::BorderData::borderLeftWidth):
+        (WebCore::BorderData::borderRightWidth):
+        (WebCore::BorderData::borderTopWidth):
+        (WebCore::BorderData::borderBottomWidth):
+        * rendering/style/BorderValue.h:
+        (WebCore::BorderValue::nonZero):
+        (WebCore::BorderValue::isVisible):
+
 2015-12-02  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/style/BorderData.h

@@ -44 +44 @@
     bool hasBorder() const
     {
-        bool haveImage = m_image.hasImage();
-        return m_left.nonZero(!haveImage) || m_right.nonZero(!haveImage) || m_top.nonZero(!haveImage) || m_bottom.nonZero(!haveImage);
+        return m_left.nonZero() || m_right.nonZero() || m_top.nonZero() || m_bottom.nonZero();
     }
 
@@ -65 +64 @@
         return false;
     }
-    
+
     float borderLeftWidth() const
     {
-        if (!m_image.hasImage() && (m_left.style() == BNONE || m_left.style() == BHIDDEN))
-            return 0; 
+        if (m_left.style() == BNONE || m_left.style() == BHIDDEN)
+            return 0;
         return m_left.width();
     }
-    
+
     float borderRightWidth() const
     {
-        if (!m_image.hasImage() && (m_right.style() == BNONE || m_right.style() == BHIDDEN))
+        if (m_right.style() == BNONE || m_right.style() == BHIDDEN)
             return 0;
         return m_right.width();
     }
-    
+
     float borderTopWidth() const
     {
-        if (!m_image.hasImage() && (m_top.style() == BNONE || m_top.style() == BHIDDEN))
+        if (m_top.style() == BNONE || m_top.style() == BHIDDEN)
             return 0;
         return m_top.width();
     }
-    
+
     float borderBottomWidth() const
     {
-        if (!m_image.hasImage() && (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN))
+        if (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN)
             return 0;
         return m_bottom.width();
@@ -98 +97 @@
         return FloatBoxExtent(borderTopWidth(), borderRightWidth(), borderBottomWidth(), borderLeftWidth());
     }
-    
+
     bool operator==(const BorderData& o) const
     {
@@ -104 +103 @@
                && 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; }

trunk/Source/WebCore/rendering/style/BorderValue.h

@@ -43 +43 @@
     }
 
-    bool nonZero(bool checkStyle = true) const
+    bool nonZero() const
     {
-        return width() && (!checkStyle || m_style != BNONE);
+        return width() && (m_style != BNONE);
     }
 
@@ -53 +53 @@
     }
 
-    bool isVisible(bool checkStyle = true) const
+    bool isVisible() const
     {
-        return nonZero(checkStyle) && !isTransparent() && (!checkStyle || m_style != BHIDDEN);
+        return nonZero() && !isTransparent() && (m_style != BHIDDEN);
     }