<!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>[208478] 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/208478">208478</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 13:27:29 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix grid layout parsing
https://bugs.webkit.org/show_bug.cgi?id=164489
Reviewed by Dean Jackson.
Source/WebCore:
* css/CSSValueKeywords.in:
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeFitContent):
(WebCore::isGridTrackFixedSized):
(WebCore::consumeGridTrackSize):
(WebCore::consumeGridTrackRepeatFunction):
(WebCore::consumeGridTrackList):
(WebCore::isCustomIdentValue):
(WebCore::CSSPropertyParser::consumeGridItemPositionShorthand):
(WebCore::CSSPropertyParser::consumeGridAreaShorthand):
(WebCore::consumeImplicitGridAutoFlow):
(WebCore::CSSPropertyParser::consumeGridShorthand):
LayoutTests:
* fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsautoflowresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208477 => 208478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-09 21:21:40 UTC (rev 208477)
+++ trunk/LayoutTests/ChangeLog 2016-11-09 21:27:29 UTC (rev 208478)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-11-09 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix grid layout parsing
+ https://bugs.webkit.org/show_bug.cgi?id=164489
+
+ Reviewed by Dean Jackson.
+
+ * fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
+
</ins><span class="cx"> 2016-11-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct a typo in the name of a flaky test.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsautoflowresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html (208477 => 208478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html 2016-11-09 21:21:40 UTC (rev 208477)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html 2016-11-09 21:27:29 UTC (rev 208478)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoMinMax {
</span><del>- font: 10/1 Ahem;
</del><ins>+ font: 10px/1 Ahem;
</ins><span class="cx"> width: 1000px;
</span><span class="cx"> grid-auto-rows: minmax(10em, 15px);
</span><span class="cx"> grid-auto-columns: minmax(30%, 100px);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208477 => 208478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-09 21:21:40 UTC (rev 208477)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 21:27:29 UTC (rev 208478)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-11-09 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix grid layout parsing
+ https://bugs.webkit.org/show_bug.cgi?id=164489
+
+ Reviewed by Dean Jackson.
+
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeFitContent):
+ (WebCore::isGridTrackFixedSized):
+ (WebCore::consumeGridTrackSize):
+ (WebCore::consumeGridTrackRepeatFunction):
+ (WebCore::consumeGridTrackList):
+ (WebCore::isCustomIdentValue):
+ (WebCore::CSSPropertyParser::consumeGridItemPositionShorthand):
+ (WebCore::CSSPropertyParser::consumeGridAreaShorthand):
+ (WebCore::consumeImplicitGridAutoFlow):
+ (WebCore::CSSPropertyParser::consumeGridShorthand):
+
</ins><span class="cx"> 2016-11-09 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move EventTarget from ExceptionCode to ExceptionOr
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (208477 => 208478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-11-09 21:21:40 UTC (rev 208477)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-11-09 21:27:29 UTC (rev 208478)
</span><span class="lines">@@ -1257,6 +1257,7 @@
</span><span class="cx">
</span><span class="cx"> // grid-template-{columns|rows}
</span><span class="cx"> minmax
</span><ins>+fit-content
</ins><span class="cx">
</span><span class="cx"> // grid-auto-flow
</span><span class="cx"> auto-flow
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208477 => 208478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-09 21:21:40 UTC (rev 208477)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-09 21:27:29 UTC (rev 208478)
</span><span class="lines">@@ -2755,7 +2755,7 @@
</span><span class="cx"> if (!length || !args.atEnd())
</span><span class="cx"> return nullptr;
</span><span class="cx"> range = rangeCopy;
</span><del>- RefPtr<CSSFunctionValue> result = CSSFunctionValue::create(CSSValueWebkitFitContent);
</del><ins>+ RefPtr<CSSFunctionValue> result = CSSFunctionValue::create(CSSValueFitContent);
</ins><span class="cx"> result->append(length.releaseNonNull());
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -2832,7 +2832,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(value.isFunctionValue());
</span><span class="cx"> auto& function = downcast<CSSFunctionValue>(value);
</span><del>- if (function.name() == CSSValueWebkitFitContent || function.arguments() == nullptr || function.arguments()->length() < 2)
</del><ins>+ if (function.name() == CSSValueFitContent || function.arguments() == nullptr || function.arguments()->length() < 2)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> CSSValue* minPrimitiveValue = downcast<CSSPrimitiveValue>(function.arguments()->item(0));
</span><span class="lines">@@ -2969,7 +2969,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (token.functionId() == CSSValueWebkitFitContent)
</del><ins>+ if (token.functionId() == CSSValueFitContent)
</ins><span class="cx"> return consumeFitContent(range, cssParserMode);
</span><span class="cx">
</span><span class="cx"> return consumeGridBreadth(range, cssParserMode);
</span><span class="lines">@@ -3041,7 +3041,7 @@
</span><span class="cx"> repetitions = std::min(repetitions, kGridMaxTracks / numberOfTracks);
</span><span class="cx"> for (size_t i = 0; i < repetitions; ++i) {
</span><span class="cx"> for (size_t j = 0; j < repeatedValues->length(); ++j)
</span><del>- list.append(adoptRef(*repeatedValues->itemWithoutBoundsCheck(j)));
</del><ins>+ list.append(*repeatedValues->itemWithoutBoundsCheck(j));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="lines">@@ -3059,7 +3059,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> values->append(lineNames.releaseNonNull());
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> bool allowRepeat = trackListType == GridTemplate;
</span><span class="cx"> bool seenAutoRepeat = false;
</span><span class="cx"> bool allTracksAreFixedSized = true;
</span><span class="lines">@@ -4628,6 +4628,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME-NEWPARSER: Hack to work around the fact that we aren't using CSSCustomIdentValue
+// for stuff yet. This can be replaced by CSSValue::isCustomIdentValue() once we switch
+// to using CSSCustomIdentValue everywhere.
+static bool isCustomIdentValue(const CSSValue& value)
+{
+ return is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).isString();
+}
+
</ins><span class="cx"> bool CSSPropertyParser::consumeGridItemPositionShorthand(CSSPropertyID shorthandId, bool important)
</span><span class="cx"> {
</span><span class="cx"> const StylePropertyShorthand& shorthand = shorthandForProperty(shorthandId);
</span><span class="lines">@@ -4642,7 +4650,7 @@
</span><span class="cx"> if (!endValue)
</span><span class="cx"> return false;
</span><span class="cx"> } else {
</span><del>- endValue = startValue->isCustomIdentValue() ? startValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</del><ins>+ endValue = isCustomIdentValue(*startValue) ? startValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</ins><span class="cx"> }
</span><span class="cx"> if (!m_range.atEnd())
</span><span class="cx"> return false;
</span><span class="lines">@@ -4677,11 +4685,11 @@
</span><span class="cx"> if (!m_range.atEnd())
</span><span class="cx"> return false;
</span><span class="cx"> if (!columnStartValue)
</span><del>- columnStartValue = rowStartValue->isCustomIdentValue() ? rowStartValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</del><ins>+ columnStartValue = isCustomIdentValue(*rowStartValue) ? rowStartValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</ins><span class="cx"> if (!rowEndValue)
</span><del>- rowEndValue = rowStartValue->isCustomIdentValue() ? rowStartValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</del><ins>+ rowEndValue = isCustomIdentValue(*rowStartValue) ? rowStartValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</ins><span class="cx"> if (!columnEndValue)
</span><del>- columnEndValue = columnStartValue->isCustomIdentValue() ? columnStartValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</del><ins>+ columnEndValue = isCustomIdentValue(*columnStartValue) ? columnStartValue : CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</ins><span class="cx">
</span><span class="cx"> addProperty(CSSPropertyGridRowStart, CSSPropertyGridArea, rowStartValue.releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyGridColumnStart, CSSPropertyGridArea, columnStartValue.releaseNonNull(), important);
</span><span class="lines">@@ -4776,6 +4784,32 @@
</span><span class="cx"> return consumeGridTemplateRowsAndAreasAndColumns(shorthandId, important);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSValue> consumeImplicitGridAutoFlow(CSSParserTokenRange& range, Ref<CSSPrimitiveValue>&& flowDirection)
+{
+ // [ auto-flow && dense? ]
+ if (range.atEnd())
+ return nullptr;
+ auto list = CSSValueList::createSpaceSeparated();
+ list->append(WTFMove(flowDirection));
+ if (range.peek().id() == CSSValueAutoFlow) {
+ range.consumeIncludingWhitespace();
+ RefPtr<CSSValue> denseIdent = consumeIdent<CSSValueDense>(range);
+ if (denseIdent)
+ list->append(denseIdent.releaseNonNull());
+ } else {
+ // Dense case
+ if (range.peek().id() != CSSValueDense)
+ return nullptr;
+ range.consumeIncludingWhitespace();
+ if (range.atEnd() || range.peek().id() != CSSValueAutoFlow)
+ return nullptr;
+ range.consumeIncludingWhitespace();
+ list->append(CSSValuePool::singleton().createIdentifierValue(CSSValueDense));
+ }
+
+ return WTFMove(list);
+}
+
</ins><span class="cx"> bool CSSPropertyParser::consumeGridShorthand(bool important)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(shorthandForProperty(CSSPropertyGrid).length() == 8);
</span><span class="lines">@@ -4796,39 +4830,61 @@
</span><span class="cx">
</span><span class="cx"> m_range = rangeCopy;
</span><span class="cx">
</span><del>- // 2- <grid-auto-flow> [ <grid-auto-rows> [ / <grid-auto-columns> ]? ]
- RefPtr<CSSValueList> gridAutoFlow = consumeGridAutoFlow(m_range);
- if (!gridAutoFlow)
- return false;
-
</del><span class="cx"> RefPtr<CSSValue> autoColumnsValue;
</span><span class="cx"> RefPtr<CSSValue> autoRowsValue;
</span><del>-
- if (!m_range.atEnd()) {
- autoRowsValue = consumeGridTrackList(m_range, m_context.mode, GridAuto);
- if (!autoRowsValue)
</del><ins>+ RefPtr<CSSValue> templateRows;
+ RefPtr<CSSValue> templateColumns;
+ RefPtr<CSSValue> gridAutoFlow;
+
+ if (m_range.peek().id() == CSSValueAutoFlow || m_range.peek().id() == CSSValueDense) {
+ // 2- [ auto-flow && dense? ] <grid-auto-rows>? / <grid-template-columns>
+ gridAutoFlow = consumeImplicitGridAutoFlow(m_range, CSSValuePool::singleton().createIdentifierValue(CSSValueRow));
+ if (!gridAutoFlow || m_range.atEnd())
</ins><span class="cx"> return false;
</span><del>- if (consumeSlashIncludingWhitespace(m_range)) {
</del><ins>+ if (consumeSlashIncludingWhitespace(m_range))
+ autoRowsValue = CSSValuePool::singleton().createImplicitInitialValue();
+ else {
+ autoRowsValue = consumeGridTrackList(m_range, m_context.mode, GridAuto);
+ if (!autoRowsValue)
+ return false;
+ if (!consumeSlashIncludingWhitespace(m_range))
+ return false;
+ }
+ if (m_range.atEnd())
+ return false;
+ templateColumns = consumeGridTemplatesRowsOrColumns(m_range, m_context.mode);
+ if (!templateColumns)
+ return false;
+ templateRows = CSSValuePool::singleton().createImplicitInitialValue();
+ autoColumnsValue = CSSValuePool::singleton().createImplicitInitialValue();
+ } else {
+ // 3- <grid-template-rows> / [ auto-flow && dense? ] <grid-auto-columns>?
+ templateRows = consumeGridTemplatesRowsOrColumns(m_range, m_context.mode);
+ if (!templateRows)
+ return false;
+ if (!consumeSlashIncludingWhitespace(m_range) || m_range.atEnd())
+ return false;
+ gridAutoFlow = consumeImplicitGridAutoFlow(m_range, CSSValuePool::singleton().createIdentifierValue(CSSValueColumn));
+ if (!gridAutoFlow)
+ return false;
+ if (m_range.atEnd())
+ autoColumnsValue = CSSValuePool::singleton().createImplicitInitialValue();
+ else {
</ins><span class="cx"> autoColumnsValue = consumeGridTrackList(m_range, m_context.mode, GridAuto);
</span><span class="cx"> if (!autoColumnsValue)
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- if (!m_range.atEnd())
- return false;
- } else {
- // Other omitted values are set to their initial values.
- autoColumnsValue = CSSValuePool::singleton().createImplicitInitialValue();
</del><ins>+ templateColumns = CSSValuePool::singleton().createImplicitInitialValue();
</ins><span class="cx"> autoRowsValue = CSSValuePool::singleton().createImplicitInitialValue();
</span><span class="cx"> }
</span><del>-
- // if <grid-auto-columns> value is omitted, it is set to the value specified for grid-auto-rows.
- if (!autoColumnsValue)
- autoColumnsValue = autoRowsValue;
-
</del><ins>+
+ if (!m_range.atEnd())
+ return false;
+
</ins><span class="cx"> // It can only be specified the explicit or the implicit grid properties in a single grid declaration.
</span><span class="cx"> // The sub-properties not specified are set to their initial value, as normal for shorthands.
</span><del>- addProperty(CSSPropertyGridTemplateColumns, CSSPropertyGrid, CSSValuePool::singleton().createImplicitInitialValue(), important);
- addProperty(CSSPropertyGridTemplateRows, CSSPropertyGrid, CSSValuePool::singleton().createImplicitInitialValue(), important);
</del><ins>+ addProperty(CSSPropertyGridTemplateColumns, CSSPropertyGrid, templateColumns.releaseNonNull(), important);
+ addProperty(CSSPropertyGridTemplateRows, CSSPropertyGrid, templateRows.releaseNonNull(), important);
</ins><span class="cx"> addProperty(CSSPropertyGridTemplateAreas, CSSPropertyGrid, CSSValuePool::singleton().createImplicitInitialValue(), important);
</span><span class="cx"> addProperty(CSSPropertyGridAutoFlow, CSSPropertyGrid, gridAutoFlow.releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyGridAutoColumns, CSSPropertyGrid, autoColumnsValue.releaseNonNull(), important);
</span><span class="lines">@@ -4835,6 +4891,7 @@
</span><span class="cx"> addProperty(CSSPropertyGridAutoRows, CSSPropertyGrid, autoRowsValue.releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyGridColumnGap, CSSPropertyGrid, CSSValuePool::singleton().createImplicitInitialValue(), important);
</span><span class="cx"> addProperty(CSSPropertyGridRowGap, CSSPropertyGrid, CSSValuePool::singleton().createImplicitInitialValue(), important);
</span><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>