Diff
Modified: trunk/LayoutTests/ChangeLog (174535 => 174536)
--- trunk/LayoutTests/ChangeLog 2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/LayoutTests/ChangeLog 2014-10-09 22:33:00 UTC (rev 174536)
@@ -1,3 +1,16 @@
+2014-10-09 Dean Jackson <[email protected]>
+
+ 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:
+
2014-10-09 Benjamin Poulain <[email protected]>
Add the baseline implementation of :not(selectorList)
Modified: trunk/LayoutTests/platform/ios-sim/Skipped (174535 => 174536)
--- 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)
@@ -659,9 +659,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=85558
http/tests/security/contentSecurityPolicy/1.1
-# ENABLE_CSS3_CONDITIONAL_RULES - CSS3 Conditionals support is not yet enabled.
-css3/supports.html
-
# ENABLE_CSS_IMAGE_ORIENTATION - CSS Image Orientation support is not yet enabled.
fast/css/image-orientation
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (174535 => 174536)
--- 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)
@@ -2734,11 +2734,6 @@
#https://bugs.webkit.org/show_bug.cgi?id=99878
css3/flexbox/flexbox-baseline-margins.html
-# 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
-
# Requires rebaselining after https://bugs.webkit.org/show_bug.cgi?id=11645
webkit.org/b/11645 fast/table/025.html [ Failure ]
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (174535 => 174536)
--- 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)
@@ -215,11 +215,6 @@
fast/dom/Window/window-focus-self.html
scrollbars/corner-resizer-window-inactive.html
-# 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
-
# Text Autosizing is not yet enabled.
# https://bugs.webkit.org/show_bug.cgi?id=84186
fast/text-autosizing
Modified: trunk/Source/_javascript_Core/ChangeLog (174535 => 174536)
--- trunk/Source/_javascript_Core/ChangeLog 2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-10-09 22:33:00 UTC (rev 174536)
@@ -1,3 +1,12 @@
+2014-10-09 Dean Jackson <[email protected]>
+
+ Remove ENABLE_CSS3_CONDITIONAL_RULES
+ https://bugs.webkit.org/show_bug.cgi?id=137571
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-10-09 Adrien Destugues <[email protected]>
Fix compiler warning on noreturn function
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (174535 => 174536)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-10-09 22:14:29 UTC (rev 174535)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2014-10-09 22:33:00 UTC (rev 174536)
@@ -58,7 +58,6 @@
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
@@ -271,4 +270,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-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));
+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));
Modified: trunk/Source/WTF/ChangeLog (174535 => 174536)
--- 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)
@@ -1,3 +1,12 @@
+2014-10-09 Dean Jackson <[email protected]>
+
+ Remove ENABLE_CSS3_CONDITIONAL_RULES
+ https://bugs.webkit.org/show_bug.cgi?id=137571
+
+ Reviewed by Simon Fraser.
+
+ * wtf/FeatureDefines.h:
+
2014-10-09 Akos Kiss <[email protected]>
Enable ARM64 disassembler for all platforms
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (174535 => 174536)
--- 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)
@@ -333,10 +333,6 @@
#define ENABLE_CSP_NEXT 0
#endif
-#if !defined(ENABLE_CSS3_CONDITIONAL_RULES)
-#define ENABLE_CSS3_CONDITIONAL_RULES 0
-#endif
-
#if !defined(ENABLE_CSS3_TEXT)
#define ENABLE_CSS3_TEXT 0
#endif
Modified: trunk/Source/WebCore/ChangeLog (174535 => 174536)
--- 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)
@@ -1,3 +1,57 @@
+2014-10-09 Dean Jackson <[email protected]>
+
+ 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:
+
2014-10-09 Benjamin Poulain <[email protected]>
Add the baseline implementation of :not(selectorList)
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (174535 => 174536)
--- 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)
@@ -58,7 +58,6 @@
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
@@ -271,4 +270,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-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));
+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));
Modified: trunk/Source/WebCore/WebCore.exp.in (174535 => 174536)
--- 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)
@@ -1,5 +1,6 @@
.objc_class_name_DOMAbstractView
.objc_class_name_DOMCSSStyleDeclaration
+.objc_class_name_DOMCSSSupportsRule
.objc_class_name_DOMCharacterData
.objc_class_name_DOMDocument
.objc_class_name_DOMDocumentFragment
@@ -205,6 +206,7 @@
__ZN7WebCore11writeToFileEiPKci
__ZN7WebCore12BlobDataItem11toEndOfFileE
__ZN7WebCore12BlobRegistryD2Ev
+__ZN7WebCore12DOMWindowCSS6createEv
__ZN7WebCore12DataTransferD1Ev
__ZN7WebCore12EditingStyleD1Ev
__ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE
@@ -1169,6 +1171,7 @@
__ZN7WebCore4coreEP28NSURLAuthenticationChallenge
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS0_7ProfileE
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE
+__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13DOMStringListE
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14ClientRectListE
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_19CSSStyleDeclarationE
@@ -3001,12 +3004,6 @@
__ZNK7WebCore21ContextMenuController21checkOrEnableIfNeededERNS_15ContextMenuItemE
#endif
-#if ENABLE(CSS3_CONDITIONAL_RULES)
-.objc_class_name_DOMCSSSupportsRule
-__ZN7WebCore12DOMWindowCSS6createEv
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
Modified: trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp (174535 => 174536)
--- 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)
@@ -94,11 +94,9 @@
case CSSRule::WEBKIT_KEYFRAMES_RULE:
wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframesRule, rule);
break;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case CSSRule::SUPPORTS_RULE:
wrapper = CREATE_DOM_WRAPPER(globalObject, CSSSupportsRule, rule);
break;
-#endif
#if ENABLE(CSS_DEVICE_ADAPTATION)
case CSSRule::WEBKIT_VIEWPORT_RULE:
wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSViewportRule, rule);
Modified: trunk/Source/WebCore/bindings/objc/DOMCSS.mm (174535 => 174536)
--- 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)
@@ -40,9 +40,7 @@
#import "DOMCSSStyleDeclaration.h"
#import "DOMCSSStyleRule.h"
#import "DOMCSSStyleSheet.h"
-#if ENABLE(CSS3_CONDITIONAL_RULES)
#import "DOMCSSSupportsRule.h"
-#endif
#import "DOMCSSUnknownRule.h"
#import "DOMCSSValueInternal.h"
#import "DOMCSSValueList.h"
@@ -95,10 +93,8 @@
return [DOMWebKitCSSKeyframesRule class];
case DOM_WEBKIT_KEYFRAME_RULE:
return [DOMWebKitCSSKeyframeRule class];
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case DOM_SUPPORTS_RULE:
return [DOMCSSSupportsRule class];
-#endif
#if ENABLE(CSS_DEVICE_ADAPTATION)
case DOM_WEBKIT_VIEWPORT_RULE:
return [DOMWebKitCSSViewportRule class];
Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (174535 => 174536)
--- 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)
@@ -66,9 +66,7 @@
#include "CSSSegmentedFontFace.cpp"
#include "CSSSelector.cpp"
#include "CSSSelectorList.cpp"
-#if ENABLE(CSS3_CONDITIONAL_RULES)
#include "CSSSupportsRule.cpp"
-#endif
#include "CSSStyleRule.cpp"
#include "CSSStyleSheet.cpp"
#include "CSSTimingFunctionValue.cpp"
Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (174535 => 174536)
--- 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)
@@ -343,8 +343,6 @@
%destructor { destroy($$); } track_names_list
#endif
-#if ENABLE_CSS3_CONDITIONAL_RULES
-
%token SUPPORTS_AND
%token SUPPORTS_NOT
%token SUPPORTS_OR
@@ -356,8 +354,6 @@
%type <boolean> supports_condition supports_condition_in_parens supports_conjunction supports_declaration_condition supports_disjunction supports_error supports_negation
-#endif
-
#if ENABLE_CSS_DEVICE_ADAPTATION
%type <rule> viewport
@@ -384,9 +380,7 @@
#endif
| webkit_selector maybe_space
| webkit_keyframe_rule maybe_space
-#if ENABLE_CSS3_CONDITIONAL_RULES
| webkit_supports_condition maybe_space
-#endif
;
webkit_rule: WEBKIT_RULE_SYM '{' maybe_space valid_rule maybe_space '}' { parser->m_rule = adoptRef($4); } ;
@@ -419,12 +413,8 @@
}
;
-#if ENABLE_CSS3_CONDITIONAL_RULES
-
webkit_supports_condition: WEBKIT_SUPPORTS_CONDITION_SYM WHITESPACE maybe_space supports_condition '}' { parser->m_supportsCondition = $4; } ;
-#endif
-
/* for expressions that require at least one whitespace to be present, like the + and - operators in calc expressions */
space: WHITESPACE | space WHITESPACE ;
@@ -471,9 +461,7 @@
| namespace { $$ = nullptr; }
| import
| region
-#if ENABLE_CSS3_CONDITIONAL_RULES
| supports
-#endif
#if ENABLE_CSS_DEVICE_ADAPTATION
| viewport
#endif
@@ -519,9 +507,7 @@
| font_face
| media
| keyframes
-#if ENABLE_CSS3_CONDITIONAL_RULES
| supports
-#endif
#if ENABLE_CSS_DEVICE_ADAPTATION
| viewport
#endif
@@ -728,8 +714,6 @@
}
;
-#if ENABLE_CSS3_CONDITIONAL_RULES
-
supports:
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 {
$$ = parser->createSupportsRule($4, std::unique_ptr<Vector<RefPtr<StyleRuleBase>>>($9).get()).leakRef();
@@ -795,8 +779,6 @@
}
;
-#endif
-
before_keyframes_rule:
/* empty */ {
parser->markRuleHeaderStart(CSSRuleSourceData::KEYFRAMES_RULE);
Modified: trunk/Source/WebCore/css/CSSParser.cpp (174535 => 174536)
--- 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)
@@ -303,9 +303,7 @@
, m_important(false)
, m_id(CSSPropertyInvalid)
, m_styleSheet(0)
-#if ENABLE(CSS3_CONDITIONAL_RULES)
, m_supportsCondition(false)
-#endif
, m_selectorListForParseSelector(0)
, m_numParsedPropertiesBeforeMarginBox(INVALID_NUM_PARSED_PROPERTIES)
, m_inParseShorthand(0)
@@ -465,7 +463,6 @@
return m_keyframe.release();
}
-#if ENABLE(CSS3_CONDITIONAL_RULES)
bool CSSParser::parseSupportsCondition(const String& string)
{
m_supportsCondition = false;
@@ -475,7 +472,6 @@
cssyyparse(this);
return m_supportsCondition;
}
-#endif
static inline bool isColorPropertyID(CSSPropertyID propertyId)
{
@@ -10987,14 +10983,12 @@
}
return;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case 's':
if (length == 9 && isEqualToCSSIdentifier(name + 2, "upports")) {
m_parsingMode = SupportsMode;
m_token = SUPPORTS_SYM;
}
return;
-#endif
case 't':
if (hasEscape)
@@ -11090,18 +11084,15 @@
return;
case 27:
-#if ENABLE(CSS3_CONDITIONAL_RULES)
if (isEqualToCSSIdentifier(name + 2, "webkit-supports-condition")) {
m_parsingMode = SupportsMode;
m_token = WEBKIT_SUPPORTS_CONDITION_SYM;
}
-#endif
return;
}
}
}
-#if ENABLE(CSS3_CONDITIONAL_RULES)
template <typename CharacterType>
inline void CSSParser::detectSupportsToken(int length)
{
@@ -11118,7 +11109,6 @@
m_token = SUPPORTS_NOT;
}
}
-#endif
template <typename SrcCharacterType>
int CSSParser::realLex(void* yylvalWithoutType)
@@ -11160,13 +11150,11 @@
m_token = IDENT;
if (UNLIKELY(*currentCharacter<SrcCharacterType>() == '(')) {
-#if ENABLE(CSS3_CONDITIONAL_RULES)
if (m_parsingMode == SupportsMode && !hasEscape) {
detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
if (m_token != IDENT)
break;
}
-#endif
m_token = FUNCTION;
bool shouldSkipParenthesis = true;
if (!hasEscape) {
@@ -11196,10 +11184,8 @@
} else if (UNLIKELY(m_parsingMode != NormalMode) && !hasEscape) {
if (m_parsingMode == MediaQueryMode)
detectMediaQueryToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
-#if ENABLE(CSS3_CONDITIONAL_RULES)
else if (m_parsingMode == SupportsMode)
detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
-#endif
else if (m_parsingMode == NthChildMode && isASCIIAlphaCaselessEqual(tokenStart<SrcCharacterType>()[0], 'n')) {
if (result - tokenStart<SrcCharacterType>() == 1) {
// String "n" is IDENT but "n+1" is NTH.
@@ -11373,10 +11359,7 @@
break;
case CharacterEndConditionQuery: {
- bool isParsingCondition = m_parsingMode == MediaQueryMode;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
- isParsingCondition = isParsingCondition || m_parsingMode == SupportsMode;
-#endif
+ bool isParsingCondition = m_parsingMode == MediaQueryMode || m_parsingMode == SupportsMode;
if (isParsingCondition)
m_parsingMode = NormalMode;
break;
@@ -11566,7 +11549,6 @@
return createMediaRule(MediaQuerySet::create(), rules);
}
-#if ENABLE(CSS3_CONDITIONAL_RULES)
PassRefPtr<StyleRuleBase> CSSParser::createSupportsRule(bool conditionIsSupported, RuleList* rules)
{
m_allowImportRules = m_allowNamespaceDeclarations = false;
@@ -11622,8 +11604,6 @@
return data.release();
}
-#endif
-
void CSSParser::processAndAddNewRuleToSourceTreeIfNeeded()
{
if (!isExtractingSourceData())
Modified: trunk/Source/WebCore/css/CSSParser.h (174535 => 174536)
--- 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)
@@ -87,9 +87,7 @@
void parseSheet(StyleSheetContents*, const String&, int startLineNumber = 0, RuleSourceDataList* = 0, bool = false);
PassRefPtr<StyleRuleBase> parseRule(StyleSheetContents*, const String&);
PassRefPtr<StyleKeyframe> parseKeyframeRule(StyleSheetContents*, const String&);
-#if ENABLE(CSS3_CONDITIONAL_RULES)
bool parseSupportsCondition(const String&);
-#endif
static bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, CSSParserMode, StyleSheetContents*);
static bool parseColor(RGBA32& color, const String&, bool strict = false);
static bool parseSystemColor(RGBA32& color, const String&, Document*);
@@ -314,12 +312,10 @@
PassRefPtr<StyleRuleBase> createPageRule(std::unique_ptr<CSSParserSelector> pageSelector);
PassRefPtr<StyleRuleBase> createRegionRule(Vector<std::unique_ptr<CSSParserSelector>>* regionSelector, RuleList* rules);
void createMarginAtRule(CSSSelector::MarginBoxType);
-#if ENABLE(CSS3_CONDITIONAL_RULES)
PassRefPtr<StyleRuleBase> createSupportsRule(bool conditionIsSupported, RuleList*);
void markSupportsRuleHeaderStart();
void markSupportsRuleHeaderEnd();
PassRefPtr<CSSRuleSourceData> popSupportsRuleData();
-#endif
void startDeclarationsForMarginBox();
void endDeclarationsForMarginBox();
@@ -352,9 +348,7 @@
std::unique_ptr<SourceSizeList> m_sourceSizeList;
#endif
std::unique_ptr<CSSParserValueList> m_valueList;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
bool m_supportsCondition;
-#endif
typedef Vector<CSSProperty, 256> ParsedPropertyVector;
ParsedPropertyVector m_parsedProperties;
@@ -483,10 +477,8 @@
inline void detectDashToken(int);
template <typename CharacterType>
inline void detectAtToken(int, bool);
-#if ENABLE(CSS3_CONDITIONAL_RULES)
template <typename CharacterType>
inline void detectSupportsToken(int);
-#endif
template <typename CharacterType>
inline void setRuleHeaderEnd(const CharacterType*);
@@ -551,9 +543,7 @@
enum ParsingMode {
NormalMode,
MediaQueryMode,
-#if ENABLE(CSS3_CONDITIONAL_RULES)
SupportsMode,
-#endif
NthChildMode
};
@@ -592,9 +582,7 @@
RefPtr<CSSCalcValue> m_parsedCalculation;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
std::unique_ptr<RuleSourceDataList> m_supportsRuleDataStack;
-#endif
// defines units allowed for a certain property, used in parseUnit
enum Units {
Modified: trunk/Source/WebCore/css/CSSRule.h (174535 => 174536)
--- 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)
@@ -51,9 +51,7 @@
// <https://bugs.webkit.org/show_bug.cgi?id=71293>.
WEBKIT_KEYFRAMES_RULE,
WEBKIT_KEYFRAME_RULE,
-#if ENABLE(CSS3_CONDITIONAL_RULES)
SUPPORTS_RULE = 12,
-#endif
#if ENABLE(CSS_DEVICE_ADAPTATION)
WEBKIT_VIEWPORT_RULE = 15,
#endif
Modified: trunk/Source/WebCore/css/CSSRule.idl (174535 => 174536)
--- 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)
@@ -37,9 +37,7 @@
const unsigned short PAGE_RULE = 6;
const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
const unsigned short WEBKIT_KEYFRAME_RULE = 8;
-#if defined(ENABLE_CSS3_CONDITIONAL_RULES) && ENABLE_CSS3_CONDITIONAL_RULES
const unsigned short SUPPORTS_RULE = 12;
-#endif
#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
const unsigned short WEBKIT_VIEWPORT_RULE = 15;
#endif
Modified: trunk/Source/WebCore/css/CSSSupportsRule.cpp (174535 => 174536)
--- 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)
@@ -37,8 +37,6 @@
#include "StyleRule.h"
#include <wtf/text/StringBuilder.h>
-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
namespace WebCore {
CSSSupportsRule::CSSSupportsRule(StyleRuleSupports& supportsRule, CSSStyleSheet* parent)
@@ -65,5 +63,3 @@
}
} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebCore/css/CSSSupportsRule.h (174535 => 174536)
--- 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)
@@ -31,8 +31,6 @@
#include "CSSGroupingRule.h"
-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
namespace WebCore {
class CSSRule;
@@ -60,6 +58,4 @@
SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSSupportsRule, CSSRule::SUPPORTS_RULE)
-#endif // ENABLE(CSS3_CONDITIONAL_RULES)
-
#endif // CSSSupportsRule_h
Modified: trunk/Source/WebCore/css/CSSSupportsRule.idl (174535 => 174536)
--- 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)
@@ -28,7 +28,6 @@
[
NoInterfaceObject,
- Conditional=CSS3_CONDITIONAL_RULES,
] interface CSSSupportsRule : CSSRule {
readonly attribute CSSRuleList cssRules;
readonly attribute DOMString conditionText;
Modified: trunk/Source/WebCore/css/DOMWindowCSS.cpp (174535 => 174536)
--- 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)
@@ -30,8 +30,6 @@
#include "config.h"
#include "DOMWindowCSS.h"
-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
#include "CSSParser.h"
#include "StyleProperties.h"
#include <wtf/text/WTFString.h>
@@ -85,5 +83,3 @@
}
}
-
-#endif
Modified: trunk/Source/WebCore/css/DOMWindowCSS.h (174535 => 174536)
--- 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)
@@ -30,8 +30,6 @@
#ifndef DOMWindowCSS_h
#define DOMWindowCSS_h
-#if ENABLE(CSS3_CONDITIONAL_RULES)
-
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -53,6 +51,4 @@
}
-#endif // ENABLE(CSS3_CONDITIONAL_RULES)
-
#endif
Modified: trunk/Source/WebCore/css/DOMWindowCSS.idl (174535 => 174536)
--- 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)
@@ -31,7 +31,6 @@
NoInterfaceObject,
InterfaceName=CSS,
ImplementationLacksVTable,
- Conditional=CSS3_CONDITIONAL_RULES,
] interface DOMWindowCSS {
boolean supports(DOMString property, DOMString value);
Modified: trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp (174535 => 174536)
--- 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)
@@ -63,11 +63,9 @@
case CSSRule::MEDIA_RULE:
collect(downcast<CSSMediaRule>(cssRule));
break;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case CSSRule::SUPPORTS_RULE:
collect(downcast<CSSSupportsRule>(cssRule));
break;
-#endif
#if ENABLE(CSS_REGIONS)
case CSSRule::WEBKIT_REGION_RULE:
collect(downcast<WebKitCSSRegionRule>(cssRule));
Modified: trunk/Source/WebCore/css/RuleSet.cpp (174535 => 174536)
--- 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)
@@ -340,9 +340,10 @@
const StyleRuleFontFace* fontFaceRule = static_cast<StyleRuleFontFace*>(rule);
resolver->fontSelector()->addFontFaceRule(fontFaceRule);
resolver->invalidateMatchedPropertiesCache();
- } else if (rule->isKeyframesRule() && resolver) {
+ } else if (rule->isKeyframesRule() && resolver)
resolver->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(rule));
- }
+ else if (rule->isSupportsRule() && static_cast<StyleRuleSupports*>(rule)->conditionIsSupported())
+ addChildRules(static_cast<StyleRuleSupports*>(rule)->childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
#if ENABLE(CSS_REGIONS)
else if (rule->isRegionRule() && resolver) {
addRegionRule(static_cast<StyleRuleRegion*>(rule), hasDocumentSecurityOrigin);
@@ -353,10 +354,6 @@
resolver->viewportStyleResolver()->addViewportRule(static_cast<StyleRuleViewport*>(rule));
}
#endif
-#if ENABLE(CSS3_CONDITIONAL_RULES)
- else if (rule->isSupportsRule() && static_cast<StyleRuleSupports*>(rule)->conditionIsSupported())
- addChildRules(static_cast<StyleRuleSupports*>(rule)->childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
-#endif
}
}
Modified: trunk/Source/WebCore/css/StyleRule.cpp (174535 => 174536)
--- 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)
@@ -70,11 +70,9 @@
case Media:
delete static_cast<StyleRuleMedia*>(this);
return;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case Supports:
delete static_cast<StyleRuleSupports*>(this);
return;
-#endif
#if ENABLE(CSS_REGIONS)
case Region:
delete static_cast<StyleRuleRegion*>(this);
@@ -114,10 +112,8 @@
return static_cast<const StyleRuleFontFace*>(this)->copy();
case Media:
return static_cast<const StyleRuleMedia*>(this)->copy();
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case Supports:
return static_cast<const StyleRuleSupports*>(this)->copy();
-#endif
#if ENABLE(CSS_REGIONS)
case Region:
return static_cast<const StyleRuleRegion*>(this)->copy();
@@ -161,11 +157,9 @@
case Media:
rule = CSSMediaRule::create(static_cast<StyleRuleMedia&>(self), parentSheet);
break;
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case Supports:
rule = CSSSupportsRule::create(static_cast<StyleRuleSupports&>(self), parentSheet);
break;
-#endif
#if ENABLE(CSS_REGIONS)
case Region:
rule = WebKitCSSRegionRule::create(static_cast<StyleRuleRegion&>(self), parentSheet);
@@ -349,7 +343,6 @@
}
-#if ENABLE(CSS3_CONDITIONAL_RULES)
StyleRuleSupports::StyleRuleSupports(const String& conditionText, bool conditionIsSupported, Vector<RefPtr<StyleRuleBase>>& adoptRules)
: StyleRuleGroup(Supports, adoptRules)
, m_conditionText(conditionText)
@@ -363,7 +356,6 @@
, m_conditionIsSupported(o.m_conditionIsSupported)
{
}
-#endif
StyleRuleRegion::StyleRuleRegion(Vector<std::unique_ptr<CSSParserSelector>>* selectors, Vector<RefPtr<StyleRuleBase>>& adoptRules)
: StyleRuleGroup(Region, adoptRules)
Modified: trunk/Source/WebCore/css/StyleRule.h (174535 => 174536)
--- 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)
@@ -48,9 +48,7 @@
Page,
Keyframes,
Keyframe, // Not used. These are internally non-rule StyleKeyframe objects.
-#if ENABLE(CSS3_CONDITIONAL_RULES)
Supports = 12,
-#endif
#if ENABLE(CSS_DEVICE_ADAPTATION)
Viewport = 15,
#endif
@@ -66,9 +64,7 @@
bool isPageRule() const { return type() == Page; }
bool isStyleRule() const { return type() == Style; }
bool isRegionRule() const { return type() == Region; }
-#if ENABLE(CSS3_CONDITIONAL_RULES)
bool isSupportsRule() const { return type() == Supports; }
-#endif
#if ENABLE(CSS_DEVICE_ADAPTATION)
bool isViewportRule() const { return type() == Viewport; }
#endif
@@ -218,7 +214,6 @@
RefPtr<MediaQuerySet> m_mediaQueries;
};
-#if ENABLE(CSS3_CONDITIONAL_RULES)
class StyleRuleSupports : public StyleRuleGroup {
public:
static PassRef<StyleRuleSupports> create(const String& conditionText, bool conditionIsSupported, Vector<RefPtr<StyleRuleBase>>& adoptRules)
@@ -237,7 +232,6 @@
String m_conditionText;
bool m_conditionIsSupported;
};
-#endif
class StyleRuleRegion : public StyleRuleGroup {
public:
@@ -283,13 +277,11 @@
return static_cast<const StyleRuleMedia*>(rule);
}
-#if ENABLE(CSS3_CONDITIONAL_RULES)
inline const StyleRuleSupports* toStyleRuleSupports(const StyleRuleGroup* rule)
{
ASSERT_WITH_SECURITY_IMPLICATION(!rule || rule->isSupportsRule());
return static_cast<const StyleRuleSupports*>(rule);
}
-#endif
inline const StyleRuleRegion* toStyleRuleRegion(const StyleRuleGroup* rule)
{
Modified: trunk/Source/WebCore/css/StyleSheetContents.cpp (174535 => 174536)
--- 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)
@@ -458,9 +458,7 @@
case StyleRuleBase::Unknown:
case StyleRuleBase::Charset:
case StyleRuleBase::Keyframe:
-#if ENABLE(CSS3_CONDITIONAL_RULES)
case StyleRuleBase::Supports:
-#endif
#if ENABLE(CSS_DEVICE_ADAPTATION)
case StyleRuleBase::Viewport:
#endif
Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (174535 => 174536)
--- 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)
@@ -107,10 +107,8 @@
target->append(data);
else if (data->type == CSSRuleSourceData::MEDIA_RULE)
flattenSourceData(&data->childRules, target);
-#if ENABLE(CSS3_CONDITIONAL_RULES)
else if (data->type == CSSRuleSourceData::SUPPORTS_RULE)
flattenSourceData(&data->childRules, target);
-#endif
}
}
@@ -220,10 +218,8 @@
if (is<WebKitCSSKeyframesRule>(*rule))
return &downcast<WebKitCSSKeyframesRule>(*rule).cssRules();
-#if ENABLE(CSS3_CONDITIONAL_RULES)
if (is<CSSSupportsRule>(*rule))
return &downcast<CSSSupportsRule>(*rule).cssRules();
-#endif
return nullptr;
}
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (174535 => 174536)
--- 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)
@@ -1675,14 +1675,12 @@
}
#endif
-#if ENABLE(CSS3_CONDITIONAL_RULES)
DOMWindowCSS* DOMWindow::css()
{
if (!m_css)
m_css = DOMWindowCSS::create();
return m_css.get();
}
-#endif
static void didAddStorageEventListener(DOMWindow* window)
{
Modified: trunk/Source/WebCore/page/DOMWindow.h (174535 => 174536)
--- 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)
@@ -269,9 +269,7 @@
void cancelAnimationFrame(int id);
#endif
-#if ENABLE(CSS3_CONDITIONAL_RULES)
DOMWindowCSS* css();
-#endif
// Events
// EventTarget API
@@ -518,9 +516,7 @@
mutable RefPtr<Performance> m_performance;
#endif
-#if ENABLE(CSS3_CONDITIONAL_RULES)
mutable RefPtr<DOMWindowCSS> m_css;
-#endif
#if ENABLE(USER_MESSAGE_HANDLERS)
mutable RefPtr<WebKitNamespace> m_webkitNamespace;
Modified: trunk/Source/WebCore/page/DOMWindow.idl (174535 => 174536)
--- 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)
@@ -190,7 +190,7 @@
[ImplementedAs=cancelAnimationFrame] void webkitCancelRequestAnimationFrame(long id); // This is a deprecated alias for webkitCancelAnimationFrame(). Remove this when removing vendor prefix.
#endif
- [Replaceable,Conditional=CSS3_CONDITIONAL_RULES] readonly attribute DOMWindowCSS CSS;
+ [Replaceable] readonly attribute DOMWindowCSS CSS;
// Events
attribute EventListener onabort;
Modified: trunk/Source/WebKit/mac/ChangeLog (174535 => 174536)
--- 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)
@@ -1,3 +1,12 @@
+2014-10-09 Dean Jackson <[email protected]>
+
+ Remove ENABLE_CSS3_CONDITIONAL_RULES
+ https://bugs.webkit.org/show_bug.cgi?id=137571
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-10-09 Tim Horton <[email protected]>
Add a WebKit1 preference for selection services
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (174535 => 174536)
--- 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)
@@ -58,7 +58,6 @@
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
@@ -271,4 +270,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-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));
+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));
Modified: trunk/Source/WebKit2/ChangeLog (174535 => 174536)
--- 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)
@@ -1,3 +1,12 @@
+2014-10-09 Dean Jackson <[email protected]>
+
+ Remove ENABLE_CSS3_CONDITIONAL_RULES
+ https://bugs.webkit.org/show_bug.cgi?id=137571
+
+ Reviewed by Simon Fraser.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-10-09 Tim Horton <[email protected]>
Move ServicesOverlayController to WebCore
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (174535 => 174536)
--- 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)
@@ -58,7 +58,6 @@
ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
-ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
ENABLE_CSS3_TEXT = ;
ENABLE_CSS3_TEXT_LINE_BREAK = ;
ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
@@ -271,4 +270,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-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));
+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));
Modified: trunk/Source/cmake/OptionsEfl.cmake (174535 => 174536)
--- 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)
@@ -67,7 +67,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
Modified: trunk/Source/cmake/OptionsGTK.cmake (174535 => 174536)
--- 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)
@@ -107,7 +107,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
Modified: trunk/Source/cmake/OptionsMac.cmake (174535 => 174536)
--- 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)
@@ -26,7 +26,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT_LINE_BREAK OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (174535 => 174536)
--- 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)
@@ -30,7 +30,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES "Toggle CSS3 Conditional Rules support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_LINE_BREAK "Toggle CSS3 Text Line Break support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK "Toggle Box Decoration break (CSS Backgrounds and Borders) support" ON)
Modified: trunk/Source/cmakeconfig.h.cmake (174535 => 174536)
--- 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)
@@ -28,7 +28,6 @@
#cmakedefine01 ENABLE_CSS_REGIONS
#cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
#cmakedefine01 ENABLE_CSS_SHAPES
-#cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
#cmakedefine01 ENABLE_CURSOR_VISIBILITY
#cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
#cmakedefine01 ENABLE_DASHBOARD_SUPPORT
