<!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>[167694] trunk</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167694">167694</a></dd>

<dt>Author</dt> <dd>zalan@apple.com</dd>

<dt>Date</dt> <dd>2014-04-22 19:44:25 -0700 (Tue, 22 Apr 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Do not paint border image when the border rect is empty.

https://bugs.webkit.org/show_bug.cgi?id=131988

Reviewed by Darin Adler.

http://trac.webkit.org/changeset/167351 introduced an early return when border

rect is empty. This patch ensures that border image is not painted either in that case.

Source/WebCore:

Modified padding-margin-negative-border.html to cover border-image case.

* rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintBorder):

LayoutTests:

* fast/css/padding-margin-negative-border-expected.html: Borders in -expected.html does not get painted either, just

ensure that they are explicitly different colors.

* fast/css/padding-margin-negative-border.html:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsfastcsspaddingmarginnegativeborderexpectedhtml">trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html</a></li>

<li><a href="#trunkLayoutTestsfastcsspaddingmarginnegativeborderhtml">trunk/LayoutTests/fast/css/padding-margin-negative-border.html</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167693 => 167694)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-23 01:37:39 UTC (rev 167693)

+++ trunk/LayoutTests/ChangeLog        2014-04-23 02:44:25 UTC (rev 167694)

</span><span class="lines">@@ -1,3 +1,17 @@

</span><ins>+2014-04-22  Zalan Bujtas  &lt;zalan@apple.com&gt;

+

+        Do not paint border image when the border rect is empty.

+        https://bugs.webkit.org/show_bug.cgi?id=131988

+

+        Reviewed by Darin Adler.

+

+        http://trac.webkit.org/changeset/167351 introduced an early return when border

+        rect is empty. This patch ensures that border image is not painted either in that case.

+

+        * fast/css/padding-margin-negative-border-expected.html: Borders in -expected.html does not get painted either, just

+        ensure that they are explicitly different colors.

+        * fast/css/padding-margin-negative-border.html:

+

</ins><span class="cx"> 2014-04-22  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;

</span><span class="cx"> 

</span><span class="cx">         REGRESSION (r157328): popover to check into flight ba.com dismisses instantly when focusing form

</span></span></pre></div>

<a id="trunkLayoutTestsfastcsspaddingmarginnegativeborderexpectedhtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html (167693 => 167694)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html        2014-04-23 01:37:39 UTC (rev 167693)

+++ trunk/LayoutTests/fast/css/padding-margin-negative-border-expected.html        2014-04-23 02:44:25 UTC (rev 167694)

</span><span class="lines">@@ -1,13 +1,22 @@

</span><span class="cx"> &lt;!DOCTYPE html&gt;

</span><span class="cx"> &lt;html&gt;

</span><ins>+  &lt;head&gt;

+    &lt;style&gt;

+      table { width: 700px; }

+      td { width: 400px; }

+      b {  border: solid blue; }

+      i { background-color: green; }

+      .nonBlueBorder { border-color: red; }

+      .borderImage { border-image:url(&quot;resources/greenbox.png&quot;) 3 3 repeat; }

+    &lt;/style&gt;

+  &lt;/head&gt;

</ins><span class="cx">   &lt;body&gt;

</span><del>-    &lt;table style=&quot;width:700px&quot;&gt;

</del><ins>+    &lt;table&gt;

</ins><span class="cx">       &lt;tr&gt;

</span><span class="cx">         &lt;td&gt;top&lt;/td&gt;

</span><del>-        &lt;td style=&quot;width:400px&quot;&gt;

-          &lt;b style=&quot;border:solid;&quot;&gt;

</del><ins>+        &lt;td&gt;

+          &lt;b&gt;

</ins><span class="cx">             &lt;i style=&quot;

</span><del>-                background-color:green;

</del><span class="cx">                 margin: -30px 0px 0px 0px;

</span><span class="cx">                 padding: 1px 0px 0px 0px;&quot;&gt;