<!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>[176494] trunk/Source</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/176494">176494</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-21 18:06:47 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start using the new :not() and :matches() in the Web Inspector
https://bugs.webkit.org/show_bug.cgi?id=138978
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-11-21
Reviewed by Joseph Pecoraro.
Source/WebCore:
There are only minor pending issues on :not() and :matches(). The feedback
has only been positive so far. It is time to move them out the experimental
flag.
* css/CSSGrammar.y.in:
* css/CSSParser.cpp:
(WebCore::CSSParser::detectFunctionTypeToken):
* css/CSSSelector.cpp:
(WebCore::simpleSelectorSpecificityInternal):
(WebCore::simpleSelectorFunctionalPseudoClassStaticSpecificity):
(WebCore::appendSelectorList):
(WebCore::CSSSelector::selectorText):
* css/CSSSelector.h:
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne):
(WebCore::SelectorChecker::determineLinkMatchType):
* css/SelectorPseudoClassAndCompatibilityElementMap.in:
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
Source/WebInspectorUI:
Start simpifying some definitions by using modern CSS.
* UserInterface/Views/CSSStyleDeclarationSection.css:
(body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:matches(.last-in-group, :last-child)):
(.style-declaration-section:matches(.locked, .selector-locked) > .header > .selector):
(body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:last-child): Deleted.
(.style-declaration-section.selector-locked > .header > .selector): Deleted.
* UserInterface/Views/CSSStyleDeclarationTextEditor.css:
(.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property:matches(.disabled, .invalid, .other-vendor, .not-inherited, .overridden)):
(.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property:matches(.implicit, .not-inherited)):
(.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property:matches(.disabled, .other-vendor, .not-inherited, .overridden)):
(.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.overridden): Deleted.
(.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.not-inherited): Deleted.
(.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.overridden): Deleted.
* UserInterface/Views/ControlToolbarItem.css:
(.toolbar:matches(.icon-and-label-horizontal, .toolbar.icon-only) .item.control):
(.toolbar.icon-only .item.control): Deleted.
* UserInterface/Views/DOMStorageContentView.css:
* UserInterface/Views/DashboardContainerView.css:
(.toolbar.icon-and-label-vertical:matches(.small-size, .normal-size) .dashboard-container):
(.toolbar:matches(.label-only, .small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal)) .dashboard-container):
(.toolbar.normal-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard-container):
(.toolbar.normal-size.icon-and-label-vertical .dashboard-container): Deleted.
(.toolbar.small-size.icon-and-label-horizontal .dashboard-container): Deleted.
(.toolbar.normal-size.icon-and-label-horizontal .dashboard-container): Deleted.
* UserInterface/Views/DataGrid.css:
(.data-grid :matches(th, td):not(:last-child)):
(.data-grid th:matches(.sort-ascending, .sort-descending)):
(.data-grid :matches(th, td) > div):
(.data-grid th:matches(.sort-ascending, .sort-descending) > div:first-child):
(.data-grid tr:matches(.selected, :hover) .go-to-arrow):
(.data-grid :-webkit-any(th, td):not(:last-child)): Deleted.
(.data-grid th:-webkit-any(.sort-ascending, .sort-descending)): Deleted.
(.data-grid :-webkit-any(th, td) > div): Deleted.
(.data-grid th:-webkit-any(.sort-ascending, .sort-descending) > div:first-child): Deleted.
(.data-grid tr:-webkit-any(.selected, :hover) .go-to-arrow): Deleted.
* UserInterface/Views/DebuggerDashboardView.css:
(.toolbar.collapsed .dashboard.debugger > :not(.message, .navigation-bar )):
(.toolbar.collapsed .dashboard.debugger > :not(.message):not(.navigation-bar )): Deleted.
* UserInterface/Views/DefaultDashboardView.css:
(body.web .toolbar.collapsed .dashboard.default > :matches(.time, .resourcesSize, .logs)):
(body.javascript .toolbar .dashboard.default > :matches(.time, .resourcesSize, .resourcesCount)):
(.toolbar:matches(.label-only, .small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal)) .dashboard.default > .item):
(.toolbar.normal-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard.default > .item):
(body.web .toolbar.collapsed .dashboard.default > .logs): Deleted.
(body.javascript .toolbar .dashboard.default > .resourcesCount): Deleted.
(.toolbar.small-size.icon-and-label-horizontal .dashboard.default > .item): Deleted.
(.toolbar.normal-size.icon-and-label-horizontal .dashboard.default > .item): Deleted.
* UserInterface/Views/DetailsSection.css:
(.details-section > .header > :matches(.node-link, .go-to-arrow)):
(.details-section > .content > .group:nth-child(even) > .row:matches(.simple:first-child > *, :not(.simple):first-child)):
(body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row.simple:last-child > *):
(.details-section > .content > .group > .row:matches(.empty, .text)):
(body.mac-platform.legacy .details-section > .content > .group > .row:matches(.empty, .text)):
(.details-section > .header > .go-to-arrow): Deleted.
(.details-section > .content > .group:nth-child(even) > .row.simple:first-child > *): Deleted.
(body.mac-platform.legacy .details-section > .content > .group:last-child > .row.simple:last-child > *): Deleted.
(.details-section > .content > .group > .row.text): Deleted.
(body.mac-platform.legacy .details-section > .content > .group > .row.text): Deleted.
* UserInterface/Views/FindBanner.css:
(:matches(.find-banner, .supports-find-banner).no-find-banner-transition):
(.supports-find-banner.no-find-banner-transition): Deleted.
* UserInterface/Views/FlexibleSpaceNavigationItem.css:
(:matches(.navigation-bar, .toolbar) .item.flexible-space):
(.toolbar .item.flexible-space): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorh">trunk/Source/WebCore/css/CSSSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorPseudoClassAndCompatibilityElementMapin">trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorcss">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsControlToolbarItemcss">trunk/Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerDashboardViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectioncss">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFlexibleSpaceNavigationItemcss">trunk/Source/WebInspectorUI/UserInterface/Views/FlexibleSpaceNavigationItem.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/ChangeLog 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-11-21 Benjamin Poulain <bpoulain@apple.com>
+
+ Start using the new :not() and :matches() in the Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=138978
+
+ Reviewed by Joseph Pecoraro.
+
+ There are only minor pending issues on :not() and :matches(). The feedback
+ has only been positive so far. It is time to move them out the experimental
+ flag.
+
+ * css/CSSGrammar.y.in:
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::detectFunctionTypeToken):
+ * css/CSSSelector.cpp:
+ (WebCore::simpleSelectorSpecificityInternal):
+ (WebCore::simpleSelectorFunctionalPseudoClassStaticSpecificity):
+ (WebCore::appendSelectorList):
+ (WebCore::CSSSelector::selectorText):
+ * css/CSSSelector.h:
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOne):
+ (WebCore::SelectorChecker::determineLinkMatchType):
+ * css/SelectorPseudoClassAndCompatibilityElementMap.in:
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoClassType):
+
</ins><span class="cx"> 2014-11-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, iOS build fix after r176462.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -57,13 +57,13 @@
</span><span class="cx"> case ANYFUNCTION:
</span><span class="cx"> case NOTFUNCTION:
</span><span class="cx"> case CALCFUNCTION:
</span><del>- case MINFUNCTION:
</del><ins>+ case MATCHESFUNCTION:
</ins><span class="cx"> case MAXFUNCTION:
</span><ins>+ case MINFUNCTION:
</ins><span class="cx"> case NTHCHILDFUNCTIONS:
</span><span class="cx"> case NTHCHILDSELECTORSEPARATOR:
</span><span class="cx"> #if ENABLE_CSS_SELECTORS_LEVEL4
</span><span class="cx"> case LANGFUNCTION:
</span><del>- case MATCHESFUNCTION:
</del><span class="cx"> case ROLEFUNCTION:
</span><span class="cx"> #endif
</span><span class="cx"> case UNICODERANGE:
</span><span class="lines">@@ -226,13 +226,13 @@
</span><span class="cx"> %token <string> ANYFUNCTION
</span><span class="cx"> %token <string> NOTFUNCTION
</span><span class="cx"> %token <string> CALCFUNCTION
</span><del>-%token <string> MINFUNCTION
</del><ins>+%token <string> MATCHESFUNCTION
</ins><span class="cx"> %token <string> MAXFUNCTION
</span><ins>+%token <string> MINFUNCTION
</ins><span class="cx"> %token <string> NTHCHILDFUNCTIONS
</span><span class="cx">
</span><span class="cx"> #if ENABLE_CSS_SELECTORS_LEVEL4
</span><span class="cx"> %token <string> LANGFUNCTION
</span><del>-%token <string> MATCHESFUNCTION
</del><span class="cx"> %token <string> ROLEFUNCTION
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1363,6 +1363,17 @@
</span><span class="cx"> $$ = selector.release();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ | ':' MATCHESFUNCTION maybe_space nested_selector_list maybe_space ')' {
+ $$ = nullptr;
+ if ($4) {
+ auto selector = std::make_unique<CSSParserSelector>();
+ selector->setMatch(CSSSelector::PseudoClass);
+ selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4));
+ selector->setPseudoClassValue($2);
+ if (selector->pseudoClassType() == CSSSelector::PseudoClassMatches)
+ $$ = selector.release();
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE_CSS_SELECTORS_LEVEL4
</span><span class="cx"> | ':' LANGFUNCTION maybe_space comma_separated_identifiers maybe_space ')' {
</span><span class="lines">@@ -1377,18 +1388,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- | ':' MATCHESFUNCTION maybe_space nested_selector_list maybe_space ')' {
- $$ = nullptr;
- if ($4) {
- auto selector = std::make_unique<CSSParserSelector>();
- selector->setMatch(CSSSelector::PseudoClass);
- selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($4));
- selector->setPseudoClassValue($2);
- if (selector->pseudoClassType() == CSSSelector::PseudoClassMatches)
- $$ = selector.release();
- }
- }
-
</del><span class="cx"> | ':' ROLEFUNCTION maybe_space IDENT maybe_space ')' {
</span><span class="cx"> $$ = nullptr;
</span><span class="cx"> auto selector = std::make_unique<CSSParserSelector>();
</span><span class="lines">@@ -1483,9 +1482,7 @@
</span><span class="cx"> }
</span><span class="cx"> $$ = selector.release();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> // Definition of :not().
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><span class="cx"> | ':' NOTFUNCTION maybe_space nested_selector_list maybe_space ')' {
</span><span class="cx"> $$ = nullptr;
</span><span class="cx"> if ($4 && selectorListDoesNotMatchAnyPseudoElement($4)) {
</span><span class="lines">@@ -1497,21 +1494,6 @@
</span><span class="cx"> $$ = selector.release();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#else
- | ':' NOTFUNCTION maybe_space compound_selector maybe_space ')' {
- std::unique_ptr<CSSParserSelector> selector($4);
- $$ = nullptr;
- if (selector && selector->isSimple()) {
- $$ = new CSSParserSelector;
- $$->setMatch(CSSSelector::PseudoClass);
-
- Vector<std::unique_ptr<CSSParserSelector>> selectorVector;
- selectorVector.append(WTF::move(selector));
- $$->adoptSelectorVector(selectorVector);
- $$->setPseudoClassValue($2);
- }
- }
-#endif
</del><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> declaration_list:
</span><span class="lines">@@ -1889,9 +1871,9 @@
</span><span class="cx"> invalid_parentheses_block: opening_parenthesis error_recovery closing_parenthesis;
</span><span class="cx">
</span><span class="cx"> opening_parenthesis:
</span><del>- '(' | FUNCTION | CALCFUNCTION | MINFUNCTION | MAXFUNCTION | ANYFUNCTION | NOTFUNCTION
</del><ins>+ '(' | FUNCTION | CALCFUNCTION | MATCHESFUNCTION | MAXFUNCTION | MINFUNCTION | ANYFUNCTION | NOTFUNCTION
</ins><span class="cx"> #if ENABLE_CSS_SELECTORS_LEVEL4
</span><del>- | LANGFUNCTION | MATCHESFUNCTION | ROLEFUNCTION
</del><ins>+ | LANGFUNCTION | ROLEFUNCTION
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE_VIDEO_TRACK
</span><span class="cx"> | CUEFUNCTION
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -10711,14 +10711,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> case 7:
</span><span class="cx"> if (isEqualToCSSIdentifier(name, "matches")) {
</span><span class="cx"> m_token = MATCHESFUNCTION;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> case 9:
</span><span class="cx"> if (isEqualToCSSIdentifier(name, "nth-child")) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> case CSSSelector::PagePseudoClass:
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::PseudoClass:
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> if (simpleSelector.pseudoClassType() == CSSSelector::PseudoClassMatches) {
</span><span class="cx"> ASSERT_WITH_MESSAGE(simpleSelector.selectorList() && simpleSelector.selectorList()->first(), "The parser should never generate a valid selector for an empty :matches().");
</span><span class="cx"> if (!isComputingMaximumSpecificity)
</span><span class="lines">@@ -102,11 +101,6 @@
</span><span class="cx"> return maxSpecificity(*simpleSelector.selectorList());
</span><span class="cx"> }
</span><span class="cx"> FALLTHROUGH;
</span><del>-#else
- if (simpleSelector.pseudoClassType() == CSSSelector::PseudoClassNot && simpleSelector.selectorList())
- return simpleSelector.selectorList()->first()->simpleSelectorSpecificity();
- FALLTHROUGH;
-#endif
</del><span class="cx"> case CSSSelector::Exact:
</span><span class="cx"> case CSSSelector::Class:
</span><span class="cx"> case CSSSelector::Set:
</span><span class="lines">@@ -136,7 +130,6 @@
</span><span class="cx">
</span><span class="cx"> static unsigned simpleSelectorFunctionalPseudoClassStaticSpecificity(const CSSSelector& simpleSelector, bool& ok)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> if (simpleSelector.match() == CSSSelector::PseudoClass) {
</span><span class="cx"> if (simpleSelector.pseudoClassType() == CSSSelector::PseudoClassMatches) {
</span><span class="cx"> const CSSSelectorList& selectorList = *simpleSelector.selectorList();
</span><span class="lines">@@ -157,7 +150,6 @@
</span><span class="cx"> return initialSpecificity;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -354,6 +346,7 @@
</span><span class="cx"> str.appendLiteral(", ");
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static void appendSelectorList(StringBuilder& str, const CSSSelectorList* selectorList)
</span><span class="cx"> {
</span><span class="lines">@@ -364,7 +357,6 @@
</span><span class="cx"> str.append(subSelector->selectorText());
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> String CSSSelector::selectorText(const String& rightSide) const
</span><span class="cx"> {
</span><span class="lines">@@ -520,12 +512,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::PseudoClassNot:
</span><span class="cx"> str.appendLiteral(":not(");
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> appendSelectorList(str, cs->selectorList());
</span><del>-#else
- if (const CSSSelectorList* selectorList = cs->selectorList())
- str.append(selectorList->first()->selectorText());
-#endif
</del><span class="cx"> str.append(')');
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::PseudoClassNthChild:
</span><span class="lines">@@ -571,13 +558,13 @@
</span><span class="cx"> case CSSSelector::PseudoClassOptional:
</span><span class="cx"> str.appendLiteral(":optional");
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> case CSSSelector::PseudoClassMatches: {
</span><span class="cx"> str.appendLiteral(":matches(");
</span><span class="cx"> appendSelectorList(str, cs->selectorList());
</span><span class="cx"> str.append(')');
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::PseudoClassPlaceholderShown:
</span><span class="cx"> str.appendLiteral(":placeholder-shown");
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.h (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.h 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/css/CSSSelector.h 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -122,9 +122,9 @@
</span><span class="cx"> PseudoClassDisabled,
</span><span class="cx"> PseudoClassOptional,
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>- PseudoClassMatches,
</del><span class="cx"> PseudoClassPlaceholderShown,
</span><span class="cx"> #endif
</span><ins>+ PseudoClassMatches,
</ins><span class="cx"> PseudoClassRequired,
</span><span class="cx"> PseudoClassReadOnly,
</span><span class="cx"> PseudoClassReadWrite,
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -576,12 +576,6 @@
</span><span class="cx"> if (selector->pseudoClassType() == CSSSelector::PseudoClassNot) {
</span><span class="cx"> const CSSSelectorList* selectorList = selector->selectorList();
</span><span class="cx">
</span><del>-#if !ENABLE(CSS_SELECTORS_LEVEL4)
- // FIXME: We probably should fix the parser and make it never produce :not rules with missing selector list.
- if (!selectorList)
- return false;
-#endif
-
</del><span class="cx"> for (const CSSSelector* subselector = selectorList->first(); subselector; subselector = CSSSelectorList::next(subselector)) {
</span><span class="cx"> CheckingContextWithStatus subcontext(context);
</span><span class="cx"> subcontext.inFunctionalPseudoClass = true;
</span><span class="lines">@@ -591,30 +585,12 @@
</span><span class="cx"> PseudoIdSet ignoreDynamicPseudo;
</span><span class="cx">
</span><span class="cx"> unsigned ignoredSpecificity;
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> if (matchRecursively(subcontext, ignoreDynamicPseudo, ignoredSpecificity).match == Match::SelectorMatches) {
</span><span class="cx"> ASSERT(!ignoreDynamicPseudo);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#else
- if (subcontext.selector->match() == CSSSelector::PseudoClass) {
- // :not cannot nest. I don't really know why this is a
- // restriction in CSS3, but it is, so let's honor it.
- // the parser enforces that this never occurs
- ASSERT(subcontext.selector->pseudoClassType() != CSSSelector::PseudoClassNot);
- // We select between :visited and :link when applying. We don't know which one applied (or not) yet.
- if (subcontext.selector->pseudoClassType() == CSSSelector::PseudoClassVisited)
- return true;
- }
- // Since :not cannot contain pseudo elements, there's no effect on matchType.
- MatchType ignoreMatchType = MatchType::Element;
- if (!checkOne(subcontext, ignoreDynamicPseudo, ignoreMatchType, ignoredSpecificity))
- return true;
-#endif
</del><span class="cx"> }
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx"> } else if (context.hasScrollbarPseudo) {
</span><span class="cx"> // CSS scrollbars match a specific subset of pseudo classes, and they have specialized rules for each
</span><span class="cx"> // (since there are no elements involved except with window-inactive).
</span><span class="lines">@@ -722,7 +698,6 @@
</span><span class="cx"> return isFirstOfType(element, element->tagQName(), context.resolvingMode == Mode::ResolvingStyle) && isLastOfType(element, element->tagQName());
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> case CSSSelector::PseudoClassMatches:
</span><span class="cx"> {
</span><span class="cx"> bool hasMatchedAnything = false;
</span><span class="lines">@@ -754,7 +729,7 @@
</span><span class="cx"> }
</span><span class="cx"> return hasMatchedAnything;
</span><span class="cx"> }
</span><del>-
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::PseudoClassPlaceholderShown:
</span><span class="cx"> if (is<HTMLTextFormControlElement>(*element)) {
</span><span class="cx"> if (context.resolvingMode == Mode::ResolvingStyle) {
</span><span class="lines">@@ -1120,26 +1095,6 @@
</span><span class="cx"> for (; selector; selector = selector->tagHistory()) {
</span><span class="cx"> if (selector->match() == CSSSelector::PseudoClass) {
</span><span class="cx"> switch (selector->pseudoClassType()) {
</span><del>-#if! ENABLE(CSS_SELECTORS_LEVEL4)
- case CSSSelector::PseudoClassNot:
- {
- // :not(:visited) is equivalent to :link. Parser enforces that :not can't nest.
- const CSSSelectorList* selectorList = selector->selectorList();
- if (!selectorList)
- break;
-
- for (const CSSSelector* subSelector = selectorList->first(); subSelector; subSelector = subSelector->tagHistory()) {
- if (subSelector->match() == CSSSelector::PseudoClass) {
- CSSSelector::PseudoClassType subType = subSelector->pseudoClassType();
- if (subType == CSSSelector::PseudoClassVisited)
- linkMatchType &= ~SelectorChecker::MatchVisited;
- else if (subType == CSSSelector::PseudoClassLink)
- linkMatchType &= ~SelectorChecker::MatchLink;
- }
- }
- }
- break;
-#endif
</del><span class="cx"> case CSSSelector::PseudoClassLink:
</span><span class="cx"> linkMatchType &= ~SelectorChecker::MatchVisited;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorPseudoClassAndCompatibilityElementMapin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/css/SelectorPseudoClassAndCompatibilityElementMap.in 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> last-child
</span><span class="cx"> last-of-type
</span><span class="cx"> link
</span><ins>+matches(
</ins><span class="cx"> no-button
</span><span class="cx"> not(
</span><span class="cx"> nth-child(
</span><span class="lines">@@ -46,7 +47,6 @@
</span><span class="cx"> out-of-range
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><span class="cx"> placeholder-shown
</span><del>-matches(
</del><span class="cx"> #endif
</span><span class="cx"> read-only
</span><span class="cx"> read-write
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -756,7 +756,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
</del><span class="cx"> case CSSSelector::PseudoClassMatches:
</span><span class="cx"> {
</span><span class="cx"> SelectorList matchesList;
</span><span class="lines">@@ -804,7 +803,6 @@
</span><span class="cx">
</span><span class="cx"> return functionType;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> case CSSSelector::PseudoClassUnknown:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -1,3 +1,76 @@
</span><ins>+2014-11-21 Benjamin Poulain <bpoulain@apple.com>
+
+ Start using the new :not() and :matches() in the Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=138978
+
+ Reviewed by Joseph Pecoraro.
+
+ Start simpifying some definitions by using modern CSS.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.css:
+ (body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:matches(.last-in-group, :last-child)):
+ (.style-declaration-section:matches(.locked, .selector-locked) > .header > .selector):
+ (body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:last-child): Deleted.
+ (.style-declaration-section.selector-locked > .header > .selector): Deleted.
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.css:
+ (.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property:matches(.disabled, .invalid, .other-vendor, .not-inherited, .overridden)):
+ (.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property:matches(.implicit, .not-inherited)):
+ (.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property:matches(.disabled, .other-vendor, .not-inherited, .overridden)):
+ (.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.overridden): Deleted.
+ (.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.not-inherited): Deleted.
+ (.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.overridden): Deleted.
+ * UserInterface/Views/ControlToolbarItem.css:
+ (.toolbar:matches(.icon-and-label-horizontal, .toolbar.icon-only) .item.control):
+ (.toolbar.icon-only .item.control): Deleted.
+ * UserInterface/Views/DOMStorageContentView.css:
+ * UserInterface/Views/DashboardContainerView.css:
+ (.toolbar.icon-and-label-vertical:matches(.small-size, .normal-size) .dashboard-container):
+ (.toolbar:matches(.label-only, .small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal)) .dashboard-container):
+ (.toolbar.normal-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard-container):
+ (.toolbar.normal-size.icon-and-label-vertical .dashboard-container): Deleted.
+ (.toolbar.small-size.icon-and-label-horizontal .dashboard-container): Deleted.
+ (.toolbar.normal-size.icon-and-label-horizontal .dashboard-container): Deleted.
+ * UserInterface/Views/DataGrid.css:
+ (.data-grid :matches(th, td):not(:last-child)):
+ (.data-grid th:matches(.sort-ascending, .sort-descending)):
+ (.data-grid :matches(th, td) > div):
+ (.data-grid th:matches(.sort-ascending, .sort-descending) > div:first-child):
+ (.data-grid tr:matches(.selected, :hover) .go-to-arrow):
+ (.data-grid :-webkit-any(th, td):not(:last-child)): Deleted.
+ (.data-grid th:-webkit-any(.sort-ascending, .sort-descending)): Deleted.
+ (.data-grid :-webkit-any(th, td) > div): Deleted.
+ (.data-grid th:-webkit-any(.sort-ascending, .sort-descending) > div:first-child): Deleted.
+ (.data-grid tr:-webkit-any(.selected, :hover) .go-to-arrow): Deleted.
+ * UserInterface/Views/DebuggerDashboardView.css:
+ (.toolbar.collapsed .dashboard.debugger > :not(.message, .navigation-bar )):
+ (.toolbar.collapsed .dashboard.debugger > :not(.message):not(.navigation-bar )): Deleted.
+ * UserInterface/Views/DefaultDashboardView.css:
+ (body.web .toolbar.collapsed .dashboard.default > :matches(.time, .resourcesSize, .logs)):
+ (body.javascript .toolbar .dashboard.default > :matches(.time, .resourcesSize, .resourcesCount)):
+ (.toolbar:matches(.label-only, .small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal)) .dashboard.default > .item):
+ (.toolbar.normal-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard.default > .item):
+ (body.web .toolbar.collapsed .dashboard.default > .logs): Deleted.
+ (body.javascript .toolbar .dashboard.default > .resourcesCount): Deleted.
+ (.toolbar.small-size.icon-and-label-horizontal .dashboard.default > .item): Deleted.
+ (.toolbar.normal-size.icon-and-label-horizontal .dashboard.default > .item): Deleted.
+ * UserInterface/Views/DetailsSection.css:
+ (.details-section > .header > :matches(.node-link, .go-to-arrow)):
+ (.details-section > .content > .group:nth-child(even) > .row:matches(.simple:first-child > *, :not(.simple):first-child)):
+ (body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row.simple:last-child > *):
+ (.details-section > .content > .group > .row:matches(.empty, .text)):
+ (body.mac-platform.legacy .details-section > .content > .group > .row:matches(.empty, .text)):
+ (.details-section > .header > .go-to-arrow): Deleted.
+ (.details-section > .content > .group:nth-child(even) > .row.simple:first-child > *): Deleted.
+ (body.mac-platform.legacy .details-section > .content > .group:last-child > .row.simple:last-child > *): Deleted.
+ (.details-section > .content > .group > .row.text): Deleted.
+ (body.mac-platform.legacy .details-section > .content > .group > .row.text): Deleted.
+ * UserInterface/Views/FindBanner.css:
+ (:matches(.find-banner, .supports-find-banner).no-find-banner-transition):
+ (.supports-find-banner.no-find-banner-transition): Deleted.
+ * UserInterface/Views/FlexibleSpaceNavigationItem.css:
+ (:matches(.navigation-bar, .toolbar) .item.flexible-space):
+ (.toolbar .item.flexible-space): Deleted.
+
</ins><span class="cx"> 2014-11-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: LayoutTests/inspector should not have localStorage side effects
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectioncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -64,8 +64,7 @@
</span><span class="cx">
</span><span class="cx"> body.mac-platform.legacy .style-declaration-section:first-child,
</span><span class="cx"> body.mac-platform.legacy div:not(.style-declaration-section) + .style-declaration-section,
</span><del>-body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section.last-in-group,
-body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:last-child {
</del><ins>+body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:matches(.last-in-group, :last-child) {
</ins><span class="cx"> box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,8 +120,7 @@
</span><span class="cx"> color: black;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.style-declaration-section.locked > .header > .selector,
-.style-declaration-section.selector-locked > .header > .selector {
</del><ins>+.style-declaration-section:matches(.locked, .selector-locked) > .header > .selector {
</ins><span class="cx"> -webkit-user-modify: read-only;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationTextEditorcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -60,35 +60,27 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.css-style-text-editor > .CodeMirror .CodeMirror-lines pre > span span:not(.css-style-declaration-property):not(.CodeMirror-widget):not(.cm-comment):not(.cm-tab),
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.disabled,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.invalid,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.other-vendor,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.not-inherited,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.overridden {
</del><ins>+.css-style-text-editor > .CodeMirror .CodeMirror-lines pre > span span:not(.css-style-declaration-property, .CodeMirror-widget, .cm-comment, .cm-tab),
+.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property:matches(.disabled, .invalid, .other-vendor, .not-inherited, .overridden) {
</ins><span class="cx"> text-decoration: line-through;
</span><span class="cx"> -webkit-text-stroke-width: 0.000000000000001px; /* A hack to get a different line-through color. */
</span><span class="cx"> -webkit-text-stroke-color: rgba(0, 0, 0, 0.6);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.css-style-text-editor > .CodeMirror .CodeMirror-lines pre > span span:not(.css-style-declaration-property):not(.CodeMirror-widget):not(.cm-comment):not(.cm-tab),
</del><ins>+.css-style-text-editor > .CodeMirror .CodeMirror-lines pre > span span:not(.css-style-declaration-property, .CodeMirror-widget, .cm-comment, .cm-tab),
</ins><span class="cx"> .css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.invalid {
</span><span class="cx"> -webkit-text-stroke-color: rgba(255, 0, 0, 0.6);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.implicit,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property.not-inherited {
</del><ins>+.css-style-text-editor > .CodeMirror .CodeMirror-lines .css-style-declaration-property:matches(.implicit, .not-inherited) {
</ins><span class="cx"> opacity: 0.5;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.disabled,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.other-vendor,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.not-inherited,
-.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.overridden {
</del><ins>+.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property:matches(.disabled, .other-vendor, .not-inherited, .overridden) {
</ins><span class="cx"> -webkit-text-stroke-color: rgba(0, 0, 0, 0.3);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line span:not(.css-style-declaration-property):not(.CodeMirror-widget):not(.cm-comment):not(.cm-tab),
</del><ins>+.css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line span:not(.css-style-declaration-property, .CodeMirror-widget, .cm-comment, .cm-tab),
</ins><span class="cx"> .css-style-text-editor > .CodeMirror .CodeMirror-lines .editing-line .css-style-declaration-property.invalid {
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsControlToolbarItemcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -40,8 +40,7 @@
</span><span class="cx"> padding: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar.icon-and-label-horizontal .item.control,
-.toolbar.icon-only .item.control {
</del><ins>+.toolbar:matches(.icon-and-label-horizontal, .icon-only) .item.control {
</ins><span class="cx"> padding: 0 2px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -31,14 +31,12 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.dom-storage > .data-grid tr.duplicate-key td.key-column,
-.content-view.dom-storage > .data-grid tr.missing-key td.key-column,
</del><ins>+.content-view.dom-storage > .data-grid tr:matches(.duplicate-key, .missing-key) td.key-column,
</ins><span class="cx"> .content-view.dom-storage > .data-grid tr.missing-value td.value-column {
</span><span class="cx"> background-color: #fee;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.dom-storage > .data-grid:focus tr.selected.duplicate-key td.key-column,
-.content-view.dom-storage > .data-grid:focus tr.selected.missing-key td.key-column,
</del><ins>+.content-view.dom-storage > .data-grid:focus tr.selected:matches(.duplicate-key, .missing-key) td.key-column,
</ins><span class="cx"> .content-view.dom-storage > .data-grid:focus tr.selected.missing-value td.value-column {
</span><span class="cx"> background-color: #daa;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDashboardContainerViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -63,25 +63,20 @@
</span><span class="cx"> width: 175px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar.small-size.icon-and-label-vertical .dashboard-container,
-.toolbar.normal-size.icon-and-label-vertical .dashboard-container {
</del><ins>+.toolbar.icon-and-label-vertical:matches(.small-size, .normal-size) .dashboard-container {
</ins><span class="cx"> margin-top: 6px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Styles for the extra short style, one row with quite a small y-margin */
</span><span class="cx">
</span><span class="cx"> .toolbar.label-only .dashboard-container,
</span><del>-.toolbar.small-size.icon-only .dashboard-container,
-.toolbar.small-size.icon-and-label-vertical .dashboard-container,
-.toolbar.small-size.icon-and-label-horizontal .dashboard-container {
</del><ins>+.toolbar.small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard-container {
</ins><span class="cx"> height: 22px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Styles for the fairly short style, one row with quite a bit of y-margin */
</span><span class="cx">
</span><del>-.toolbar.normal-size.icon-only .dashboard-container,
-.toolbar.normal-size.icon-and-label-vertical .dashboard-container,
-.toolbar.normal-size.icon-and-label-horizontal .dashboard-container {
</del><ins>+.toolbar.normal-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard-container {
</ins><span class="cx"> height: 30px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid :-webkit-any(th, td):not(:last-child) {
</del><ins>+.data-grid :matches(th, td):not(:last-child) {
</ins><span class="cx"> border-right: 1px solid rgb(179, 179, 179);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> background-color: rgb(179, 179, 179);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid th:-webkit-any(.sort-ascending, .sort-descending) {
</del><ins>+.data-grid th:matches(.sort-ascending, .sort-descending) {
</ins><span class="cx"> background-color: rgb(230, 230, 230);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> border-right-color: rgb(53, 109, 189);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid :-webkit-any(th, td) > div {
</del><ins>+.data-grid :matches(th, td) > div {
</ins><span class="cx"> white-space: nowrap;
</span><span class="cx"> text-overflow: ellipsis;
</span><span class="cx"> overflow: hidden;
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid th:-webkit-any(.sort-ascending, .sort-descending) > div:first-child {
</del><ins>+.data-grid th:matches(.sort-ascending, .sort-descending) > div:first-child {
</ins><span class="cx"> padding-right: 12px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> margin-left: 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid tr:-webkit-any(.selected, :hover) .go-to-arrow {
</del><ins>+.data-grid tr:matches(.selected, :hover) .go-to-arrow {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerDashboardViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar.collapsed .dashboard.debugger > :not(.message):not(.navigation-bar ) {
</del><ins>+.toolbar.collapsed .dashboard.debugger > :not(.message, .navigation-bar) {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -23,15 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-body.web .toolbar.collapsed .dashboard.default > .time,
-body.web .toolbar.collapsed .dashboard.default > .resourcesSize,
-body.web .toolbar.collapsed .dashboard.default > .logs {
</del><ins>+body.web .toolbar.collapsed .dashboard.default > :matches(.time, .resourcesSize, .logs) {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.javascript .toolbar .dashboard.default > .time,
-body.javascript .toolbar .dashboard.default > .resourcesSize,
-body.javascript .toolbar .dashboard.default > .resourcesCount {
</del><ins>+body.javascript .toolbar .dashboard.default > :matches(.time, .resourcesSize, .resourcesCount) {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,16 +212,12 @@
</span><span class="cx"> /* Styles for the extra short style, one row with quite a small y-margin */
</span><span class="cx">
</span><span class="cx"> .toolbar.label-only .dashboard.default > .item,
</span><del>-.toolbar.small-size.icon-only .dashboard.default > .item,
-.toolbar.small-size.icon-and-label-vertical .dashboard.default > .item,
-.toolbar.small-size.icon-and-label-horizontal .dashboard.default > .item {
</del><ins>+.toolbar.small-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard.default > .item {
</ins><span class="cx"> margin: 1px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Styles for the fairly short style, one row with quite a bit of y-margin */
</span><span class="cx">
</span><del>-.toolbar.normal-size.icon-only .dashboard.default > .item,
-.toolbar.normal-size.icon-and-label-vertical .dashboard.default > .item,
-.toolbar.normal-size.icon-and-label-horizontal .dashboard.default > .item {
</del><ins>+.toolbar.normal-size:matches(.icon-only, .icon-and-label-vertical, .icon-and-label-horizontal) .dashboard.default > .item {
</ins><span class="cx"> margin: 4px 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectioncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -167,8 +167,7 @@
</span><span class="cx"> font-size: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.details-section > .header > .node-link,
-.details-section > .header > .go-to-arrow {
</del><ins>+.details-section > .header > :matches(.node-link, .go-to-arrow) {
</ins><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -210,15 +209,12 @@
</span><span class="cx"> background-color: rgb(222, 222, 222);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.details-section > .content > .group:nth-child(even) > .row:not(.simple):first-child,
-.details-section > .content > .group:nth-child(even) > .row.simple:first-child > * {
</del><ins>+.details-section > .content > .group:nth-child(even) > .row:matches(.simple:first-child > *, :not(.simple):first-child) {
</ins><span class="cx"> border-top: 1px solid rgb(179, 179, 179);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform.legacy .details-section > .content > .group:nth-child(even) > .row:not(.simple):last-child,
-body.mac-platform.legacy .details-section > .content > .group:last-child > .row:not(.simple):last-child,
-body.mac-platform.legacy .details-section > .content > .group:nth-child(even) > .row.simple:last-child > *,
-body.mac-platform.legacy .details-section > .content > .group:last-child > .row.simple:last-child > * {
</del><ins>+body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row:not(.simple):last-child,
+body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row.simple:last-child > * {
</ins><span class="cx"> border-bottom: 1px solid rgb(179, 179, 179);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -298,15 +294,13 @@
</span><span class="cx"> word-break: break-all;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.details-section > .content > .group > .row.empty,
-.details-section > .content > .group > .row.text {
</del><ins>+.details-section > .content > .group > .row:matches(.empty, .text) {
</ins><span class="cx"> padding: 0 6px 7px 6px;
</span><span class="cx"> text-align: center;
</span><span class="cx"> color: gray;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform.legacy .details-section > .content > .group > .row.empty,
-body.mac-platform.legacy .details-section > .content > .group > .row.text {
</del><ins>+body.mac-platform.legacy .details-section > .content > .group > .row:matches(.empty, .text) {
</ins><span class="cx"> padding: 6px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -49,8 +49,7 @@
</span><span class="cx"> transition-timing-function: ease-out;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.find-banner.no-find-banner-transition,
-.supports-find-banner.no-find-banner-transition {
</del><ins>+.no-find-banner-transition:matches(.find-banner, .supports-find-banner) {
</ins><span class="cx"> transition-duration: 0 !important;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFlexibleSpaceNavigationItemcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FlexibleSpaceNavigationItem.css (176493 => 176494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FlexibleSpaceNavigationItem.css 2014-11-22 02:06:00 UTC (rev 176493)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FlexibleSpaceNavigationItem.css 2014-11-22 02:06:47 UTC (rev 176494)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.navigation-bar .item.flexible-space,
-.toolbar .item.flexible-space {
</del><ins>+:matches(.navigation-bar, .toolbar) .item.flexible-space {
</ins><span class="cx"> flex: 1;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>