<!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>[207677] 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/207677">207677</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-21 09:35:09 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Add support for @-webkit-region rules
https://bugs.webkit.org/show_bug.cgi?id=163787
Reviewed by Zalan Bujtas.
* css/StyleRule.cpp:
(WebCore::StyleRuleRegion::StyleRuleRegion):
* css/StyleRule.h:
* css/parser/CSSAtRuleID.cpp:
(WebCore::cssAtRuleID):
* css/parser/CSSAtRuleID.h:
* css/parser/CSSParserImpl.cpp:
(WebCore::CSSParserImpl::consumeAtRule):
(WebCore::CSSParserImpl::consumePageRule):
(WebCore::CSSParserImpl::consumeRegionRule):
* css/parser/CSSParserImpl.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRuleh">trunk/Source/WebCore/css/StyleRule.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSAtRuleIDcpp">trunk/Source/WebCore/css/parser/CSSAtRuleID.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSAtRuleIDh">trunk/Source/WebCore/css/parser/CSSAtRuleID.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserImplcpp">trunk/Source/WebCore/css/parser/CSSParserImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserImplh">trunk/Source/WebCore/css/parser/CSSParserImpl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/ChangeLog 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-21 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Add support for @-webkit-region rules
+ https://bugs.webkit.org/show_bug.cgi?id=163787
+
+ Reviewed by Zalan Bujtas.
+
+ * css/StyleRule.cpp:
+ (WebCore::StyleRuleRegion::StyleRuleRegion):
+ * css/StyleRule.h:
+ * css/parser/CSSAtRuleID.cpp:
+ (WebCore::cssAtRuleID):
+ * css/parser/CSSAtRuleID.h:
+ * css/parser/CSSParserImpl.cpp:
+ (WebCore::CSSParserImpl::consumeAtRule):
+ (WebCore::CSSParserImpl::consumePageRule):
+ (WebCore::CSSParserImpl::consumeRegionRule):
+ * css/parser/CSSParserImpl.h:
+
</ins><span class="cx"> 2016-10-21 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Bug 163757: Use IntSize::unclampedArea() in PDFDocumentImage::updateCachedImageIfNeeded()
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -371,6 +371,12 @@
</span><span class="cx"> m_selectorList.adoptSelectorVector(*selectors);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+StyleRuleRegion::StyleRuleRegion(CSSSelectorList& selectors, Vector<RefPtr<StyleRuleBase>>& adoptRules)
+ : StyleRuleGroup(Region, adoptRules)
+ , m_selectorList(WTFMove(selectors))
+{
+}
+
</ins><span class="cx"> StyleRuleRegion::StyleRuleRegion(const StyleRuleRegion& o)
</span><span class="cx"> : StyleRuleGroup(o)
</span><span class="cx"> , m_selectorList(o.m_selectorList)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.h (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.h 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/css/StyleRule.h 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -236,7 +236,12 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new StyleRuleRegion(selectors, adoptRules));
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ static Ref<StyleRuleRegion> create(CSSSelectorList& selectors, Vector<RefPtr<StyleRuleBase>>& adoptRules)
+ {
+ return adoptRef(*new StyleRuleRegion(selectors, adoptRules));
+ }
+
</ins><span class="cx"> const CSSSelectorList& selectorList() const { return m_selectorList; }
</span><span class="cx">
</span><span class="cx"> Ref<StyleRuleRegion> copy() const { return adoptRef(*new StyleRuleRegion(*this)); }
</span><span class="lines">@@ -243,6 +248,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> StyleRuleRegion(Vector<std::unique_ptr<CSSParserSelector>>*, Vector<RefPtr<StyleRuleBase>>& adoptRules);
</span><ins>+ StyleRuleRegion(CSSSelectorList&, Vector<RefPtr<StyleRuleBase>>&);
</ins><span class="cx"> StyleRuleRegion(const StyleRuleRegion&);
</span><span class="cx">
</span><span class="cx"> CSSSelectorList m_selectorList;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSAtRuleIDcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSAtRuleID.cpp (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSAtRuleID.cpp 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/css/parser/CSSAtRuleID.cpp 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -56,6 +56,10 @@
</span><span class="cx"> return CSSAtRuleWebkitKeyframes;
</span><span class="cx"> if (equalIgnoringASCIICase(name, "apply"))
</span><span class="cx"> return CSSAtRuleApply;
</span><ins>+#if ENABLE(CSS_REGIONS)
+ if (equalIgnoringASCIICase(name, "-webkit-region"))
+ return CSSAtRuleWebkitRegion;
+#endif
</ins><span class="cx"> return CSSAtRuleInvalid;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSAtRuleIDh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSAtRuleID.h (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSAtRuleID.h 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/css/parser/CSSAtRuleID.h 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx">
</span><span class="cx"> CSSAtRuleWebkitKeyframes = 10,
</span><span class="cx"> CSSAtRuleApply = 11,
</span><ins>+ CSSAtRuleWebkitRegion = 12
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CSSAtRuleID cssAtRuleID(StringView name);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.cpp (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.cpp 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -422,6 +422,10 @@
</span><span class="cx"> return consumeKeyframesRule(false, prelude, block);
</span><span class="cx"> case CSSAtRulePage:
</span><span class="cx"> return consumePageRule(prelude, block);
</span><ins>+#if ENABLE(CSS_REGIONS)
+ case CSSAtRuleWebkitRegion:
+ return consumeRegionRule(prelude, block);
+#endif
</ins><span class="cx"> default:
</span><span class="cx"> return nullptr; // Parse error, unrecognised at-rule with block
</span><span class="cx"> }
</span><span class="lines">@@ -635,6 +639,32 @@
</span><span class="cx"> return page;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_REGIONS)
+RefPtr<StyleRuleRegion> CSSParserImpl::consumeRegionRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
+{
+ CSSSelectorList selectorList = CSSSelectorParser::parseSelector(prelude, m_context, m_styleSheet.get());
+ if (!selectorList.isValid())
+ return nullptr; // Parse error, invalid selector list
+
+ if (m_observerWrapper) {
+ m_observerWrapper->observer().startRuleHeader(StyleRule::Region, m_observerWrapper->startOffset(prelude));
+ m_observerWrapper->observer().endRuleHeader(m_observerWrapper->endOffset(prelude));
+ m_observerWrapper->observer().startRuleBody(m_observerWrapper->previousTokenStartOffset(block));
+ }
+
+ Vector<RefPtr<StyleRuleBase>> rules;
+ consumeRuleList(block, RegularRuleList, [&rules](RefPtr<StyleRuleBase> rule) {
+ rules.append(rule);
+ });
+
+ if (m_observerWrapper)
+ m_observerWrapper->observer().endRuleBody(m_observerWrapper->endOffset(block));
+
+ return StyleRuleRegion::create(selectorList, rules);
+
+}
+#endif
+
</ins><span class="cx"> // FIXME-NEWPARSER: Support "apply"
</span><span class="cx"> /*void CSSParserImpl::consumeApplyRule(CSSParserTokenRange prelude)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserImpl.h (207676 => 207677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserImpl.h 2016-10-21 16:14:06 UTC (rev 207676)
+++ trunk/Source/WebCore/css/parser/CSSParserImpl.h 2016-10-21 16:35:09 UTC (rev 207677)
</span><span class="lines">@@ -123,6 +123,9 @@
</span><span class="cx"> RefPtr<StyleRuleFontFace> consumeFontFaceRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
</span><span class="cx"> RefPtr<StyleRuleKeyframes> consumeKeyframesRule(bool webkitPrefixed, CSSParserTokenRange prelude, CSSParserTokenRange block);
</span><span class="cx"> RefPtr<StyleRulePage> consumePageRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
</span><ins>+#if ENABLE(CSS_REGIONS)
+ RefPtr<StyleRuleRegion> consumeRegionRule(CSSParserTokenRange prelude, CSSParserTokenRange block);
+#endif
</ins><span class="cx"> // Updates m_parsedProperties
</span><span class="cx">
</span><span class="cx"> // FIXME-NEWPARSER: Support "apply"
</span></span></pre>
</div>
</div>
</body>
</html>