<!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>[161667] 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/161667">161667</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-01-10 13:12:26 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Change parseBasicShape to return a CSSPrimitiveValue
https://bugs.webkit.org/show_bug.cgi?id=126713
Reviewed by Dirk Schulze.
Avoid the duplicated code wrapping the CSSBasicShape in a CSSPrimitiveValue
by having parseBasicShape return a CSSPrimitiveValue reference.
Refactoring, no new tests.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseShapeProperty):
(WebCore::CSSParser::parseClipPath):
(WebCore::CSSParser::parseBasicShape):
* css/CSSParser.h:</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="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161666 => 161667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-10 21:10:57 UTC (rev 161666)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 21:12:26 UTC (rev 161667)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-10 Bear Travis <betravis@adobe.com>
+
+ [CSS Shapes] Change parseBasicShape to return a CSSPrimitiveValue
+ https://bugs.webkit.org/show_bug.cgi?id=126713
+
+ Reviewed by Dirk Schulze.
+
+ Avoid the duplicated code wrapping the CSSBasicShape in a CSSPrimitiveValue
+ by having parseBasicShape return a CSSPrimitiveValue reference.
+
+ Refactoring, no new tests.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseShapeProperty):
+ (WebCore::CSSParser::parseClipPath):
+ (WebCore::CSSParser::parseBasicShape):
+ * css/CSSParser.h:
+
</ins><span class="cx"> 2014-01-10 Piotr Grad <p.grad@samsung.com>
</span><span class="cx">
</span><span class="cx"> Possible crash in ApplicationCache::removeResource.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (161666 => 161667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-01-10 21:10:57 UTC (rev 161666)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-01-10 21:12:26 UTC (rev 161667)
</span><span class="lines">@@ -5866,7 +5866,7 @@
</span><span class="cx"> CSSParserValue* value = m_valueList->current();
</span><span class="cx"> CSSValueID valueId = value->id;
</span><span class="cx"> RefPtr<CSSPrimitiveValue> keywordValue;
</span><del>- RefPtr<CSSBasicShape> shapeValue;
</del><ins>+ RefPtr<CSSPrimitiveValue> shapeValue;
</ins><span class="cx">
</span><span class="cx"> if (valueId == CSSValueNone
</span><span class="cx"> || (valueId == CSSValueOutsideShape && propId == CSSPropertyWebkitShapeInside)) {
</span><span class="lines">@@ -5902,10 +5902,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ASSERT(!shapeValue || shapeValue->isShape());
+
</ins><span class="cx"> if (shapeValue && keywordValue)
</span><del>- shapeValue->setLayoutBox(keywordValue.release());
</del><ins>+ shapeValue->getShapeValue()->setLayoutBox(keywordValue.release());
</ins><span class="cx">
</span><del>- return shapeValue ? cssValuePool().createValue(shapeValue.release()) : keywordValue.release();
</del><ins>+ return shapeValue ? shapeValue.release() : keywordValue.release();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -5934,10 +5936,10 @@
</span><span class="cx"> valueId = value->id;
</span><span class="cx"> if (value->unit == CSSParserValue::Function && !shapeFound) {
</span><span class="cx"> // parseBasicShape already asks for the next value list item.
</span><del>- RefPtr<CSSBasicShape> shapeValue = parseBasicShape();
</del><ins>+ RefPtr<CSSPrimitiveValue> shapeValue = parseBasicShape();
</ins><span class="cx"> if (!shapeValue)
</span><span class="cx"> return nullptr;
</span><del>- list->append(cssValuePool().createValue(shapeValue.release()));
</del><ins>+ list->append(shapeValue.release());
</ins><span class="cx"> shapeFound = true;
</span><span class="cx"> } else if ((isBoxValue(valueId) || valueId == CSSValueBoundingBox) && !boxFound) {
</span><span class="cx"> list->append(parseValidPrimitive(valueId, value));
</span><span class="lines">@@ -5966,7 +5968,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<CSSBasicShape> CSSParser::parseBasicShape()
</del><ins>+PassRefPtr<CSSPrimitiveValue> CSSParser::parseBasicShape()
</ins><span class="cx"> {
</span><span class="cx"> CSSParserValue* value = m_valueList->current();
</span><span class="cx"> ASSERT(value->unit == CSSParserValue::Function);
</span><span class="lines">@@ -5999,7 +6001,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> m_valueList->next();
</span><del>- return shape.release();
</del><ins>+ return cssValuePool().createValue(shape.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? 'font-family'
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (161666 => 161667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2014-01-10 21:10:57 UTC (rev 161666)
+++ trunk/Source/WebCore/css/CSSParser.h 2014-01-10 21:12:26 UTC (rev 161667)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> PassRefPtr<CSSValue> parseShapeProperty(CSSPropertyID);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PassRefPtr<CSSBasicShape> parseBasicShape();
</del><ins>+ PassRefPtr<CSSPrimitiveValue> parseBasicShape();
</ins><span class="cx"> PassRefPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
</span><span class="cx"> PassRefPtr<CSSBasicShape> parseBasicShapeRectangle(CSSParserValueList*);
</span><span class="cx"> PassRefPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueList*);
</span></span></pre>
</div>
</div>
</body>
</html>