<!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>[174536] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174536">174536</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-10-09 15:33:00 -0700 (Thu, 09 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove ENABLE_CSS3_CONDITIONAL_RULES
https://bugs.webkit.org/show_bug.cgi?id=137571

Reviewed by Simon Fraser.

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

We have good enough support for @supports that
it should be a consistent part of the platform. Remove
the compile-time guard.

* Configurations/FeatureDefines.xcconfig:
* WebCore.exp.in:
* bindings/js/JSCSSRuleCustom.cpp:
(WebCore::toJS):
* bindings/objc/DOMCSS.mm:
(kitClass):
* css/CSSGrammar.y.in:
* css/CSSParser.cpp:
(WebCore::CSSParser::CSSParser):
(WebCore::CSSParser::parseSupportsCondition):
(WebCore::CSSParser::detectAtToken):
(WebCore::CSSParser::detectSupportsToken):
(WebCore::CSSParser::realLex):
* css/CSSParser.h:
* css/CSSRule.h:
* css/CSSRule.idl:
* css/CSSSupportsRule.cpp:
* css/CSSSupportsRule.h:
* css/CSSSupportsRule.idl:
* css/DOMWindowCSS.cpp:
* css/DOMWindowCSS.h:
* css/DOMWindowCSS.idl:
* css/InspectorCSSOMWrappers.cpp:
(WebCore::InspectorCSSOMWrappers::collect):
* css/RuleSet.cpp:
(WebCore::RuleSet::addChildRules):
* css/StyleRule.cpp:
(WebCore::StyleRuleBase::destroy):
(WebCore::StyleRuleBase::copy):
(WebCore::StyleRuleBase::createCSSOMWrapper):
(WebCore::StyleRuleSupports::StyleRuleSupports):
* css/StyleRule.h:
(WebCore::toStyleRuleSupports):
* css/StyleSheetContents.cpp:
(WebCore::childRulesHaveFailedOrCanceledSubresources):
* inspector/InspectorStyleSheet.cpp:
(flattenSourceData):
(WebCore::asCSSRuleList):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::css):
* page/DOMWindow.h:
* page/DOMWindow.idl:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Source/WTF:

* wtf/FeatureDefines.h:

LayoutTests:

Unskipping tests.

