<!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>[69424] tags/Safari-534.9.1</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/69424">69424</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2010-10-08 15:14:33 -0700 (Fri, 08 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/69423">r69423</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53491LayoutTestsChangeLog">tags/Safari-534.9.1/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari53491WebCoreChangeLog">tags/Safari-534.9.1/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari53491WebCorerenderingRenderImagecpp">tags/Safari-534.9.1/WebCore/rendering/RenderImage.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari53491LayoutTestsfastreplacedcsscontentandwebkitmaskboximagecrashexpectedtxt">tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash-expected.txt</a></li>
<li><a href="#tagsSafari53491LayoutTestsfastreplacedcsscontentandwebkitmaskboximagecrashhtml">tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53491LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-534.9.1/LayoutTests/ChangeLog (69423 => 69424)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-534.9.1/LayoutTests/ChangeLog        2010-10-08 21:57:29 UTC (rev 69423)
+++ tags/Safari-534.9.1/LayoutTests/ChangeLog        2010-10-08 22:14:33 UTC (rev 69424)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2010-10-08  Andy Estes  &lt;aestes@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r66599): Crash when using CSS content and -webkit-mask-box-image properties containing cached images.
+        https://bugs.webkit.org/show_bug.cgi?id=47430
+
+        * fast/replaced/css-content-and-webkit-mask-box-image-crash-expected.txt: Added.
+        * fast/replaced/css-content-and-webkit-mask-box-image-crash.html: Added.
+
</ins><span class="cx"> 2010-09-24  Sheriff Bot  &lt;webkit.review.bot@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r68236.
</span></span></pre></div>
<a id="tagsSafari53491LayoutTestsfastreplacedcsscontentandwebkitmaskboximagecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash-expected.txt (0 => 69424)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash-expected.txt                                (rev 0)
+++ tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash-expected.txt        2010-10-08 22:14:33 UTC (rev 69424)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+The test passes if you see the Safari icon below.
+
</ins></span></pre></div>
<a id="tagsSafari53491LayoutTestsfastreplacedcsscontentandwebkitmaskboximagecrashhtml"></a>
<div class="addfile"><h4>Added: tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash.html (0 => 69424)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash.html                                (rev 0)
+++ tags/Safari-534.9.1/LayoutTests/fast/replaced/css-content-and-webkit-mask-box-image-crash.html        2010-10-08 22:14:33 UTC (rev 69424)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+&lt;script&gt;
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    function insertSpan() {
+        document.getElementById(&quot;container&quot;).innerHTML = &quot;&lt;span style=\&quot;content:url('resources/compass.jpg'); -webkit-mask-box-image:url('resources/compass.jpg');\&quot;&gt;FAIL&lt;/span&gt;&quot;;
+    }
+&lt;/script&gt;
+&lt;body onload=&quot;insertSpan()&quot;&gt;
+    The test passes if you see the Safari icon below.
+    &lt;div id=&quot;container&quot;&gt;&lt;/div&gt;
+    &lt;script&gt;
+        insertSpan();
+    &lt;/script&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="tagsSafari53491WebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-534.9.1/WebCore/ChangeLog (69423 => 69424)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-534.9.1/WebCore/ChangeLog        2010-10-08 21:57:29 UTC (rev 69423)
+++ tags/Safari-534.9.1/WebCore/ChangeLog        2010-10-08 22:14:33 UTC (rev 69424)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2010-10-08  Andy Estes  &lt;aestes@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r66599): Crash when using CSS content and -webkit-mask-box-image properties containing cached images.
+        https://bugs.webkit.org/show_bug.cgi?id=47430
+
+        Test: fast/replaced/css-content-and-webkit-mask-box-image-crash.html
+
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageChanged): imageChanged() can be called prior
+        to m_imageResource being set. The appropriate thing to do in this case
+        is to return early.
+        (WebCore::RenderImage::notifyFinished): Ditto.
+
</ins><span class="cx"> 2010-09-24  Eric Uhrhane  &lt;ericu@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="tagsSafari53491WebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-534.9.1/WebCore/rendering/RenderImage.cpp (69423 => 69424)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-534.9.1/WebCore/rendering/RenderImage.cpp        2010-10-08 21:57:29 UTC (rev 69423)
+++ tags/Safari-534.9.1/WebCore/rendering/RenderImage.cpp        2010-10-08 22:14:33 UTC (rev 69424)
</span><span class="lines">@@ -127,6 +127,9 @@
</span><span class="cx"> 
</span><span class="cx">     if (hasBoxDecorations() || hasMask())
</span><span class="cx">         RenderReplaced::imageChanged(newImage, rect);
</span><ins>+    
+    if (!m_imageResource)
+        return;
</ins><span class="cx"> 
</span><span class="cx">     if (newImage != m_imageResource-&gt;imagePtr() || !newImage)
</span><span class="cx">         return;
</span><span class="lines">@@ -191,6 +194,9 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderImage::notifyFinished(CachedResource* newImage)
</span><span class="cx"> {
</span><ins>+    if (!m_imageResource)
+        return;
+    
</ins><span class="cx">     if (documentBeingDestroyed())
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>