<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[28683] tags/Safari-5523.15/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28683">28683</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2007-12-13 05:47:13 -0800 (Thu, 13 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge r28066.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari552315WebCoreChangeLog">tags/Safari-5523.15/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari552315WebCorepageFramecpp">tags/Safari-5523.15/WebCore/page/Frame.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari552315WebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-5523.15/WebCore/ChangeLog (28682 => 28683)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-5523.15/WebCore/ChangeLog        2007-12-13 13:46:27 UTC (rev 28682)
+++ tags/Safari-5523.15/WebCore/ChangeLog        2007-12-13 13:47:13 UTC (rev 28683)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2007-12-10  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r28066.
+
+    2007-11-26  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Darin.
+
+        Update to last change.  Moved addPendingSheet call to within nil check for m_cachedSheet.
+
+        * page/Frame.cpp:
+        (WebCore::UserStyleSheetLoader::UserStyleSheetLoader):
+
+2007-12-10  Mark Rowe  &lt;mrowe@apple.com&gt;
+
</ins><span class="cx">         Merge r28064.
</span><span class="cx"> 
</span><span class="cx">     2007-11-26  Adele Peterson  &lt;adele@apple.com&gt;
</span></span></pre></div>
<a id="tagsSafari552315WebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-5523.15/WebCore/page/Frame.cpp (28682 => 28683)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-5523.15/WebCore/page/Frame.cpp        2007-12-13 13:46:27 UTC (rev 28682)
+++ tags/Safari-5523.15/WebCore/page/Frame.cpp        2007-12-13 13:47:13 UTC (rev 28683)
</span><span class="lines">@@ -99,9 +99,10 @@
</span><span class="cx">         : m_document(document)
</span><span class="cx">         , m_cachedSheet(m_document-&gt;docLoader()-&gt;requestUserCSSStyleSheet(url, &quot;&quot;))
</span><span class="cx">     {
</span><del>-        m_document-&gt;addPendingSheet();
-        if (m_cachedSheet)
</del><ins>+        if (m_cachedSheet) {
+            m_document-&gt;addPendingSheet();
</ins><span class="cx">             m_cachedSheet-&gt;ref(this);
</span><ins>+        }
</ins><span class="cx">     }
</span><span class="cx">     ~UserStyleSheetLoader()
</span><span class="cx">     {
</span></span></pre>
</div>
</div>

</body>
</html>