<!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>[207629] 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/207629">207629</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 11:35:56 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix region, column and page break parsing
https://bugs.webkit.org/show_bug.cgi?id=163743
Reviewed by Simon Fraser.
* css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
Add the missing values for break support.
* css/parser/CSSPropertyParser.cpp:
(WebCore::isLegacyBreakProperty):
(WebCore::CSSPropertyParser::parseValueStart):
Add a special case for handling legacy break properties. Blink treats them like
shorthands, but we can't do that without breaking the old parser, so for now
we add a special case.
(WebCore::mapFromPageBreakBetween):
(WebCore::mapFromColumnBreakBetween):
(WebCore::mapFromRegionBreakBetween):
Updated to have the AvoidXXX values (where XXX is Column/Page/Region).
(WebCore::CSSPropertyParser::parseShorthand):
Remove the consumeLegacyBreak from the shorthand function, since we can't treat
the legacy break properties as shorthands yet.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserFastPathscpp">trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207628 => 207629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-20 18:30:59 UTC (rev 207628)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 18:35:56 UTC (rev 207629)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-10-20 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix region, column and page break parsing
+ https://bugs.webkit.org/show_bug.cgi?id=163743
+
+ Reviewed by Simon Fraser.
+
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ Add the missing values for break support.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::isLegacyBreakProperty):
+ (WebCore::CSSPropertyParser::parseValueStart):
+ Add a special case for handling legacy break properties. Blink treats them like
+ shorthands, but we can't do that without breaking the old parser, so for now
+ we add a special case.
+
+ (WebCore::mapFromPageBreakBetween):
+ (WebCore::mapFromColumnBreakBetween):
+ (WebCore::mapFromRegionBreakBetween):
+ Updated to have the AvoidXXX values (where XXX is Column/Page/Region).
+
+ (WebCore::CSSPropertyParser::parseShorthand):
+ Remove the consumeLegacyBreak from the shorthand function, since we can't treat
+ the legacy break properties as shorthands yet.
+
</ins><span class="cx"> 2016-10-20 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add convenience function that combines WTF::visit(...) with WTF::makeVisitor(...)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserFastPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (207628 => 207629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-10-20 18:30:59 UTC (rev 207628)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-10-20 18:35:56 UTC (rev 207629)
</span><span class="lines">@@ -596,9 +596,17 @@
</span><span class="cx"> return valueID == CSSValueVisible || valueID == CSSValueHidden || valueID == CSSValueScroll || valueID == CSSValueAuto || valueID == CSSValueOverlay || valueID == CSSValueWebkitPagedX || valueID == CSSValueWebkitPagedY;
</span><span class="cx"> case CSSPropertyBreakAfter:
</span><span class="cx"> case CSSPropertyBreakBefore:
</span><del>- return valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidPage || valueID == CSSValuePage || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueRecto || valueID == CSSValueVerso || valueID == CSSValueAvoidColumn || valueID == CSSValueColumn;
</del><ins>+ return valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidPage || valueID == CSSValuePage || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueRecto || valueID == CSSValueVerso || valueID == CSSValueAvoidColumn || valueID == CSSValueColumn
+#if ENABLE(CSS_REGIONS)
+ || valueID == CSSValueRegion || valueID == CSSValueAvoidRegion
+#endif
+ ;
</ins><span class="cx"> case CSSPropertyBreakInside:
</span><del>- return valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidPage || valueID == CSSValueAvoidColumn;
</del><ins>+ return valueID == CSSValueAuto || valueID == CSSValueAvoid || valueID == CSSValueAvoidPage || valueID == CSSValueAvoidColumn
+#if ENABLE(CSS_REGIONS)
+ || valueID == CSSValueAvoidRegion
+#endif
+ ;
</ins><span class="cx"> case CSSPropertyPointerEvents:
</span><span class="cx"> // none | visiblePainted | visibleFill | visibleStroke | visible |
</span><span class="cx"> // painted | fill | stroke | auto | all | bounding-box
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (207628 => 207629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-10-20 18:30:59 UTC (rev 207628)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-10-20 18:35:56 UTC (rev 207629)
</span><span class="lines">@@ -266,6 +266,27 @@
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isLegacyBreakProperty(CSSPropertyID propertyID)
+{
+ switch (propertyID) {
+ case CSSPropertyPageBreakAfter:
+ case CSSPropertyPageBreakBefore:
+ case CSSPropertyPageBreakInside:
+ case CSSPropertyWebkitColumnBreakAfter:
+ case CSSPropertyWebkitColumnBreakBefore:
+ case CSSPropertyWebkitColumnBreakInside:
+#if ENABLE(CSS_REGIONS)
+ case CSSPropertyWebkitRegionBreakAfter:
+ case CSSPropertyWebkitRegionBreakBefore:
+ case CSSPropertyWebkitRegionBreakInside:
+#endif
+ return true;
+ default:
+ break;
+ }
+ return false;
+}
+
</ins><span class="cx"> bool CSSPropertyParser::parseValueStart(CSSPropertyID propertyID, bool important)
</span><span class="cx"> {
</span><span class="cx"> if (consumeCSSWideKeyword(propertyID, important))
</span><span class="lines">@@ -278,6 +299,11 @@
</span><span class="cx"> // Variable references will fail to parse here and will fall out to the variable ref parser below.
</span><span class="cx"> if (parseShorthand(propertyID, important))
</span><span class="cx"> return true;
</span><ins>+ } else if (isLegacyBreakProperty(propertyID)) {
+ // FIXME-NEWPARSER: Can turn this into a shorthand once old parser is gone, and then
+ // we don't need the special case.
+ if (consumeLegacyBreakProperty(propertyID, important))
+ return true;
</ins><span class="cx"> } else {
</span><span class="cx"> RefPtr<CSSValue> parsedValue = parseSingleValue(propertyID);
</span><span class="cx"> if (parsedValue && m_range.atEnd()) {
</span><span class="lines">@@ -4003,8 +4029,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (value == CSSValueAlways)
</span><span class="cx"> return CSSValuePage;
</span><del>- if (value == CSSValueAuto || value == CSSValueAvoid || value == CSSValueLeft || value == CSSValueRight)
</del><ins>+ if (value == CSSValueAuto || value == CSSValueLeft || value == CSSValueRight)
</ins><span class="cx"> return value;
</span><ins>+ if (value == CSSValueAvoid)
+ return CSSValueAvoidPage;
</ins><span class="cx"> return CSSValueInvalid;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4012,8 +4040,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (value == CSSValueAlways)
</span><span class="cx"> return CSSValueColumn;
</span><del>- if (value == CSSValueAuto || value == CSSValueAvoid)
</del><ins>+ if (value == CSSValueAuto)
</ins><span class="cx"> return value;
</span><ins>+ if (value == CSSValueAvoid)
+ return CSSValueAvoidColumn;
</ins><span class="cx"> return CSSValueInvalid;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4022,8 +4052,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (value == CSSValueAlways)
</span><span class="cx"> return CSSValueRegion;
</span><del>- if (value == CSSValueAuto || value == CSSValueAvoid)
</del><ins>+ if (value == CSSValueAuto)
</ins><span class="cx"> return value;
</span><ins>+ if (value == CSSValueAvoid)
+ return CSSValueAvoidRegion;
</ins><span class="cx"> return CSSValueInvalid;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -4571,13 +4603,6 @@
</span><span class="cx"> return consumeBorder(important);
</span><span class="cx"> case CSSPropertyBorderImage:
</span><span class="cx"> return consumeBorderImage(property, important);
</span><del>- case CSSPropertyPageBreakAfter:
- case CSSPropertyPageBreakBefore:
- case CSSPropertyPageBreakInside:
- case CSSPropertyWebkitColumnBreakAfter:
- case CSSPropertyWebkitColumnBreakBefore:
- case CSSPropertyWebkitColumnBreakInside:
- return consumeLegacyBreakProperty(property, important);
</del><span class="cx"> case CSSPropertyWebkitMaskPosition:
</span><span class="cx"> case CSSPropertyBackgroundPosition: {
</span><span class="cx"> RefPtr<CSSValue> resultX;
</span></span></pre>
</div>
</div>
</body>
</html>