<!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>[165717] trunk/Source/WebCore</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/165717">165717</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-03-16 21:31:47 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSSValueList should assert that no null values are added to it.
<https://webkit.org/b/130315>
Add assertions in CSSValueList's append() and prepend() that we are
not adding a null value. This caught a single place in CSSParser
that was appending an alread-released RefPtr to a CSSValueList.
That list was eventually discarded anyway (due to "foundClip" now
being true), so the fix is simply to remove the adding.
Eventually we should use Ref and PassRef all over for CSSValueList,
this is just a first step on the way.
Reviewed by Darin Adler.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseFillShorthand):
* css/CSSValueList.h:
(WebCore::CSSValueList::append):
(WebCore::CSSValueList::prepend):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListh">trunk/Source/WebCore/css/CSSValueList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165716 => 165717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-17 03:41:28 UTC (rev 165716)
+++ trunk/Source/WebCore/ChangeLog 2014-03-17 04:31:47 UTC (rev 165717)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-16 Andreas Kling <akling@apple.com>
+
+ CSSValueList should assert that no null values are added to it.
+ <https://webkit.org/b/130315>
+
+ Add assertions in CSSValueList's append() and prepend() that we are
+ not adding a null value. This caught a single place in CSSParser
+ that was appending an alread-released RefPtr to a CSSValueList.
+ That list was eventually discarded anyway (due to "foundClip" now
+ being true), so the fix is simply to remove the adding.
+
+ Eventually we should use Ref and PassRef all over for CSSValueList,
+ this is just a first step on the way.
+
+ Reviewed by Darin Adler.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseFillShorthand):
+ * css/CSSValueList.h:
+ (WebCore::CSSValueList::append):
+ (WebCore::CSSValueList::prepend):
+
</ins><span class="cx"> 2014-03-16 Praveen R Jadhav <praveen.j@samsung.com>
</span><span class="cx">
</span><span class="cx"> AudioBufferSourceNode stop attribute shouldn't throw exception in finished state.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (165716 => 165717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-03-17 03:41:28 UTC (rev 165716)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-03-17 04:31:47 UTC (rev 165717)
</span><span class="lines">@@ -3195,11 +3195,8 @@
</span><span class="cx"> else
</span><span class="cx"> addFillValue(clipValue, cssValuePool().createImplicitInitialValue()); // Some value was used for origin that is not supported by clip. Just reset clip instead.
</span><span class="cx"> }
</span><del>- if (properties[i] == CSSPropertyBackgroundClip || properties[i] == CSSPropertyWebkitMaskClip) {
- // Update clipValue
- addFillValue(clipValue, val1.release());
</del><ins>+ if (properties[i] == CSSPropertyBackgroundClip || properties[i] == CSSPropertyWebkitMaskClip)
</ins><span class="cx"> foundClip = true;
</span><del>- }
</del><span class="cx"> if (properties[i] == CSSPropertyBackgroundPosition || properties[i] == CSSPropertyWebkitMaskPosition)
</span><span class="cx"> foundPositionCSSProperty = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.h (165716 => 165717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.h 2014-03-17 03:41:28 UTC (rev 165716)
+++ trunk/Source/WebCore/css/CSSValueList.h 2014-03-17 04:31:47 UTC (rev 165717)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx"> CSSValue* itemWithoutBoundsCheck(size_t index) { return m_values[index].get(); }
</span><span class="cx"> const CSSValue* itemWithoutBoundsCheck(size_t index) const { ASSERT(index < m_values.size()); return m_values[index].get(); }
</span><span class="cx">
</span><del>- void append(PassRefPtr<CSSValue> value) { m_values.append(value); }
- void prepend(PassRefPtr<CSSValue> value) { m_values.insert(0, value); }
</del><ins>+ void append(PassRefPtr<CSSValue>);
+ void prepend(PassRefPtr<CSSValue>);
</ins><span class="cx"> bool removeAll(CSSValue*);
</span><span class="cx"> bool hasValue(CSSValue*) const;
</span><span class="cx"> PassRefPtr<CSSValueList> copy();
</span><span class="lines">@@ -83,6 +83,18 @@
</span><span class="cx">
</span><span class="cx"> CSS_VALUE_TYPE_CASTS(CSSValueList, isValueList())
</span><span class="cx">
</span><ins>+inline void CSSValueList::append(PassRefPtr<CSSValue> value)
+{
+ ASSERT(value);
+ m_values.append(value);
+}
+
+inline void CSSValueList::prepend(PassRefPtr<CSSValue> value)
+{
+ ASSERT(value);
+ m_values.insert(0, value);
+}
+
</ins><span class="cx"> // Objects of this class are intended to be stack-allocated and scoped to a single function.
</span><span class="cx"> // Please take care not to pass these around as they do hold onto a raw pointer.
</span><span class="cx"> class CSSValueListInspector {
</span></span></pre>
</div>
</div>
</body>
</html>