Changeset 174536 in webkit


Ignore:
Timestamp:
Oct 9, 2014, 3:33:00 PM (10 years ago)
Author:
dino@apple.com
Message:

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:
Location:
trunk
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r174535 r174536  
     12014-10-09  Dean Jackson  <dino@apple.com>
     2
     3        Remove ENABLE_CSS3_CONDITIONAL_RULES
     4        https://bugs.webkit.org/show_bug.cgi?id=137571
     5
     6        Reviewed by Simon Fraser.
     7
     8        Unskip tests.
     9
     10        * platform/ios-sim/Skipped:
     11        * platform/wincairo/TestExpectations:
     12        * platform/wk2/TestExpectations:
     13
    1142014-10-09  Benjamin Poulain  <benjamin@webkit.org>
    215

  • trunk/LayoutTests/platform/ios-sim/Skipped

    r169832 r174536  
    659659# https://bugs.webkit.org/show_bug.cgi?id=85558
    660660http/tests/security/contentSecurityPolicy/1.1
    661 
    662 # ENABLE_CSS3_CONDITIONAL_RULES - CSS3 Conditionals support is not yet enabled.
    663 css3/supports.html
    664661
    665662# ENABLE_CSS_IMAGE_ORIENTATION - CSS Image Orientation support is not yet enabled.

  • trunk/LayoutTests/platform/wincairo/TestExpectations

    r172318 r174536  
    27352735css3/flexbox/flexbox-baseline-margins.html
    27362736
    2737 # css3-conditionals support is not yet enabled. http://webkit.org/b/86146 http://webkit.org/b/104822 http://webkit.org/b/100324
    2738 css3/supports.html
    2739 css3/supports-cssom.html
    2740 css3/supports-dom-api.html
    2741 
    27422737# Requires rebaselining after https://bugs.webkit.org/show_bug.cgi?id=11645
    27432738webkit.org/b/11645 fast/table/025.html [ Failure ]

  • trunk/LayoutTests/platform/wk2/TestExpectations

    r173247 r174536  
    215215fast/dom/Window/window-focus-self.html
    216216scrollbars/corner-resizer-window-inactive.html
    217 
    218 # css3-conditionals support is not yet enabled.
    219 webkit.org/b/86146 css3/supports.html
    220 webkit.org/b/104822 css3/supports-cssom.html
    221 webkit.org/b/100324 css3/supports-dom-api.html
    222217
    223218# Text Autosizing is not yet enabled.

  • trunk/Source/JavaScriptCore/ChangeLog

    r174509 r174536  
     12014-10-09  Dean Jackson  <dino@apple.com>
     2
     3        Remove ENABLE_CSS3_CONDITIONAL_RULES
     4        https://bugs.webkit.org/show_bug.cgi?id=137571
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102014-10-09  Adrien Destugues  <pulkomandy@gmail.com>
    211

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r173596 r174536  
    5959ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
    6060ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
    61 ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
    6261ENABLE_CSS3_TEXT = ;
    6362ENABLE_CSS3_TEXT_LINE_BREAK = ;
    … …  
    272271ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    273272
    274 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));
     273FEATURE_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));

  • trunk/Source/WTF/ChangeLog

    r174511 r174536  
     12014-10-09  Dean Jackson  <dino@apple.com>
     2
     3        Remove ENABLE_CSS3_CONDITIONAL_RULES
     4        https://bugs.webkit.org/show_bug.cgi?id=137571
     5
     6        Reviewed by Simon Fraser.
     7
     8        * wtf/FeatureDefines.h:
     9
    1102014-10-09  Akos Kiss  <akiss@inf.u-szeged.hu>
    211

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r173949 r174536  
    334334#endif
    335335
    336 #if !defined(ENABLE_CSS3_CONDITIONAL_RULES)
    337 #define ENABLE_CSS3_CONDITIONAL_RULES 0
    338 #endif
    339 
    340336#if !defined(ENABLE_CSS3_TEXT)
    341337#define ENABLE_CSS3_TEXT 0

  • trunk/Source/WebCore/ChangeLog

    r174535 r174536  
     12014-10-09  Dean Jackson  <dino@apple.com>
     2
     3        Remove ENABLE_CSS3_CONDITIONAL_RULES
     4        https://bugs.webkit.org/show_bug.cgi?id=137571
     5
     6        Reviewed by Simon Fraser.
     7
     8        We have good enough support for @supports that
     9        it should be a consistent part of the platform. Remove
     10        the compile-time guard.
     11
     12        * Configurations/FeatureDefines.xcconfig:
     13        * WebCore.exp.in:
     14        * bindings/js/JSCSSRuleCustom.cpp:
     15        (WebCore::toJS):
     16        * bindings/objc/DOMCSS.mm:
     17        (kitClass):
     18        * css/CSSGrammar.y.in:
     19        * css/CSSParser.cpp:
     20        (WebCore::CSSParser::CSSParser):
     21        (WebCore::CSSParser::parseSupportsCondition):
     22        (WebCore::CSSParser::detectAtToken):
     23        (WebCore::CSSParser::detectSupportsToken):
     24        (WebCore::CSSParser::realLex):
     25        * css/CSSParser.h:
     26        * css/CSSRule.h:
     27        * css/CSSRule.idl:
     28        * css/CSSSupportsRule.cpp:
     29        * css/CSSSupportsRule.h:
     30        * css/CSSSupportsRule.idl:
     31        * css/DOMWindowCSS.cpp:
     32        * css/DOMWindowCSS.h:
     33        * css/DOMWindowCSS.idl:
     34        * css/InspectorCSSOMWrappers.cpp:
     35        (WebCore::InspectorCSSOMWrappers::collect):
     36        * css/RuleSet.cpp:
     37        (WebCore::RuleSet::addChildRules):
     38        * css/StyleRule.cpp:
     39        (WebCore::StyleRuleBase::destroy):
     40        (WebCore::StyleRuleBase::copy):
     41        (WebCore::StyleRuleBase::createCSSOMWrapper):
     42        (WebCore::StyleRuleSupports::StyleRuleSupports):
     43        * css/StyleRule.h:
     44        (WebCore::toStyleRuleSupports):
     45        * css/StyleSheetContents.cpp:
     46        (WebCore::childRulesHaveFailedOrCanceledSubresources):
     47        * inspector/InspectorStyleSheet.cpp:
     48        (flattenSourceData):
     49        (WebCore::asCSSRuleList):
     50        * page/DOMWindow.cpp:
     51        (WebCore::DOMWindow::css):
     52        * page/DOMWindow.h:
     53        * page/DOMWindow.idl:
     54
    1552014-10-09  Benjamin Poulain  <benjamin@webkit.org>
    256

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r173596 r174536  
    5959ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
    6060ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
    61 ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
    6261ENABLE_CSS3_TEXT = ;
    6362ENABLE_CSS3_TEXT_LINE_BREAK = ;
    … …  
    272271ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    273272
    274 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));
     273FEATURE_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));

  • trunk/Source/WebCore/WebCore.exp.in

    r174517 r174536  
    11.objc_class_name_DOMAbstractView
    22.objc_class_name_DOMCSSStyleDeclaration
     3.objc_class_name_DOMCSSSupportsRule
    34.objc_class_name_DOMCharacterData
    45.objc_class_name_DOMDocument
    … …  
    206207__ZN7WebCore12BlobDataItem11toEndOfFileE
    207208__ZN7WebCore12BlobRegistryD2Ev
     209__ZN7WebCore12DOMWindowCSS6createEv
    208210__ZN7WebCore12DataTransferD1Ev
    209211__ZN7WebCore12EditingStyleD1Ev
    … …  
    11701172__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS0_7ProfileE
    11711173__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_10ClientRectE
     1174__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
    11721175__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_13DOMStringListE
    11731176__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_14ClientRectListE
    … …  
    30023005#endif
    30033006
    3004 #if ENABLE(CSS3_CONDITIONAL_RULES)
    3005 .objc_class_name_DOMCSSSupportsRule
    3006 __ZN7WebCore12DOMWindowCSS6createEv
    3007 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
    3008 #endif
    3009 
    30103007#if ENABLE(CSS_SCROLL_SNAP)
    30113008__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE

  • trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp

    r167794 r174536  
    9595            wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframesRule, rule);
    9696            break;
    97 #if ENABLE(CSS3_CONDITIONAL_RULES)
    9897        case CSSRule::SUPPORTS_RULE:
    9998            wrapper = CREATE_DOM_WRAPPER(globalObject, CSSSupportsRule, rule);
    10099            break;
    101 #endif
    102100#if ENABLE(CSS_DEVICE_ADAPTATION)
    103101        case CSSRule::WEBKIT_VIEWPORT_RULE:

  • trunk/Source/WebCore/bindings/objc/DOMCSS.mm

    r173268 r174536  
    4141#import "DOMCSSStyleRule.h"
    4242#import "DOMCSSStyleSheet.h"
    43 #if ENABLE(CSS3_CONDITIONAL_RULES)
    4443#import "DOMCSSSupportsRule.h"
    45 #endif
    4644#import "DOMCSSUnknownRule.h"
    4745#import "DOMCSSValueInternal.h"
    … …  
    9694        case DOM_WEBKIT_KEYFRAME_RULE:
    9795            return [DOMWebKitCSSKeyframeRule class];
    98 #if ENABLE(CSS3_CONDITIONAL_RULES)
    9996        case DOM_SUPPORTS_RULE:
    10097            return [DOMCSSSupportsRule class];
    101 #endif
    10298#if ENABLE(CSS_DEVICE_ADAPTATION)
    10399        case DOM_WEBKIT_VIEWPORT_RULE:

  • trunk/Source/WebCore/css/CSSAllInOne.cpp

    r173904 r174536  
    6767#include "CSSSelector.cpp"
    6868#include "CSSSelectorList.cpp"
    69 #if ENABLE(CSS3_CONDITIONAL_RULES)
    7069#include "CSSSupportsRule.cpp"
    71 #endif
    7270#include "CSSStyleRule.cpp"
    7371#include "CSSStyleSheet.cpp"

  • trunk/Source/WebCore/css/CSSGrammar.y.in

    r174535 r174536  
    344344#endif
    345345
    346 #if ENABLE_CSS3_CONDITIONAL_RULES
    347 
    348346%token SUPPORTS_AND
    349347%token SUPPORTS_NOT
    … …  
    356354
    357355%type <boolean> supports_condition supports_condition_in_parens supports_conjunction supports_declaration_condition supports_disjunction supports_error supports_negation
    358 
    359 #endif
    360356
    361357#if ENABLE_CSS_DEVICE_ADAPTATION
    … …  
    385381  | webkit_selector maybe_space
    386382  | webkit_keyframe_rule maybe_space
    387 #if ENABLE_CSS3_CONDITIONAL_RULES
    388383  | webkit_supports_condition maybe_space
    389 #endif
    390384  ;
    391385
    … …  
    420414;
    421415
    422 #if ENABLE_CSS3_CONDITIONAL_RULES
    423 
    424416webkit_supports_condition: WEBKIT_SUPPORTS_CONDITION_SYM WHITESPACE maybe_space supports_condition '}' { parser->m_supportsCondition = $4; } ;
    425 
    426 #endif
    427417
    428418/* for expressions that require at least one whitespace to be present, like the + and - operators in calc expressions */
    … …  
    472462  | import
    473463  | region
    474 #if ENABLE_CSS3_CONDITIONAL_RULES
    475464  | supports
    476 #endif
    477465#if ENABLE_CSS_DEVICE_ADAPTATION
    478466  | viewport
    … …  
    520508  | media
    521509  | keyframes
    522 #if ENABLE_CSS3_CONDITIONAL_RULES
    523510  | supports
    524 #endif
    525511#if ENABLE_CSS_DEVICE_ADAPTATION
    526512  | viewport
    … …  
    728714    }
    729715    ;
    730 
    731 #if ENABLE_CSS3_CONDITIONAL_RULES
    732716
    733717supports:
    … …  
    795779    }
    796780    ;
    797 
    798 #endif
    799781
    800782before_keyframes_rule:

  • trunk/Source/WebCore/css/CSSParser.cpp

    r174379 r174536  
    304304    , m_id(CSSPropertyInvalid)
    305305    , m_styleSheet(0)
    306 #if ENABLE(CSS3_CONDITIONAL_RULES)
    307306    , m_supportsCondition(false)
    308 #endif
    309307    , m_selectorListForParseSelector(0)
    310308    , m_numParsedPropertiesBeforeMarginBox(INVALID_NUM_PARSED_PROPERTIES)
    … …  
    466464}
    467465
    468 #if ENABLE(CSS3_CONDITIONAL_RULES)
    469466bool CSSParser::parseSupportsCondition(const String& string)
    470467{
    … …  
    476473    return m_supportsCondition;
    477474}
    478 #endif
    479475
    480476static inline bool isColorPropertyID(CSSPropertyID propertyId)
    … …  
    1098810984        return;
    1098910985
    10990 #if ENABLE(CSS3_CONDITIONAL_RULES)
    1099110986    case 's':
    1099210987        if (length == 9 && isEqualToCSSIdentifier(name + 2, "upports")) {
    … …  
    1099510990        }
    1099610991        return;
    10997 #endif
    1099810992
    1099910993    case 't':
    … …  
    1109111085
    1109211086        case 27:
    11093 #if ENABLE(CSS3_CONDITIONAL_RULES)
    1109411087            if (isEqualToCSSIdentifier(name + 2, "webkit-supports-condition")) {
    1109511088                m_parsingMode = SupportsMode;
    1109611089                m_token = WEBKIT_SUPPORTS_CONDITION_SYM;
    1109711090            }
    11098 #endif
    1109911091            return;
    1110011092        }
    … …  
    1110211094}
    1110311095
    11104 #if ENABLE(CSS3_CONDITIONAL_RULES)
    1110511096template <typename CharacterType>
    1110611097inline void CSSParser::detectSupportsToken(int length)
    … …  
    1111911110    }
    1112011111}
    11121 #endif
    1112211112
    1112311113template <typename SrcCharacterType>
    … …  
    1116111151
    1116211152        if (UNLIKELY(*currentCharacter<SrcCharacterType>() == '(')) {
    11163 #if ENABLE(CSS3_CONDITIONAL_RULES)
    1116411153            if (m_parsingMode == SupportsMode && !hasEscape) {
    1116511154                detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
    … …  
    1116711156                    break;
    1116811157            }
    11169 #endif
    1117011158            m_token = FUNCTION;
    1117111159            bool shouldSkipParenthesis = true;
    … …  
    1119711185            if (m_parsingMode == MediaQueryMode)
    1119811186                detectMediaQueryToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
    11199 #if ENABLE(CSS3_CONDITIONAL_RULES)
    1120011187            else if (m_parsingMode == SupportsMode)
    1120111188                detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
    11202 #endif
    1120311189            else if (m_parsingMode == NthChildMode && isASCIIAlphaCaselessEqual(tokenStart<SrcCharacterType>()[0], 'n')) {
    1120411190                if (result - tokenStart<SrcCharacterType>() == 1) {
    … …  
    1137411360
    1137511361    case CharacterEndConditionQuery: {
    11376         bool isParsingCondition = m_parsingMode == MediaQueryMode;
    11377 #if ENABLE(CSS3_CONDITIONAL_RULES)
    11378         isParsingCondition = isParsingCondition || m_parsingMode == SupportsMode;
    11379 #endif
     11362        bool isParsingCondition = m_parsingMode == MediaQueryMode || m_parsingMode == SupportsMode;
    1138011363        if (isParsingCondition)
    1138111364            m_parsingMode = NormalMode;
    … …  
    1156711550}
    1156811551
    11569 #if ENABLE(CSS3_CONDITIONAL_RULES)
    1157011552PassRefPtr<StyleRuleBase> CSSParser::createSupportsRule(bool conditionIsSupported, RuleList* rules)
    1157111553{
    … …  
    1162211604    return data.release();
    1162311605}
    11624 
    11625 #endif
    1162611606
    1162711607void CSSParser::processAndAddNewRuleToSourceTreeIfNeeded()

  • trunk/Source/WebCore/css/CSSParser.h

    r174379 r174536  
    8888    PassRefPtr<StyleRuleBase> parseRule(StyleSheetContents*, const String&);
    8989    PassRefPtr<StyleKeyframe> parseKeyframeRule(StyleSheetContents*, const String&);
    90 #if ENABLE(CSS3_CONDITIONAL_RULES)
    9190    bool parseSupportsCondition(const String&);
    92 #endif
    9391    static bool parseValue(MutableStyleProperties*, CSSPropertyID, const String&, bool important, CSSParserMode, StyleSheetContents*);
    9492    static bool parseColor(RGBA32& color, const String&, bool strict = false);
    … …  
    315313    PassRefPtr<StyleRuleBase> createRegionRule(Vector<std::unique_ptr<CSSParserSelector>>* regionSelector, RuleList* rules);
    316314    void createMarginAtRule(CSSSelector::MarginBoxType);
    317 #if ENABLE(CSS3_CONDITIONAL_RULES)
    318315    PassRefPtr<StyleRuleBase> createSupportsRule(bool conditionIsSupported, RuleList*);
    319316    void markSupportsRuleHeaderStart();
    320317    void markSupportsRuleHeaderEnd();
    321318    PassRefPtr<CSSRuleSourceData> popSupportsRuleData();
    322 #endif
    323319
    324320    void startDeclarationsForMarginBox();
    … …  
    353349#endif
    354350    std::unique_ptr<CSSParserValueList> m_valueList;
    355 #if ENABLE(CSS3_CONDITIONAL_RULES)
    356351    bool m_supportsCondition;
    357 #endif
    358352
    359353    typedef Vector<CSSProperty, 256> ParsedPropertyVector;
    … …  
    484478    template <typename CharacterType>
    485479    inline void detectAtToken(int, bool);
    486 #if ENABLE(CSS3_CONDITIONAL_RULES)
    487480    template <typename CharacterType>
    488481    inline void detectSupportsToken(int);
    489 #endif
    490482
    491483    template <typename CharacterType>
    … …  
    552544        NormalMode,
    553545        MediaQueryMode,
    554 #if ENABLE(CSS3_CONDITIONAL_RULES)
    555546        SupportsMode,
    556 #endif
    557547        NthChildMode
    558548    };
    … …  
    593583    RefPtr<CSSCalcValue> m_parsedCalculation;
    594584
    595 #if ENABLE(CSS3_CONDITIONAL_RULES)
    596585    std::unique_ptr<RuleSourceDataList> m_supportsRuleDataStack;
    597 #endif
    598586
    599587    // defines units allowed for a certain property, used in parseUnit

  • trunk/Source/WebCore/css/CSSRule.h

    r174256 r174536  
    5252        WEBKIT_KEYFRAMES_RULE,
    5353        WEBKIT_KEYFRAME_RULE,
    54 #if ENABLE(CSS3_CONDITIONAL_RULES)
    5554        SUPPORTS_RULE = 12,
    56 #endif
    5755#if ENABLE(CSS_DEVICE_ADAPTATION)
    5856        WEBKIT_VIEWPORT_RULE = 15,

  • trunk/Source/WebCore/css/CSSRule.idl

    r163359 r174536  
    3838    const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
    3939    const unsigned short WEBKIT_KEYFRAME_RULE = 8;
    40 #if defined(ENABLE_CSS3_CONDITIONAL_RULES) && ENABLE_CSS3_CONDITIONAL_RULES
    4140    const unsigned short SUPPORTS_RULE = 12;
    42 #endif
    4341#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
    4442    const unsigned short WEBKIT_VIEWPORT_RULE = 15;

  • trunk/Source/WebCore/css/CSSSupportsRule.cpp

    r174256 r174536  
    3838#include <wtf/text/StringBuilder.h>
    3939
    40 #if ENABLE(CSS3_CONDITIONAL_RULES)
    41 
    4240namespace WebCore {
    4341
    … …  
    6664
    6765} // namespace WebCore
    68 
    69 #endif

  • trunk/Source/WebCore/css/CSSSupportsRule.h

    r174256 r174536  
    3232#include "CSSGroupingRule.h"
    3333
    34 #if ENABLE(CSS3_CONDITIONAL_RULES)
    35 
    3634namespace WebCore {
    3735
    … …  
    6159SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSSupportsRule, CSSRule::SUPPORTS_RULE)
    6260
    63 #endif // ENABLE(CSS3_CONDITIONAL_RULES)
    64 
    6561#endif // CSSSupportsRule_h

  • trunk/Source/WebCore/css/CSSSupportsRule.idl

    r159061 r174536  
    2929[
    3030    NoInterfaceObject,
    31     Conditional=CSS3_CONDITIONAL_RULES,
    3231] interface CSSSupportsRule : CSSRule {
    3332    readonly attribute CSSRuleList cssRules;

  • trunk/Source/WebCore/css/DOMWindowCSS.cpp

    r159856 r174536  
    3030#include "config.h"
    3131#include "DOMWindowCSS.h"
    32 
    33 #if ENABLE(CSS3_CONDITIONAL_RULES)
    3432
    3533#include "CSSParser.h"
    … …  
    8684
    8785}
    88 
    89 #endif

  • trunk/Source/WebCore/css/DOMWindowCSS.h

    r172814 r174536  
    3131#define DOMWindowCSS_h
    3232
    33 #if ENABLE(CSS3_CONDITIONAL_RULES)
    34 
    3533#include <wtf/Forward.h>
    3634#include <wtf/PassRefPtr.h>
    … …  
    5452}
    5553
    56 #endif // ENABLE(CSS3_CONDITIONAL_RULES)
    57 
    5854#endif

  • trunk/Source/WebCore/css/DOMWindowCSS.idl

    r170539 r174536  
    3232    InterfaceName=CSS,
    3333    ImplementationLacksVTable,
    34     Conditional=CSS3_CONDITIONAL_RULES,
    3534] interface DOMWindowCSS {
    3635

  • trunk/Source/WebCore/css/InspectorCSSOMWrappers.cpp

    r174253 r174536  
    6464            collect(downcast<CSSMediaRule>(cssRule));
    6565            break;
    66 #if ENABLE(CSS3_CONDITIONAL_RULES)
    6766        case CSSRule::SUPPORTS_RULE:
    6867            collect(downcast<CSSSupportsRule>(cssRule));
    6968            break;
    70 #endif
    7169#if ENABLE(CSS_REGIONS)
    7270        case CSSRule::WEBKIT_REGION_RULE:

  • trunk/Source/WebCore/css/RuleSet.cpp

    r173569 r174536  
    341341            resolver->fontSelector()->addFontFaceRule(fontFaceRule);
    342342            resolver->invalidateMatchedPropertiesCache();
    343         } else if (rule->isKeyframesRule() && resolver) {
     343        } else if (rule->isKeyframesRule() && resolver)
    344344            resolver->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(rule));
    345         }
     345        else if (rule->isSupportsRule() && static_cast<StyleRuleSupports*>(rule)->conditionIsSupported())
     346            addChildRules(static_cast<StyleRuleSupports*>(rule)->childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
    346347#if ENABLE(CSS_REGIONS)
    347348        else if (rule->isRegionRule() && resolver) {
    … …  
    353354            resolver->viewportStyleResolver()->addViewportRule(static_cast<StyleRuleViewport*>(rule));
    354355        }
    355 #endif
    356 #if ENABLE(CSS3_CONDITIONAL_RULES)
    357         else if (rule->isSupportsRule() && static_cast<StyleRuleSupports*>(rule)->conditionIsSupported())
    358             addChildRules(static_cast<StyleRuleSupports*>(rule)->childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
    359356#endif
    360357    }

  • trunk/Source/WebCore/css/StyleRule.cpp

    r174313 r174536  
    7171        delete static_cast<StyleRuleMedia*>(this);
    7272        return;
    73 #if ENABLE(CSS3_CONDITIONAL_RULES)
    7473    case Supports:
    7574        delete static_cast<StyleRuleSupports*>(this);
    7675        return;
    77 #endif
    7876#if ENABLE(CSS_REGIONS)
    7977    case Region:
    … …  
    115113    case Media:
    116114        return static_cast<const StyleRuleMedia*>(this)->copy();
    117 #if ENABLE(CSS3_CONDITIONAL_RULES)
    118115    case Supports:
    119116        return static_cast<const StyleRuleSupports*>(this)->copy();
    120 #endif
    121117#if ENABLE(CSS_REGIONS)
    122118    case Region:
    … …  
    162158        rule = CSSMediaRule::create(static_cast<StyleRuleMedia&>(self), parentSheet);
    163159        break;
    164 #if ENABLE(CSS3_CONDITIONAL_RULES)
    165160    case Supports:
    166161        rule = CSSSupportsRule::create(static_cast<StyleRuleSupports&>(self), parentSheet);
    167162        break;
    168 #endif
    169163#if ENABLE(CSS_REGIONS)
    170164    case Region:
    … …  
    350344
    351345
    352 #if ENABLE(CSS3_CONDITIONAL_RULES)
    353346StyleRuleSupports::StyleRuleSupports(const String& conditionText, bool conditionIsSupported, Vector<RefPtr<StyleRuleBase>>& adoptRules)
    354347    : StyleRuleGroup(Supports, adoptRules)
    … …  
    364357{
    365358}
    366 #endif
    367359
    368360StyleRuleRegion::StyleRuleRegion(Vector<std::unique_ptr<CSSParserSelector>>* selectors, Vector<RefPtr<StyleRuleBase>>& adoptRules)

  • trunk/Source/WebCore/css/StyleRule.h

    r170774 r174536  
    4949        Keyframes,
    5050        Keyframe, // Not used. These are internally non-rule StyleKeyframe objects.
    51 #if ENABLE(CSS3_CONDITIONAL_RULES)
    5251        Supports = 12,
    53 #endif
    5452#if ENABLE(CSS_DEVICE_ADAPTATION)
    5553        Viewport = 15,
    … …  
    6765    bool isStyleRule() const { return type() == Style; }
    6866    bool isRegionRule() const { return type() == Region; }
    69 #if ENABLE(CSS3_CONDITIONAL_RULES)
    7067    bool isSupportsRule() const { return type() == Supports; }
    71 #endif
    7268#if ENABLE(CSS_DEVICE_ADAPTATION)
    7369    bool isViewportRule() const { return type() == Viewport; }
    … …  
    219215};
    220216
    221 #if ENABLE(CSS3_CONDITIONAL_RULES)
    222217class StyleRuleSupports : public StyleRuleGroup {
    223218public:
    … …  
    238233    bool m_conditionIsSupported;
    239234};
    240 #endif
    241235
    242236class StyleRuleRegion : public StyleRuleGroup {
    … …  
    284278}
    285279
    286 #if ENABLE(CSS3_CONDITIONAL_RULES)
    287280inline const StyleRuleSupports* toStyleRuleSupports(const StyleRuleGroup* rule)
    288281{
    … …  
    290283    return static_cast<const StyleRuleSupports*>(rule);
    291284}
    292 #endif
    293285
    294286inline const StyleRuleRegion* toStyleRuleRegion(const StyleRuleGroup* rule)

  • trunk/Source/WebCore/css/StyleSheetContents.cpp

    r165607 r174536  
    459459        case StyleRuleBase::Charset:
    460460        case StyleRuleBase::Keyframe:
    461 #if ENABLE(CSS3_CONDITIONAL_RULES)
    462461        case StyleRuleBase::Supports:
    463 #endif
    464462#if ENABLE(CSS_DEVICE_ADAPTATION)
    465463        case StyleRuleBase::Viewport:

  • trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

    r174253 r174536  
    108108        else if (data->type == CSSRuleSourceData::MEDIA_RULE)
    109109            flattenSourceData(&data->childRules, target);
    110 #if ENABLE(CSS3_CONDITIONAL_RULES)
    111110        else if (data->type == CSSRuleSourceData::SUPPORTS_RULE)
    112111            flattenSourceData(&data->childRules, target);
    113 #endif
    114112    }
    115113}
    … …  
    221219        return &downcast<WebKitCSSKeyframesRule>(*rule).cssRules();
    222220
    223 #if ENABLE(CSS3_CONDITIONAL_RULES)
    224221    if (is<CSSSupportsRule>(*rule))
    225222        return &downcast<CSSSupportsRule>(*rule).cssRules();
    226 #endif
    227223
    228224    return nullptr;

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r174089 r174536  
    16761676#endif
    16771677
    1678 #if ENABLE(CSS3_CONDITIONAL_RULES)
    16791678DOMWindowCSS* DOMWindow::css()
    16801679{
    … …  
    16831682    return m_css.get();
    16841683}
    1685 #endif
    16861684
    16871685static void didAddStorageEventListener(DOMWindow* window)

  • trunk/Source/WebCore/page/DOMWindow.h

    r173251 r174536  
    270270#endif
    271271
    272 #if ENABLE(CSS3_CONDITIONAL_RULES)
    273272        DOMWindowCSS* css();
    274 #endif
    275273
    276274        // Events
    … …  
    519517#endif
    520518
    521 #if ENABLE(CSS3_CONDITIONAL_RULES)
    522519        mutable RefPtr<DOMWindowCSS> m_css;
    523 #endif
    524520
    525521#if ENABLE(USER_MESSAGE_HANDLERS)

  • trunk/Source/WebCore/page/DOMWindow.idl

    r173596 r174536  
    191191#endif
    192192
    193     [Replaceable,Conditional=CSS3_CONDITIONAL_RULES] readonly attribute DOMWindowCSS CSS;
     193    [Replaceable] readonly attribute DOMWindowCSS CSS;
    194194
    195195    // Events

  • trunk/Source/WebKit/mac/ChangeLog

    r174525 r174536  
     12014-10-09  Dean Jackson  <dino@apple.com>
     2
     3        Remove ENABLE_CSS3_CONDITIONAL_RULES
     4        https://bugs.webkit.org/show_bug.cgi?id=137571
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102014-10-09  Tim Horton  <timothy_horton@apple.com>
    211

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r173596 r174536  
    5959ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
    6060ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
    61 ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
    6261ENABLE_CSS3_TEXT = ;
    6362ENABLE_CSS3_TEXT_LINE_BREAK = ;
    … …  
    272271ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    273272
    274 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));
     273FEATURE_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));

  • trunk/Source/WebKit2/ChangeLog

    r174524 r174536  
     12014-10-09  Dean Jackson  <dino@apple.com>
     2
     3        Remove ENABLE_CSS3_CONDITIONAL_RULES
     4        https://bugs.webkit.org/show_bug.cgi?id=137571
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102014-10-09  Tim Horton  <timothy_horton@apple.com>
    211

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r173596 r174536  
    5959ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
    6060ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
    61 ENABLE_CSS3_CONDITIONAL_RULES = ENABLE_CSS3_CONDITIONAL_RULES;
    6261ENABLE_CSS3_TEXT = ;
    6362ENABLE_CSS3_TEXT_LINE_BREAK = ;
    … …  
    272271ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    273272
    274 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));
     273FEATURE_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));

  • trunk/Source/cmake/OptionsEfl.cmake

    r174419 r174536  
    6868WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
    6969WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
    70 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
    7170WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
    7271WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)

  • trunk/Source/cmake/OptionsGTK.cmake

    r174200 r174536  
    108108WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS OFF)
    109109WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH OFF)
    110 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
    111110WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
    112111WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)

  • trunk/Source/cmake/OptionsMac.cmake

    r173397 r174536  
    2727WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
    2828WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES ON)
    29 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
    3029WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
    3130WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT_LINE_BREAK OFF)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r173397 r174536  
    3131    WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
    3232    WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
    33     WEBKIT_OPTION_DEFINE(ENABLE_CSS3_CONDITIONAL_RULES "Toggle CSS3 Conditional Rules support" OFF)
    3433    WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT "Toggle CSS3 Text support" OFF)
    3534    WEBKIT_OPTION_DEFINE(ENABLE_CSS3_TEXT_LINE_BREAK "Toggle CSS3 Text Line Break support" OFF)

  • trunk/Source/cmakeconfig.h.cmake

    r173397 r174536  
    2929#cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
    3030#cmakedefine01 ENABLE_CSS_SHAPES
    31 #cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
    3231#cmakedefine01 ENABLE_CURSOR_VISIBILITY
    3332#cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
Note: See TracChangeset for help on using the changeset viewer.