<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182696] releases/WebKitGTK/webkit-2.8</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182696">182696</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-13 03:13:51 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182197">r182197</a> - border-image with 'fill' keyword does not fill the middle area unless the border width is greater than zero.
https://bugs.webkit.org/show_bug.cgi?id=142650.
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-03-31
Reviewed by Simon Fraser.
Source/WebCore:
The decoration of a RenderBox, a RenderTable or an InlineFlowBox should be
drawn if its RenderStyle has a non-zero width border or the border-image
has the keyword fill.
Tests: fast/borders/border-image-fill-inline-no-border.html
fast/borders/border-image-fill-no-border.html
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::paintBoxDecorations):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintBoxDecorations):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::hasBoxDecorationStyle):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::paintBoxDecorations):
* rendering/style/BorderData.h:
(WebCore::BorderData::hasFill):
* rendering/style/RenderStyle.h:
LayoutTests:
Add tests to ensure the middle area of a RenderBox is going to be drawn
even if the border width is not greater than zero.
* fast/borders/border-image-fill-inline-no-border-expected.html: Added.
* fast/borders/border-image-fill-inline-no-border.html: Added.
* fast/borders/border-image-fill-no-border-expected.html: Added.
* fast/borders/border-image-fill-no-border.html: Added.
* fast/borders/resources/button-border-cropped.svg: Added.
* fast/borders/resources/button-border.svg: Added.
* fast/borders/resources/svg-100x100-intrinsic.svg: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingInlineFlowBoxcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBoxcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBoxModelObjectcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderTablecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingstyleBorderDatah">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/BorderData.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingstyleRenderStyleh">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillinlinenoborderexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillinlinenoborderhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillnoborderexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillnoborderhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersresourcesbuttonbordercroppedsvg">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border-cropped.svg</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersresourcesbuttonbordersvg">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border.svg</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastbordersresourcessvg100x100intrinsicsvg">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/svg-100x100-intrinsic.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-03-31 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ border-image with 'fill' keyword does not fill the middle area unless the border width is greater than zero.
+ https://bugs.webkit.org/show_bug.cgi?id=142650.
+
+ Reviewed by Simon Fraser.
+
+ Add tests to ensure the middle area of a RenderBox is going to be drawn
+ even if the border width is not greater than zero.
+
+ * fast/borders/border-image-fill-inline-no-border-expected.html: Added.
+ * fast/borders/border-image-fill-inline-no-border.html: Added.
+ * fast/borders/border-image-fill-no-border-expected.html: Added.
+ * fast/borders/border-image-fill-no-border.html: Added.
+ * fast/borders/resources/button-border-cropped.svg: Added.
+ * fast/borders/resources/button-border.svg: Added.
+ * fast/borders/resources/svg-100x100-intrinsic.svg: Added.
+
</ins><span class="cx"> 2015-03-31 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r173484): Reducing content of scrollable region does not reset scroll
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillinlinenoborderexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border-expected.html (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border-expected.html 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ td {
+ padding: 10px;
+ }
+ div {
+ display: inline;
+ padding: 5px 14px;
+ }
+ .font-size-200 {
+ font-size: 200%;
+ }
+ .font-size-400 {
+ font-size: 400%;
+ }
+ .border-slices {
+ border: 20px solid transparent;
+ border-image: url("resources/button-border.svg") 0 14 0 14 fill;
+ }
+ .no-border-image-cropped {
+ border: 0px none;
+ background-image: url("resources/button-border-cropped.svg");
+ background-size: 100% 100%;
+ }
+ .no-border-image {
+ border: 0px none;
+ background-image: url("resources/button-border.svg");
+ background-size: 100% 100%;
+ }
+ </style>
+</head>
+<body>
+ <table>
+ <tr>
+ <td><div class="font-size-200 border-slices">Search</div></td>
+ <td><div class="font-size-200 no-border-image-cropped">Search</div></td>
+ <td><div class="font-size-200 no-border-image">Search</div></td>
+ </tr>
+ <tr>
+ <td><div class="font-size-400 border-slices">Search</div></td>
+ <td><div class="font-size-400 no-border-image-cropped">Search</div></td>
+ <td><div class="font-size-400 no-border-image">Search</div></td>
+ </tr>
+ </table>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillinlinenoborderhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border.html (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-inline-no-border.html 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ td {
+ padding: 10px;
+ }
+ div {
+ display: inline;
+ padding: 5px 14px;
+ }
+ .font-size-200 {
+ font-size: 200%;
+ }
+ .font-size-400 {
+ font-size: 400%;
+ }
+ .border-slices {
+ border: 20px solid transparent;
+ border-image: url("resources/button-border.svg") 0 14 0 14 fill;
+ }
+ .no-border-slices {
+ border: 0px solid transparent;
+ border-image: url("resources/button-border.svg") 0 14 0 14 fill;
+ }
+ .no-border-no-slices {
+ border: 0px solid transparent;
+ border-image: url("resources/button-border.svg") 0 fill;
+ }
+ </style>
+</head>
+<body>
+ <table>
+ <tr>
+ <td><div class="font-size-200 border-slices">Search</div></td>
+ <td><div class="font-size-200 no-border-slices">Search</div></td>
+ <td><div class="font-size-200 no-border-no-slices">Search</div></td>
+ </tr>
+ <tr>
+ <td><div class="font-size-400 border-slices">Search</div></td>
+ <td><div class="font-size-400 no-border-slices">Search</div></td>
+ <td><div class="font-size-400 no-border-no-slices">Search</div></td>
+ </tr>
+ </table>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillnoborderexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border-expected.html (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border-expected.html 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<html>
+<head>
+ <style>
+ .inline-block {
+ display: inline-block;
+ margin: 10px;
+ background-color: yellow;
+ }
+ .image-cropper {
+ position: relative;
+ overflow: hidden;
+ border: 0px red solid;
+ }
+ .fixed-container {
+ height: 80px;
+ width: 80px;
+ }
+ .fixed-thick-container {
+ height: 120px;
+ width: 120px;
+ }
+ .centered-out {
+ position: absolute;
+ left: -10;
+ top: -10;
+ }
+ .cenetered-in {
+ position: absolute;
+ left: 10;
+ top: 10;
+ }
+ .scaled-down {
+ transform: scale(0.8);
+ -webkit-transform: scale(0.8);
+ }
+ .scaled-up {
+ transform: scale(1.333);
+ -webkit-transform: scale(1.333);
+ }
+ </style>
+</head>
+<body>
+ <div class="inline-block image-cropper fixed-container"><img class="centered-out scaled-down" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-thick-container"><img class="cenetered-in scaled-down" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-container"><img class="centered-out scaled-up" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-thick-container"><img class="cenetered-in scaled-up" src="resources/svg-100x100-intrinsic.svg"></div>
+ <br>
+ <div class="inline-block image-cropper fixed-container"><img class="centered-out scaled-down" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-thick-container"><img class="cenetered-in scaled-down" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-container"><img class="centered-out scaled-up" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-thick-container"><img class="cenetered-in scaled-up" src="resources/svg-100x100-intrinsic.svg"></div>
+ <br>
+ <div class="inline-block image-cropper fixed-container"><img class="centered-out scaled-down" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-thick-container"><img class="cenetered-in scaled-down" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-container"><img class="centered-out scaled-up" src="resources/svg-100x100-intrinsic.svg"></div>
+ <div class="inline-block image-cropper fixed-thick-container"><img class="cenetered-in scaled-up" src="resources/svg-100x100-intrinsic.svg"></div>
+</body>
+</htm>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersborderimagefillnoborderhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border.html (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/border-image-fill-no-border.html 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+ <style>
+ .inline-block {
+ display: inline-block;
+ margin: 10px;
+ }
+ .fixed-container {
+ height: 80px;
+ width: 80px;
+ }
+ .thick-border {
+ border: 20px solid black;
+ background-color: yellow;
+ }
+ .zero-border {
+ border: 0px solid black;
+ background-color: red;
+ }
+ .border-image-zero-slice {
+ border-image: url('resources/svg-100x100-intrinsic.svg') 0 fill;
+ }
+ .border-image-thick-slice {
+ border-image: url('resources/svg-100x100-intrinsic.svg') 20 fill;
+ }
+ </style>
+</head>
+<body>
+ <div class="inline-block fixed-container zero-border border-image-zero-slice"></div>
+ <div class="inline-block fixed-container thick-border border-image-zero-slice"></div>
+ <div class="inline-block fixed-container zero-border border-image-thick-slice"></div>
+ <div class="inline-block fixed-container thick-border border-image-thick-slice"></div>
+ <br>
+ <div class="inline-block"><object class="fixed-container zero-border border-image-zero-slice"></object></div>
+ <div class="inline-block"><object class="fixed-container thick-border border-image-zero-slice"></object></div>
+ <div class="inline-block"><object class="fixed-container zero-border border-image-thick-slice"></object></div>
+ <div class="inline-block"><object class="fixed-container thick-border border-image-thick-slice"></object></div>
+ <br>
+ <table class="inline-block fixed-container zero-border border-image-zero-slice"><tr/></table>
+ <table class="inline-block fixed-container thick-border border-image-zero-slice"><tr/></table>
+ <table class="inline-block fixed-container zero-border border-image-thick-slice"><tr/></table>
+ <table class="inline-block fixed-container thick-border border-image-thick-slice"><tr/></table>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersresourcesbuttonbordercroppedsvg"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border-cropped.svg (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border-cropped.svg (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border-cropped.svg 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="4" height="48" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="upperClip">
+ <rect width="100%" height="50%"/>
+ </clipPath>
+ <clipPath id="lowerClip">
+ <rect y="50%" width="100%" height="50%"/>
+ </clipPath>
+ </defs>
+ <rect x="0" y="0" width="32" height="48" fill="#808080" shape-rendering="crispEdges"/>
+ <rect x="0" y="2" width="32" height="44" fill="#D0D0D0" shape-rendering="crispEdges" clip-path="url(#upperClip)"/>
+ <rect x="0" y="2" width="32" height="44" fill="#C0C0C0" shape-rendering="crispEdges" clip-path="url(#lowerClip)"/>
+</svg>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersresourcesbuttonbordersvg"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border.svg (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border.svg (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/button-border.svg 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="48" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="upperClip">
+ <rect width="100%" height="50%"/>
+ </clipPath>
+ <clipPath id="lowerClip">
+ <rect y="50%" width="100%" height="50%"/>
+ </clipPath>
+ </defs>
+ <rect x="0" y="0" width="32" height="48" fill="#808080" shape-rendering="crispEdges"/>
+ <rect x="2" y="2" width="28" height="44" fill="#D0D0D0" shape-rendering="crispEdges" clip-path="url(#upperClip)"/>
+ <rect x="2" y="2" width="28" height="44" fill="#C0C0C0" shape-rendering="crispEdges" clip-path="url(#lowerClip)"/>
+</svg>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastbordersresourcessvg100x100intrinsicsvg"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/svg-100x100-intrinsic.svg (0 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/svg-100x100-intrinsic.svg (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/borders/resources/svg-100x100-intrinsic.svg 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100" height="100">
+ <rect width="100" height="100" fill="lime"/>
+ <rect x="25" y="25" width="50" height="50" fill="green"/>
+</svg>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-03-31 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ border-image with 'fill' keyword does not fill the middle area unless the border width is greater than zero.
+ https://bugs.webkit.org/show_bug.cgi?id=142650.
+
+ Reviewed by Simon Fraser.
+
+ The decoration of a RenderBox, a RenderTable or an InlineFlowBox should be
+ drawn if its RenderStyle has a non-zero width border or the border-image
+ has the keyword fill.
+
+ Tests: fast/borders/border-image-fill-inline-no-border.html
+ fast/borders/border-image-fill-no-border.html
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::paintBoxDecorations):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::paintBoxDecorations):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::hasBoxDecorationStyle):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::paintBoxDecorations):
+ * rendering/style/BorderData.h:
+ (WebCore::BorderData::hasFill):
+ * rendering/style/RenderStyle.h:
+
</ins><span class="cx"> 2015-03-31 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r173484): Reducing content of scrollable region does not reset scroll
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/InlineFlowBox.cpp (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/InlineFlowBox.cpp 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/InlineFlowBox.cpp 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -1347,7 +1347,7 @@
</span><span class="cx">
</span><span class="cx"> // :first-line cannot be used to put borders on a line. Always paint borders with our
</span><span class="cx"> // non-first-line style.
</span><del>- if (!parent() || !renderer().style().hasBorder())
</del><ins>+ if (!parent() || !renderer().style().hasBorderDecoration())
</ins><span class="cx"> return;
</span><span class="cx"> const NinePieceImage& borderImage = renderer().style().borderImage();
</span><span class="cx"> StyleImage* borderImageSource = borderImage.image();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBox.cpp (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBox.cpp 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBox.cpp 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -1306,7 +1306,7 @@
</span><span class="cx"> paintBoxShadow(paintInfo, paintRect, style(), Inset);
</span><span class="cx">
</span><span class="cx"> // The theme will tell us whether or not we should also paint the CSS border.
</span><del>- if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style().hasAppearance() || (!themePainted && theme().paintBorderOnly(*this, paintInfo, paintRect))) && style().hasBorder())
</del><ins>+ if (bleedAvoidance != BackgroundBleedBackgroundOverBorder && (!style().hasAppearance() || (!themePainted && theme().paintBorderOnly(*this, paintInfo, paintRect))) && style().hasBorderDecoration())
</ins><span class="cx"> paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
</span><span class="cx">
</span><span class="cx"> if (bleedAvoidance == BackgroundBleedUseTransparencyLayer)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBoxModelObject::hasBoxDecorationStyle() const
</span><span class="cx"> {
</span><del>- return hasBackground() || style().hasBorder() || style().hasAppearance() || style().boxShadow();
</del><ins>+ return hasBackground() || style().hasBorderDecoration() || style().hasAppearance() || style().boxShadow();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBoxModelObject::updateFromStyle()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderTable.cpp (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderTable.cpp 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderTable.cpp 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> paintBackground(paintInfo, rect, bleedAvoidance);
</span><span class="cx"> paintBoxShadow(paintInfo, rect, style(), Inset);
</span><span class="cx">
</span><del>- if (style().hasBorder() && !collapseBorders())
</del><ins>+ if (style().hasBorderDecoration() && !collapseBorders())
</ins><span class="cx"> paintBorder(paintInfo, rect, style());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingstyleBorderDatah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/BorderData.h (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/BorderData.h 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/BorderData.h 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx"> return m_left.nonZero(!haveImage) || m_right.nonZero(!haveImage) || m_top.nonZero(!haveImage) || m_bottom.nonZero(!haveImage);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool hasFill() const
+ {
+ return m_image.hasImage() && m_image.fill();
+ }
+
</ins><span class="cx"> bool hasBorderRadius() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_topLeft.width().isZero())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.h (182695 => 182696)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.h 2015-04-13 10:04:26 UTC (rev 182695)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/style/RenderStyle.h 2015-04-13 10:13:51 UTC (rev 182696)
</span><span class="lines">@@ -526,6 +526,8 @@
</span><span class="cx"> bool isFloating() const { return noninherited_flags.isFloating(); }
</span><span class="cx"> bool hasMargin() const { return surround->margin.nonZero(); }
</span><span class="cx"> bool hasBorder() const { return surround->border.hasBorder(); }
</span><ins>+ bool hasBorderFill() const { return surround->border.hasFill(); }
+ bool hasBorderDecoration() const { return hasBorder() || hasBorderFill(); }
</ins><span class="cx"> bool hasPadding() const { return surround->padding.nonZero(); }
</span><span class="cx"> bool hasOffset() const { return surround->offset.nonZero(); }
</span><span class="cx"> bool hasMarginBeforeQuirk() const { return marginBefore().hasQuirk(); }
</span></span></pre>
</div>
</div>
</body>
</html>