https://bugs.webkit.org/show_bug.cgi?id=136529
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-09-04
Reviewed by Dirk Schulze.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
No new tests, no behaviour changed.
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.cpp:
* WebCore.exp.in:
* bindings/js/JSCSSValueCustom.cpp:
(WebCore::toJS):
* bindings/objc/DOMCSS.mm:
(kitClass):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForFilter):
(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSComputedStyleDeclaration.h:
* css/CSSFilterImageValue.cpp:
* css/CSSFilterImageValue.h:
* css/CSSImageGeneratorValue.cpp:
(WebCore::CSSImageGeneratorValue::image):
(WebCore::CSSImageGeneratorValue::isFixedSize):
(WebCore::CSSImageGeneratorValue::fixedSize):
(WebCore::CSSImageGeneratorValue::isPending):
(WebCore::CSSImageGeneratorValue::knownToBeOpaque):
(WebCore::CSSImageGeneratorValue::loadSubimages):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGeneratedImage):
(WebCore::CSSParser::parseFilterImage):
(WebCore::CSSParser::parseFilter):
* css/CSSParser.h:
* css/CSSPropertyNames.in:
* css/CSSValue.cpp:
(WebCore::CSSValue::hasFailedOrCanceledSubresources):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::cloneForCSSOM):
* css/CSSValue.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::clear):
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::generatedOrPendingFromValue):
(WebCore::StyleResolver::loadPendingResources):
* css/StyleResolver.h:
* css/WebKitCSSFilterValue.cpp:
* css/WebKitCSSFilterValue.h:
* css/WebKitCSSFilterValue.idl:
* loader/cache/CachedSVGDocumentReference.cpp:
* loader/cache/CachedSVGDocumentReference.h:
* page/FrameView.cpp:
(WebCore::FrameView::scrollContentsFastPath):
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::AnimationBase):
* page/animation/AnimationBase.h:
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFilter):
(WebCore::blendFunc):
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::reset):
(WebCore::ImplicitAnimation::checkForMatchingFilterFunctionLists):
* page/animation/ImplicitAnimation.h:
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::KeyframeAnimation):
(WebCore::KeyframeAnimation::checkForMatchingFilterFunctionLists):
* page/animation/KeyframeAnimation.h:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::validateFilterOperations):
* platform/graphics/GraphicsLayer.h:
* platform/graphics/GraphicsLayerAnimation.cpp:
(WebCore::applyFilterAnimation):
(WebCore::GraphicsLayerAnimation::applyInternal):
* platform/graphics/GraphicsLayerAnimation.h:
* platform/graphics/IntRectExtent.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::propertyIdToString):
(WebCore::supportsAcceleratedFilterAnimations):
(WebCore::GraphicsLayerCA::filtersCanBeComposited):
(WebCore::GraphicsLayerCA::moveOrCopyAnimations):
(WebCore::GraphicsLayerCA::setFilters):
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateFilters):
(WebCore::GraphicsLayerCA::ensureStructuralLayer):
(WebCore::GraphicsLayerCA::createFilterAnimationsFromKeyframes):
(WebCore::GraphicsLayerCA::setFilterAnimationKeyframes):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/PlatformCAAnimation.h:
* platform/graphics/ca/PlatformCAFilters.h:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/mac/PlatformCAAnimationMac.h:
* platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
(PlatformCAAnimationMac::setFromValue):
(PlatformCAAnimationMac::setToValue):
(PlatformCAAnimationMac::setValues):
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
(PlatformCAFilters::animatedFilterPropertyName):
* platform/graphics/ca/mac/PlatformCALayerMac.h:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::clone):
(PlatformCALayerMac::filtersCanBeComposited):
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimationWin::setFromValue):
(PlatformCAAnimationWin::setToValue):
(PlatformCAAnimationWin::setValues):
* platform/graphics/ca/win/PlatformCAAnimationWin.h:
* platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
(PlatformCAFilters::animatedFilterPropertyName):
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::clone):
* platform/graphics/ca/win/PlatformCALayerWin.h:
* platform/graphics/filters/FilterOperation.cpp:
* platform/graphics/filters/FilterOperation.h:
* platform/graphics/filters/FilterOperations.cpp:
* platform/graphics/filters/FilterOperations.h:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
(WebCore::GraphicsLayerTextureMapper::setFilters):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
* platform/graphics/texmap/TextureMapper.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGLData::TextureMapperGLData):
(WebCore::prepareFilterProgram):
(WebCore::TextureMapperGL::drawTexture):
(WebCore::BitmapTextureGL::applyFilters):
* platform/graphics/texmap/TextureMapperGL.h:
* platform/graphics/texmap/TextureMapperImageBuffer.cpp:
(WebCore::BitmapTextureImageBuffer::applyFilters):
* platform/graphics/texmap/TextureMapperImageBuffer.h:
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::setAnimatedFilters):
(WebCore::TextureMapperLayer::computeOverlapRegions):
(WebCore::TextureMapperLayer::paintIntoSurface):
(WebCore::TextureMapperLayer::setFilters):
(WebCore::TextureMapperLayer::syncAnimations):
* platform/graphics/texmap/TextureMapperLayer.h:
(WebCore::TextureMapperLayer::hasFilters):
* platform/graphics/texmap/TextureMapperShaderProgram.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::didChangeFilters):
(WebCore::CoordinatedGraphicsLayer::setFilters):
(WebCore::CoordinatedGraphicsLayer::syncFilters):
(WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
(WebCore::CoordinatedGraphicsScene::setLayerFiltersIfNeeded):
(WebCore::CoordinatedGraphicsScene::setLayerState):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
* rendering/FilterEffectRenderer.cpp:
* rendering/FilterEffectRenderer.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::adjustStyleDifference):
* rendering/RenderElement.h:
(WebCore::RenderElement::hasFilter): Deleted.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::~RenderLayer):
(WebCore::transparencyClipBox):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::RenderLayerBacking):
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateFilters):
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::startAnimation):
(WebCore::RenderLayerBacking::startTransition):
(WebCore::RenderLayerBacking::graphicsLayerToCSSProperty):
(WebCore::RenderLayerBacking::cssToGraphicsLayerProperty):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
(WebCore::RenderLayerCompositor::requiresCompositingForFilters):
* rendering/RenderLayerFilterInfo.cpp:
* rendering/RenderLayerFilterInfo.h:
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::styleWillChange):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containerForRepaint):
(WebCore::RenderObject::repaintUsingContainer):
* rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
* rendering/RenderView.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
(WebCore::RenderStyle::changeRequiresLayerRepaint):
* rendering/style/RenderStyle.h:
* rendering/style/StyleFilterData.cpp:
* rendering/style/StyleFilterData.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
(WebCore::StyleRareNonInheritedData::hasFilters):
* rendering/style/StyleRareNonInheritedData.h:
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::markAllClientLayersForInvalidation):
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<WebCore::FilterOperations>::decode):
(IPC::ArgumentCoder<GraphicsLayerAnimation>::encode):
(IPC::ArgumentCoder<GraphicsLayerAnimation>::decode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebCoreArgumentCoders.h:
* WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp:
(WebKit::GraphicsLayerCARemote::filtersCanBeComposited):
* WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
(WebKit::PlatformCAAnimationRemote::setFromValue):
(WebKit::PlatformCAAnimationRemote::setToValue):
(WebKit::PlatformCAAnimationRemote::setValues):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::updateClonedLayerProperties):
(WebKit::PlatformCALayerRemote::filtersCanBeComposited):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* Scripts/webkitperl/FeatureList.pm:
WebKitLibraries:
* win/tools/vsprops/FeatureDefines.props:
* win/tools/vsprops/FeatureDefinesCairo.props:
LayoutTests:
* platform/efl/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173268
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmakeconfig.h.cmake:
+
2014-09-01 Gyuyoung Kim <gyuyoung.kim@samsung.com>
[CMAKE] Build warning by INTERFACE_LINK_LIBRARIES
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * platform/efl/TestExpectations:
+
2014-09-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
XMLHttpRequest always defaults Content-Type to application/xml, while it should depend on data type
# Bug in the test itself, as the input box can be big enough for the given coordinates to be inside it.
Bug(EFL) fast/forms/input-text-click-outside.html
-# CSS Filters support not yet enabled (needs ENABLE_CSS_FILTERS).
webkit.org/b/85465 css3/filters [ Skip ]
webkit.org/b/85465 compositing/filters [ Skip ]
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-09-04 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r173248.
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
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_FILTERS) $(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_FILTERS) $(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_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_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_FILTERS) $(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_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));
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * wtf/FeatureDefines.h:
+
2014-09-04 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r173201.
#define ENABLE_CSS_COMPOSITING 0
#endif
-#if !defined(ENABLE_CSS_FILTERS)
-#define ENABLE_CSS_FILTERS 0
-#endif
-
#if !defined(ENABLE_CSS_IMAGE_ORIENTATION)
#define ENABLE_CSS_IMAGE_ORIENTATION 0
#endif
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ No new tests, no behaviour changed.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.cpp:
+ * WebCore.exp.in:
+ * bindings/js/JSCSSValueCustom.cpp:
+ (WebCore::toJS):
+ * bindings/objc/DOMCSS.mm:
+ (kitClass):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::valueForFilter):
+ (WebCore::isLayoutDependent):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSComputedStyleDeclaration.h:
+ * css/CSSFilterImageValue.cpp:
+ * css/CSSFilterImageValue.h:
+ * css/CSSImageGeneratorValue.cpp:
+ (WebCore::CSSImageGeneratorValue::image):
+ (WebCore::CSSImageGeneratorValue::isFixedSize):
+ (WebCore::CSSImageGeneratorValue::fixedSize):
+ (WebCore::CSSImageGeneratorValue::isPending):
+ (WebCore::CSSImageGeneratorValue::knownToBeOpaque):
+ (WebCore::CSSImageGeneratorValue::loadSubimages):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseGeneratedImage):
+ (WebCore::CSSParser::parseFilterImage):
+ (WebCore::CSSParser::parseFilter):
+ * css/CSSParser.h:
+ * css/CSSPropertyNames.in:
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::hasFailedOrCanceledSubresources):
+ (WebCore::CSSValue::equals):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ (WebCore::CSSValue::cloneForCSSOM):
+ * css/CSSValue.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::State::clear):
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::StyleResolver::generatedOrPendingFromValue):
+ (WebCore::StyleResolver::loadPendingResources):
+ * css/StyleResolver.h:
+ * css/WebKitCSSFilterValue.cpp:
+ * css/WebKitCSSFilterValue.h:
+ * css/WebKitCSSFilterValue.idl:
+ * loader/cache/CachedSVGDocumentReference.cpp:
+ * loader/cache/CachedSVGDocumentReference.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollContentsFastPath):
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::AnimationBase):
+ * page/animation/AnimationBase.h:
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFilter):
+ (WebCore::blendFunc):
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * page/animation/ImplicitAnimation.cpp:
+ (WebCore::ImplicitAnimation::reset):
+ (WebCore::ImplicitAnimation::checkForMatchingFilterFunctionLists):
+ * page/animation/ImplicitAnimation.h:
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::KeyframeAnimation):
+ (WebCore::KeyframeAnimation::checkForMatchingFilterFunctionLists):
+ * page/animation/KeyframeAnimation.h:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::validateFilterOperations):
+ * platform/graphics/GraphicsLayer.h:
+ * platform/graphics/GraphicsLayerAnimation.cpp:
+ (WebCore::applyFilterAnimation):
+ (WebCore::GraphicsLayerAnimation::applyInternal):
+ * platform/graphics/GraphicsLayerAnimation.h:
+ * platform/graphics/IntRectExtent.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::propertyIdToString):
+ (WebCore::supportsAcceleratedFilterAnimations):
+ (WebCore::GraphicsLayerCA::filtersCanBeComposited):
+ (WebCore::GraphicsLayerCA::moveOrCopyAnimations):
+ (WebCore::GraphicsLayerCA::setFilters):
+ (WebCore::GraphicsLayerCA::addAnimation):
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+ (WebCore::GraphicsLayerCA::updateFilters):
+ (WebCore::GraphicsLayerCA::ensureStructuralLayer):
+ (WebCore::GraphicsLayerCA::createFilterAnimationsFromKeyframes):
+ (WebCore::GraphicsLayerCA::setFilterAnimationKeyframes):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * platform/graphics/ca/PlatformCAAnimation.h:
+ * platform/graphics/ca/PlatformCAFilters.h:
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/mac/PlatformCAAnimationMac.h:
+ * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
+ (PlatformCAAnimationMac::setFromValue):
+ (PlatformCAAnimationMac::setToValue):
+ (PlatformCAAnimationMac::setValues):
+ * platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
+ (PlatformCAFilters::animatedFilterPropertyName):
+ * platform/graphics/ca/mac/PlatformCALayerMac.h:
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayerMac::clone):
+ (PlatformCALayerMac::filtersCanBeComposited):
+ * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+ (PlatformCAAnimationWin::setFromValue):
+ (PlatformCAAnimationWin::setToValue):
+ (PlatformCAAnimationWin::setValues):
+ * platform/graphics/ca/win/PlatformCAAnimationWin.h:
+ * platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
+ (PlatformCAFilters::animatedFilterPropertyName):
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (PlatformCALayerWin::clone):
+ * platform/graphics/ca/win/PlatformCALayerWin.h:
+ * platform/graphics/filters/FilterOperation.cpp:
+ * platform/graphics/filters/FilterOperation.h:
+ * platform/graphics/filters/FilterOperations.cpp:
+ * platform/graphics/filters/FilterOperations.h:
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
+ (WebCore::GraphicsLayerTextureMapper::setFilters):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+ * platform/graphics/texmap/TextureMapper.h:
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGLData::TextureMapperGLData):
+ (WebCore::prepareFilterProgram):
+ (WebCore::TextureMapperGL::drawTexture):
+ (WebCore::BitmapTextureGL::applyFilters):
+ * platform/graphics/texmap/TextureMapperGL.h:
+ * platform/graphics/texmap/TextureMapperImageBuffer.cpp:
+ (WebCore::BitmapTextureImageBuffer::applyFilters):
+ * platform/graphics/texmap/TextureMapperImageBuffer.h:
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::TextureMapperLayer::setAnimatedFilters):
+ (WebCore::TextureMapperLayer::computeOverlapRegions):
+ (WebCore::TextureMapperLayer::paintIntoSurface):
+ (WebCore::TextureMapperLayer::setFilters):
+ (WebCore::TextureMapperLayer::syncAnimations):
+ * platform/graphics/texmap/TextureMapperLayer.h:
+ (WebCore::TextureMapperLayer::hasFilters):
+ * platform/graphics/texmap/TextureMapperShaderProgram.h:
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::CoordinatedGraphicsLayer::didChangeFilters):
+ (WebCore::CoordinatedGraphicsLayer::setFilters):
+ (WebCore::CoordinatedGraphicsLayer::syncFilters):
+ (WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
+ (WebCore::CoordinatedGraphicsScene::setLayerFiltersIfNeeded):
+ (WebCore::CoordinatedGraphicsScene::setLayerState):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
+ * rendering/FilterEffectRenderer.cpp:
+ * rendering/FilterEffectRenderer.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::adjustStyleDifference):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::hasFilter): Deleted.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::RenderLayer):
+ (WebCore::RenderLayer::~RenderLayer):
+ (WebCore::transparencyClipBox):
+ (WebCore::RenderLayer::paintLayerContents):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::RenderLayerBacking):
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::updateFilters):
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::RenderLayerBacking::startAnimation):
+ (WebCore::RenderLayerBacking::startTransition):
+ (WebCore::RenderLayerBacking::graphicsLayerToCSSProperty):
+ (WebCore::RenderLayerBacking::cssToGraphicsLayerProperty):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
+ (WebCore::RenderLayerCompositor::requiresCompositingForFilters):
+ * rendering/RenderLayerFilterInfo.cpp:
+ * rendering/RenderLayerFilterInfo.h:
+ * rendering/RenderLayerModelObject.cpp:
+ (WebCore::RenderLayerModelObject::styleWillChange):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::containerForRepaint):
+ (WebCore::RenderObject::repaintUsingContainer):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::RenderView):
+ * rendering/RenderView.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout):
+ (WebCore::RenderStyle::changeRequiresLayerRepaint):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleFilterData.cpp:
+ * rendering/style/StyleFilterData.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ (WebCore::StyleRareNonInheritedData::hasFilters):
+ * rendering/style/StyleRareNonInheritedData.h:
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::markAllClientLayersForInvalidation):
+
2014-09-04 Pratik Solanki <psolanki@apple.com>
Remove iOS specific disk image cache
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
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_FILTERS) $(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_FILTERS) $(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_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_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_FILTERS) $(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_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));
#include "JSValidityState.cpp"
#include "JSVoidCallback.cpp"
#include "JSWebKitAnimationEvent.cpp"
-#if ENABLE(CSS_FILTERS)
#include "JSWebKitCSSFilterValue.cpp"
-#endif
#include "JSWebKitCSSKeyframeRule.cpp"
#include "JSWebKitCSSKeyframesRule.cpp"
#include "JSWebKitCSSTransformValue.cpp"
__ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
__ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
__ZN7WebCore16FilterOperationsC1Ev
+__ZN7WebCore16FilterOperationsaSERKS0_
__ZN7WebCore16FontPlatformDataD1Ev
__ZN7WebCore16FrameLoadRequestC1EPNS_5FrameERKNS_15ResourceRequestERKNS_14SubstituteDataE
__ZN7WebCore16HTMLInputElement13setAutofilledEb
__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
#endif
-#if ENABLE(CSS_FILTERS)
-__ZN7WebCore16FilterOperationsaSERKS0_
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
__ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
__ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
#include "JSNode.h"
#include "JSSVGColor.h"
#include "JSSVGPaint.h"
+#include "JSWebKitCSSFilterValue.h"
#include "JSWebKitCSSTransformValue.h"
#include "SVGColor.h"
#include "SVGPaint.h"
-#include "WebKitCSSTransformValue.h"
-
-#if ENABLE(CSS_FILTERS)
-#include "JSWebKitCSSFilterValue.h"
#include "WebKitCSSFilterValue.h"
-#endif
+#include "WebKitCSSTransformValue.h"
using namespace JSC;
if (value->isWebKitCSSTransformValue())
wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSTransformValue, value);
-#if ENABLE(CSS_FILTERS)
else if (value->isWebKitCSSFilterValue())
wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSFilterValue, value);
-#endif
else if (value->isValueList())
wrapper = CREATE_DOM_WRAPPER(globalObject, CSSValueList, value);
else if (value->isSVGPaint())
#import "DOMCSSValueList.h"
#import "DOMInternal.h"
#import "DOMStyleSheetInternal.h"
+#import "DOMWebKitCSSFilterValue.h"
#import "DOMWebKitCSSKeyframeRule.h"
#import "DOMWebKitCSSKeyframesRule.h"
#import "DOMWebKitCSSTransformValue.h"
-#if ENABLE(CSS_FILTERS)
-#import "DOMWebKitCSSFilterValue.h"
-#endif
-
#if ENABLE(CSS_REGIONS)
#import "DOMWebKitCSSRegionRule.h"
#endif
case WebCore::CSSValue::CSS_VALUE_LIST:
if (impl->isWebKitCSSTransformValue())
return [DOMWebKitCSSTransformValue class];
-#if ENABLE(CSS_FILTERS)
if (impl->isWebKitCSSFilterValue())
return [DOMWebKitCSSFilterValue class];
-#endif
return [DOMCSSValueList class];
case WebCore::CSSValue::CSS_INHERIT:
case WebCore::CSSValue::CSS_INITIAL:
#include "StyleProperties.h"
#include "StylePropertyShorthand.h"
#include "StyleResolver.h"
+#include "WebKitCSSFilterValue.h"
#include "WebKitCSSTransformValue.h"
#include "WebKitFontFamilyNames.h"
#include <wtf/NeverDestroyed.h>
#include "ShapeValue.h"
#endif
-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
#if ENABLE(DASHBOARD_SUPPORT)
#include "DashboardRegion.h"
#endif
#endif
#if ENABLE(DASHBOARD_SUPPORT)
CSSPropertyWebkitDashboardRegion,
-#endif
-#if ENABLE(CSS_FILTERS)
- CSSPropertyWebkitFilter,
#endif
CSSPropertyWebkitAlignContent,
CSSPropertyWebkitAlignItems,
CSSPropertyWebkitFlexWrap,
CSSPropertyWebkitJustifyContent,
CSSPropertyWebkitJustifySelf,
+ CSSPropertyWebkitFilter,
CSSPropertyWebkitFontKerning,
CSSPropertyWebkitFontSmoothing,
CSSPropertyWebkitFontVariantLigatures,
return WTF::move(list);
}
-#if ENABLE(CSS_FILTERS)
PassRef<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderStyle* style, const FilterOperations& filterOperations, AdjustPixelValuesForComputedStyle adjust)
{
if (filterOperations.operations().isEmpty())
return WTF::move(list);
}
-#endif
#if ENABLE(CSS_GRID_LAYOUT)
static PassRef<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const RenderStyle* style)
case CSSPropertyWebkitPerspectiveOrigin:
case CSSPropertyWebkitTransformOrigin:
case CSSPropertyWebkitTransform:
-#if ENABLE(CSS_FILTERS)
case CSSPropertyWebkitFilter:
-#endif
return true;
case CSSPropertyMargin: {
if (!renderer || !renderer->isBox())
case CSSPropertyWebkitShapeOutside:
return shapePropertyValue(style.get(), style->shapeOutside());
#endif
-#if ENABLE(CSS_FILTERS)
case CSSPropertyWebkitFilter:
return valueForFilter(style.get(), style->filter());
-#endif
#if ENABLE(CSS_COMPOSITING)
case CSSPropertyMixBlendMode:
return cssValuePool().createValue(style->blendMode());
bool useFixedFontDefaultSize() const;
bool propertyMatches(CSSPropertyID, const CSSValue*) const;
-#if ENABLE(CSS_FILTERS)
static PassRef<CSSValue> valueForFilter(const RenderStyle*, const FilterOperations&, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
-#endif
private:
// The styled node is either the node passed into computedPropertyValue, or the
#include "config.h"
#include "CSSFilterImageValue.h"
-#if ENABLE(CSS_FILTERS)
-
#include "CSSImageValue.h"
#include "CachedImage.h"
#include "CachedResourceLoader.h"
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef CSSFilterImageValue_h
#define CSSFilterImageValue_h
-#if ENABLE(CSS_FILTERS)
-
#include "CSSImageGeneratorValue.h"
#include "CSSPrimitiveValue.h"
#include "CachedImageClient.h"
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // CSSFilterImageValue_h
return toCSSCanvasValue(this)->image(renderer, size);
case CrossfadeClass:
return toCSSCrossfadeValue(this)->image(renderer, size);
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return toCSSFilterImageValue(this)->image(renderer, size);
-#endif
case LinearGradientClass:
return toCSSLinearGradientValue(this)->image(renderer, size);
case RadialGradientClass:
return toCSSCanvasValue(this)->isFixedSize();
case CrossfadeClass:
return toCSSCrossfadeValue(this)->isFixedSize();
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return toCSSFilterImageValue(this)->isFixedSize();
-#endif
case LinearGradientClass:
return toCSSLinearGradientValue(this)->isFixedSize();
case RadialGradientClass:
return toCSSCanvasValue(this)->fixedSize(renderer);
case CrossfadeClass:
return toCSSCrossfadeValue(this)->fixedSize(renderer);
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return toCSSFilterImageValue(this)->fixedSize(renderer);
-#endif
case LinearGradientClass:
return toCSSLinearGradientValue(this)->fixedSize(renderer);
case RadialGradientClass:
return toCSSCrossfadeValue(this)->isPending();
case CanvasClass:
return toCSSCanvasValue(this)->isPending();
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return toCSSFilterImageValue(this)->isPending();
-#endif
case LinearGradientClass:
return toCSSLinearGradientValue(this)->isPending();
case RadialGradientClass:
return toCSSCrossfadeValue(this)->knownToBeOpaque(renderer);
case CanvasClass:
return false;
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return toCSSFilterImageValue(this)->knownToBeOpaque(renderer);
-#endif
case LinearGradientClass:
return toCSSLinearGradientValue(this)->knownToBeOpaque(renderer);
case RadialGradientClass:
case CanvasClass:
toCSSCanvasValue(this)->loadSubimages(cachedResourceLoader);
break;
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
toCSSFilterImageValue(this)->loadSubimages(cachedResourceLoader);
break;
-#endif
case LinearGradientClass:
toCSSLinearGradientValue(this)->loadSubimages(cachedResourceLoader);
break;
#include "StyleRuleImport.h"
#include "StyleSheetContents.h"
#include "TextEncoding.h"
+#include "WebKitCSSFilterValue.h"
#include "WebKitCSSKeyframeRule.h"
#include "WebKitCSSKeyframesRule.h"
#include "WebKitCSSRegionRule.h"
#include "CSSImageSetValue.h"
#endif
-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
#include "LengthRepeat.h"
#endif
case CSSPropertyWebkitBoxOrdinalGroup:
validPrimitive = validUnit(value, FInteger | FNonNeg, CSSStrictMode) && value->fValue;
break;
-#if ENABLE(CSS_FILTERS)
case CSSPropertyWebkitFilter:
if (id == CSSValueNone)
validPrimitive = true;
return true;
}
break;
-#endif
#if ENABLE(CSS_COMPOSITING)
case CSSPropertyMixBlendMode:
if (cssCompositingEnabled())
if (equalIgnoringCase(val->function->name, "-webkit-cross-fade("))
return parseCrossfade(valueList, value);
-#if ENABLE(CSS_FILTERS)
if (equalIgnoringCase(val->function->name, "-webkit-filter("))
return parseFilterImage(valueList, value);
-#endif
return false;
}
-#if ENABLE(CSS_FILTERS)
bool CSSParser::parseFilterImage(CSSParserValueList* valueList, RefPtr<CSSValue>& filter)
{
RefPtr<CSSFilterImageValue> result;
return true;
}
-#endif
bool CSSParser::parseCrossfade(CSSParserValueList* valueList, RefPtr<CSSValue>& crossfade)
{
return valueID >= CSSValueClear && valueID <= CSSValueXor;
}
-#if ENABLE(CSS_FILTERS)
-
static void filterInfoForName(const CSSParserString& name, WebKitCSSFilterValue::FilterOperationType& filterType, unsigned& maximumArgumentCount)
{
if (equalIgnoringCase(name, "grayscale("))
return true;
}
-#endif
#if ENABLE(CSS_REGIONS)
static bool validFlowName(const String& flowName)
#include "Color.h"
#include "MediaQuery.h"
#include "SourceSizeList.h"
+#include "WebKitCSSFilterValue.h"
#include <memory>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
#include <wtf/text/AtomicString.h>
-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
#if ENABLE(CSS_GRID_LAYOUT)
#include "CSSGridTemplateAreasValue.h"
#endif
PassRefPtr<CSSValue> parseImageSet();
#endif
-#if ENABLE(CSS_FILTERS)
bool parseFilterImage(CSSParserValueList*, RefPtr<CSSValue>&);
bool parseFilter(CSSParserValueList*, RefPtr<CSSValue>&);
PassRefPtr<WebKitCSSFilterValue> parseBuiltinFilterArguments(CSSParserValueList*, WebKitCSSFilterValue::FilterOperationType);
-#endif
PassRefPtr<CSSValue> parseClipPath();
double parsedDouble(CSSParserValue*, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue);
friend class TransformOperationInfo;
-#if ENABLE(CSS_FILTERS)
friend class FilterOperationInfo;
-#endif
};
CSSPropertyID cssPropertyID(const CSSParserString&);
mix-blend-mode
isolation
#endif
-#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
-webkit-filter
-#endif
-webkit-align-content
-webkit-align-items
-webkit-align-self
return toCSSImageValue(this)->hasFailedOrCanceledSubresources();
if (classType() == CrossfadeClass)
return toCSSCrossfadeValue(this)->hasFailedOrCanceledSubresources();
-#if ENABLE(CSS_FILTERS)
if (classType() == FilterImageClass)
return toCSSFilterImageValue(this)->hasFailedOrCanceledSubresources();
-#endif
#if ENABLE(CSS_IMAGE_SET)
if (classType() == ImageSetClass)
return toCSSImageSetValue(this)->hasFailedOrCanceledSubresources();
return compareCSSValues<CSSCanvasValue>(*this, other);
case CursorImageClass:
return compareCSSValues<CSSCursorImageValue>(*this, other);
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return compareCSSValues<CSSFilterImageValue>(*this, other);
-#endif
case FontClass:
return compareCSSValues<CSSFontValue>(*this, other);
case FontFaceSrcClass:
case ImageSetClass:
return compareCSSValues<CSSImageSetValue>(*this, other);
#endif
-#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return compareCSSValues<WebKitCSSFilterValue>(*this, other);
-#endif
case SVGColorClass:
return compareCSSValues<SVGColor>(*this, other);
case SVGPaintClass:
return toCSSCanvasValue(this)->customCSSText();
case CursorImageClass:
return toCSSCursorImageValue(this)->customCSSText();
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
return toCSSFilterImageValue(this)->customCSSText();
-#endif
case FontClass:
return toCSSFontValue(this)->customCSSText();
case FontFaceSrcClass:
case ImageSetClass:
return toCSSImageSetValue(this)->customCSSText();
#endif
-#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return toWebKitCSSFilterValue(this)->customCSSText();
-#endif
case SVGColorClass:
return toSVGColor(this)->customCSSText();
case SVGPaintClass:
delete toCSSImageSetValue(this);
return;
#endif
-#if ENABLE(CSS_FILTERS)
case FilterImageClass:
delete toCSSFilterImageValue(this);
return;
case WebKitCSSFilterClass:
delete toWebKitCSSFilterValue(this);
return;
-#endif
case SVGColorClass:
delete toSVGColor(this);
return;
case ImageClass:
case CursorImageClass:
return toCSSImageValue(this)->cloneForCSSOM();
-#if ENABLE(CSS_FILTERS)
case WebKitCSSFilterClass:
return toWebKitCSSFilterValue(this)->cloneForCSSOM();
-#endif
case WebKitCSSTransformClass:
return toWebKitCSSTransformValue(this)->cloneForCSSOM();
#if ENABLE(CSS_IMAGE_SET)
bool isWebKitCSSTransformValue() const { return m_classType == WebKitCSSTransformClass; }
bool isLineBoxContainValue() const { return m_classType == LineBoxContainClass; }
bool isCalcValue() const {return m_classType == CalculationClass; }
-#if ENABLE(CSS_FILTERS)
bool isFilterImageValue() const { return m_classType == FilterImageClass; }
bool isWebKitCSSFilterValue() const { return m_classType == WebKitCSSFilterClass; }
-#endif // ENABLE(CSS_FILTERS)
#if ENABLE(CSS_GRID_LAYOUT)
bool isGridTemplateAreasValue() const { return m_classType == GridTemplateAreasClass; }
bool isGridLineNamesValue() const { return m_classType == GridLineNamesClass; }
// Image generator classes.
CanvasClass,
CrossfadeClass,
-#if ENABLE(CSS_FILTERS)
FilterImageClass,
-#endif
LinearGradientClass,
RadialGradientClass,
#if ENABLE(CSS_IMAGE_SET)
ImageSetClass,
#endif
-#if ENABLE(CSS_FILTERS)
WebKitCSSFilterClass,
-#endif
WebKitCSSTransformClass,
#if ENABLE(CSS_GRID_LAYOUT)
GridLineNamesClass,
#include "DeprecatedStyleBuilder.h"
#include "DocumentStyleSheetCollection.h"
#include "ElementRuleCollector.h"
+#include "FilterOperation.h"
#include "Frame.h"
#include "FrameSelection.h"
#include "FrameView.h"
#include "UserAgentStyleSheets.h"
#include "ViewportStyleResolver.h"
#include "VisitedLinkState.h"
+#include "WebKitCSSFilterValue.h"
#include "WebKitCSSKeyframeRule.h"
#include "WebKitCSSKeyframesRule.h"
#include "WebKitCSSRegionRule.h"
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
-#if ENABLE(CSS_FILTERS)
-#include "FilterOperation.h"
-#include "WebKitCSSFilterValue.h"
-#endif
-
#if ENABLE(CSS_GRID_LAYOUT)
#include "CSSGridLineNamesValue.h"
#include "CSSGridTemplateAreasValue.h"
m_parentStyle = nullptr;
m_regionForStyling = nullptr;
m_pendingImageProperties.clear();
-#if ENABLE(CSS_FILTERS)
m_filtersWithPendingSVGDocuments.clear();
-#endif
m_cssToLengthConversionData = CSSToLengthConversionData();
}
return;
}
-#if ENABLE(CSS_FILTERS)
case CSSPropertyWebkitFilter: {
HANDLE_INHERIT_AND_INITIAL(filter, Filter);
FilterOperations operations;
state.style()->setFilter(operations);
return;
}
-#endif
+
#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitGridAutoColumns: {
HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns);
PassRefPtr<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
{
-#if ENABLE(CSS_FILTERS)
if (value.isFilterImageValue()) {
// FilterImage needs to calculate FilterOperations.
toCSSFilterImageValue(value).createFilterOperations(this);
}
-#endif
+
if (value.isPending()) {
m_state.pendingImageProperties().set(property, &value);
return StylePendingImage::create(&value);
return false;
}
-#if ENABLE(CSS_FILTERS)
static FilterOperation::OperationType filterOperationForType(WebKitCSSFilterValue::FilterOperationType type)
{
switch (type) {
return true;
}
-#endif
-
PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
{
if (auto imageValue = pendingImage.cssImageValue())
// Start loading images referenced by this style.
loadPendingImages();
-#if ENABLE(CSS_FILTERS)
// Start loading the SVG Documents referenced by this style.
loadPendingSVGDocuments();
-#endif
#ifndef NDEBUG
inLoadPendingResources = false;
void clearCachedPropertiesAffectedByViewportUnits();
-#if ENABLE(CSS_FILTERS)
bool createFilterOperations(CSSValue* inValue, FilterOperations& outOperations);
void loadPendingSVGDocuments();
-#endif // ENABLE(CSS_FILTERS)
void loadPendingResources();
bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
PendingImagePropertyMap& pendingImageProperties() { return m_pendingImageProperties; }
-#if ENABLE(CSS_FILTERS)
+
Vector<RefPtr<ReferenceFilterOperation>>& filtersWithPendingSVGDocuments() { return m_filtersWithPendingSVGDocuments; }
-#endif
void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
CSSValue* lineHeightValue() { return m_lineHeightValue; }
bool m_applyPropertyToVisitedLinkStyle;
PendingImagePropertyMap m_pendingImageProperties;
-#if ENABLE(CSS_FILTERS)
+
Vector<RefPtr<ReferenceFilterOperation>> m_filtersWithPendingSVGDocuments;
-#endif
+
CSSValue* m_lineHeightValue;
bool m_fontDirty;
bool m_fontSizeHasViewportUnits;
#include "config.h"
#include "WebKitCSSFilterValue.h"
-#if ENABLE(CSS_FILTERS)
-
#include "CSSValueList.h"
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
}
}
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef WebKitCSSFilterValue_h
#define WebKitCSSFilterValue_h
-#if ENABLE(CSS_FILTERS)
-
#include "CSSValueList.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
}
-#endif // ENABLE(CSS_FILTERS)
-
#endif
*/
[
- Conditional=CSS_FILTERS,
DoNotCheckConstants,
ImplementationLacksVTable,
] interface WebKitCSSFilterValue : CSSValueList {
#include "config.h"
#include "CachedSVGDocumentReference.h"
-#if ENABLE(CSS_FILTERS)
#include "CachedResourceHandle.h"
#include "CachedResourceLoader.h"
#include "CachedResourceRequest.h"
}
}
-
-#endif
#ifndef CachedSVGDocumentReference_h
#define CachedSVGDocumentReference_h
-#if ENABLE(CSS_FILTERS)
#include "CachedResourceHandle.h"
#include "CachedSVGDocumentClient.h"
#include <wtf/text/WTFString.h>
};
-#endif // ENABLE(CSS_FILTERS)
-
#endif // CachedSVGDocumentReference_h
continue;
}
-#if ENABLE(CSS_FILTERS)
if (layer->hasAncestorWithFilterOutsets()) {
// If the fixed layer has a blur/drop-shadow filter applied on at least one of its parents, we cannot
// scroll using the fast path, otherwise the outsets of the filter will be moved around the page.
return false;
}
-#endif
+
IntRect updateRect = snappedIntRect(layer->repaintRectIncludingNonCompositingDescendants());
updateRect = contentsToRootView(updateRect);
if (!isCompositedContentLayer && clipsRepaints())
: m_animationState(AnimationState::New)
, m_isAccelerated(false)
, m_transformFunctionListValid(false)
-#if ENABLE(CSS_FILTERS)
, m_filterFunctionListsMatch(false)
-#endif
, m_startTime(0)
, m_pauseTime(-1)
, m_requestedStartTime(0)
// FIXME: rename this using the "lists match" terminology.
bool isTransformFunctionListValid() const { return m_transformFunctionListValid; }
-#if ENABLE(CSS_FILTERS)
bool filterFunctionListsMatch() const { return m_filterFunctionListsMatch; }
-#endif
// Freeze the animation; used by DumpRenderTree.
void freezeAtTime(double t);
bool m_isAccelerated;
bool m_transformFunctionListValid;
-#if ENABLE(CSS_FILTERS)
bool m_filterFunctionListsMatch;
-#endif
double m_startTime;
double m_pauseTime;
double m_requestedStartTime;
}
#endif
-#if ENABLE(CSS_FILTERS)
static inline PassRefPtr<FilterOperation> blendFunc(const AnimationBase* anim, FilterOperation* fromOp, FilterOperation* toOp, double progress, bool blendToPassthrough = false)
{
ASSERT(toOp);
result.get().setFilterOperations(filterResult);
return StyleGeneratedImage::create(WTF::move(result));
}
-#endif // ENABLE(CSS_FILTERS)
static inline EVisibility blendFunc(const AnimationBase* anim, EVisibility from, EVisibility to, double progress)
{
CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
CSSImageGeneratorValue& toGenerated = toStyleGeneratedImage(to)->imageValue();
-#if ENABLE(CSS_FILTERS)
if (fromGenerated.isFilterImageValue() && toGenerated.isFilterImageValue()) {
// Animation of generated images just possible if input images are equal.
// Otherwise fall back to cross fade animation.
if (fromFilter.equalInputImages(toFilter) && fromFilter.cachedImage())
return blendFilter(anim, fromFilter.cachedImage(), fromFilter.filterOperations(), toFilter.filterOperations(), progress);
}
-#endif
if (fromGenerated.isCrossfadeValue() && toGenerated.isCrossfadeValue()) {
CSSCrossfadeValue& fromCrossfade = toCSSCrossfadeValue(fromGenerated);
// FIXME: Add support for animation between two *gradient() functions.
// https://bugs.webkit.org/show_bug.cgi?id=119956
-#if ENABLE(CSS_FILTERS)
} else if (from->isGeneratedImage() && to->isCachedImage()) {
CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
if (fromGenerated.isFilterImageValue()) {
if (toFilter.cachedImage() && toStyleCachedImage(from)->cachedImage() == toFilter.cachedImage())
return blendFilter(anim, toFilter.cachedImage(), FilterOperations(), toFilter.filterOperations(), progress);
}
-#endif
// FIXME: Add interpolation between image source and cross-fade.
}
}
};
-#if ENABLE(CSS_FILTERS)
class PropertyWrapperAcceleratedFilter : public PropertyWrapper<const FilterOperations&> {
public:
PropertyWrapperAcceleratedFilter()
dst->setFilter(blendFunc(anim, a->filter(), b->filter(), progress));
}
};
-#endif
static inline size_t shadowListLength(const ShadowData* shadow)
{
new PropertyWrapperAcceleratedOpacity(),
new PropertyWrapperAcceleratedTransform(),
-#if ENABLE(CSS_FILTERS)
new PropertyWrapperAcceleratedFilter(),
-#endif
-
new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
#if ENABLE(CSS_SHAPES)
// set the transform animation list
validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
checkForMatchingFilterFunctionLists();
-#endif
}
void ImplicitAnimation::setOverridden(bool b)
m_transformFunctionListValid = true;
}
-#if ENABLE(CSS_FILTERS)
void ImplicitAnimation::checkForMatchingFilterFunctionLists()
{
m_filterFunctionListsMatch = false;
// Filter lists match.
m_filterFunctionListsMatch = true;
}
-#endif
double ImplicitAnimation::timeToNextService()
{
bool sendTransitionEvent(const AtomicString&, double elapsedTime);
void validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
void checkForMatchingFilterFunctionLists();
-#endif
private:
ImplicitAnimation(const Animation&, CSSPropertyID, RenderElement*, CompositeAnimation*, RenderStyle*);
// Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
checkForMatchingFilterFunctionLists();
-#endif
}
KeyframeAnimation::~KeyframeAnimation()
m_transformFunctionListValid = true;
}
-#if ENABLE(CSS_FILTERS)
void KeyframeAnimation::checkForMatchingFilterFunctionLists()
{
m_filterFunctionListsMatch = false;
m_filterFunctionListsMatch = true;
}
-#endif
double KeyframeAnimation::timeToNextService()
{
virtual bool affectsProperty(CSSPropertyID) const override;
void validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
void checkForMatchingFilterFunctionLists();
-#endif
private:
KeyframeAnimation(const Animation&, RenderElement*, int index, CompositeAnimation*, RenderStyle* unanimatedStyle);
}
}
-#if ENABLE(CSS_FILTERS)
static inline const FilterOperations& filterOperationsAt(const KeyframeValueList& valueList, size_t index)
{
return static_cast<const FilterAnimationValue&>(valueList.at(index)).value();
return firstIndex;
}
-#endif
// An "invalid" list is one whose functions don't match, and therefore has to be animated as a Matrix
// The hasBigRotation flag will always return false if isValid is false. Otherwise hasBigRotation is
#include "Animation.h"
#include "Color.h"
+#include "FilterOperations.h"
#include "FloatPoint.h"
#include "FloatPoint3D.h"
#include "FloatRect.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
-#if ENABLE(CSS_FILTERS)
-#include "FilterOperations.h"
-#endif
-
#if ENABLE(CSS_COMPOSITING)
#include "GraphicsTypes.h"
#endif
TransformOperations m_value;
};
-#if ENABLE(CSS_FILTERS)
// Used to store one filter value in a keyframe list.
// FIXME: Should be moved to its own header file.
class FilterAnimationValue : public AnimationValue {
FilterOperations m_value;
};
-#endif
// Used to store a series of values in a keyframe list.
// Values will all be of the same type, which can be inferred from the property.
float opacity() const { return m_opacity; }
virtual void setOpacity(float opacity) { m_opacity = opacity; }
-#if ENABLE(CSS_FILTERS)
const FilterOperations& filters() const { return m_filters; }
// Returns true if filter can be rendered by the compositor
virtual bool setFilters(const FilterOperations& filters) { m_filters = filters; return true; }
-#endif
#if ENABLE(CSS_COMPOSITING)
BlendMode blendMode() const { return m_blendMode; }
// Should be called from derived class destructors. Should call willBeDestroyed() on super.
WEBCORE_EXPORT virtual void willBeDestroyed();
-#if ENABLE(CSS_FILTERS)
// This method is used by platform GraphicsLayer classes to clear the filters
// when compositing is not done in hardware. It is not virtual, so the caller
// needs to notifiy the change to the platform layer as needed.
// Given a KeyframeValueList containing filterOperations, return true if the operations are valid.
static int validateFilterOperations(const KeyframeValueList&);
-#endif
// Given a list of TransformAnimationValues, see if all the operations for each keyframe match. If so
// return the index of the KeyframeValueList entry that has that list of operations (it may not be
float m_opacity;
float m_zPosition;
-#if ENABLE(CSS_FILTERS)
FilterOperations m_filters;
-#endif
#if ENABLE(CSS_COMPOSITING)
BlendMode m_blendMode;
namespace WebCore {
-#if ENABLE(CSS_FILTERS)
static inline PassRefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation* toOp, double progress, const FloatSize& size, bool blendToPassthrough = false)
{
ASSERT(toOp);
return result;
}
-#endif
static bool shouldReverseAnimationValue(Animation::AnimationDirection direction, int loopCount)
{
case AnimatedPropertyWebkitTransform:
client->setAnimatedTransform(applyTransformAnimation(static_cast<const TransformAnimationValue&>(from).value(), static_cast<const TransformAnimationValue&>(to).value(), progress, m_boxSize, m_listsMatch));
return;
-#if ENABLE(CSS_FILTERS)
case AnimatedPropertyWebkitFilter:
client->setAnimatedFilters(applyFilterAnimation(static_cast<const FilterAnimationValue&>(from).value(), static_cast<const FilterAnimationValue&>(to).value(), progress, m_boxSize));
return;
-#endif
default:
ASSERT_NOT_REACHED();
}
public:
virtual void setAnimatedTransform(const TransformationMatrix&) = 0;
virtual void setAnimatedOpacity(float) = 0;
-#if ENABLE(CSS_FILTERS)
virtual void setAnimatedFilters(const FilterOperations&) = 0;
-#endif
};
GraphicsLayerAnimation()
#ifndef IntRectExtent_h
#define IntRectExtent_h
-#if ENABLE(CSS_FILTERS)
-
#include "LayoutRect.h"
namespace WebCore {
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // IntRectExtent_h
case AnimatedPropertyBackgroundColor:
return "backgroundColor";
case AnimatedPropertyWebkitFilter:
-#if ENABLE(CSS_FILTERS)
return "filters";
-#else
- ASSERT_NOT_REACHED();
-#endif
case AnimatedPropertyInvalid:
ASSERT_NOT_REACHED();
}
return false;
}
-#if ENABLE(CSS_FILTERS) || !ASSERT_DISABLED
static inline bool supportsAcceleratedFilterAnimations()
{
// <rdar://problem/10907251> - WebKit2 doesn't support CA animations of CI filters on Lion and below
return false;
#endif
}
-#endif
std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient& client)
{
return graphicsLayer;
}
-#if ENABLE(CSS_FILTERS)
bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
{
#if PLATFORM(COCOA)
return PlatformCALayerWin::filtersCanBeComposited(filters);
#endif
}
-#endif
PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
{
if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity
|| currAnimation.m_property == AnimatedPropertyBackgroundColor
-#if ENABLE(CSS_FILTERS)
|| currAnimation.m_property == AnimatedPropertyWebkitFilter
-#endif
)
moveOrCopyLayerAnimation(operation, animationIdentifier(currAnimation.m_name, currAnimation.m_property, currAnimation.m_index, currAnimation.m_subIndex), fromLayer, toLayer);
}
noteLayerPropertyChanged(OpacityChanged);
}
-#if ENABLE(CSS_FILTERS)
bool GraphicsLayerCA::setFilters(const FilterOperations& filterOperations)
{
bool canCompositeFilters = filtersCanBeComposited(filterOperations);
}
return canCompositeFilters;
}
-#endif
#if ENABLE(CSS_COMPOSITING)
void GraphicsLayerCA::setBlendMode(BlendMode blendMode)
bool createdAnimations = false;
if (valueList.property() == AnimatedPropertyWebkitTransform)
createdAnimations = createTransformAnimationsFromKeyframes(valueList, anim, animationName, timeOffset, boxSize);
-#if ENABLE(CSS_FILTERS)
else if (valueList.property() == AnimatedPropertyWebkitFilter) {
if (supportsAcceleratedFilterAnimations())
createdAnimations = createFilterAnimationsFromKeyframes(valueList, anim, animationName, timeOffset);
}
-#endif
else
createdAnimations = createAnimationFromKeyframes(valueList, anim, animationName, timeOffset);
if (m_uncommittedChanges & OpacityChanged)
updateOpacityOnLayer();
-
-#if ENABLE(CSS_FILTERS)
+
if (m_uncommittedChanges & FiltersChanged)
updateFilters();
-#endif
#if ENABLE(CSS_COMPOSITING)
if (m_uncommittedChanges & BlendModeChanged)
}
}
-#if ENABLE(CSS_FILTERS)
void GraphicsLayerCA::updateFilters()
{
m_layer->setFilters(m_filters);
}
}
}
-#endif
#if ENABLE(CSS_COMPOSITING)
void GraphicsLayerCA::updateBlendMode()
| ChildrenTransformChanged
| ChildrenChanged
| BackfaceVisibilityChanged
-#if ENABLE(CSS_FILTERS)
| FiltersChanged
-#endif
| OpacityChanged;
if (purpose == NoStructuralLayer) {
return validMatrices;
}
-#if ENABLE(CSS_FILTERS)
bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& valueList, const FilterOperation* operation, const Animation* animation, const String& animationName, int animationIndex, double timeOffset)
{
bool isKeyframe = valueList.size() > 2;
return true;
}
-#endif
PassRefPtr<PlatformCAAnimation> GraphicsLayerCA::createBasicAnimation(const Animation* anim, const String& keyPath, bool additive)
{
return true;
}
-#if ENABLE(CSS_FILTERS)
bool GraphicsLayerCA::setFilterAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, int internalFilterPropertyIndex)
{
ASSERT(valueList.size() == 2);
return true;
}
-#endif
void GraphicsLayerCA::suspendAnimations(double time)
{
// return true if we started an animation
WEBCORE_EXPORT virtual void setOpacity(float) override;
-#if ENABLE(CSS_FILTERS)
WEBCORE_EXPORT virtual bool setFilters(const FilterOperations&) override;
virtual bool filtersCanBeComposited(const FilterOperations&);
-#endif
#if ENABLE(CSS_COMPOSITING)
WEBCORE_EXPORT virtual void setBlendMode(BlendMode) override;
WEBCORE_EXPORT void layerDidDisplay(PlatformCALayer*);
void updateOpacityOnLayer();
-
-#if ENABLE(CSS_FILTERS)
void updateFilters();
-#endif
#if ENABLE(CSS_COMPOSITING)
void updateBlendMode();
bool createAnimationFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset);
bool createTransformAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset, const FloatSize& boxSize);
-#if ENABLE(CSS_FILTERS)
bool createFilterAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset);
-#endif
// Return autoreleased animation (use RetainPtr?)
PassRefPtr<PlatformCAAnimation> createBasicAnimation(const Animation*, const String& keyPath, bool additive);
bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const FloatSize& boxSize);
bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const FloatSize& boxSize);
-#if ENABLE(CSS_FILTERS)
bool setFilterAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, int internalFilterPropertyIndex);
bool setFilterAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, int internalFilterPropertyIndex, FilterOperation::OperationType);
-#endif
bool isRunningTransformAnimation() const;
void moveOrCopyAnimations(MoveOrCopy, PlatformCALayer * fromLayer, PlatformCALayer * toLayer);
bool appendToUncommittedAnimations(const KeyframeValueList&, const TransformOperations*, const Animation*, const String& animationName, const FloatSize& boxSize, int animationIndex, double timeOffset, bool isMatrixAnimation);
-#if ENABLE(CSS_FILTERS)
bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, double timeOffset);
-#endif
enum LayerChange {
NoChange = 0,
virtual void setFromValue(const WebCore::TransformationMatrix&) = 0;
virtual void setFromValue(const FloatPoint3D&) = 0;
virtual void setFromValue(const WebCore::Color&) = 0;
-#if ENABLE(CSS_FILTERS)
virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) = 0;
-#endif
virtual void copyFromValueFrom(const PlatformCAAnimation*) = 0;
virtual void setToValue(float) = 0;
virtual void setToValue(const WebCore::TransformationMatrix&) = 0;
virtual void setToValue(const FloatPoint3D&) = 0;
virtual void setToValue(const WebCore::Color&) = 0;
-#if ENABLE(CSS_FILTERS)
virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) = 0;
-#endif
virtual void copyToValueFrom(const PlatformCAAnimation*) = 0;
// Keyframe-animation properties.
virtual void setValues(const Vector<WebCore::TransformationMatrix>&) = 0;
virtual void setValues(const Vector<FloatPoint3D>&) = 0;
virtual void setValues(const Vector<WebCore::Color>&) = 0;
-#if ENABLE(CSS_FILTERS)
virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) = 0;
-#endif
virtual void copyValuesFrom(const PlatformCAAnimation*) = 0;
virtual void setKeyTimes(const Vector<float>&) = 0;
#ifndef PlatformCAFilters_h
#define PlatformCAFilters_h
-#if ENABLE(CSS_FILTERS)
-
#include "FilterOperations.h"
#include "GraphicsTypes.h"
#include "PlatformLayer.h"
}
-#endif // ENABLE(CSS_FILTERS)
-
#endif // PlatformCAFilters_h
virtual float opacity() const = 0;
virtual void setOpacity(float) = 0;
-
-#if ENABLE(CSS_FILTERS)
virtual void setFilters(const FilterOperations&) = 0;
virtual void copyFiltersFrom(const PlatformCALayer*) = 0;
-#endif
#if ENABLE(CSS_COMPOSITING)
virtual void setBlendMode(BlendMode) = 0;
virtual void setFromValue(const WebCore::TransformationMatrix&) override;
virtual void setFromValue(const FloatPoint3D&) override;
virtual void setFromValue(const WebCore::Color&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) override;
-#endif
virtual void copyFromValueFrom(const PlatformCAAnimation*) override;
virtual void setToValue(float) override;
virtual void setToValue(const WebCore::TransformationMatrix&) override;
virtual void setToValue(const FloatPoint3D&) override;
virtual void setToValue(const WebCore::Color&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) override;
-#endif
virtual void copyToValueFrom(const PlatformCAAnimation*) override;
// Keyframe-animation properties.
virtual void setValues(const Vector<WebCore::TransformationMatrix>&) override;
virtual void setValues(const Vector<FloatPoint3D>&) override;
virtual void setValues(const Vector<WebCore::Color>&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) override;
-#endif
virtual void copyValuesFrom(const PlatformCAAnimation*) override;
virtual void setKeyTimes(const Vector<float>&) override;
[static_cast<CABasicAnimation*>(m_animation.get()) setFromValue:array];
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationMac::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
{
RetainPtr<id> value = PlatformCAFilters::filterValueForOperation(operation, internalFilterPropertyIndex);
[static_cast<CABasicAnimation*>(m_animation.get()) setFromValue:value.get()];
}
-#endif
void PlatformCAAnimationMac::copyFromValueFrom(const PlatformCAAnimation* value)
{
[static_cast<CABasicAnimation*>(m_animation.get()) setToValue:array];
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationMac::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
{
RetainPtr<id> value = PlatformCAFilters::filterValueForOperation(operation, internalFilterPropertyIndex);
[static_cast<CABasicAnimation*>(m_animation.get()) setToValue:value.get()];
}
-#endif
void PlatformCAAnimationMac::copyToValueFrom(const PlatformCAAnimation* value)
{
[static_cast<CAKeyframeAnimation*>(m_animation.get()) setValues:array];
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationMac::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
{
if (animationType() != Keyframe)
}
[static_cast<CAKeyframeAnimation*>(m_animation.get()) setValues:array];
}
-#endif
void PlatformCAAnimationMac::copyValuesFrom(const PlatformCAAnimation* value)
{
#include "config.h"
-#if ENABLE(CSS_FILTERS)
-
#import "PlatformCAFilters.h"
#import "BlockExceptions.h"
#import "FloatConversion.h"
}
#endif
}
-
-#endif // ENABLE(CSS_FILTERS)
virtual float opacity() const override;
virtual void setOpacity(float) override;
-
-#if ENABLE(CSS_FILTERS)
virtual void setFilters(const FilterOperations&) override;
WEBCORE_EXPORT static bool filtersCanBeComposited(const FilterOperations&);
virtual void copyFiltersFrom(const PlatformCALayer*) override;
-#endif
#if ENABLE(CSS_COMPOSITING)
virtual void setBlendMode(BlendMode) override;
newLayer->setOpaque(isOpaque());
newLayer->setBackgroundColor(backgroundColor());
newLayer->setContentsScale(contentsScale());
-#if ENABLE(CSS_FILTERS)
newLayer->copyFiltersFrom(this);
-#endif
newLayer->updateCustomAppearance(customAppearance());
if (type == LayerTypeAVPlayerLayer) {
END_BLOCK_OBJC_EXCEPTIONS
}
-#if ENABLE(CSS_FILTERS)
void PlatformCALayerMac::setFilters(const FilterOperations& filters)
{
PlatformCAFilters::setFiltersOnLayer(platformLayer(), filters);
return true;
}
-#endif
#if ENABLE(CSS_COMPOSITING)
void PlatformCALayerMac::setBlendMode(BlendMode blendMode)
CACFAnimationSetFromValue(m_animation.get(), v.get());
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationWin::setFromValue(const FilterOperation*, int)
{
// FIXME: Hardware filter animation not implemented on Windows
}
-#endif
void PlatformCAAnimationWin::copyFromValueFrom(const PlatformCAAnimation* value)
{
CACFAnimationSetToValue(m_animation.get(), v.get());
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationWin::setToValue(const FilterOperation*, int)
{
// FIXME: Hardware filter animation not implemented on Windows
}
-#endif
void PlatformCAAnimationWin::copyToValueFrom(const PlatformCAAnimation* value)
{
CACFAnimationSetValues(m_animation.get(), array.get());
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationWin::setValues(const Vector<RefPtr<FilterOperation> >&, int)
{
// FIXME: Hardware filter animation not implemented on Windows
}
-#endif
void PlatformCAAnimationWin::copyValuesFrom(const PlatformCAAnimation* value)
{
virtual void setFromValue(const WebCore::TransformationMatrix&) override;
virtual void setFromValue(const FloatPoint3D&) override;
virtual void setFromValue(const WebCore::Color&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) override;
-#endif
virtual void copyFromValueFrom(const PlatformCAAnimation*) override;
virtual void setToValue(float) override;
virtual void setToValue(const WebCore::TransformationMatrix&) override;
virtual void setToValue(const FloatPoint3D&) override;
virtual void setToValue(const WebCore::Color&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) override;
-#endif
virtual void copyToValueFrom(const PlatformCAAnimation*) override;
// Keyframe-animation properties.
virtual void setValues(const Vector<WebCore::TransformationMatrix>&) override;
virtual void setValues(const Vector<FloatPoint3D>&) override;
virtual void setValues(const Vector<WebCore::Color>&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) override;
-#endif
virtual void copyValuesFrom(const PlatformCAAnimation*) override;
virtual void setKeyTimes(const Vector<float>&) override;
*/
#include "config.h"
-
-#if ENABLE(CSS_FILTERS)
-
#include "PlatformCAFilters.h"
using namespace WebCore;
// Hardware filter animation not implemented on Windows.
return "";
}
-
-#endif // ENABLE(CSS_FILTERS)
newLayer->setOpaque(isOpaque());
newLayer->setBackgroundColor(backgroundColor());
newLayer->setContentsScale(contentsScale());
-#if ENABLE(CSS_FILTERS)
newLayer->copyFiltersFrom(this);
-#endif
return newLayer;
}
setNeedsCommit();
}
-#if ENABLE(CSS_FILTERS)
-
void PlatformCALayerWin::setFilters(const FilterOperations&)
{
}
{
}
-#endif // ENABLE(CSS_FILTERS)
-
void PlatformCALayerWin::setName(const String& value)
{
CACFLayerSetName(m_layer.get(), value.createCFString().get());
virtual float opacity() const override;
virtual void setOpacity(float) override;
-#if ENABLE(CSS_FILTERS)
virtual void setFilters(const FilterOperations&) override;
static bool filtersCanBeComposited(const FilterOperations&) { return false; }
virtual void copyFiltersFrom(const PlatformCALayer*) override;
-#endif
virtual void setName(const String&) override;
*/
#include "config.h"
-
-#if ENABLE(CSS_FILTERS)
#include "FilterOperation.h"
#include "AnimationUtilities.h"
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef FilterOperation_h
#define FilterOperation_h
-#if ENABLE(CSS_FILTERS)
-
#include "Color.h"
#include "FilterEffect.h"
#include "LayoutSize.h"
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // FilterOperation_h
#include "IntSize.h"
#include "LengthFunctions.h"
-#if ENABLE(CSS_FILTERS)
-
namespace WebCore {
static inline IntSize outsetSizeForBlur(float stdDeviation)
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef FilterOperations_h
#define FilterOperations_h
-#if ENABLE(CSS_FILTERS)
-
#include "FilterOperation.h"
#include "IntRectExtent.h"
#include <wtf/RefPtr.h>
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // FilterOperations_h
if (m_changeMask & BackgroundColorChange)
m_layer->setSolidColor(solidColor());
-#if ENABLE(CSS_FILTERS)
if (m_changeMask & FilterChange)
m_layer->setFilters(filters());
-#endif
if (m_changeMask & BackingStoreChange)
m_layer->setBackingStore(m_backingStore);
m_animations.remove(animationName);
}
-#if ENABLE(CSS_FILTERS)
bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters)
{
TextureMapper* textureMapper = m_layer->textureMapper();
notifyChange(FilterChange);
return GraphicsLayer::setFilters(filters);
}
-#endif
void GraphicsLayerTextureMapper::setFixedToViewport(bool fixed)
{
void setIsScrollable(bool);
bool isScrollable() const { return m_isScrollable; }
-#if ENABLE(CSS_FILTERS)
virtual bool setFilters(const FilterOperations&);
-#endif
void setFixedToViewport(bool);
bool fixedToViewport() const { return m_fixedToViewport; }
inline int numberOfBytes() const { return size().width() * size().height() * bpp() >> 3; }
inline bool isOpaque() const { return !(m_flags & SupportsAlpha); }
-#if ENABLE(CSS_FILTERS)
virtual PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&) { return this; }
-#endif
protected:
IntSize m_contentSize;
, previousScissorState(0)
, previousDepthState(0)
, sharedData(TextureMapperGLData::SharedGLData::currentSharedGLData(this->context))
-#if ENABLE(CSS_FILTERS)
, filterInfo(0)
-#endif
{ }
~TextureMapperGLData();
RefPtr<SharedGLData> sharedData;
RefPtr<BitmapTexture> currentSurface;
HashMap<const void*, Platform3DObject> vbos;
-#if ENABLE(CSS_FILTERS)
const BitmapTextureGL::FilterInfo* filterInfo;
-#endif
};
Platform3DObject TextureMapperGLData::getStaticVBO(GC3Denum target, GC3Dsizeiptr size, const void* data)
#endif
}
-#if ENABLE(CSS_FILTERS)
-
static TextureMapperShaderProgram::Options optionsForFilterType(FilterOperation::OperationType type, unsigned pass)
{
switch (type) {
break;
}
}
-#endif
void TextureMapperGL::drawTexture(const BitmapTexture& texture, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, unsigned exposedEdges)
{
return;
const BitmapTextureGL& textureGL = static_cast<const BitmapTextureGL&>(texture);
-#if ENABLE(CSS_FILTERS)
TemporaryChange<const BitmapTextureGL::FilterInfo*> filterInfo(data().filterInfo, textureGL.filterInfo());
-#endif
drawTexture(textureGL.id(), textureGL.isOpaque() ? 0 : ShouldBlend, textureGL.size(), targetRect, matrix, opacity, exposedEdges);
}
flags |= ShouldAntialias;
}
-#if ENABLE(CSS_FILTERS)
RefPtr<FilterOperation> filter = data().filterInfo ? data().filterInfo->filter: 0;
GC3Duint filterContentTextureID = 0;
if (filter->affectsOpacity())
flags |= ShouldBlend;
}
-#endif
if (useAntialiasing || opacity < 1)
flags |= ShouldBlend;
RefPtr<TextureMapperShaderProgram> program;
program = data().sharedGLData().getShaderProgram(options);
-#if ENABLE(CSS_FILTERS)
if (filter)
prepareFilterProgram(program.get(), *filter.get(), data().filterInfo->pass, textureSize, filterContentTextureID);
-#endif
drawTexturedQuadWithProgram(program.get(), texture, flags, textureSize, targetRect, modelViewMatrix, opacity);
}
updateContents(imageData, targetRect, offset, bytesPerLine, updateContentsFlag);
}
-#if ENABLE(CSS_FILTERS)
void TextureMapperGL::drawFiltered(const BitmapTexture& sampler, const BitmapTexture* contentTexture, const FilterOperation& filter, int pass)
{
// For standard filters, we always draw the whole texture without transformations.
texmapGL->bindSurface(previousSurface.get());
return resultSurface;
}
-#endif
static inline TransformationMatrix createProjectionMatrix(const IntSize& size, bool mirrored)
{
virtual PassRefPtr<BitmapTexture> createTexture() override;
inline GraphicsContext3D* graphicsContext3D() const { return m_context3D.get(); }
-#if ENABLE(CSS_FILTERS)
void drawFiltered(const BitmapTexture& sourceTexture, const BitmapTexture* contentTexture, const FilterOperation&, int pass);
-#endif
void setEnableEdgeDistanceAntialiasing(bool enabled) { m_enableEdgeDistanceAntialiasing = enabled; }
virtual void updateContents(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag);
virtual bool isBackedByOpenGL() const { return true; }
-#if ENABLE(CSS_FILTERS)
virtual PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&) override;
struct FilterInfo {
RefPtr<FilterOperation> filter;
{ }
};
const FilterInfo* filterInfo() const { return &m_filterInfo; }
-#endif
private:
void updateContentsNoSwizzle(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, unsigned bytesPerPixel = 4, Platform3DObject glFormat = GraphicsContext3D::RGBA);
void clearIfNeeded();
void createFboIfNeeded();
-#if ENABLE(CSS_FILTERS)
FilterInfo m_filterInfo;
-#endif
friend class TextureMapperGL;
};
notImplemented();
}
-#if ENABLE(CSS_FILTERS)
PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&)
{
ASSERT_NOT_REACHED();
return this;
}
-#endif
}
#endif
virtual void updateContents(Image*, const IntRect&, const IntPoint&, UpdateContentsFlag);
virtual void updateContents(TextureMapper*, GraphicsLayer*, const IntRect& target, const IntPoint& offset, UpdateContentsFlag);
virtual void updateContents(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag);
-#if ENABLE(CSS_FILTERS)
PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&);
-#endif
private:
BitmapTextureImageBuffer() { }
return TransformationMatrix(m_state.replicaLayer->m_currentTransform.combined()).multiply(m_currentTransform.combined().inverse());
}
-#if ENABLE(CSS_FILTERS)
void TextureMapperLayer::setAnimatedFilters(const FilterOperations& filters)
{
m_currentFilters = filters;
}
-#endif
static void resolveOverlaps(Region newRegion, Region& overlapRegion, Region& nonOverlapRegion)
{
else if (m_contentsLayer || m_state.solidColor.alpha())
boundingRect = m_state.contentsRect;
-#if ENABLE(CSS_FILTERS)
if (m_currentFilters.hasOutsets()) {
FilterOutsets outsets = m_currentFilters.outsets();
IntRect unfilteredTargetRect(boundingRect);
boundingRect.expand(outsets.left() + outsets.right(), outsets.top() + outsets.bottom());
boundingRect.unite(unfilteredTargetRect);
}
-#endif
TransformationMatrix replicaMatrix;
if (m_state.replicaLayer) {
paintSelfAndChildren(paintOptions);
if (m_state.maskLayer)
m_state.maskLayer->applyMask(options);
-#if ENABLE(CSS_FILTERS)
surface = surface->applyFilters(options.textureMapper, m_currentFilters);
-#endif
options.textureMapper->bindSurface(surface.get());
return surface;
}
m_state.solidColor = color;
}
-#if ENABLE(CSS_FILTERS)
void TextureMapperLayer::setFilters(const FilterOperations& filters)
{
m_state.filters = filters;
}
-#endif
void TextureMapperLayer::setDebugVisuals(bool showDebugBorders, const Color& debugBorderColor, float debugBorderWidth, bool showRepaintCounter)
{
if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity))
m_currentOpacity = m_state.opacity;
-#if ENABLE(CSS_FILTERS)
if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitFilter))
m_currentFilters = m_state.filters;
-#endif
}
bool TextureMapperLayer::isAncestorFixedToViewport() const
void setSolidColor(const Color&);
void setContentsTileSize(const FloatSize&);
void setContentsTilePhase(const FloatPoint&);
-#if ENABLE(CSS_FILTERS)
void setFilters(const FilterOperations&);
-#endif
bool hasFilters() const
{
-#if ENABLE(CSS_FILTERS)
return !m_currentFilters.isEmpty();
-#else
- return false;
-#endif
}
void setDebugVisuals(bool showDebugBorders, const Color& debugBorderColor, float debugBorderWidth, bool showRepaintCounter);
// GraphicsLayerAnimation::Client
virtual void setAnimatedTransform(const TransformationMatrix&) override;
virtual void setAnimatedOpacity(float) override;
-#if ENABLE(CSS_FILTERS)
virtual void setAnimatedFilters(const FilterOperations&) override;
-#endif
bool isVisible() const;
enum ContentsLayerCount {
TextureMapperPlatformLayer* m_contentsLayer;
GraphicsLayerTransform m_currentTransform;
float m_currentOpacity;
-#if ENABLE(CSS_FILTERS)
FilterOperations m_currentFilters;
-#endif
float m_centerZ;
template<class HitTestCondition> TextureMapperLayer* hitTest(const FloatPoint&, HitTestCondition);
TextureMapperLayer* maskLayer;
TextureMapperLayer* replicaLayer;
Color solidColor;
-#if ENABLE(CSS_FILTERS)
FilterOperations filters;
-#endif
Color debugBorderColor;
float debugBorderWidth;
int repaintCount;
TEXMAP_DECLARE_SAMPLER(sampler)
TEXMAP_DECLARE_SAMPLER(mask)
-#if ENABLE(CSS_FILTERS)
TEXMAP_DECLARE_UNIFORM(filterAmount)
TEXMAP_DECLARE_UNIFORM(gaussianKernel)
TEXMAP_DECLARE_UNIFORM(blurRadius)
TEXMAP_DECLARE_UNIFORM(shadowOffset)
TEXMAP_DECLARE_SAMPLER(contentTexture)
-#endif
void setMatrix(GC3Duint, const TransformationMatrix&);
notifyFlushRequired();
}
-#if ENABLE(CSS_FILTERS)
void CoordinatedGraphicsLayer::didChangeFilters()
{
m_shouldSyncFilters = true;
notifyFlushRequired();
}
-#endif
void CoordinatedGraphicsLayer::didChangeImageBacking()
{
#endif
}
-#if ENABLE(CSS_FILTERS)
bool CoordinatedGraphicsLayer::setFilters(const FilterOperations& newFilters)
{
if (filters() == newFilters)
didChangeFilters();
return true;
}
-#endif
void CoordinatedGraphicsLayer::setContentsToSolidColor(const Color& color)
{
m_layerState.children.append(toCoordinatedLayerID(children()[i]));
}
-#if ENABLE(CSS_FILTERS)
void CoordinatedGraphicsLayer::syncFilters()
{
if (!m_shouldSyncFilters)
m_layerState.filters = GraphicsLayer::filters();
m_layerState.filtersChanged = true;
}
-#endif
void CoordinatedGraphicsLayer::syncImageBacking()
{
syncAnimations();
computeTransformedVisibleRect();
syncChildren();
-#if ENABLE(CSS_FILTERS)
syncFilters();
-#endif
#if USE(GRAPHICS_SURFACE)
syncPlatformLayer();
#endif
virtual void deviceOrPageScaleFactorChanged() override;
virtual void flushCompositingState(const FloatRect&) override;
virtual void flushCompositingStateForThisLayerOnly() override;
-#if ENABLE(CSS_FILTERS)
virtual bool setFilters(const FilterOperations&) override;
-#endif
virtual bool addAnimation(const KeyframeValueList&, const FloatSize&, const Animation*, const String&, double) override;
virtual void pauseAnimation(const String&, double) override;
virtual void removeAnimation(const String&) override;
void didChangeAnimations();
void didChangeGeometry();
void didChangeChildren();
-#if ENABLE(CSS_FILTERS)
void didChangeFilters();
-#endif
void didChangeImageBacking();
void resetLayerState();
void syncLayerState();
void syncAnimations();
void syncChildren();
-#if ENABLE(CSS_FILTERS)
void syncFilters();
-#endif
void syncImageBacking();
void computeTransformedVisibleRect();
void updateContentBuffers();
layer->setChildren(children);
}
-#if ENABLE(CSS_FILTERS)
void CoordinatedGraphicsScene::setLayerFiltersIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
{
if (!state.filtersChanged)
layer->setFilters(state.filters);
}
-#endif
void CoordinatedGraphicsScene::setLayerState(CoordinatedLayerID id, const CoordinatedGraphicsLayerState& layerState)
{
createTilesIfNeeded(layer, layerState);
removeTilesIfNeeded(layer, layerState);
updateTilesIfNeeded(layer, layerState);
-#if ENABLE(CSS_FILTERS)
setLayerFiltersIfNeeded(layer, layerState);
-#endif
setLayerAnimationsIfNeeded(layer, layerState);
#if USE(GRAPHICS_SURFACE)
syncPlatformLayerIfNeeded(layer, layerState);
void updateTilesIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
void createTilesIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
void removeTilesIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
-#if ENABLE(CSS_FILTERS)
void setLayerFiltersIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
-#endif
void setLayerAnimationsIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
#if USE(GRAPHICS_SURFACE)
void createPlatformLayerIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
#if USE(COORDINATED_GRAPHICS)
#include "Color.h"
+#include "FilterOperations.h"
#include "FloatRect.h"
#include "FloatSize.h"
#include "GraphicsLayerAnimation.h"
#include "SurfaceUpdateInfo.h"
#include "TransformationMatrix.h"
-#if ENABLE(CSS_FILTERS)
-#include "FilterOperations.h"
-#endif
-
#if USE(GRAPHICS_SURFACE)
#include "GraphicsSurface.h"
#include "GraphicsSurfaceToken.h"
Color solidColor;
Color debugBorderColor;
float debugBorderWidth;
-#if ENABLE(CSS_FILTERS)
FilterOperations filters;
-#endif
GraphicsLayerAnimations animations;
Vector<uint32_t> children;
Vector<TileCreationInfo> tilesToCreate;
#include "config.h"
-#if ENABLE(CSS_FILTERS)
-
#include "FilterEffectRenderer.h"
#include "CachedSVGDocument.h"
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef FilterEffectRenderer_h
#define FilterEffectRenderer_h
-#if ENABLE(CSS_FILTERS)
-
#include "Filter.h"
#include "FilterEffect.h"
#include "FilterOperations.h"
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // FilterEffectRenderer_h
else if (diff < StyleDifferenceRecompositeLayer)
diff = StyleDifferenceRecompositeLayer;
}
-
-#if ENABLE(CSS_FILTERS)
+
if ((contextSensitiveProperties & ContextSensitivePropertyFilter) && hasLayer()) {
RenderLayer* layer = toRenderLayerModelObject(this)->layer();
if (!layer->isComposited() || layer->paintsWithFilters())
else if (diff < StyleDifferenceRecompositeLayer)
diff = StyleDifferenceRecompositeLayer;
}
-#endif
// The answer to requiresLayer() for plugins, iframes, and canvas can change without the actual
// style changing, since it depends on whether we decide to composite these elements. When the
bool hasClipPath() const { return style().clipPath(); }
bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
-#if ENABLE(CSS_FILTERS)
bool hasFilter() const { return style().hasFilter(); }
-#else
- bool hasFilter() const { return false; }
-#endif
#if ENABLE(CSS_COMPOSITING)
bool hasBlendMode() const { return style().hasBlendMode(); }
#include "DocumentEventQueue.h"
#include "Element.h"
#include "EventHandler.h"
+#include "FEColorMatrix.h"
+#include "FEMerge.h"
+#include "FilterEffectRenderer.h"
#include "FloatConversion.h"
#include "FloatPoint3D.h"
#include "FloatRect.h"
#include "RenderIterator.h"
#include "RenderLayerBacking.h"
#include "RenderLayerCompositor.h"
+#include "RenderLayerFilterInfo.h"
#include "RenderMarquee.h"
#include "RenderMultiColumnFlowThread.h"
#include "RenderNamedFlowFragment.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
-#if ENABLE(CSS_FILTERS)
-#include "FEColorMatrix.h"
-#include "FEMerge.h"
-#include "FilterEffectRenderer.h"
-#include "RenderLayerFilterInfo.h"
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
#include "AxisScrollSnapOffsets.h"
#endif
#if !ASSERT_DISABLED
, m_layerListMutationAllowed(true)
#endif
-#if ENABLE(CSS_FILTERS)
, m_hasFilterInfo(false)
-#endif
#if ENABLE(CSS_COMPOSITING)
, m_blendMode(BlendModeNormal)
, m_hasNotIsolatedCompositedBlendingDescendants(false)
if (m_reflection)
removeReflection();
-
-#if ENABLE(CSS_FILTERS)
+
FilterInfo::remove(*this);
-#endif
// Child layers will be deleted by their corresponding render objects, so
// we don't need to delete them ourselves.
return compositor().canRender3DTransforms();
}
-#if ENABLE(CSS_FILTERS)
-
bool RenderLayer::paintsWithFilters() const
{
// FIXME: Eventually there will be cases where we paint with filters even without accelerated compositing,
return filterInfo ? filterInfo->renderer() : 0;
}
-#endif
-
void RenderLayer::updateLayerPositionsAfterLayout(const RenderLayer* rootLayer, UpdateLayerPositionsFlags flags)
{
RenderGeometryMap geometryMap(UseTransforms);
return 0;
}
-#if ENABLE(CSS_FILTERS)
-
RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) const
{
const RenderLayer* curr = (includeSelf == IncludeSelf) ? this : parent();
return false;
}
-#endif
-
RenderLayer* RenderLayer::clippingRootForPainting() const
{
if (isComposited())
// paints unfragmented.
LayoutRect clipRect = layer.boundingBox(&layer);
expandClipRectForDescendantsAndReflection(clipRect, layer, &layer, transparencyBehavior, paintBehavior);
-#if ENABLE(CSS_FILTERS)
layer.renderer().style().filterOutsets().expandRect(clipRect);
-#endif
LayoutRect result = transform.mapRect(clipRect);
if (!paginationLayer)
return result;
LayoutRect clipRect = layer.boundingBox(rootLayer, layer.offsetFromAncestor(rootLayer), transparencyBehavior == HitTestingTransparencyClipBox ? RenderLayer::UseFragmentBoxesIncludingCompositing : RenderLayer::UseFragmentBoxesExcludingCompositing);
expandClipRectForDescendantsAndReflection(clipRect, layer, rootLayer, transparencyBehavior, paintBehavior);
-#if ENABLE(CSS_FILTERS)
layer.renderer().style().filterOutsets().expandRect(clipRect);
-#endif
+
return clipRect;
}
return false;
}
-#if ENABLE(CSS_FILTERS)
-
std::unique_ptr<FilterEffectRendererHelper> RenderLayer::setupFilters(GraphicsContext* context, LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed)
{
if (context->paintingDisabled())
return originalContext;
}
-#endif
-
// Helper for the sorting of layers by z-index.
static inline bool compareZIndex(RenderLayer* first, RenderLayer* second)
{
LayerPaintingInfo localPaintingInfo(paintingInfo);
GraphicsContext* transparencyLayerContext = context;
-#if ENABLE(CSS_FILTERS)
std::unique_ptr<FilterEffectRendererHelper> filterPainter = setupFilters(context, localPaintingInfo, paintFlags, offsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
if (filterPainter) {
context = filterPainter->filterContext();
beginTransparencyLayers(transparencyLayerContext, localPaintingInfo, paintingInfo.paintDirtyRect);
}
}
-#endif
// If this layer's renderer is a child of the subtreePaintRoot, we render unconditionally, which
// is done by passing a nil subtreePaintRoot down to our renderer (as if no subtreePaintRoot was ever set).
if (isPaintingOverlayScrollbars)
paintOverflowControlsForFragments(layerFragments, context, localPaintingInfo);
-#if ENABLE(CSS_FILTERS)
if (filterPainter) {
context = applyFilters(filterPainter.get(), transparencyLayerContext, localPaintingInfo, layerFragments);
filterPainter = nullptr;
}
-#endif
// Make sure that we now use the original transparency context.
ASSERT(transparencyLayerContext == context);
}
}
}
-
-#if ENABLE(CSS_FILTERS)
+
// FIXME: We can optimize the size of the composited layers, by not enlarging
// filtered areas with the outsets if we know that the filter is going to render in hardware.
// https://bugs.webkit.org/show_bug.cgi?id=81239
if (flags & IncludeLayerFilterOutsets)
renderer().style().filterOutsets().expandRect(unionBounds);
-#endif
if ((flags & IncludeSelfTransform) && paintsWithTransform(PaintBehaviorNormal)) {
TransformationMatrix* affineTrans = transform();
m_backing = std::make_unique<RenderLayerBacking>(*this);
compositor().layerBecameComposited(*this);
-#if ENABLE(CSS_FILTERS)
updateOrRemoveFilterEffectRenderer();
-#endif
}
return m_backing.get();
}
compositor().layerBecameNonComposited(*this);
m_backing = nullptr;
-#if ENABLE(CSS_FILTERS)
if (!layerBeingDestroyed)
updateOrRemoveFilterEffectRenderer();
-#else
- UNUSED_PARAM(layerBeingDestroyed);
-#endif
}
bool RenderLayer::hasCompositedMask() const
if (renderer().style().visibility() != VISIBLE)
return false;
-#if ENABLE(CSS_FILTERS)
if (paintsWithFilters() && renderer().style().filter().hasFilterThatAffectsOpacity())
return false;
-#endif
// FIXME: Handle simple transforms.
if (paintsWithTransform(PaintBehaviorNormal))
&& !renderer().isPositioned()
&& !renderer().hasTransform()
&& !renderer().hasClipPath()
-#if ENABLE(CSS_FILTERS)
&& !renderer().hasFilter()
-#endif
#if PLATFORM(IOS)
&& !hasAcceleratedTouchScrolling()
#endif
#if ENABLE(CSS_COMPOSITING)
updateBlendMode();
#endif
-#if ENABLE(CSS_FILTERS)
updateOrRemoveFilterClients();
-#endif
updateNeedsCompositedScrolling();
UNUSED_PARAM(diff);
#endif
-#if ENABLE(CSS_FILTERS)
updateOrRemoveFilterEffectRenderer();
bool backingDidCompositeLayers = isComposited() && backing()->canCompositeFilters();
if (isComposited() && backingDidCompositeLayers && !backing()->canCompositeFilters()) {
// Fallback to drawing them in software.
setBackingNeedsRepaint();
}
-#endif
}
void RenderLayer::updateScrollableAreaSet(bool hasOverflow)
return newStyle;
}
-#if ENABLE(CSS_FILTERS)
-
void RenderLayer::updateOrRemoveFilterClients()
{
if (!hasFilter()) {
renderer().repaint();
}
-#endif
-
void RenderLayer::paintNamedFlowThreadInsideRegion(GraphicsContext* context, RenderNamedFlowFragment* region, LayoutRect paintDirtyRect, LayoutPoint paintOffset, PaintBehavior paintBehavior, PaintLayerFlags paintFlags)
{
LayoutRect regionContentBox = toRenderBox(region->layerOwner()).contentBoxRect();
// Ancestor compositing layer, excluding this.
RenderLayer* ancestorCompositingLayer() const { return enclosingCompositingLayer(ExcludeSelf); }
-#if ENABLE(CSS_FILTERS)
RenderLayer* enclosingFilterLayer(IncludeSelfOrNot = IncludeSelf) const;
RenderLayer* enclosingFilterRepaintLayer() const;
void setFilterBackendNeedsRepaintingInRect(const LayoutRect&);
bool hasAncestorWithFilterOutsets() const;
-#endif
bool canUseConvertToLayerCoords() const
{
// Bounds used for layer overlap testing in RenderLayerCompositor.
LayoutRect overlapBounds() const { return overlapBoundsIncludeChildren() ? calculateLayerBounds(this, LayoutSize()) : localBoundingBox(); }
-#if ENABLE(CSS_FILTERS)
// If true, this layer's children are included in its bounds for overlap testing.
// We can't rely on the children's positions if this layer has a filter that could have moved the children's pixels around.
bool overlapBoundsIncludeChildren() const { return hasFilter() && renderer().style().filter().hasFilterThatMovesPixels(); }
-#else
- bool overlapBoundsIncludeChildren() const { return false; }
-#endif
// Can pass offsetFromRoot if known.
LayoutRect calculateLayerBounds(const RenderLayer* ancestorLayer, const LayoutSize& offsetFromRoot, CalculateLayerBoundsFlags = DefaultCalculateLayerBoundsFlags) const;
bool preserves3D() const { return renderer().style().transformStyle3D() == TransformStyle3DPreserve3D; }
bool has3DTransform() const { return m_transform && !m_transform->isAffine(); }
-#if ENABLE(CSS_FILTERS)
virtual void filterNeedsRepaint();
bool hasFilter() const { return renderer().hasFilter(); }
-#else
- bool hasFilter() const { return false; }
-#endif
#if ENABLE(CSS_COMPOSITING)
bool hasBlendMode() const { return renderer().hasBlendMode(); }
bool containsDirtyOverlayScrollbars() const { return m_containsDirtyOverlayScrollbars; }
void setContainsDirtyOverlayScrollbars(bool dirtyScrollbars) { m_containsDirtyOverlayScrollbars = dirtyScrollbars; }
-#if ENABLE(CSS_FILTERS)
bool paintsWithFilters() const;
bool requiresFullLayerImageForFilters() const;
FilterEffectRenderer* filterRenderer() const;
-#endif
#if !ASSERT_DISABLED
bool layerListMutationAllowed() const { return m_layerListMutationAllowed; }
bool setupFontSubpixelQuantization(GraphicsContext*, bool& didQuantizeFonts);
bool setupClipPath(GraphicsContext*, const LayerPaintingInfo&, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
-#if ENABLE(CSS_FILTERS)
+
std::unique_ptr<FilterEffectRendererHelper> setupFilters(GraphicsContext*, LayerPaintingInfo&, PaintLayerFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
GraphicsContext* applyFilters(FilterEffectRendererHelper*, GraphicsContext* originalContext, LayerPaintingInfo&, LayerFragments&);
-#endif
void paintLayer(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
void paintFixedLayersInNamedFlows(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
bool paintingInsideReflection() const { return m_paintingInsideReflection; }
void setPaintingInsideReflection(bool b) { m_paintingInsideReflection = b; }
-#if ENABLE(CSS_FILTERS)
void updateOrRemoveFilterClients();
void updateOrRemoveFilterEffectRenderer();
-#endif
#if ENABLE(CSS_COMPOSITING)
void updateAncestorChainHasBlendingDescendants();
bool m_layerListMutationAllowed : 1;
#endif
-#if ENABLE(CSS_FILTERS)
bool m_hasFilterInfo : 1;
-#endif
#if ENABLE(CSS_COMPOSITING)
unsigned m_blendMode : 5;
#include "CSSPropertyNames.h"
#include "CachedImage.h"
#include "Chrome.h"
+#include "FilterEffectRenderer.h"
#include "FontCache.h"
#include "FrameView.h"
#include "GraphicsContext.h"
#include "TiledBacking.h"
#include <wtf/text/StringBuilder.h>
-#if ENABLE(CSS_FILTERS)
-#include "FilterEffectRenderer.h"
-#endif
-
#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
#include "GraphicsContext3D.h"
#endif
, m_isMainFrameRenderViewLayer(false)
, m_usingTiledCacheLayer(false)
, m_requiresOwnBackingStore(true)
-#if ENABLE(CSS_FILTERS)
, m_canCompositeFilters(false)
-#endif
, m_backgroundLayerPaintsFixedRootBackground(false)
{
Page* page = renderer().frame().page();
updateOpacity(renderer().style());
updateTransform(renderer().style());
-#if ENABLE(CSS_FILTERS)
updateFilters(renderer().style());
-#endif
#if ENABLE(CSS_COMPOSITING)
updateBlendMode(renderer().style());
#endif
m_graphicsLayer->setTransform(t);
}
-#if ENABLE(CSS_FILTERS)
void RenderLayerBacking::updateFilters(const RenderStyle& style)
{
m_canCompositeFilters = m_graphicsLayer->setFilters(style.filter());
}
-#endif
#if ENABLE(CSS_COMPOSITING)
void RenderLayerBacking::updateBlendMode(const RenderStyle& style)
// Set opacity, if it is not animating.
if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(&renderer(), CSSPropertyOpacity, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
updateOpacity(style);
-
-#if ENABLE(CSS_FILTERS)
+
updateFilters(style);
-#endif
#if ENABLE(CSS_COMPOSITING)
updateBlendMode(style);
{
bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
-#if ENABLE(CSS_FILTERS)
bool hasFilter = keyframes.containsProperty(CSSPropertyWebkitFilter);
-#else
- bool hasFilter = false;
-#endif
if (!hasOpacity && !hasTransform && !hasFilter)
return false;
KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
KeyframeValueList opacityVector(AnimatedPropertyOpacity);
-#if ENABLE(CSS_FILTERS)
KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
-#endif
size_t numKeyframes = keyframes.size();
for (size_t i = 0; i < numKeyframes; ++i) {
if ((hasOpacity && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyOpacity))
opacityVector.insert(FloatAnimationValue::create(key, keyframeStyle->opacity(), tf));
-#if ENABLE(CSS_FILTERS)
if ((hasFilter && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyWebkitFilter))
filterVector.insert(FilterAnimationValue::create(key, keyframeStyle->filter(), tf));
-#endif
}
if (renderer().frame().page() && !renderer().frame().page()->settings().acceleratedCompositedAnimationsEnabled())
if (hasOpacity && m_graphicsLayer->addAnimation(opacityVector, IntSize(), anim, keyframes.animationName(), timeOffset))
didAnimate = true;
-#if ENABLE(CSS_FILTERS)
if (hasFilter && m_graphicsLayer->addAnimation(filterVector, IntSize(), anim, keyframes.animationName(), timeOffset))
didAnimate = true;
-#endif
return didAnimate;
}
}
}
-#if ENABLE(CSS_FILTERS)
if (property == CSSPropertyWebkitFilter && m_owningLayer.hasFilter()) {
const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
}
}
}
-#endif
return didAnimate;
}
cssProperty = CSSPropertyBackgroundColor;
break;
case AnimatedPropertyWebkitFilter:
-#if ENABLE(CSS_FILTERS)
cssProperty = CSSPropertyWebkitFilter;
-#else
- ASSERT_NOT_REACHED();
-#endif
break;
case AnimatedPropertyInvalid:
ASSERT_NOT_REACHED();
return AnimatedPropertyOpacity;
case CSSPropertyBackgroundColor:
return AnimatedPropertyBackgroundColor;
-#if ENABLE(CSS_FILTERS)
case CSSPropertyWebkitFilter:
return AnimatedPropertyWebkitFilter;
-#endif
default:
// It's fine if we see other css properties here; they are just not accelerated.
break;
GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }
GraphicsLayer* layerForScrollCorner() const { return m_layerForScrollCorner.get(); }
-#if ENABLE(CSS_FILTERS)
bool canCompositeFilters() const { return m_canCompositeFilters; }
-#endif
// Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers.
double backingStoreMemoryEstimate() const;
void updateOpacity(const RenderStyle&);
void updateTransform(const RenderStyle&);
-#if ENABLE(CSS_FILTERS)
void updateFilters(const RenderStyle&);
-#endif
#if ENABLE(CSS_COMPOSITING)
void updateBlendMode(const RenderStyle&);
#endif
bool m_isMainFrameRenderViewLayer;
bool m_usingTiledCacheLayer;
bool m_requiresOwnBackingStore;
-#if ENABLE(CSS_FILTERS)
bool m_canCompositeFilters;
-#endif
bool m_backgroundLayerPaintsFixedRootBackground;
static bool m_creatingPrimaryGraphicsLayer;
AnimationController& animController = renderer.animation();
return (animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyOpacity, activeAnimationState)
&& (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
-#if ENABLE(CSS_FILTERS)
|| animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitFilter, activeAnimationState)
-#endif // CSS_FILTERS
|| animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform, activeAnimationState);
}
bool RenderLayerCompositor::requiresCompositingForFilters(RenderLayerModelObject& renderer) const
{
-#if ENABLE(CSS_FILTERS)
if (!(m_compositingTriggers & ChromeClient::FilterTrigger))
return false;
return renderer.hasFilter();
-#else
- UNUSED_PARAM(renderer);
- return false;
-#endif
}
bool RenderLayerCompositor::isAsyncScrollableStickyLayer(const RenderLayer& layer, const RenderLayer** enclosingAcceleratedOverflowLayer) const
#include "config.h"
-#if ENABLE(CSS_FILTERS)
#include "RenderLayerFilterInfo.h"
#include "CachedSVGDocument.h"
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef RenderLayerFilterInfo_h
#define RenderLayerFilterInfo_h
-#if ENABLE(CSS_FILTERS)
-
#include "CachedResourceHandle.h"
#include "CachedSVGDocumentClient.h"
#include "RenderLayer.h"
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // RenderLayerFilterInfo_h
|| oldStyle->hasClip() != newStyle.hasClip()
|| oldStyle->opacity() != newStyle.opacity()
|| oldStyle->transform() != newStyle.transform()
-#if ENABLE(CSS_FILTERS)
|| oldStyle->filter() != newStyle.filter()
-#endif
)
layer()->repaintIncludingDescendants();
} else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter()) {
repaintContainer = &compLayer->renderer();
}
}
-
-#if ENABLE(CSS_FILTERS)
if (view().hasSoftwareFilters()) {
if (RenderLayer* parentLayer = enclosingLayer()) {
RenderLayer* enclosingFilterLayer = parentLayer->enclosingFilterLayer();
return &enclosingFilterLayer->renderer();
}
}
-#endif
// If we have a flow thread, then we need to do individual repaints within the RenderRegions instead.
// Return the flow thread as a repaint container in order to create a chokepoint that allows us to change
return;
}
-#if ENABLE(CSS_FILTERS)
if (repaintContainer->hasFilter() && repaintContainer->layer() && repaintContainer->layer()->requiresFullLayerImageForFilters()) {
repaintContainer->layer()->setFilterBackendNeedsRepaintingInRect(r);
return;
}
-#endif
RenderView& v = view();
if (repaintContainer->isRenderView()) {
, m_renderQuoteHead(0)
, m_renderCounterCount(0)
, m_selectionWasCaret(false)
-#if ENABLE(CSS_FILTERS)
, m_hasSoftwareFilters(false)
-#endif
#if ENABLE(SERVICE_CONTROLS)
, m_selectionRectGatherer(*this)
#endif
ImageQualityController& imageQualityController();
-#if ENABLE(CSS_FILTERS)
void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
-#endif
uint64_t rendererCount() const { return m_rendererCount; }
void didCreateRenderer() { ++m_rendererCount; }
unsigned m_renderCounterCount;
bool m_selectionWasCaret;
-#if ENABLE(CSS_FILTERS)
bool m_hasSoftwareFilters;
-#endif
HashSet<RenderElement*> m_renderersWithPausedImageAnimation;
return true;
}
-#if ENABLE(CSS_FILTERS)
if (rareNonInheritedData->hasFilters() != other->rareNonInheritedData->hasFilters())
return true;
-#endif
const QuotesData* quotesDataA = rareInheritedData->quotes.get();
const QuotesData* quotesDataB = other->rareInheritedData->quotes.get();
// Don't return; keep looking for another change.
}
-#if ENABLE(CSS_FILTERS)
if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_filter.get()
&& *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData->m_filter.get()) {
changedContextSensitiveProperties |= ContextSensitivePropertyFilter;
// Don't return; keep looking for another change.
}
-#endif
if (rareNonInheritedData->m_mask != other->rareNonInheritedData->m_mask
|| rareNonInheritedData->m_maskBoxImage != other->rareNonInheritedData->m_maskBoxImage)
#include "StyleBackgroundData.h"
#include "StyleBoxData.h"
#include "StyleDeprecatedFlexibleBoxData.h"
+#include "StyleFilterData.h"
#include "StyleFlexibleBoxData.h"
#include "StyleMarqueeData.h"
#include "StyleMultiColData.h"
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
-#if ENABLE(CSS_FILTERS)
-#include "StyleFilterData.h"
-#endif
-
#if ENABLE(CSS_GRID_LAYOUT)
#include "StyleGridData.h"
#include "StyleGridItemData.h"
namespace WebCore {
-#if ENABLE(CSS_FILTERS)
class FilterOperations;
-#endif
-
class BorderData;
class CounterContent;
class CursorList;
return imageOutsets(maskBoxImage());
}
-#if ENABLE(CSS_FILTERS)
bool hasFilterOutsets() const { return hasFilter() && filter().hasOutsets(); }
FilterOutsets filterOutsets() const { return hasFilter() ? filter().outsets() : FilterOutsets(); }
-#endif
Order rtlOrdering() const { return static_cast<Order>(inherited_flags.m_rtlOrdering); }
void setRTLOrdering(Order o) { inherited_flags.m_rtlOrdering = o; }
ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
-#if ENABLE(CSS_FILTERS)
FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
-#else
- bool hasFilter() const { return false; }
-#endif
#if ENABLE(CSS_COMPOSITING)
BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode); }
void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_rubyPosition, position); }
-#if ENABLE(CSS_FILTERS)
void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_filter, m_operations, ops); }
-#endif
void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); }
static const Vector<StyleDashboardRegion>& initialDashboardRegions();
static const Vector<StyleDashboardRegion>& noneDashboardRegions();
#endif
-#if ENABLE(CSS_FILTERS)
static const FilterOperations& initialFilter() { DEPRECATED_DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
-#endif
#if ENABLE(CSS_COMPOSITING)
static BlendMode initialBlendMode() { return BlendModeNormal; }
static Isolation initialIsolation() { return IsolationAuto; }
#include "StyleFilterData.h"
#include "FEGaussianBlur.h"
-
-#if ENABLE(CSS_FILTERS)
-
#include "RenderStyle.h"
namespace WebCore {
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
#ifndef StyleFilterData_h
#define StyleFilterData_h
-#if ENABLE(CSS_FILTERS)
-
#include "FilterOperations.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
} // namespace WebCore
-#endif // ENABLE(CSS_FILTERS)
-
#endif // StyleFilterData_h
, m_marquee(StyleMarqueeData::create())
, m_multiCol(StyleMultiColData::create())
, m_transform(StyleTransformData::create())
-#if ENABLE(CSS_FILTERS)
, m_filter(StyleFilterData::create())
-#endif
#if ENABLE(CSS_GRID_LAYOUT)
, m_grid(StyleGridData::create())
, m_gridItem(StyleGridItemData::create())
, m_marquee(o.m_marquee)
, m_multiCol(o.m_multiCol)
, m_transform(o.m_transform)
-#if ENABLE(CSS_FILTERS)
, m_filter(o.m_filter)
-#endif
#if ENABLE(CSS_GRID_LAYOUT)
, m_grid(o.m_grid)
, m_gridItem(o.m_gridItem)
&& m_marquee == o.m_marquee
&& m_multiCol == o.m_multiCol
&& m_transform == o.m_transform
-#if ENABLE(CSS_FILTERS)
&& m_filter == o.m_filter
-#endif
#if ENABLE(CSS_GRID_LAYOUT)
&& m_grid == o.m_grid
&& m_gridItem == o.m_gridItem
bool StyleRareNonInheritedData::hasFilters() const
{
-#if ENABLE(CSS_FILTERS)
return m_filter.get() && !m_filter->m_operations.isEmpty();
-#else
- return false;
-#endif
}
} // namespace WebCore
class AnimationList;
class ShadowData;
class StyleDeprecatedFlexibleBoxData;
-#if ENABLE(CSS_FILTERS)
class StyleFilterData;
-#endif
class StyleFlexibleBoxData;
#if ENABLE(CSS_GRID_LAYOUT)
class StyleGridData;
DataRef<StyleMarqueeData> m_marquee; // Marquee properties
DataRef<StyleMultiColData> m_multiCol; // CSS3 multicol properties
DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.)
-
-#if ENABLE(CSS_FILTERS)
DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, etc.)
-#endif
#if ENABLE(CSS_GRID_LAYOUT)
DataRef<StyleGridData> m_grid;
void RenderSVGResourceContainer::markAllClientLayersForInvalidation()
{
-#if ENABLE(CSS_FILTERS)
for (auto* clientLayer : m_clientLayers)
clientLayer->filterNeedsRepaint();
-#endif
}
void RenderSVGResourceContainer::markClientForInvalidation(RenderObject& client, InvalidationMode mode)
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2014-09-04 Pratik Solanki <psolanki@apple.com>
Remove iOS specific disk image cache
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
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_FILTERS) $(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_FILTERS) $(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_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_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_FILTERS) $(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_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));
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+ (IPC::ArgumentCoder<WebCore::FilterOperations>::decode):
+ (IPC::ArgumentCoder<GraphicsLayerAnimation>::encode):
+ (IPC::ArgumentCoder<GraphicsLayerAnimation>::decode):
+ (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
+ (IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
+ * Shared/WebCoreArgumentCoders.cpp:
+ * Shared/WebCoreArgumentCoders.h:
+ * WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp:
+ (WebKit::GraphicsLayerCARemote::filtersCanBeComposited):
+ * WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
+ * WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
+ * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+ (WebKit::PlatformCAAnimationRemote::setFromValue):
+ (WebKit::PlatformCAAnimationRemote::setToValue):
+ (WebKit::PlatformCAAnimationRemote::setValues):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::updateClonedLayerProperties):
+ (WebKit::PlatformCALayerRemote::filtersCanBeComposited):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
2014-09-04 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r173245.
ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
ENABLE_CSS_DEVICE_ADAPTATION = ;
-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
ENABLE_CSS_IMAGE_ORIENTATION = ;
ENABLE_CSS_IMAGE_RESOLUTION = ;
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_FILTERS) $(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_FILTERS) $(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_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_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_FILTERS) $(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_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));
#include <WebCore/Animation.h>
#include <WebCore/Color.h>
#include <WebCore/CoordinatedGraphicsState.h>
+#include <WebCore/FilterOperations.h>
#include <WebCore/FloatPoint3D.h>
#include <WebCore/GraphicsLayerAnimation.h>
#include <WebCore/IdentityTransformOperation.h>
#include <WebCore/TransformationMatrix.h>
#include <WebCore/TranslateTransformOperation.h>
-#if ENABLE(CSS_FILTERS)
-#include <WebCore/FilterOperations.h>
-#endif
-
#if USE(GRAPHICS_SURFACE)
#include <WebCore/GraphicsSurface.h>
#endif
namespace IPC {
-#if ENABLE(CSS_FILTERS)
void ArgumentCoder<WebCore::FilterOperations>::encode(ArgumentEncoder& encoder, const WebCore::FilterOperations& filters)
{
encoder << static_cast<uint32_t>(filters.size());
return true;
}
-#endif
void ArgumentCoder<TransformOperations>::encode(ArgumentEncoder& encoder, const TransformOperations& transformOperations)
{
case AnimatedPropertyWebkitTransform:
encoder << static_cast<const TransformAnimationValue&>(value).value();
break;
-#if ENABLE(CSS_FILTERS)
case AnimatedPropertyWebkitFilter:
encoder << static_cast<const FilterAnimationValue&>(value).value();
break;
-#endif
default:
break;
}
keyframes.insert(TransformAnimationValue::create(keyTime, transform, timingFunction.get()));
break;
}
-#if ENABLE(CSS_FILTERS)
case AnimatedPropertyWebkitFilter: {
FilterOperations filter;
if (!decoder.decode(filter))
keyframes.insert(FilterAnimationValue::create(keyTime, filter, timingFunction.get()));
break;
}
-#endif
default:
break;
}
if (state.debugBorderWidthChanged)
encoder << state.debugBorderWidth;
-#if ENABLE(CSS_FILTERS)
if (state.filtersChanged)
encoder << state.filters;
-#endif
if (state.animationsChanged)
encoder << state.animations;
if (state.debugBorderWidthChanged && !decoder.decode(state.debugBorderWidth))
return false;
-#if ENABLE(CSS_FILTERS)
if (state.filtersChanged && !decoder.decode(state.filters))
return false;
-#endif
if (state.animationsChanged && !decoder.decode(state.animations))
return false;
class TransformOperations;
struct Length;
-#if ENABLE(CSS_FILTERS)
class FilterOperations;
-#endif
#if USE(GRAPHICS_SURFACE)
struct GraphicsSurfaceToken;
namespace IPC {
-#if ENABLE(CSS_FILTERS)
template<> struct ArgumentCoder<WebCore::FilterOperations> {
static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
};
-#endif
template<> struct ArgumentCoder<WebCore::TransformOperations> {
static void encode(ArgumentEncoder&, const WebCore::TransformOperations&);
return true;
}
-#if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
+#if !USE(COORDINATED_GRAPHICS)
void ArgumentCoder<FilterOperation>::encode(ArgumentEncoder& encoder, const FilterOperation& filter)
{
encoder.encodeEnum(filter.type());
return true;
}
-#endif // ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
+#endif // !USE(COORDINATED_GRAPHICS)
#if ENABLE(INDEXED_DATABASE)
void ArgumentCoder<IDBDatabaseMetadata>::encode(ArgumentEncoder& encoder, const IDBDatabaseMetadata& metadata)
static bool decode(ArgumentDecoder&, WebCore::StickyPositionViewportConstraints&);
};
-#if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
+#if !USE(COORDINATED_GRAPHICS)
template<> struct ArgumentCoder<WebCore::FilterOperations> {
static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
{
}
-#if ENABLE(CSS_FILTERS)
bool GraphicsLayerCARemote::filtersCanBeComposited(const FilterOperations& filters)
{
return PlatformCALayerRemote::filtersCanBeComposited(filters);
}
-#endif
PassRefPtr<PlatformCALayer> GraphicsLayerCARemote::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
{
}
virtual ~GraphicsLayerCARemote();
-
-#if ENABLE(CSS_FILTERS)
+
virtual bool filtersCanBeComposited(const WebCore::FilterOperations& filters) override;
-#endif
private:
virtual bool isGraphicsLayerCARemote() const override { return true; }
virtual void setFromValue(const WebCore::TransformationMatrix&) override;
virtual void setFromValue(const WebCore::FloatPoint3D&) override;
virtual void setFromValue(const WebCore::Color&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setFromValue(const WebCore::FilterOperation*, int internalFilterPropertyIndex) override;
-#endif
virtual void copyFromValueFrom(const WebCore::PlatformCAAnimation*) override;
virtual void setToValue(float) override;
virtual void setToValue(const WebCore::TransformationMatrix&) override;
virtual void setToValue(const WebCore::FloatPoint3D&) override;
virtual void setToValue(const WebCore::Color&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setToValue(const WebCore::FilterOperation*, int internalFilterPropertyIndex) override;
-#endif
virtual void copyToValueFrom(const WebCore::PlatformCAAnimation*) override;
// Keyframe-animation properties.
virtual void setValues(const Vector<WebCore::TransformationMatrix>&) override;
virtual void setValues(const Vector<WebCore::FloatPoint3D>&) override;
virtual void setValues(const Vector<WebCore::Color>&) override;
-#if ENABLE(CSS_FILTERS)
virtual void setValues(const Vector<RefPtr<WebCore::FilterOperation>>&, int internalFilterPropertyIndex) override;
-#endif
virtual void copyValuesFrom(const WebCore::PlatformCAAnimation*) override;
virtual void setKeyTimes(const Vector<float>&) override;
m_properties.keyValues[0] = KeyframeValue(value);
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationRemote::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
{
if (animationType() != Basic)
m_properties.keyValues.resize(2);
m_properties.keyValues[0] = KeyframeValue(operation->clone());
}
-#endif
void PlatformCAAnimationRemote::copyFromValueFrom(const PlatformCAAnimation* value)
{
m_properties.keyValues[1] = KeyframeValue(value);
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationRemote::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
{
if (animationType() != Basic)
m_properties.keyValues.resize(2);
m_properties.keyValues[1] = KeyframeValue(operation->clone());
}
-#endif
void PlatformCAAnimationRemote::copyToValueFrom(const PlatformCAAnimation* value)
{
m_properties.keyValues = WTF::move(keyframes);
}
-#if ENABLE(CSS_FILTERS)
void PlatformCAAnimationRemote::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
{
UNUSED_PARAM(internalFilterPropertyIndex);
m_properties.keyValues = WTF::move(keyframes);
}
-#endif
void PlatformCAAnimationRemote::copyValuesFrom(const PlatformCAAnimation* value)
{
clone.setOpaque(isOpaque());
clone.setBackgroundColor(backgroundColor());
clone.setContentsScale(contentsScale());
-#if ENABLE(CSS_FILTERS)
if (m_properties.filters)
clone.copyFiltersFrom(this);
-#endif
clone.updateCustomAppearance(customAppearance());
}
m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::OpacityChanged);
}
-#if ENABLE(CSS_FILTERS)
void PlatformCALayerRemote::setFilters(const FilterOperations& filters)
{
m_properties.filters = std::make_unique<FilterOperations>(filters);
{
return PlatformCALayerMac::filtersCanBeComposited(filters);
}
-#endif
void PlatformCALayerRemote::setName(const String& value)
{
virtual float opacity() const override;
virtual void setOpacity(float) override;
-#if ENABLE(CSS_FILTERS)
virtual void setFilters(const WebCore::FilterOperations&) override;
static bool filtersCanBeComposited(const WebCore::FilterOperations&);
virtual void copyFiltersFrom(const WebCore::PlatformCALayer*) override;
-#endif
#if ENABLE(CSS_COMPOSITING)
virtual void setBlendMode(WebCore::BlendMode) override;
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_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
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_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_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK "Toggle Box Decoration break (CSS Backgrounds and Borders) support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_COMPOSITING "Toggle CSS COMPOSITING support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_DEVICE_ADAPTATION "Toggle CSS Device Adaptation support" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_CSS_FILTERS "Toggle CSS Filters support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_GRID_LAYOUT "Toggle CSS Grid Layout support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_ORIENTATION "Toggle CSS image-orientation support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" OFF)
#cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
#cmakedefine01 ENABLE_CSS_COMPOSITING
-#cmakedefine01 ENABLE_CSS_FILTERS
#cmakedefine01 ENABLE_CSS_GRID_LAYOUT
#cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
#cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
2014-09-04 Commit Queue <commit-queue@webkit.org>
Unreviewed, rolling out r173201.
{ option => "css-shapes", desc => "Toggle CSS Shapes support",
define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
- { option => "css-filters", desc => "Toggle CSS Filters support",
- define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit() || isEfl() || isGtk()), value => \$cssFiltersSupport },
-
{ option => "css-grid-layout", desc => "Toggle CSS Grid Layout support",
define => "ENABLE_CSS_GRID_LAYOUT", default => 1, value => \$cssGridLayoutSupport },
+2014-09-04 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
+
+ Remove CSS_FILTERS flag
+ https://bugs.webkit.org/show_bug.cgi?id=136529
+
+ Reviewed by Dirk Schulze.
+
+ * win/tools/vsprops/FeatureDefines.props:
+ * win/tools/vsprops/FeatureDefinesCairo.props:
+
2014-08-27 peavo@outlook.com <peavo@outlook.com>
[WinCairo] Link error.
<ENABLE_CSS3_TEXT />
<ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
<ENABLE_CSS_COMPOSITING />
- <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
<ENABLE_CSS_GRID_LAYOUT>ENABLE_CSS_GRID_LAYOUT</ENABLE_CSS_GRID_LAYOUT>
<ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
<ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<Value>$(ENABLE_CSS_COMPOSITING)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_CSS_FILTERS">
- <Value>$(ENABLE_CSS_FILTERS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_CSS_IMAGE_SET">
<Value>$(ENABLE_CSS_IMAGE_SET)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
<ENABLE_CSS3_TEXT />
<ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
<ENABLE_CSS_COMPOSITING />
- <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
<ENABLE_CSS_GRID_LAYOUT>ENABLE_CSS_GRID_LAYOUT</ENABLE_CSS_GRID_LAYOUT>
<ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
<ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<Value>$(ENABLE_CSS_COMPOSITING)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_CSS_FILTERS">
- <Value>$(ENABLE_CSS_FILTERS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_CSS_IMAGE_SET">
<Value>$(ENABLE_CSS_IMAGE_SET)</Value>
<EnvironmentVariable>true</EnvironmentVariable>