<!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>[208681] 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/208681">208681</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-14 07:39:27 -0800 (Mon, 14 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the !ENABLE(VIDEO_TRACK) build
https://bugs.webkit.org/show_bug.cgi?id=164476
Reviewed by Darin Adler.
* css/RuleSet.cpp:
(WebCore::RuleSet::addRule):
* css/parser/CSSParserValues.h:
(WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching):
* css/parser/CSSSelectorParser.cpp:
(WebCore::isPseudoElementFunction):
(WebCore::CSSSelectorParser::consumePseudo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserValuesh">trunk/Source/WebCore/css/parser/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSelectorParsercpp">trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208680 => 208681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-14 15:21:16 UTC (rev 208680)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 15:39:27 UTC (rev 208681)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-14 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix the !ENABLE(VIDEO_TRACK) build
+ https://bugs.webkit.org/show_bug.cgi?id=164476
+
+ Reviewed by Darin Adler.
+
+ * css/RuleSet.cpp:
+ (WebCore::RuleSet::addRule):
+ * css/parser/CSSParserValues.h:
+ (WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching):
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::isPseudoElementFunction):
+ (WebCore::CSSSelectorParser::consumePseudo):
+
</ins><span class="cx"> 2016-11-14 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Do not use gstreamer-gl when accelerated compositing is disabled
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (208680 => 208681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2016-11-14 15:21:16 UTC (rev 208680)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2016-11-14 15:39:27 UTC (rev 208681)
</span><span class="lines">@@ -207,7 +207,9 @@
</span><span class="cx"> const CSSSelector* focusSelector = nullptr;
</span><span class="cx"> const CSSSelector* customPseudoElementSelector = nullptr;
</span><span class="cx"> const CSSSelector* slottedPseudoElementSelector = nullptr;
</span><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx"> const CSSSelector* cuePseudoElementSelector = nullptr;
</span><ins>+#endif
</ins><span class="cx"> const CSSSelector* selector = ruleData.selector();
</span><span class="cx"> do {
</span><span class="cx"> switch (selector->match()) {
</span><span class="lines">@@ -285,10 +287,12 @@
</span><span class="cx"> selector = selector->tagHistory();
</span><span class="cx"> } while (selector);
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx"> if (cuePseudoElementSelector) {
</span><span class="cx"> m_cuePseudoRules.append(ruleData);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (slottedPseudoElementSelector) {
</span><span class="cx"> // ::slotted pseudo elements work accross shadow boundary making filtering difficult.
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserValues.h (208680 => 208681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-11-14 15:21:16 UTC (rev 208680)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-11-14 15:39:27 UTC (rev 208681)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> // connection of ShadowDescendant, and the current shadow DOM code doesn't expect this. When
</span><span class="cx"> // we do fix this issue, make sure to patch the namespace prependTag code to remove the slotted
</span><span class="cx"> // special case, since it will be covered by this function once again.
</span><del>- bool needsImplicitShadowCombinatorForMatching() const { return match() == CSSSelector::PseudoElement && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed || pseudoElementType() == CSSSelector::PseudoElementCue); }
</del><ins>+ bool needsImplicitShadowCombinatorForMatching() const;
</ins><span class="cx">
</span><span class="cx"> CSSParserSelector* tagHistory() const { return m_tagHistory.get(); }
</span><span class="cx"> void setTagHistory(std::unique_ptr<CSSParserSelector> selector) { m_tagHistory = WTFMove(selector); }
</span><span class="lines">@@ -284,6 +284,17 @@
</span><span class="cx"> return m_selector->relation() == CSSSelector::ShadowDescendant;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool CSSParserSelector::needsImplicitShadowCombinatorForMatching() const
+{
+ return match() == CSSSelector::PseudoElement
+ && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom
+ || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom
+#if ENABLE(VIDEO_TRACK)
+ || pseudoElementType() == CSSSelector::PseudoElementCue
+#endif
+ || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed);
+}
+
</ins><span class="cx"> inline void CSSParserValue::setFromValueList(std::unique_ptr<CSSParserValueList> valueList)
</span><span class="cx"> {
</span><span class="cx"> id = CSSValueInvalid;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSelectorParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (208680 => 208681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-11-14 15:21:16 UTC (rev 208680)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-11-14 15:39:27 UTC (rev 208681)
</span><span class="lines">@@ -486,7 +486,9 @@
</span><span class="cx"> static bool isPseudoElementFunction(CSSSelector::PseudoElementType pseudoElementType)
</span><span class="cx"> {
</span><span class="cx"> switch (pseudoElementType) {
</span><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx"> case CSSSelector::PseudoElementCue:
</span><ins>+#endif
</ins><span class="cx"> case CSSSelector::PseudoElementSlotted:
</span><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="lines">@@ -634,6 +636,7 @@
</span><span class="cx">
</span><span class="cx"> if (selector->match() == CSSSelector::PseudoElement) {
</span><span class="cx"> switch (selector->pseudoElementType()) {
</span><ins>+#if ENABLE(VIDEO_TRACK)
</ins><span class="cx"> case CSSSelector::PseudoElementCue: {
</span><span class="cx"> DisallowPseudoElementsScope scope(this);
</span><span class="cx"> std::unique_ptr<CSSSelectorList> selectorList = std::unique_ptr<CSSSelectorList>(new CSSSelectorList());
</span><span class="lines">@@ -643,6 +646,7 @@
</span><span class="cx"> selector->setSelectorList(WTFMove(selectorList));
</span><span class="cx"> return selector;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> case CSSSelector::PseudoElementSlotted: {
</span><span class="cx"> DisallowPseudoElementsScope scope(this);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>