* platform/ios-sim/Skipped:
* platform/wincairo/TestExpectations:
* platform/wk2/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimSkipped">trunk/LayoutTests/platform/ios-sim/Skipped</a></li>
<li><a href="#trunkLayoutTestsplatformwincairoTestExpectations">trunk/LayoutTests/platform/wincairo/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformwk2TestExpectations">trunk/LayoutTests/platform/wk2/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSmm">trunk/Source/WebCore/bindings/objc/DOMCSS.mm</a></li>
<li><a href="#trunkSourceWebCorecssCSSAllInOnecpp">trunk/Source/WebCore/css/CSSAllInOne.cpp</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="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleh">trunk/Source/WebCore/css/CSSRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleidl">trunk/Source/WebCore/css/CSSRule.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSSupportsRulecpp">trunk/Source/WebCore/css/CSSSupportsRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSupportsRuleh">trunk/Source/WebCore/css/CSSSupportsRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSSupportsRuleidl">trunk/Source/WebCore/css/CSSSupportsRule.idl</a></li>
<li><a href="#trunkSourceWebCorecssDOMWindowCSScpp">trunk/Source/WebCore/css/DOMWindowCSS.cpp</a></li>
<li><a href="#trunkSourceWebCorecssDOMWindowCSSh">trunk/Source/WebCore/css/DOMWindowCSS.h</a></li>
<li><a href="#trunkSourceWebCorecssDOMWindowCSSidl">trunk/Source/WebCore/css/DOMWindowCSS.idl</a></li>
<li><a href="#trunkSourceWebCorecssInspectorCSSOMWrapperscpp">trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</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="#trunkSourceWebCorecssStyleSheetContentscpp">trunk/Source/WebCore/css/StyleSheetContents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowidl">trunk/Source/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/LayoutTests/ChangeLog        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-10-09  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Remove ENABLE_CSS3_CONDITIONAL_RULES
+        https://bugs.webkit.org/show_bug.cgi?id=137571
+
+        Reviewed by Simon Fraser.
+
+        Unskip tests.
+
+        * platform/ios-sim/Skipped:
+        * platform/wincairo/TestExpectations:
+        * platform/wk2/TestExpectations:
+
</ins><span class="cx"> 2014-10-09  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Add the baseline implementation of :not(selectorList)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimSkipped"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-sim/Skipped (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-sim/Skipped        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/LayoutTests/platform/ios-sim/Skipped        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -659,9 +659,6 @@
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=85558
</span><span class="cx"> http/tests/security/contentSecurityPolicy/1.1
</span><span class="cx"> 
</span><del>-# ENABLE_CSS3_CONDITIONAL_RULES - CSS3 Conditionals support is not yet enabled.
-css3/supports.html
-
</del><span class="cx"> # ENABLE_CSS_IMAGE_ORIENTATION - CSS Image Orientation support is not yet enabled.
</span><span class="cx"> fast/css/image-orientation
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwincairoTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wincairo/TestExpectations        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -2734,11 +2734,6 @@
</span><span class="cx"> #https://bugs.webkit.org/show_bug.cgi?id=99878
</span><span class="cx"> css3/flexbox/flexbox-baseline-margins.html
</span><span class="cx"> 
</span><del>-# css3-conditionals support is not yet enabled. http://webkit.org/b/86146 http://webkit.org/b/104822 http://webkit.org/b/100324
-css3/supports.html
-css3/supports-cssom.html
-css3/supports-dom-api.html
-
</del><span class="cx"> # Requires rebaselining after https://bugs.webkit.org/show_bug.cgi?id=11645
</span><span class="cx"> webkit.org/b/11645 fast/table/025.html [ Failure ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wk2/TestExpectations (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wk2/TestExpectations        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/LayoutTests/platform/wk2/TestExpectations        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -215,11 +215,6 @@
</span><span class="cx"> fast/dom/Window/window-focus-self.html
</span><span class="cx"> scrollbars/corner-resizer-window-inactive.html
</span><span class="cx"> 
</span><del>-# css3-conditionals support is not yet enabled.
-webkit.org/b/86146 css3/supports.html
-webkit.org/b/104822 css3/supports-cssom.html
-webkit.org/b/100324 css3/supports-dom-api.html
-
</del><span class="cx"> # Text Autosizing is not yet enabled.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=84186
</span><span class="cx"> fast/text-autosizing
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-09  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Remove ENABLE_CSS3_CONDITIONAL_RULES
+        https://bugs.webkit.org/show_bug.cgi?id=137571
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-10-09  Adrien Destugues  &lt;pulkomandy@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix compiler warning on noreturn function
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="lines">@@ -271,4 +270,4 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx"> 
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WTF/ChangeLog        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-09  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Remove ENABLE_CSS3_CONDITIONAL_RULES
+        https://bugs.webkit.org/show_bug.cgi?id=137571
+
+        Reviewed by Simon Fraser.
+
+        * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2014-10-09  Akos Kiss  &lt;akiss@inf.u-szeged.hu&gt;
</span><span class="cx"> 
</span><span class="cx">         Enable ARM64 disassembler for all platforms
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WTF/wtf/FeatureDefines.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -333,10 +333,6 @@
</span><span class="cx"> #define ENABLE_CSP_NEXT 0
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if !defined(ENABLE_CSS3_CONDITIONAL_RULES)
-#define ENABLE_CSS3_CONDITIONAL_RULES 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CSS3_TEXT)
</span><span class="cx"> #define ENABLE_CSS3_TEXT 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/ChangeLog        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2014-10-09  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Remove ENABLE_CSS3_CONDITIONAL_RULES
+        https://bugs.webkit.org/show_bug.cgi?id=137571
+
+        Reviewed by Simon Fraser.
+
+        We have good enough support for @supports that
+        it should be a consistent part of the platform. Remove
+        the compile-time guard.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * WebCore.exp.in:
+        * bindings/js/JSCSSRuleCustom.cpp:
+        (WebCore::toJS):
+        * bindings/objc/DOMCSS.mm:
+        (kitClass):
+        * css/CSSGrammar.y.in:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::CSSParser):
+        (WebCore::CSSParser::parseSupportsCondition):
+        (WebCore::CSSParser::detectAtToken):
+        (WebCore::CSSParser::detectSupportsToken):
+        (WebCore::CSSParser::realLex):
+        * css/CSSParser.h:
+        * css/CSSRule.h:
+        * css/CSSRule.idl:
+        * css/CSSSupportsRule.cpp:
+        * css/CSSSupportsRule.h:
+        * css/CSSSupportsRule.idl:
+        * css/DOMWindowCSS.cpp:
+        * css/DOMWindowCSS.h:
+        * css/DOMWindowCSS.idl:
+        * css/InspectorCSSOMWrappers.cpp:
+        (WebCore::InspectorCSSOMWrappers::collect):
+        * css/RuleSet.cpp:
+        (WebCore::RuleSet::addChildRules):
+        * css/StyleRule.cpp:
+        (WebCore::StyleRuleBase::destroy):
+        (WebCore::StyleRuleBase::copy):
+        (WebCore::StyleRuleBase::createCSSOMWrapper):
+        (WebCore::StyleRuleSupports::StyleRuleSupports):
+        * css/StyleRule.h:
+        (WebCore::toStyleRuleSupports):
+        * css/StyleSheetContents.cpp:
+        (WebCore::childRulesHaveFailedOrCanceledSubresources):
+        * inspector/InspectorStyleSheet.cpp:
+        (flattenSourceData):
+        (WebCore::asCSSRuleList):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::css):
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+
</ins><span class="cx"> 2014-10-09  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Add the baseline implementation of :not(selectorList)
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="lines">@@ -271,4 +270,4 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx"> 
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/WebCore.exp.in        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> .objc_class_name_DOMAbstractView
</span><span class="cx"> .objc_class_name_DOMCSSStyleDeclaration
</span><ins>+.objc_class_name_DOMCSSSupportsRule
</ins><span class="cx"> .objc_class_name_DOMCharacterData
</span><span class="cx"> .objc_class_name_DOMDocument
</span><span class="cx"> .objc_class_name_DOMDocumentFragment
</span><span class="lines">@@ -205,6 +206,7 @@
</span><span class="cx"> __ZN7WebCore11writeToFileEiPKci
</span><span class="cx"> __ZN7WebCore12BlobDataItem11toEndOfFileE
</span><span class="cx"> __ZN7WebCore12BlobRegistryD2Ev
</span><ins>+__ZN7WebCore12DOMWindowCSS6createEv
</ins><span class="cx"> __ZN7WebCore12DataTransferD1Ev
</span><span class="cx"> __ZN7WebCore12EditingStyleD1Ev
</span><span class="cx"> __ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE
</span><span class="lines">@@ -1169,6 +1171,7 @@
</span><span class="cx"> __ZN7WebCore4coreEP28NSURLAuthenticationChallenge
</span><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS0_7ProfileE
</span><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE
</span><ins>+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
</ins><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13DOMStringListE
</span><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14ClientRectListE
</span><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_19CSSStyleDeclarationE
</span><span class="lines">@@ -3001,12 +3004,6 @@
</span><span class="cx"> __ZNK7WebCore21ContextMenuController21checkOrEnableIfNeededERNS_15ContextMenuItemE
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
-.objc_class_name_DOMCSSSupportsRule
-__ZN7WebCore12DOMWindowCSS6createEv
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -94,11 +94,9 @@
</span><span class="cx">         case CSSRule::WEBKIT_KEYFRAMES_RULE:
</span><span class="cx">             wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframesRule, rule);
</span><span class="cx">             break;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         case CSSRule::SUPPORTS_RULE:
</span><span class="cx">             wrapper = CREATE_DOM_WRAPPER(globalObject, CSSSupportsRule, rule);
</span><span class="cx">             break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">         case CSSRule::WEBKIT_VIEWPORT_RULE:
</span><span class="cx">             wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSViewportRule, rule);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSS.mm (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSS.mm        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/bindings/objc/DOMCSS.mm        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -40,9 +40,7 @@
</span><span class="cx"> #import &quot;DOMCSSStyleDeclaration.h&quot;
</span><span class="cx"> #import &quot;DOMCSSStyleRule.h&quot;
</span><span class="cx"> #import &quot;DOMCSSStyleSheet.h&quot;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> #import &quot;DOMCSSSupportsRule.h&quot;
</span><del>-#endif
</del><span class="cx"> #import &quot;DOMCSSUnknownRule.h&quot;
</span><span class="cx"> #import &quot;DOMCSSValueInternal.h&quot;
</span><span class="cx"> #import &quot;DOMCSSValueList.h&quot;
</span><span class="lines">@@ -95,10 +93,8 @@
</span><span class="cx">             return [DOMWebKitCSSKeyframesRule class];
</span><span class="cx">         case DOM_WEBKIT_KEYFRAME_RULE:
</span><span class="cx">             return [DOMWebKitCSSKeyframeRule class];
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         case DOM_SUPPORTS_RULE:
</span><span class="cx">             return [DOMCSSSupportsRule class];
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">         case DOM_WEBKIT_VIEWPORT_RULE:
</span><span class="cx">             return [DOMWebKitCSSViewportRule class];
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSAllInOne.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSAllInOne.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -66,9 +66,7 @@
</span><span class="cx"> #include &quot;CSSSegmentedFontFace.cpp&quot;
</span><span class="cx"> #include &quot;CSSSelector.cpp&quot;
</span><span class="cx"> #include &quot;CSSSelectorList.cpp&quot;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> #include &quot;CSSSupportsRule.cpp&quot;
</span><del>-#endif
</del><span class="cx"> #include &quot;CSSStyleRule.cpp&quot;
</span><span class="cx"> #include &quot;CSSStyleSheet.cpp&quot;
</span><span class="cx"> #include &quot;CSSTimingFunctionValue.cpp&quot;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -343,8 +343,6 @@
</span><span class="cx"> %destructor { destroy($$); } track_names_list
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE_CSS3_CONDITIONAL_RULES
-
</del><span class="cx"> %token SUPPORTS_AND
</span><span class="cx"> %token SUPPORTS_NOT
</span><span class="cx"> %token SUPPORTS_OR
</span><span class="lines">@@ -356,8 +354,6 @@
</span><span class="cx"> 
</span><span class="cx"> %type &lt;boolean&gt; supports_condition supports_condition_in_parens supports_conjunction supports_declaration_condition supports_disjunction supports_error supports_negation
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> #if ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx"> 
</span><span class="cx"> %type &lt;rule&gt; viewport
</span><span class="lines">@@ -384,9 +380,7 @@
</span><span class="cx"> #endif
</span><span class="cx">   | webkit_selector maybe_space
</span><span class="cx">   | webkit_keyframe_rule maybe_space
</span><del>-#if ENABLE_CSS3_CONDITIONAL_RULES
</del><span class="cx">   | webkit_supports_condition maybe_space
</span><del>-#endif
</del><span class="cx">   ;
</span><span class="cx"> 
</span><span class="cx"> webkit_rule: WEBKIT_RULE_SYM '{' maybe_space valid_rule maybe_space '}' { parser-&gt;m_rule = adoptRef($4); } ;
</span><span class="lines">@@ -419,12 +413,8 @@
</span><span class="cx">     }
</span><span class="cx"> ;
</span><span class="cx"> 
</span><del>-#if ENABLE_CSS3_CONDITIONAL_RULES
-
</del><span class="cx"> webkit_supports_condition: WEBKIT_SUPPORTS_CONDITION_SYM WHITESPACE maybe_space supports_condition '}' { parser-&gt;m_supportsCondition = $4; } ;
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> /* for expressions that require at least one whitespace to be present, like the + and - operators in calc expressions */
</span><span class="cx"> space: WHITESPACE | space WHITESPACE ;
</span><span class="cx"> 
</span><span class="lines">@@ -471,9 +461,7 @@
</span><span class="cx">   | namespace { $$ = nullptr; }
</span><span class="cx">   | import
</span><span class="cx">   | region
</span><del>-#if ENABLE_CSS3_CONDITIONAL_RULES
</del><span class="cx">   | supports
</span><del>-#endif
</del><span class="cx"> #if ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx">   | viewport
</span><span class="cx"> #endif
</span><span class="lines">@@ -519,9 +507,7 @@
</span><span class="cx">   | font_face
</span><span class="cx">   | media
</span><span class="cx">   | keyframes
</span><del>-#if ENABLE_CSS3_CONDITIONAL_RULES
</del><span class="cx">   | supports
</span><del>-#endif
</del><span class="cx"> #if ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx">   | viewport
</span><span class="cx"> #endif
</span><span class="lines">@@ -728,8 +714,6 @@
</span><span class="cx">     }
</span><span class="cx">     ;
</span><span class="cx"> 
</span><del>-#if ENABLE_CSS3_CONDITIONAL_RULES
-
</del><span class="cx"> supports:
</span><span class="cx">     before_supports_rule SUPPORTS_SYM maybe_space supports_condition at_supports_rule_header_end '{' at_rule_body_start maybe_space block_rule_list save_block {
</span><span class="cx">         $$ = parser-&gt;createSupportsRule($4, std::unique_ptr&lt;Vector&lt;RefPtr&lt;StyleRuleBase&gt;&gt;&gt;($9).get()).leakRef();
</span><span class="lines">@@ -795,8 +779,6 @@
</span><span class="cx">     }
</span><span class="cx">     ;
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> before_keyframes_rule:
</span><span class="cx">     /* empty */ {
</span><span class="cx">         parser-&gt;markRuleHeaderStart(CSSRuleSourceData::KEYFRAMES_RULE);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -303,9 +303,7 @@
</span><span class="cx">     , m_important(false)
</span><span class="cx">     , m_id(CSSPropertyInvalid)
</span><span class="cx">     , m_styleSheet(0)
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     , m_supportsCondition(false)
</span><del>-#endif
</del><span class="cx">     , m_selectorListForParseSelector(0)
</span><span class="cx">     , m_numParsedPropertiesBeforeMarginBox(INVALID_NUM_PARSED_PROPERTIES)
</span><span class="cx">     , m_inParseShorthand(0)
</span><span class="lines">@@ -465,7 +463,6 @@
</span><span class="cx">     return m_keyframe.release();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> bool CSSParser::parseSupportsCondition(const String&amp; string)
</span><span class="cx"> {
</span><span class="cx">     m_supportsCondition = false;
</span><span class="lines">@@ -475,7 +472,6 @@
</span><span class="cx">     cssyyparse(this);
</span><span class="cx">     return m_supportsCondition;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> static inline bool isColorPropertyID(CSSPropertyID propertyId)
</span><span class="cx"> {
</span><span class="lines">@@ -10987,14 +10983,12 @@
</span><span class="cx">         }
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     case 's':
</span><span class="cx">         if (length == 9 &amp;&amp; isEqualToCSSIdentifier(name + 2, &quot;upports&quot;)) {
</span><span class="cx">             m_parsingMode = SupportsMode;
</span><span class="cx">             m_token = SUPPORTS_SYM;
</span><span class="cx">         }
</span><span class="cx">         return;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     case 't':
</span><span class="cx">         if (hasEscape)
</span><span class="lines">@@ -11090,18 +11084,15 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         case 27:
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">             if (isEqualToCSSIdentifier(name + 2, &quot;webkit-supports-condition&quot;)) {
</span><span class="cx">                 m_parsingMode = SupportsMode;
</span><span class="cx">                 m_token = WEBKIT_SUPPORTS_CONDITION_SYM;
</span><span class="cx">             }
</span><del>-#endif
</del><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> template &lt;typename CharacterType&gt;
</span><span class="cx"> inline void CSSParser::detectSupportsToken(int length)
</span><span class="cx"> {
</span><span class="lines">@@ -11118,7 +11109,6 @@
</span><span class="cx">             m_token = SUPPORTS_NOT;
</span><span class="cx">     }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> template &lt;typename SrcCharacterType&gt;
</span><span class="cx"> int CSSParser::realLex(void* yylvalWithoutType)
</span><span class="lines">@@ -11160,13 +11150,11 @@
</span><span class="cx">         m_token = IDENT;
</span><span class="cx"> 
</span><span class="cx">         if (UNLIKELY(*currentCharacter&lt;SrcCharacterType&gt;() == '(')) {
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">             if (m_parsingMode == SupportsMode &amp;&amp; !hasEscape) {
</span><span class="cx">                 detectSupportsToken&lt;SrcCharacterType&gt;(result - tokenStart&lt;SrcCharacterType&gt;());
</span><span class="cx">                 if (m_token != IDENT)
</span><span class="cx">                     break;
</span><span class="cx">             }
</span><del>-#endif
</del><span class="cx">             m_token = FUNCTION;
</span><span class="cx">             bool shouldSkipParenthesis = true;
</span><span class="cx">             if (!hasEscape) {
</span><span class="lines">@@ -11196,10 +11184,8 @@
</span><span class="cx">         } else if (UNLIKELY(m_parsingMode != NormalMode) &amp;&amp; !hasEscape) {
</span><span class="cx">             if (m_parsingMode == MediaQueryMode)
</span><span class="cx">                 detectMediaQueryToken&lt;SrcCharacterType&gt;(result - tokenStart&lt;SrcCharacterType&gt;());
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">             else if (m_parsingMode == SupportsMode)
</span><span class="cx">                 detectSupportsToken&lt;SrcCharacterType&gt;(result - tokenStart&lt;SrcCharacterType&gt;());
</span><del>-#endif
</del><span class="cx">             else if (m_parsingMode == NthChildMode &amp;&amp; isASCIIAlphaCaselessEqual(tokenStart&lt;SrcCharacterType&gt;()[0], 'n')) {
</span><span class="cx">                 if (result - tokenStart&lt;SrcCharacterType&gt;() == 1) {
</span><span class="cx">                     // String &quot;n&quot; is IDENT but &quot;n+1&quot; is NTH.
</span><span class="lines">@@ -11373,10 +11359,7 @@
</span><span class="cx">         break;
</span><span class="cx"> 
</span><span class="cx">     case CharacterEndConditionQuery: {
</span><del>-        bool isParsingCondition = m_parsingMode == MediaQueryMode;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
-        isParsingCondition = isParsingCondition || m_parsingMode == SupportsMode;
-#endif
</del><ins>+        bool isParsingCondition = m_parsingMode == MediaQueryMode || m_parsingMode == SupportsMode;
</ins><span class="cx">         if (isParsingCondition)
</span><span class="cx">             m_parsingMode = NormalMode;
</span><span class="cx">         break;
</span><span class="lines">@@ -11566,7 +11549,6 @@
</span><span class="cx">     return createMediaRule(MediaQuerySet::create(), rules);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> PassRefPtr&lt;StyleRuleBase&gt; CSSParser::createSupportsRule(bool conditionIsSupported, RuleList* rules)
</span><span class="cx"> {
</span><span class="cx">     m_allowImportRules = m_allowNamespaceDeclarations = false;
</span><span class="lines">@@ -11622,8 +11604,6 @@
</span><span class="cx">     return data.release();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> void CSSParser::processAndAddNewRuleToSourceTreeIfNeeded()
</span><span class="cx"> {
</span><span class="cx">     if (!isExtractingSourceData())
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSParser.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -87,9 +87,7 @@
</span><span class="cx">     void parseSheet(StyleSheetContents*, const String&amp;, int startLineNumber = 0, RuleSourceDataList* = 0, bool = false);
</span><span class="cx">     PassRefPtr&lt;StyleRuleBase&gt; parseRule(StyleSheetContents*, const String&amp;);
</span><span class="cx">     PassRefPtr&lt;StyleKeyframe&gt; parseKeyframeRule(StyleSheetContents*, const String&amp;);
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     bool parseSupportsCondition(const String&amp;);
</span><del>-#endif
</del><span class="cx">     static bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&amp;, bool important, CSSParserMode, StyleSheetContents*);
</span><span class="cx">     static bool parseColor(RGBA32&amp; color, const String&amp;, bool strict = false);
</span><span class="cx">     static bool parseSystemColor(RGBA32&amp; color, const String&amp;, Document*);
</span><span class="lines">@@ -314,12 +312,10 @@
</span><span class="cx">     PassRefPtr&lt;StyleRuleBase&gt; createPageRule(std::unique_ptr&lt;CSSParserSelector&gt; pageSelector);
</span><span class="cx">     PassRefPtr&lt;StyleRuleBase&gt; createRegionRule(Vector&lt;std::unique_ptr&lt;CSSParserSelector&gt;&gt;* regionSelector, RuleList* rules);
</span><span class="cx">     void createMarginAtRule(CSSSelector::MarginBoxType);
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     PassRefPtr&lt;StyleRuleBase&gt; createSupportsRule(bool conditionIsSupported, RuleList*);
</span><span class="cx">     void markSupportsRuleHeaderStart();
</span><span class="cx">     void markSupportsRuleHeaderEnd();
</span><span class="cx">     PassRefPtr&lt;CSSRuleSourceData&gt; popSupportsRuleData();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void startDeclarationsForMarginBox();
</span><span class="cx">     void endDeclarationsForMarginBox();
</span><span class="lines">@@ -352,9 +348,7 @@
</span><span class="cx">     std::unique_ptr&lt;SourceSizeList&gt; m_sourceSizeList;
</span><span class="cx"> #endif
</span><span class="cx">     std::unique_ptr&lt;CSSParserValueList&gt; m_valueList;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     bool m_supportsCondition;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     typedef Vector&lt;CSSProperty, 256&gt; ParsedPropertyVector;
</span><span class="cx">     ParsedPropertyVector m_parsedProperties;
</span><span class="lines">@@ -483,10 +477,8 @@
</span><span class="cx">     inline void detectDashToken(int);
</span><span class="cx">     template &lt;typename CharacterType&gt;
</span><span class="cx">     inline void detectAtToken(int, bool);
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     template &lt;typename CharacterType&gt;
</span><span class="cx">     inline void detectSupportsToken(int);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     template &lt;typename CharacterType&gt;
</span><span class="cx">     inline void setRuleHeaderEnd(const CharacterType*);
</span><span class="lines">@@ -551,9 +543,7 @@
</span><span class="cx">     enum ParsingMode {
</span><span class="cx">         NormalMode,
</span><span class="cx">         MediaQueryMode,
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         SupportsMode,
</span><del>-#endif
</del><span class="cx">         NthChildMode
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="lines">@@ -592,9 +582,7 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;CSSCalcValue&gt; m_parsedCalculation;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     std::unique_ptr&lt;RuleSourceDataList&gt; m_supportsRuleDataStack;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     // defines units allowed for a certain property, used in parseUnit
</span><span class="cx">     enum Units {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSRule.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -51,9 +51,7 @@
</span><span class="cx">         // &lt;https://bugs.webkit.org/show_bug.cgi?id=71293&gt;.
</span><span class="cx">         WEBKIT_KEYFRAMES_RULE,
</span><span class="cx">         WEBKIT_KEYFRAME_RULE,
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         SUPPORTS_RULE = 12,
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">         WEBKIT_VIEWPORT_RULE = 15,
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.idl (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.idl        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSRule.idl        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -37,9 +37,7 @@
</span><span class="cx">     const unsigned short PAGE_RULE = 6;
</span><span class="cx">     const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
</span><span class="cx">     const unsigned short WEBKIT_KEYFRAME_RULE = 8;
</span><del>-#if defined(ENABLE_CSS3_CONDITIONAL_RULES) &amp;&amp; ENABLE_CSS3_CONDITIONAL_RULES
</del><span class="cx">     const unsigned short SUPPORTS_RULE = 12;
</span><del>-#endif
</del><span class="cx"> #if defined(ENABLE_CSS_DEVICE_ADAPTATION) &amp;&amp; ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx">     const unsigned short WEBKIT_VIEWPORT_RULE = 15;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSupportsRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSupportsRule.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSupportsRule.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSSupportsRule.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -37,8 +37,6 @@
</span><span class="cx"> #include &quot;StyleRule.h&quot;
</span><span class="cx"> #include &lt;wtf/text/StringBuilder.h&gt;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> CSSSupportsRule::CSSSupportsRule(StyleRuleSupports&amp; supportsRule, CSSStyleSheet* parent)
</span><span class="lines">@@ -65,5 +63,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSSupportsRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSupportsRule.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSupportsRule.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSSupportsRule.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CSSGroupingRule.h&quot;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class CSSRule;
</span><span class="lines">@@ -60,6 +58,4 @@
</span><span class="cx"> 
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSSupportsRule, CSSRule::SUPPORTS_RULE)
</span><span class="cx"> 
</span><del>-#endif // ENABLE(CSS3_CONDITIONAL_RULES)
-
</del><span class="cx"> #endif // CSSSupportsRule_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSupportsRuleidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSupportsRule.idl (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSupportsRule.idl        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/CSSSupportsRule.idl        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> 
</span><span class="cx"> [
</span><span class="cx">     NoInterfaceObject,
</span><del>-    Conditional=CSS3_CONDITIONAL_RULES,
</del><span class="cx"> ] interface CSSSupportsRule : CSSRule {
</span><span class="cx">     readonly attribute CSSRuleList cssRules;
</span><span class="cx">     readonly attribute DOMString conditionText;
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMWindowCSScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMWindowCSS.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMWindowCSS.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/DOMWindowCSS.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;DOMWindowCSS.h&quot;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
</del><span class="cx"> #include &quot;CSSParser.h&quot;
</span><span class="cx"> #include &quot;StyleProperties.h&quot;
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="lines">@@ -85,5 +83,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorecssDOMWindowCSSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMWindowCSS.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMWindowCSS.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/DOMWindowCSS.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #ifndef DOMWindowCSS_h
</span><span class="cx"> #define DOMWindowCSS_h
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
</del><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><span class="lines">@@ -53,6 +51,4 @@
</span><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif // ENABLE(CSS3_CONDITIONAL_RULES)
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssDOMWindowCSSidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DOMWindowCSS.idl (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DOMWindowCSS.idl        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/DOMWindowCSS.idl        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">     NoInterfaceObject,
</span><span class="cx">     InterfaceName=CSS,
</span><span class="cx">     ImplementationLacksVTable,
</span><del>-    Conditional=CSS3_CONDITIONAL_RULES,
</del><span class="cx"> ] interface DOMWindowCSS {
</span><span class="cx"> 
</span><span class="cx">     boolean supports(DOMString property, DOMString value);
</span></span></pre></div>
<a id="trunkSourceWebCorecssInspectorCSSOMWrapperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -63,11 +63,9 @@
</span><span class="cx">         case CSSRule::MEDIA_RULE:
</span><span class="cx">             collect(downcast&lt;CSSMediaRule&gt;(cssRule));
</span><span class="cx">             break;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         case CSSRule::SUPPORTS_RULE:
</span><span class="cx">             collect(downcast&lt;CSSSupportsRule&gt;(cssRule));
</span><span class="cx">             break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx">         case CSSRule::WEBKIT_REGION_RULE:
</span><span class="cx">             collect(downcast&lt;WebKitCSSRegionRule&gt;(cssRule));
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/RuleSet.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -340,9 +340,10 @@
</span><span class="cx">             const StyleRuleFontFace* fontFaceRule = static_cast&lt;StyleRuleFontFace*&gt;(rule);
</span><span class="cx">             resolver-&gt;fontSelector()-&gt;addFontFaceRule(fontFaceRule);
</span><span class="cx">             resolver-&gt;invalidateMatchedPropertiesCache();
</span><del>-        } else if (rule-&gt;isKeyframesRule() &amp;&amp; resolver) {
</del><ins>+        } else if (rule-&gt;isKeyframesRule() &amp;&amp; resolver)
</ins><span class="cx">             resolver-&gt;addKeyframeStyle(static_cast&lt;StyleRuleKeyframes*&gt;(rule));
</span><del>-        }
</del><ins>+        else if (rule-&gt;isSupportsRule() &amp;&amp; static_cast&lt;StyleRuleSupports*&gt;(rule)-&gt;conditionIsSupported())
+            addChildRules(static_cast&lt;StyleRuleSupports*&gt;(rule)-&gt;childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
</ins><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx">         else if (rule-&gt;isRegionRule() &amp;&amp; resolver) {
</span><span class="cx">             addRegionRule(static_cast&lt;StyleRuleRegion*&gt;(rule), hasDocumentSecurityOrigin);
</span><span class="lines">@@ -353,10 +354,6 @@
</span><span class="cx">             resolver-&gt;viewportStyleResolver()-&gt;addViewportRule(static_cast&lt;StyleRuleViewport*&gt;(rule));
</span><span class="cx">         }
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
-        else if (rule-&gt;isSupportsRule() &amp;&amp; static_cast&lt;StyleRuleSupports*&gt;(rule)-&gt;conditionIsSupported())
-            addChildRules(static_cast&lt;StyleRuleSupports*&gt;(rule)-&gt;childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
-#endif
</del><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/StyleRule.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -70,11 +70,9 @@
</span><span class="cx">     case Media:
</span><span class="cx">         delete static_cast&lt;StyleRuleMedia*&gt;(this);
</span><span class="cx">         return;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     case Supports:
</span><span class="cx">         delete static_cast&lt;StyleRuleSupports*&gt;(this);
</span><span class="cx">         return;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx">     case Region:
</span><span class="cx">         delete static_cast&lt;StyleRuleRegion*&gt;(this);
</span><span class="lines">@@ -114,10 +112,8 @@
</span><span class="cx">         return static_cast&lt;const StyleRuleFontFace*&gt;(this)-&gt;copy();
</span><span class="cx">     case Media:
</span><span class="cx">         return static_cast&lt;const StyleRuleMedia*&gt;(this)-&gt;copy();
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     case Supports:
</span><span class="cx">         return static_cast&lt;const StyleRuleSupports*&gt;(this)-&gt;copy();
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx">     case Region:
</span><span class="cx">         return static_cast&lt;const StyleRuleRegion*&gt;(this)-&gt;copy();
</span><span class="lines">@@ -161,11 +157,9 @@
</span><span class="cx">     case Media:
</span><span class="cx">         rule = CSSMediaRule::create(static_cast&lt;StyleRuleMedia&amp;&gt;(self), parentSheet);
</span><span class="cx">         break;
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     case Supports:
</span><span class="cx">         rule = CSSSupportsRule::create(static_cast&lt;StyleRuleSupports&amp;&gt;(self), parentSheet);
</span><span class="cx">         break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx">     case Region:
</span><span class="cx">         rule = WebKitCSSRegionRule::create(static_cast&lt;StyleRuleRegion&amp;&gt;(self), parentSheet);
</span><span class="lines">@@ -349,7 +343,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> StyleRuleSupports::StyleRuleSupports(const String&amp; conditionText, bool conditionIsSupported, Vector&lt;RefPtr&lt;StyleRuleBase&gt;&gt;&amp; adoptRules)
</span><span class="cx">     : StyleRuleGroup(Supports, adoptRules)
</span><span class="cx">     , m_conditionText(conditionText)
</span><span class="lines">@@ -363,7 +356,6 @@
</span><span class="cx">     , m_conditionIsSupported(o.m_conditionIsSupported)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> StyleRuleRegion::StyleRuleRegion(Vector&lt;std::unique_ptr&lt;CSSParserSelector&gt;&gt;* selectors, Vector&lt;RefPtr&lt;StyleRuleBase&gt;&gt;&amp; adoptRules)
</span><span class="cx">     : StyleRuleGroup(Region, adoptRules)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/StyleRule.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -48,9 +48,7 @@
</span><span class="cx">         Page,
</span><span class="cx">         Keyframes,
</span><span class="cx">         Keyframe, // Not used. These are internally non-rule StyleKeyframe objects.
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         Supports = 12,
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">         Viewport = 15,
</span><span class="cx"> #endif
</span><span class="lines">@@ -66,9 +64,7 @@
</span><span class="cx">     bool isPageRule() const { return type() == Page; }
</span><span class="cx">     bool isStyleRule() const { return type() == Style; }
</span><span class="cx">     bool isRegionRule() const { return type() == Region; }
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     bool isSupportsRule() const { return type() == Supports; }
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">     bool isViewportRule() const { return type() == Viewport; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -218,7 +214,6 @@
</span><span class="cx">     RefPtr&lt;MediaQuerySet&gt; m_mediaQueries;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> class StyleRuleSupports : public StyleRuleGroup {
</span><span class="cx"> public:
</span><span class="cx">     static PassRef&lt;StyleRuleSupports&gt; create(const String&amp; conditionText, bool conditionIsSupported, Vector&lt;RefPtr&lt;StyleRuleBase&gt;&gt;&amp; adoptRules)
</span><span class="lines">@@ -237,7 +232,6 @@
</span><span class="cx">     String m_conditionText;
</span><span class="cx">     bool m_conditionIsSupported;
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> class StyleRuleRegion : public StyleRuleGroup {
</span><span class="cx"> public:
</span><span class="lines">@@ -283,13 +277,11 @@
</span><span class="cx">     return static_cast&lt;const StyleRuleMedia*&gt;(rule);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> inline const StyleRuleSupports* toStyleRuleSupports(const StyleRuleGroup* rule)
</span><span class="cx"> {
</span><span class="cx">     ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule-&gt;isSupportsRule());
</span><span class="cx">     return static_cast&lt;const StyleRuleSupports*&gt;(rule);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> inline const StyleRuleRegion* toStyleRuleRegion(const StyleRuleGroup* rule)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleSheetContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleSheetContents.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/css/StyleSheetContents.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -458,9 +458,7 @@
</span><span class="cx">         case StyleRuleBase::Unknown:
</span><span class="cx">         case StyleRuleBase::Charset:
</span><span class="cx">         case StyleRuleBase::Keyframe:
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         case StyleRuleBase::Supports:
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx">         case StyleRuleBase::Viewport:
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -107,10 +107,8 @@
</span><span class="cx">             target-&gt;append(data);
</span><span class="cx">         else if (data-&gt;type == CSSRuleSourceData::MEDIA_RULE)
</span><span class="cx">             flattenSourceData(&amp;data-&gt;childRules, target);
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         else if (data-&gt;type == CSSRuleSourceData::SUPPORTS_RULE)
</span><span class="cx">             flattenSourceData(&amp;data-&gt;childRules, target);
</span><del>-#endif
</del><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -220,10 +218,8 @@
</span><span class="cx">     if (is&lt;WebKitCSSKeyframesRule&gt;(*rule))
</span><span class="cx">         return &amp;downcast&lt;WebKitCSSKeyframesRule&gt;(*rule).cssRules();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">     if (is&lt;CSSSupportsRule&gt;(*rule))
</span><span class="cx">         return &amp;downcast&lt;CSSSupportsRule&gt;(*rule).cssRules();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/page/DOMWindow.cpp        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1675,14 +1675,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx"> DOMWindowCSS* DOMWindow::css()
</span><span class="cx"> {
</span><span class="cx">     if (!m_css)
</span><span class="cx">         m_css = DOMWindowCSS::create();
</span><span class="cx">     return m_css.get();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> static void didAddStorageEventListener(DOMWindow* window)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/page/DOMWindow.h        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -269,9 +269,7 @@
</span><span class="cx">         void cancelAnimationFrame(int id);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         DOMWindowCSS* css();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">         // Events
</span><span class="cx">         // EventTarget API
</span><span class="lines">@@ -518,9 +516,7 @@
</span><span class="cx">         mutable RefPtr&lt;Performance&gt; m_performance;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS3_CONDITIONAL_RULES)
</del><span class="cx">         mutable RefPtr&lt;DOMWindowCSS&gt; m_css;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(USER_MESSAGE_HANDLERS)
</span><span class="cx">         mutable RefPtr&lt;WebKitNamespace&gt; m_webkitNamespace;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.idl (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.idl        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebCore/page/DOMWindow.idl        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">     [ImplementedAs=cancelAnimationFrame] void webkitCancelRequestAnimationFrame(long id); // This is a deprecated alias for webkitCancelAnimationFrame(). Remove this when removing vendor prefix.
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    [Replaceable,Conditional=CSS3_CONDITIONAL_RULES] readonly attribute DOMWindowCSS CSS;
</del><ins>+    [Replaceable] readonly attribute DOMWindowCSS CSS;
</ins><span class="cx"> 
</span><span class="cx">     // Events
</span><span class="cx">     attribute EventListener onabort;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-09  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Remove ENABLE_CSS3_CONDITIONAL_RULES
+        https://bugs.webkit.org/show_bug.cgi?id=137571
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-10-09  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a WebKit1 preference for selection services
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="lines">@@ -271,4 +270,4 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx"> 
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebKit2/ChangeLog        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-09  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Remove ENABLE_CSS3_CONDITIONAL_RULES
+        https://bugs.webkit.org/show_bug.cgi?id=137571
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2014-10-09  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Move ServicesOverlayController to WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><span class="cx"> ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><del>-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
</del><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="lines">@@ -271,4 +270,4 @@
</span><span class="cx"> 
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx"> 
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INSPECTOR) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_SHARED_WORKERS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(FEATURE_DEFINES_$(PLATFORM_NAME));
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/cmake/OptionsEfl.cmake        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/cmake/OptionsGTK.cmake        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/cmake/OptionsMac.cmake        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT_LINE_BREAK OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY ON)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/cmake/WebKitFeatures.cmake        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING &quot;Toggle content filtering support&quot; OFF)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS &quot;Toggle Context Menu support&quot; ON)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT &quot;Toggle Content Security Policy 1.1 support&quot; OFF)
</span><del>-    WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES &quot;Toggle CSS3 Conditional Rules support&quot; OFF)
</del><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT &quot;Toggle CSS3 Text support&quot; OFF)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_LINE_BREAK &quot;Toggle CSS3 Text Line Break support&quot; OFF)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK &quot;Toggle Box Decoration break (CSS Backgrounds and Borders) support&quot; ON)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (174535 => 174536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake        2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/cmakeconfig.h.cmake        2014-10-09 22:33:00 UTC (rev 174536)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_REGIONS
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_SHAPES
</span><del>-#cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
</del><span class="cx"> #cmakedefine01 ENABLE_CURSOR_VISIBILITY
</span><span class="cx"> #cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
</span><span class="cx"> #cmakedefine01 ENABLE_DASHBOARD_SUPPORT
</span></span></pre>
</div>
</div>

</body>
</html>