Remove CSS_FILTERS flag

author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Thu, 4 Sep 2014 18:43:39 +0000 (18:43 +0000)

committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Thu, 4 Sep 2014 18:43:39 +0000 (18:43 +0000)
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Sep 2014 18:43:39 +0000 (18:43 +0000)
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Sep 2014 18:43:39 +0000 (18:43 +0000)
diff --git a/ChangeLog b/ChangeLog

index e0328aa4a9b3f7da514910694780c7f1abe0a549..b1d87730bab0392e0ad073ff133ac0ee4af19ee8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog

index cc6e491417e837b53ee30924221e55c55c48f739..4f84c83c36ba3fc1a8f5c98dd2f017d49d013181 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations

index a9b02b5815a4e6929dabbc16327c837924302460..c3e3152f3082f5cad75e87142ebda08166882508 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -288,7 +288,6 @@ webkit.org/b/65709 canvas/philip/tests/2d.drawImage.outsidesource.html [ Failure
  # 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 ]
  
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog

index 8a58f2b1374b5da538595f56feeb91db2f4ee6d8..dd7710e0916ae2ab70bd815e564518f87f5665c1 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

index 84f1bfaa3fe705f6d39c8e4380544191dd54e509..705baafd155c04bef58ebc6e335e980e0c9022af 100644 (file)
--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -52,7 +52,6 @@ ENABLE_CSP_NEXT = ;
  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 = ;
@@ -272,4 +271,4 @@ ENABLE_LLINT_C_LOOP = ;
  
  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));
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog

index d8ce3ddcd1068c3943dd918b9d4a02807a0c8452..7a72255e209a7c44405a5d3b9218338fbd5c7963 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h

index 18179f979782d9f029ce98886dca4c75f602a223..bf6f6e0e44f8cad3431064ee30861a91f45fa1b5 100644 (file)
--- a/Source/WTF/wtf/FeatureDefines.h
+++ b/Source/WTF/wtf/FeatureDefines.h
@@ -372,10 +372,6 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
  #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
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index d749fb4d8b16c1b35ff2f004949d81ddc2251138..caf1bddba627c7cacb21b95650ed41de021e96d8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,208 @@
+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
diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig

index 84f1bfaa3fe705f6d39c8e4380544191dd54e509..705baafd155c04bef58ebc6e335e980e0c9022af 100644 (file)
--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
@@ -52,7 +52,6 @@ ENABLE_CSP_NEXT = ;
  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 = ;
@@ -272,4 +271,4 @@ ENABLE_LLINT_C_LOOP = ;
  
  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));
diff --git a/Source/WebCore/DerivedSources.cpp b/Source/WebCore/DerivedSources.cpp

index 74a52bf2d5c3c66c19868f764ae4c3320461ae02..624ce17842e3aa8a4e7290efa2ea21bd4b001e32 100644 (file)
--- a/Source/WebCore/DerivedSources.cpp
+++ b/Source/WebCore/DerivedSources.cpp
@@ -494,9 +494,7 @@
  #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"
diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in

index d21eb3e34a54e192ed31daa4146ee7394296b12f..330a6b42fc3b7bd9f1c125df902f91c8b378c6fc 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -683,6 +683,7 @@ __ZN7WebCore16DeviceMotionData12Acceleration6createEbdbdbd
  __ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
  __ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
  __ZN7WebCore16FilterOperationsC1Ev
+__ZN7WebCore16FilterOperationsaSERKS0_
  __ZN7WebCore16FontPlatformDataD1Ev
  __ZN7WebCore16FrameLoadRequestC1EPNS_5FrameERKNS_15ResourceRequestERKNS_14SubstituteDataE
  __ZN7WebCore16HTMLInputElement13setAutofilledEb
@@ -3008,10 +3009,6 @@ __ZN7WebCore12DOMWindowCSS6createEv
  __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
  #endif
  
-#if ENABLE(CSS_FILTERS)
-__ZN7WebCore16FilterOperationsaSERKS0_
-#endif
-
  #if ENABLE(CSS_SCROLL_SNAP)
  __ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
  __ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
diff --git a/Source/WebCore/bindings/js/JSCSSValueCustom.cpp b/Source/WebCore/bindings/js/JSCSSValueCustom.cpp

index b54de7bf15a70b151236f7b54c614db5d5f79f02..4ad1f60e526eb8f2d06487bd85f4a3f9a4ccaf27 100644 (file)
--- a/Source/WebCore/bindings/js/JSCSSValueCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCSSValueCustom.cpp
@@ -33,15 +33,12 @@
  #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;
  
@@ -87,10 +84,8 @@ JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, CSSValue* value)
  
      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())
diff --git a/Source/WebCore/bindings/objc/DOMCSS.mm b/Source/WebCore/bindings/objc/DOMCSS.mm

index bda7126a4bf1f479b5f019df2dcea35259c4e4a0..90f6b9d2e35cdb270ec26823aa7da8a15e59c044 100644 (file)
--- a/Source/WebCore/bindings/objc/DOMCSS.mm
+++ b/Source/WebCore/bindings/objc/DOMCSS.mm
@@ -48,14 +48,11 @@
  #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
@@ -126,10 +123,8 @@ Class kitClass(WebCore::CSSValue* impl)
          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:
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

index e81e3d40d4dfd8eb70694ad9dfab1fb774a53410..78fdc6b79a811d5004468d519402a2b0f9dc2231 100644 (file)
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -62,6 +62,7 @@
  #include "StyleProperties.h"
  #include "StylePropertyShorthand.h"
  #include "StyleResolver.h"
+#include "WebKitCSSFilterValue.h"
  #include "WebKitCSSTransformValue.h"
  #include "WebKitFontFamilyNames.h"
  #include <wtf/NeverDestroyed.h>
@@ -77,10 +78,6 @@
  #include "ShapeValue.h"
  #endif
  
-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
  #if ENABLE(DASHBOARD_SUPPORT)
  #include "DashboardRegion.h"
  #endif
@@ -282,9 +279,6 @@ static const CSSPropertyID computedProperties[] = {
  #endif
  #if ENABLE(DASHBOARD_SUPPORT)
      CSSPropertyWebkitDashboardRegion,
-#endif
-#if ENABLE(CSS_FILTERS)
-    CSSPropertyWebkitFilter,
  #endif
      CSSPropertyWebkitAlignContent,
      CSSPropertyWebkitAlignItems,
@@ -296,6 +290,7 @@ static const CSSPropertyID computedProperties[] = {
      CSSPropertyWebkitFlexWrap,
      CSSPropertyWebkitJustifyContent,
      CSSPropertyWebkitJustifySelf,
+    CSSPropertyWebkitFilter,
      CSSPropertyWebkitFontKerning,
      CSSPropertyWebkitFontSmoothing,
      CSSPropertyWebkitFontVariantLigatures,
@@ -883,7 +878,6 @@ PassRef<CSSValue> ComputedStyleExtractor::valueForShadow(const ShadowData* shado
      return WTF::move(list);
  }
  
-#if ENABLE(CSS_FILTERS)
  PassRef<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderStyle* style, const FilterOperations& filterOperations, AdjustPixelValuesForComputedStyle adjust)
  {
      if (filterOperations.operations().isEmpty())
@@ -974,7 +968,6 @@ PassRef<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderStyle* styl
  
      return WTF::move(list);
  }
-#endif
  
  #if ENABLE(CSS_GRID_LAYOUT)
  static PassRef<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const RenderStyle* style)
@@ -1618,9 +1611,7 @@ static bool isLayoutDependent(CSSPropertyID propertyID, RenderStyle* style, Rend
      case CSSPropertyWebkitPerspectiveOrigin:
      case CSSPropertyWebkitTransformOrigin:
      case CSSPropertyWebkitTransform:
-#if ENABLE(CSS_FILTERS)
      case CSSPropertyWebkitFilter:
-#endif
          return true;
      case CSSPropertyMargin: {
          if (!renderer || !renderer->isBox())
@@ -2917,10 +2908,8 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
          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());
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.h b/Source/WebCore/css/CSSComputedStyleDeclaration.h

index e06271fa81c9705503cc8ba1d98ac0cd413b1cea..34af2a50fd86101ad7fcc423d00d7807c08e27c0 100644 (file)
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.h
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.h
@@ -58,9 +58,7 @@ public:
      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
diff --git a/Source/WebCore/css/CSSFilterImageValue.cpp b/Source/WebCore/css/CSSFilterImageValue.cpp

index b0a7e69d9187df3896c4cbf4b224d7059d7fc503..2f986fd4989e3ecfacaea0a9d2095f48e57eb536 100644 (file)
--- a/Source/WebCore/css/CSSFilterImageValue.cpp
+++ b/Source/WebCore/css/CSSFilterImageValue.cpp
@@ -27,8 +27,6 @@
  #include "config.h"
  #include "CSSFilterImageValue.h"
  
-#if ENABLE(CSS_FILTERS)
-
  #include "CSSImageValue.h"
  #include "CachedImage.h"
  #include "CachedResourceLoader.h"
@@ -168,5 +166,3 @@ bool CSSFilterImageValue::equalInputImages(const CSSFilterImageValue& other) con
  }
  
  } // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/css/CSSFilterImageValue.h b/Source/WebCore/css/CSSFilterImageValue.h

index 5b2402811c496e997271500b89efa7d7f3eff011..6005f7e7c04c684ad09989ae89b703b201f8a063 100644 (file)
--- a/Source/WebCore/css/CSSFilterImageValue.h
+++ b/Source/WebCore/css/CSSFilterImageValue.h
@@ -27,8 +27,6 @@
  #ifndef CSSFilterImageValue_h
  #define CSSFilterImageValue_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "CSSImageGeneratorValue.h"
  #include "CSSPrimitiveValue.h"
  #include "CachedImageClient.h"
@@ -123,6 +121,4 @@ CSS_VALUE_TYPE_CASTS(CSSFilterImageValue, isFilterImageValue())
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // CSSFilterImageValue_h
diff --git a/Source/WebCore/css/CSSImageGeneratorValue.cpp b/Source/WebCore/css/CSSImageGeneratorValue.cpp

index 0525e41f4541048c12b39d58b7c805167f8625b6..0ef774f84b1ba653969cea18a5ed44629960b4f2 100644 (file)
--- a/Source/WebCore/css/CSSImageGeneratorValue.cpp
+++ b/Source/WebCore/css/CSSImageGeneratorValue.cpp
@@ -112,10 +112,8 @@ PassRefPtr<Image> CSSImageGeneratorValue::image(RenderElement* renderer, const F
          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:
@@ -133,10 +131,8 @@ bool CSSImageGeneratorValue::isFixedSize() const
          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:
@@ -154,10 +150,8 @@ FloatSize CSSImageGeneratorValue::fixedSize(const RenderElement* renderer)
          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:
@@ -175,10 +169,8 @@ bool CSSImageGeneratorValue::isPending() const
          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:
@@ -196,10 +188,8 @@ bool CSSImageGeneratorValue::knownToBeOpaque(const RenderElement* renderer) cons
          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:
@@ -219,11 +209,9 @@ void CSSImageGeneratorValue::loadSubimages(CachedResourceLoader* cachedResourceL
      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;
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp

index 2abf1882570d27a649bc276514f17c247a59ea96..42ee46bc1581fe6f2660264726da8dada1ffaa4e 100644 (file)
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -78,6 +78,7 @@
  #include "StyleRuleImport.h"
  #include "StyleSheetContents.h"
  #include "TextEncoding.h"
+#include "WebKitCSSFilterValue.h"
  #include "WebKitCSSKeyframeRule.h"
  #include "WebKitCSSKeyframesRule.h"
  #include "WebKitCSSRegionRule.h"
@@ -100,10 +101,6 @@
  #include "CSSImageSetValue.h"
  #endif
  
-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
  #if ENABLE(CSS_SCROLL_SNAP)
  #include "LengthRepeat.h"
  #endif
@@ -2456,7 +2453,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
      case CSSPropertyWebkitBoxOrdinalGroup:
          validPrimitive = validUnit(value, FInteger | FNonNeg, CSSStrictMode) && value->fValue;
          break;
-#if ENABLE(CSS_FILTERS)
      case CSSPropertyWebkitFilter:
          if (id == CSSValueNone)
              validPrimitive = true;
@@ -2468,7 +2464,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
              return true;
          }
          break;
-#endif
  #if ENABLE(CSS_COMPOSITING)
      case CSSPropertyMixBlendMode:
          if (cssCompositingEnabled())
@@ -8709,15 +8704,12 @@ bool CSSParser::parseGeneratedImage(CSSParserValueList* valueList, RefPtr<CSSVal
      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;
@@ -8758,7 +8750,6 @@ bool CSSParser::parseFilterImage(CSSParserValueList* valueList, RefPtr<CSSValue>
  
      return true;
  }
-#endif
  
  bool CSSParser::parseCrossfade(CSSParserValueList* valueList, RefPtr<CSSValue>& crossfade)
  {
@@ -9267,8 +9258,6 @@ bool CSSParser::isCompositeOperator(CSSValueID valueID)
      return valueID >= CSSValueClear && valueID <= CSSValueXor;
  }
  
-#if ENABLE(CSS_FILTERS)
-
  static void filterInfoForName(const CSSParserString& name, WebKitCSSFilterValue::FilterOperationType& filterType, unsigned& maximumArgumentCount)
  {
      if (equalIgnoringCase(name, "grayscale("))
@@ -9430,7 +9419,6 @@ bool CSSParser::parseFilter(CSSParserValueList* valueList, RefPtr<CSSValue>& res
  
      return true;
  }
-#endif
  
  #if ENABLE(CSS_REGIONS)
  static bool validFlowName(const String& flowName)
diff --git a/Source/WebCore/css/CSSParser.h b/Source/WebCore/css/CSSParser.h

index e2ebd3e0a0fecba7b0a355871f9e43fbc39d3559..62c6d3ae5022ab0197ecb6107a222aca3362942e 100644 (file)
--- a/Source/WebCore/css/CSSParser.h
+++ b/Source/WebCore/css/CSSParser.h
@@ -34,16 +34,13 @@
  #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
@@ -263,12 +260,10 @@ public:
      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();
  
@@ -639,9 +634,7 @@ private:
      double parsedDouble(CSSParserValue*, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue);
      
      friend class TransformOperationInfo;
-#if ENABLE(CSS_FILTERS)
      friend class FilterOperationInfo;
-#endif
  };
  
  CSSPropertyID cssPropertyID(const CSSParserString&);
diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in

index 22fa80460e0d137b90b483f378095445aa8d3d11..c8e35b5f2a8c10d46926521f0f5587164b0b0009 100644 (file)
--- a/Source/WebCore/css/CSSPropertyNames.in
+++ b/Source/WebCore/css/CSSPropertyNames.in
@@ -292,9 +292,7 @@ z-index
  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
diff --git a/Source/WebCore/css/CSSValue.cpp b/Source/WebCore/css/CSSValue.cpp

index 46b087fcfb8b01d92f9c9f2ce641314d5ea94b86..aacf686853d5b25ba5107785966393204d2054e6 100644 (file)
--- a/Source/WebCore/css/CSSValue.cpp
+++ b/Source/WebCore/css/CSSValue.cpp
@@ -135,10 +135,8 @@ bool CSSValue::hasFailedOrCanceledSubresources() const
          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();
@@ -169,10 +167,8 @@ bool CSSValue::equals(const CSSValue& other) const
              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:
@@ -223,10 +219,8 @@ bool CSSValue::equals(const CSSValue& other) const
          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:
@@ -259,10 +253,8 @@ String CSSValue::cssText() const
          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:
@@ -313,10 +305,8 @@ String CSSValue::cssText() const
      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:
@@ -421,14 +411,12 @@ void CSSValue::destroy()
          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;
@@ -449,10 +437,8 @@ PassRefPtr<CSSValue> CSSValue::cloneForCSSOM() const
      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)
diff --git a/Source/WebCore/css/CSSValue.h b/Source/WebCore/css/CSSValue.h

index fa64bf4686e58665d329187610d6b09c91e55063..80413f8820a7f76d2bc4ee23b28a1cc2444fc371 100644 (file)
--- a/Source/WebCore/css/CSSValue.h
+++ b/Source/WebCore/css/CSSValue.h
@@ -93,10 +93,8 @@ public:
      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; }
@@ -134,9 +132,7 @@ protected:
          // Image generator classes.
          CanvasClass,
          CrossfadeClass,
-#if ENABLE(CSS_FILTERS)
          FilterImageClass,
-#endif
          LinearGradientClass,
          RadialGradientClass,
  
@@ -171,9 +167,7 @@ protected:
  #if ENABLE(CSS_IMAGE_SET)
          ImageSetClass,
  #endif
-#if ENABLE(CSS_FILTERS)
          WebKitCSSFilterClass,
-#endif
          WebKitCSSTransformClass,
  #if ENABLE(CSS_GRID_LAYOUT)
          GridLineNamesClass,
diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp

index ab186fe2d8e66b9973173187675c05aefb4ab5bc..d02b22cb06ee5ec76335668d93a40685fd942aae 100644 (file)
--- a/Source/WebCore/css/StyleResolver.cpp
+++ b/Source/WebCore/css/StyleResolver.cpp
@@ -66,6 +66,7 @@
  #include "DeprecatedStyleBuilder.h"
  #include "DocumentStyleSheetCollection.h"
  #include "ElementRuleCollector.h"
+#include "FilterOperation.h"
  #include "Frame.h"
  #include "FrameSelection.h"
  #include "FrameView.h"
@@ -128,6 +129,7 @@
  #include "UserAgentStyleSheets.h"
  #include "ViewportStyleResolver.h"
  #include "VisitedLinkState.h"
+#include "WebKitCSSFilterValue.h"
  #include "WebKitCSSKeyframeRule.h"
  #include "WebKitCSSKeyframesRule.h"
  #include "WebKitCSSRegionRule.h"
@@ -138,11 +140,6 @@
  #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"
@@ -236,9 +233,7 @@ inline void StyleResolver::State::clear()
      m_parentStyle = nullptr;
      m_regionForStyling = nullptr;
      m_pendingImageProperties.clear();
-#if ENABLE(CSS_FILTERS)
      m_filtersWithPendingSVGDocuments.clear();
-#endif
      m_cssToLengthConversionData = CSSToLengthConversionData();
  }
  
@@ -2670,7 +2665,6 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
          return;
      }
  
-#if ENABLE(CSS_FILTERS)
      case CSSPropertyWebkitFilter: {
          HANDLE_INHERIT_AND_INITIAL(filter, Filter);
          FilterOperations operations;
@@ -2678,7 +2672,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
              state.style()->setFilter(operations);
          return;
      }
-#endif
+
  #if ENABLE(CSS_GRID_LAYOUT)
      case CSSPropertyWebkitGridAutoColumns: {
          HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns);
@@ -3274,12 +3268,11 @@ PassRefPtr<StyleImage> StyleResolver::cachedOrPendingFromValue(CSSPropertyID pro
  
  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);
@@ -3485,7 +3478,6 @@ bool StyleResolver::hasMediaQueriesAffectedByViewportChange() const
      return false;
  }
  
-#if ENABLE(CSS_FILTERS)
  static FilterOperation::OperationType filterOperationForType(WebKitCSSFilterValue::FilterOperationType type)
  {
      switch (type) {
@@ -3675,8 +3667,6 @@ bool StyleResolver::createFilterOperations(CSSValue* inValue, FilterOperations&
      return true;
  }
  
-#endif
-
  PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
  {
      if (auto imageValue = pendingImage.cssImageValue())
@@ -3837,10 +3827,8 @@ void StyleResolver::loadPendingResources()
      // 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;
diff --git a/Source/WebCore/css/StyleResolver.h b/Source/WebCore/css/StyleResolver.h

index 6ea670680e687d23300f924f18a0bbaa805092ec..c7ee7ab4bdb8afd241acb3b91459f0821beea22a 100644 (file)
--- a/Source/WebCore/css/StyleResolver.h
+++ b/Source/WebCore/css/StyleResolver.h
@@ -238,10 +238,8 @@ public:
  
      void clearCachedPropertiesAffectedByViewportUnits();
  
-#if ENABLE(CSS_FILTERS)
      bool createFilterOperations(CSSValue* inValue, FilterOperations& outOperations);
      void loadPendingSVGDocuments();
-#endif // ENABLE(CSS_FILTERS)
  
      void loadPendingResources();
  
@@ -382,9 +380,8 @@ public:
          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; }
@@ -431,9 +428,9 @@ public:
          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;
diff --git a/Source/WebCore/css/WebKitCSSFilterValue.cpp b/Source/WebCore/css/WebKitCSSFilterValue.cpp

index a4af5d4036ae9c5093da0b6d97217b949e0a1009..86cb4cb6c068675712be722b86d46bff8841d054 100644 (file)
--- a/Source/WebCore/css/WebKitCSSFilterValue.cpp
+++ b/Source/WebCore/css/WebKitCSSFilterValue.cpp
@@ -26,8 +26,6 @@
  #include "config.h"
  #include "WebKitCSSFilterValue.h"
  
-#if ENABLE(CSS_FILTERS)
-
  #include "CSSValueList.h"
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -101,5 +99,3 @@ bool WebKitCSSFilterValue::equals(const WebKitCSSFilterValue& other) const
  }
  
  }
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/css/WebKitCSSFilterValue.h b/Source/WebCore/css/WebKitCSSFilterValue.h

index 9daeeff56fa835eef5f6bfcd2d6ce1d3ec889fff..4f9d9158669f51a0bc1d2d067ff62a830ffe4104 100644 (file)
--- a/Source/WebCore/css/WebKitCSSFilterValue.h
+++ b/Source/WebCore/css/WebKitCSSFilterValue.h
@@ -26,8 +26,6 @@
  #ifndef WebKitCSSFilterValue_h
  #define WebKitCSSFilterValue_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "CSSValueList.h"
  #include <wtf/PassRefPtr.h>
  #include <wtf/RefPtr.h>
@@ -76,6 +74,4 @@ CSS_VALUE_TYPE_CASTS(WebKitCSSFilterValue, isWebKitCSSFilterValue())
  
  }
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif
diff --git a/Source/WebCore/css/WebKitCSSFilterValue.idl b/Source/WebCore/css/WebKitCSSFilterValue.idl

index 7a3c0de0f00b7e04fd45edf9a31db42a008dcf8c..45e7a2efc895e597a24784bb42220a16b5a22a76 100644 (file)
--- a/Source/WebCore/css/WebKitCSSFilterValue.idl
+++ b/Source/WebCore/css/WebKitCSSFilterValue.idl
@@ -24,7 +24,6 @@
   */
  
  [
-    Conditional=CSS_FILTERS,
      DoNotCheckConstants,
      ImplementationLacksVTable,
  ] interface WebKitCSSFilterValue : CSSValueList {
diff --git a/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp b/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp

index fda0cc7b2e45a12045305222241953b67683f256..06f3ab8d7325c5906757ab5957e89db80b47fa5d 100644 (file)
--- a/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp
+++ b/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp
@@ -26,7 +26,6 @@
  #include "config.h"
  #include "CachedSVGDocumentReference.h"
  
-#if ENABLE(CSS_FILTERS)
  #include "CachedResourceHandle.h"
  #include "CachedResourceLoader.h"
  #include "CachedResourceRequest.h"
@@ -64,5 +63,3 @@ void CachedSVGDocumentReference::load(CachedResourceLoader* loader)
  }
  
  }
-
-#endif
diff --git a/Source/WebCore/loader/cache/CachedSVGDocumentReference.h b/Source/WebCore/loader/cache/CachedSVGDocumentReference.h

index c6636afc4fe8bafcfeffada05ec98565090948dd..5da3eec554296557799f262cf4f318d40cb4f4b5 100644 (file)
--- a/Source/WebCore/loader/cache/CachedSVGDocumentReference.h
+++ b/Source/WebCore/loader/cache/CachedSVGDocumentReference.h
@@ -26,7 +26,6 @@
  #ifndef CachedSVGDocumentReference_h
  #define CachedSVGDocumentReference_h
  
-#if ENABLE(CSS_FILTERS)
  #include "CachedResourceHandle.h"
  #include "CachedSVGDocumentClient.h"
  #include <wtf/text/WTFString.h>
@@ -55,6 +54,4 @@ private:
  
  };
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // CachedSVGDocumentReference_h
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp

index 4ae1348575513137219dce457b39cab203c9e759..114de2c763f5cc325adbe8c356b9213300463149 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -1784,13 +1784,12 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
              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())
diff --git a/Source/WebCore/page/animation/AnimationBase.cpp b/Source/WebCore/page/animation/AnimationBase.cpp

index 343001aefabbf2e6a6ec003371f45456417b19f0..da752e0b273242959ebc83dc7c645e2b8702968a 100644 (file)
--- a/Source/WebCore/page/animation/AnimationBase.cpp
+++ b/Source/WebCore/page/animation/AnimationBase.cpp
@@ -72,9 +72,7 @@ AnimationBase::AnimationBase(const Animation& transition, RenderElement* rendere
      : 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)
diff --git a/Source/WebCore/page/animation/AnimationBase.h b/Source/WebCore/page/animation/AnimationBase.h

index fd3cb0acce9a5187ad87322c3514e007d17285c3..3c6ad20bf6edfb5c711f401cb2e0a3c64cc1e258 100644 (file)
--- a/Source/WebCore/page/animation/AnimationBase.h
+++ b/Source/WebCore/page/animation/AnimationBase.h
@@ -185,9 +185,7 @@ public:
  
      // 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);
@@ -242,9 +240,7 @@ protected:
  
      bool m_isAccelerated;
      bool m_transformFunctionListValid;
-#if ENABLE(CSS_FILTERS)
      bool m_filterFunctionListsMatch;
-#endif
      double m_startTime;
      double m_pauseTime;
      double m_requestedStartTime;
diff --git a/Source/WebCore/page/animation/CSSPropertyAnimation.cpp b/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

index bbdee182b822597cf3a6c9e393dc7e3621e95d53..d10f41f9ea5b8697587af229693d8d1cb44a489e 100644 (file)
--- a/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
+++ b/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
@@ -161,7 +161,6 @@ static inline PassRefPtr<ShapeValue> blendFunc(const AnimationBase*, ShapeValue*
  }
  #endif
  
-#if ENABLE(CSS_FILTERS)
  static inline PassRefPtr<FilterOperation> blendFunc(const AnimationBase* anim, FilterOperation* fromOp, FilterOperation* toOp, double progress, bool blendToPassthrough = false)
  {
      ASSERT(toOp);
@@ -224,7 +223,6 @@ static inline PassRefPtr<StyleImage> blendFilter(const AnimationBase* anim, Cach
      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)
  {
@@ -299,7 +297,6 @@ static inline PassRefPtr<StyleImage> blendFunc(const AnimationBase* anim, StyleI
          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.
@@ -308,7 +305,6 @@ static inline PassRefPtr<StyleImage> blendFunc(const AnimationBase* anim, StyleI
              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);
@@ -319,7 +315,6 @@ static inline PassRefPtr<StyleImage> blendFunc(const AnimationBase* anim, StyleI
  
          // 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()) {
@@ -335,7 +330,6 @@ static inline PassRefPtr<StyleImage> blendFunc(const AnimationBase* anim, StyleI
              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.
      }
  
@@ -557,7 +551,6 @@ public:
      }
  };
  
-#if ENABLE(CSS_FILTERS)
  class PropertyWrapperAcceleratedFilter : public PropertyWrapper<const FilterOperations&> {
  public:
      PropertyWrapperAcceleratedFilter()
@@ -572,7 +565,6 @@ public:
          dst->setFilter(blendFunc(anim, a->filter(), b->filter(), progress));
      }
  };
-#endif
  
  static inline size_t shadowListLength(const ShadowData* shadow)
  {
@@ -1221,10 +1213,7 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
  
          new PropertyWrapperAcceleratedOpacity(),
          new PropertyWrapperAcceleratedTransform(),
-#if ENABLE(CSS_FILTERS)
          new PropertyWrapperAcceleratedFilter(),
-#endif
-
          new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
  
  #if ENABLE(CSS_SHAPES)
diff --git a/Source/WebCore/page/animation/ImplicitAnimation.cpp b/Source/WebCore/page/animation/ImplicitAnimation.cpp

index 6d577f7006a0a5b7b055e4186bd2b615787106d2..d626986c6383e406bc3e1c3ba1b43dcc0d96a5d5 100644 (file)
--- a/Source/WebCore/page/animation/ImplicitAnimation.cpp
+++ b/Source/WebCore/page/animation/ImplicitAnimation.cpp
@@ -181,9 +181,7 @@ void ImplicitAnimation::reset(RenderStyle* to)
          
      // set the transform animation list
      validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
      checkForMatchingFilterFunctionLists();
-#endif
  }
  
  void ImplicitAnimation::setOverridden(bool b)
@@ -244,7 +242,6 @@ void ImplicitAnimation::validateTransformFunctionList()
      m_transformFunctionListValid = true;
  }
  
-#if ENABLE(CSS_FILTERS)
  void ImplicitAnimation::checkForMatchingFilterFunctionLists()
  {
      m_filterFunctionListsMatch = false;
@@ -268,7 +265,6 @@ void ImplicitAnimation::checkForMatchingFilterFunctionLists()
      // Filter lists match.
      m_filterFunctionListsMatch = true;
  }
-#endif
  
  double ImplicitAnimation::timeToNextService()
  {
diff --git a/Source/WebCore/page/animation/ImplicitAnimation.h b/Source/WebCore/page/animation/ImplicitAnimation.h

index 9de4bf80b2ec3246de57566695442f3e768ceb02..d42c38b7df1159edc2f856889d57bd7f64cafb67 100644 (file)
--- a/Source/WebCore/page/animation/ImplicitAnimation.h
+++ b/Source/WebCore/page/animation/ImplicitAnimation.h
@@ -79,9 +79,7 @@ protected:
      bool sendTransitionEvent(const AtomicString&, double elapsedTime);
  
      void validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
      void checkForMatchingFilterFunctionLists();
-#endif
  
  private:
      ImplicitAnimation(const Animation&, CSSPropertyID, RenderElement*, CompositeAnimation*, RenderStyle*);
diff --git a/Source/WebCore/page/animation/KeyframeAnimation.cpp b/Source/WebCore/page/animation/KeyframeAnimation.cpp

index 64c23459bae34cc63db326e5b71d1abb3e84a857..089df889a57d883eba6620307c5dc022522addf6 100644 (file)
--- a/Source/WebCore/page/animation/KeyframeAnimation.cpp
+++ b/Source/WebCore/page/animation/KeyframeAnimation.cpp
@@ -53,9 +53,7 @@ KeyframeAnimation::KeyframeAnimation(const Animation& animation, RenderElement*
  
      // Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
      validateTransformFunctionList();
-#if ENABLE(CSS_FILTERS)
      checkForMatchingFilterFunctionLists();
-#endif
  }
  
  KeyframeAnimation::~KeyframeAnimation()
@@ -361,7 +359,6 @@ void KeyframeAnimation::validateTransformFunctionList()
      m_transformFunctionListValid = true;
  }
  
-#if ENABLE(CSS_FILTERS)
  void KeyframeAnimation::checkForMatchingFilterFunctionLists()
  {
      m_filterFunctionListsMatch = false;
@@ -400,7 +397,6 @@ void KeyframeAnimation::checkForMatchingFilterFunctionLists()
      
      m_filterFunctionListsMatch = true;
  }
-#endif
  
  double KeyframeAnimation::timeToNextService()
  {
diff --git a/Source/WebCore/page/animation/KeyframeAnimation.h b/Source/WebCore/page/animation/KeyframeAnimation.h

index fd16545767e072e463a33777d7f05072293395a9..b8b2bb5bd950deaa22050dc220e07acf692d4b71 100644 (file)
--- a/Source/WebCore/page/animation/KeyframeAnimation.h
+++ b/Source/WebCore/page/animation/KeyframeAnimation.h
@@ -78,9 +78,7 @@ protected:
      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);
diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.cpp b/Source/WebCore/platform/graphics/GraphicsLayer.cpp

index 85d0f3a8eb5216173ad837c0a771d32a20259419..6c6146d06dae431c51dcb5433c96ba1364d300f6 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsLayer.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsLayer.cpp
@@ -440,7 +440,6 @@ void GraphicsLayer::distributeOpacity(float accumulatedOpacity)
      }
  }
  
-#if ENABLE(CSS_FILTERS)
  static inline const FilterOperations& filterOperationsAt(const KeyframeValueList& valueList, size_t index)
  {
      return static_cast<const FilterAnimationValue&>(valueList.at(index)).value();
@@ -478,7 +477,6 @@ int GraphicsLayer::validateFilterOperations(const KeyframeValueList& valueList)
      
      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 
diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.h b/Source/WebCore/platform/graphics/GraphicsLayer.h

index 268009c51dae91a6856cd48918e958d0f555790a..7db7b70cb52258adf5c7a6fa14bfa9faf2e41b69 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsLayer.h
+++ b/Source/WebCore/platform/graphics/GraphicsLayer.h
@@ -28,6 +28,7 @@
  
  #include "Animation.h"
  #include "Color.h"
+#include "FilterOperations.h"
  #include "FloatPoint.h"
  #include "FloatPoint3D.h"
  #include "FloatRect.h"
@@ -39,10 +40,6 @@
  #include <wtf/OwnPtr.h>
  #include <wtf/PassOwnPtr.h>
  
-#if ENABLE(CSS_FILTERS)
-#include "FilterOperations.h"
-#endif
-
  #if ENABLE(CSS_COMPOSITING)
  #include "GraphicsTypes.h"
  #endif
@@ -145,7 +142,6 @@ private:
      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 {
@@ -171,7 +167,6 @@ private:
  
      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.
@@ -356,12 +351,10 @@ public:
      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; }
@@ -531,7 +524,6 @@ protected:
      // 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.
@@ -539,7 +531,6 @@ protected:
  
      // 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
@@ -582,9 +573,7 @@ protected:
      float m_opacity;
      float m_zPosition;
      
-#if ENABLE(CSS_FILTERS)
      FilterOperations m_filters;
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
      BlendMode m_blendMode;
diff --git a/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp b/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp

index dc9a69b3c294c4a41b9789bdef12e7558fa54ffb..07a43209fe7fb3b810278dea1e29477169f9c1a6 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp
+++ b/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp
@@ -27,7 +27,6 @@
  
  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);
@@ -73,7 +72,6 @@ static FilterOperations applyFilterAnimation(const FilterOperations& from, const
  
      return result;
  }
-#endif
  
  static bool shouldReverseAnimationValue(Animation::AnimationDirection direction, int loopCount)
  {
@@ -235,11 +233,9 @@ void GraphicsLayerAnimation::applyInternal(Client* client, const AnimationValue&
      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();
      }
diff --git a/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h b/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h

index d551732aa12f5a38f243513a68da260833b8a33c..fde2f83033efa6a906d346fef260927247e992bf 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h
+++ b/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h
@@ -34,9 +34,7 @@ public:
      public:
          virtual void setAnimatedTransform(const TransformationMatrix&) = 0;
          virtual void setAnimatedOpacity(float) = 0;
-#if ENABLE(CSS_FILTERS)
          virtual void setAnimatedFilters(const FilterOperations&) = 0;
-#endif
      };
  
      GraphicsLayerAnimation()
diff --git a/Source/WebCore/platform/graphics/IntRectExtent.h b/Source/WebCore/platform/graphics/IntRectExtent.h

index 6517f8ae00bc55365fa6699b6bc1cd8cda6bd6fc..611739054021b4334b7bfbf647e3c6d15963e96e 100644 (file)
--- a/Source/WebCore/platform/graphics/IntRectExtent.h
+++ b/Source/WebCore/platform/graphics/IntRectExtent.h
@@ -30,8 +30,6 @@
  #ifndef IntRectExtent_h
  #define IntRectExtent_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "LayoutRect.h"
  
  namespace WebCore {
@@ -107,6 +105,4 @@ inline void operator+=(IntRectExtent& a, const IntRectExtent& b)
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // IntRectExtent_h
diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

index e80a29cf3f7fad8273ebd808c16fdc6cd8e4ed20..e439f50ebf3eac25239ab75b598e04d7e984eaa1 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -243,11 +243,7 @@ static String propertyIdToString(AnimatedPropertyID property)
      case AnimatedPropertyBackgroundColor:
          return "backgroundColor";
      case AnimatedPropertyWebkitFilter:
-#if ENABLE(CSS_FILTERS)
          return "filters";
-#else
-        ASSERT_NOT_REACHED();
-#endif
      case AnimatedPropertyInvalid:
          ASSERT_NOT_REACHED();
      }
@@ -275,7 +271,6 @@ static bool animationHasStepsTimingFunction(const KeyframeValueList& valueList,
      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
@@ -285,7 +280,6 @@ static inline bool supportsAcceleratedFilterAnimations()
      return false;
  #endif
  }
-#endif
  
  std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient& client)
  {
@@ -300,7 +294,6 @@ std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* facto
      return graphicsLayer;
  }
  
-#if ENABLE(CSS_FILTERS)
  bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
  {
  #if PLATFORM(COCOA)
@@ -309,7 +302,6 @@ bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
      return PlatformCALayerWin::filtersCanBeComposited(filters);
  #endif
  }
-#endif
      
  PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
  {
@@ -578,9 +570,7 @@ void GraphicsLayerCA::moveOrCopyAnimations(MoveOrCopy operation, PlatformCALayer
              
              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);
          }
@@ -673,7 +663,6 @@ void GraphicsLayerCA::setOpacity(float opacity)
      noteLayerPropertyChanged(OpacityChanged);
  }
  
-#if ENABLE(CSS_FILTERS)
  bool GraphicsLayerCA::setFilters(const FilterOperations& filterOperations)
  {
      bool canCompositeFilters = filtersCanBeComposited(filterOperations);
@@ -695,7 +684,6 @@ bool GraphicsLayerCA::setFilters(const FilterOperations& filterOperations)
      }
      return canCompositeFilters;
  }
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
  void GraphicsLayerCA::setBlendMode(BlendMode blendMode)
@@ -802,12 +790,10 @@ bool GraphicsLayerCA::addAnimation(const KeyframeValueList& valueList, const Flo
      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);
  
@@ -1324,11 +1310,9 @@ void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState
  
      if (m_uncommittedChanges & OpacityChanged)
          updateOpacityOnLayer();
-    
-#if ENABLE(CSS_FILTERS)
+
      if (m_uncommittedChanges & FiltersChanged)
          updateFilters();
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
      if (m_uncommittedChanges & BlendModeChanged)
@@ -1641,7 +1625,6 @@ void GraphicsLayerCA::updateBackfaceVisibility()
      }
  }
  
-#if ENABLE(CSS_FILTERS)
  void GraphicsLayerCA::updateFilters()
  {
      m_layer->setFilters(m_filters);
@@ -1656,7 +1639,6 @@ void GraphicsLayerCA::updateFilters()
          }
      }
  }
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
  void GraphicsLayerCA::updateBlendMode()
@@ -1687,9 +1669,7 @@ void GraphicsLayerCA::ensureStructuralLayer(StructuralLayerPurpose purpose)
          | ChildrenTransformChanged
          | ChildrenChanged
          | BackfaceVisibilityChanged
-#if ENABLE(CSS_FILTERS)
          | FiltersChanged
-#endif
          | OpacityChanged;
  
      if (purpose == NoStructuralLayer) {
@@ -2378,7 +2358,6 @@ bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValue
      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;
@@ -2442,7 +2421,6 @@ bool GraphicsLayerCA::createFilterAnimationsFromKeyframes(const KeyframeValueLis
  
      return true;
  }
-#endif
  
  PassRefPtr<PlatformCAAnimation> GraphicsLayerCA::createBasicAnimation(const Animation* anim, const String& keyPath, bool additive)
  {
@@ -2695,7 +2673,6 @@ bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& va
      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);
@@ -2768,7 +2745,6 @@ bool GraphicsLayerCA::setFilterAnimationKeyframes(const KeyframeValueList& value
  
      return true;
  }
-#endif
  
  void GraphicsLayerCA::suspendAnimations(double time)
  {
diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

index b204f4c3fd7bb856e3c1abe118fa11b3989ba6c8..660bea414b734f9c4b1d33c9b6c2193202d69fe7 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
+++ b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
@@ -102,10 +102,8 @@ public:
      // 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;
@@ -203,10 +201,7 @@ private:
  
      WEBCORE_EXPORT void layerDidDisplay(PlatformCALayer*);
      void updateOpacityOnLayer();
-    
-#if ENABLE(CSS_FILTERS)
      void updateFilters();
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
      void updateBlendMode();
@@ -230,9 +225,7 @@ private:
  
      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);
@@ -247,10 +240,8 @@ private:
      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;
  
@@ -406,9 +397,7 @@ private:
      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,
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h

index 05b430acc254daf62784b198b3c8da5db4e936c2..a5ba693b4c378e75d07a3f1c3654e34b7b732567 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
+++ b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
@@ -93,18 +93,14 @@ public:
      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.
@@ -112,9 +108,7 @@ public:
      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;
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h b/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h

index 8860687887818e306a0e883e81c570cfae852594..7cdb3d2299bf6ff4a9b32885f4da9ebaa97e691a 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h
+++ b/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h
@@ -26,8 +26,6 @@
  #ifndef PlatformCAFilters_h
  #define PlatformCAFilters_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "FilterOperations.h"
  #include "GraphicsTypes.h"
  #include "PlatformLayer.h"
@@ -64,6 +62,4 @@ public:
  
  }
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // PlatformCAFilters_h
diff --git a/Source/WebCore/platform/graphics/ca/PlatformCALayer.h b/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

index 5c0a8633f27712bde8d1a477b5370703ad442b2b..310e9016167c84985604a80f273def1ac18f6920 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/PlatformCALayer.h
+++ b/Source/WebCore/platform/graphics/ca/PlatformCALayer.h
@@ -181,11 +181,8 @@ public:
  
      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;
diff --git a/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h b/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h

index 4f0054c65a6150163e6b6f1de3dac0cb8f9246f9..3f370b566f8520a8ca3eb324779d1345048b6a13 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h
+++ b/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h
@@ -99,18 +99,14 @@ public:
      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.
@@ -118,9 +114,7 @@ public:
      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;
diff --git a/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm b/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm

index d8b43d6720c49322091b6f219b8c25321d0eeb0c..2bc65dc90c33b604784c055dccb192dcc1756840 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
+++ b/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
@@ -387,13 +387,11 @@ void PlatformCAAnimationMac::setFromValue(const WebCore::Color& value)
      [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)
  {
@@ -446,13 +444,11 @@ void PlatformCAAnimationMac::setToValue(const WebCore::Color& 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)
  {
@@ -526,7 +522,6 @@ void PlatformCAAnimationMac::setValues(const Vector<WebCore::Color>& 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)
@@ -540,7 +535,6 @@ void PlatformCAAnimationMac::setValues(const Vector<RefPtr<FilterOperation>>& va
      }
      [static_cast<CAKeyframeAnimation*>(m_animation.get()) setValues:array];
  }
-#endif
  
  void PlatformCAAnimationMac::copyValuesFrom(const PlatformCAAnimation* value)
  {
diff --git a/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm b/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm

index 61a923064ad67a144c32fadde5e9cba242a60c93..248f9ed65683b36820b2fafd39930a04a93ac410 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm
+++ b/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm
@@ -25,8 +25,6 @@
  
  #include "config.h"
  
-#if ENABLE(CSS_FILTERS)
-
  #import "PlatformCAFilters.h"
  #import "BlockExceptions.h"
  #import "FloatConversion.h"
@@ -669,5 +667,3 @@ const char* PlatformCAFilters::animatedFilterPropertyName(FilterOperation::Opera
      }
  #endif
  }
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h b/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h

index 549b092b6e5435881d11f0573d1c08890860d943..654eb4852858198360f489d844c149bb9a33420d 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h
+++ b/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h
@@ -117,12 +117,9 @@ public:
  
      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;
diff --git a/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

index 8377e9549bbee22500dff2ea2abe91bf5aa3c3a6..aadc611d2f9f3272825b4b0e8a504a34289c8f90 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -320,9 +320,7 @@ PassRefPtr<PlatformCALayer> PlatformCALayerMac::clone(PlatformCALayerClient* own
      newLayer->setOpaque(isOpaque());
      newLayer->setBackgroundColor(backgroundColor());
      newLayer->setContentsScale(contentsScale());
-#if ENABLE(CSS_FILTERS)
      newLayer->copyFiltersFrom(this);
-#endif
      newLayer->updateCustomAppearance(customAppearance());
  
      if (type == LayerTypeAVPlayerLayer) {
@@ -710,7 +708,6 @@ void PlatformCALayerMac::setOpacity(float value)
      END_BLOCK_OBJC_EXCEPTIONS
  }
  
-#if ENABLE(CSS_FILTERS)
  void PlatformCALayerMac::setFilters(const FilterOperations& filters)
  {
      PlatformCAFilters::setFiltersOnLayer(platformLayer(), filters);
@@ -746,7 +743,6 @@ bool PlatformCALayerMac::filtersCanBeComposited(const FilterOperations& filters)
  
      return true;
  }
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
  void PlatformCALayerMac::setBlendMode(BlendMode blendMode)
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp

index cc1c26e1741711505327fa3f943edfbbf1e642c2..995bdd65c78b810aa9e9a1d654384dda60bc320d 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
@@ -374,12 +374,10 @@ void PlatformCAAnimationWin::setFromValue(const WebCore::Color& value)
      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)
  {
@@ -427,12 +425,10 @@ void PlatformCAAnimationWin::setToValue(const WebCore::Color& 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)
  {
@@ -501,12 +497,10 @@ void PlatformCAAnimationWin::setValues(const Vector<WebCore::Color>& 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)
  {
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h b/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h

index dd2b19f43b74507aca456cc7c51538c42c33718c..0daef9ee4ea372cc7e44b28d1e62e3e45f9dacb7 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h
@@ -89,18 +89,14 @@ public:
      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.
@@ -108,9 +104,7 @@ public:
      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;
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp

index 78e179e3b12c3db9cd096ab12a1f750e766fda77..beb397b03eada225b9f6aec136625a547ec1e343 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp
@@ -24,9 +24,6 @@
   */
  
  #include "config.h"
-
-#if ENABLE(CSS_FILTERS)
-
  #include "PlatformCAFilters.h"
  
  using namespace WebCore;
@@ -47,5 +44,3 @@ const char* PlatformCAFilters::animatedFilterPropertyName(FilterOperation::Opera
      // Hardware filter animation not implemented on Windows.
      return "";
  }
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

index 17087e6565cd3dd8b0fad8179e3ed95b1c7d7bd2..fd6c1a71cba0f18a650cd6e431323132ae668e8e 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
@@ -182,9 +182,7 @@ PassRefPtr<PlatformCALayer> PlatformCALayerWin::clone(PlatformCALayerClient* own
      newLayer->setOpaque(isOpaque());
      newLayer->setBackgroundColor(backgroundColor());
      newLayer->setContentsScale(contentsScale());
-#if ENABLE(CSS_FILTERS)
      newLayer->copyFiltersFrom(this);
-#endif
  
      return newLayer;
  }
@@ -545,8 +543,6 @@ void PlatformCALayerWin::setOpacity(float value)
      setNeedsCommit();
  }
  
-#if ENABLE(CSS_FILTERS)
-
  void PlatformCALayerWin::setFilters(const FilterOperations&)
  {
  }
@@ -555,8 +551,6 @@ void PlatformCALayerWin::copyFiltersFrom(const PlatformCALayer*)
  {
  }
  
-#endif // ENABLE(CSS_FILTERS)
-
  void PlatformCALayerWin::setName(const String& value)
  {
      CACFLayerSetName(m_layer.get(), value.createCFString().get());
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h

index 438b266252048356e3d1ad66b8a04ef493f2cb3e..3bda8f5065378296a65f7d7ffba5b6218559385d 100644 (file)
--- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h
+++ b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h
@@ -109,11 +109,9 @@ public:
      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;
  
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperation.cpp b/Source/WebCore/platform/graphics/filters/FilterOperation.cpp

index d87f0696554ac906bcd704b68596fbc966e83bd3..f5ed73284b22f14b67dfbb10c53fc3d880690228 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperation.cpp
+++ b/Source/WebCore/platform/graphics/filters/FilterOperation.cpp
@@ -24,8 +24,6 @@
   */
  
  #include "config.h"
-
-#if ENABLE(CSS_FILTERS)
  #include "FilterOperation.h"
  
  #include "AnimationUtilities.h"
@@ -195,5 +193,3 @@ PassRefPtr<FilterOperation> DropShadowFilterOperation::blend(const FilterOperati
  }
  
  } // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperation.h b/Source/WebCore/platform/graphics/filters/FilterOperation.h

index 0bc84da81f61445979ef73632c41b107dba35cbf..a18d995bbd70253c751aac743b1a283365a605fd 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperation.h
+++ b/Source/WebCore/platform/graphics/filters/FilterOperation.h
@@ -26,8 +26,6 @@
  #ifndef FilterOperation_h
  #define FilterOperation_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "Color.h"
  #include "FilterEffect.h"
  #include "LayoutSize.h"
@@ -359,6 +357,4 @@ FILTEROPERATION_TYPE_CASTS(DropShadowFilterOperation, type() == FilterOperation:
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // FilterOperation_h
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperations.cpp b/Source/WebCore/platform/graphics/filters/FilterOperations.cpp

index 2545461502813a4715d0b95b6746597c9cde89b7..af8236623712a7e78203ac53e04e72a664047cc2 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperations.cpp
+++ b/Source/WebCore/platform/graphics/filters/FilterOperations.cpp
@@ -30,8 +30,6 @@
  #include "IntSize.h"
  #include "LengthFunctions.h"
  
-#if ENABLE(CSS_FILTERS)
-
  namespace WebCore {
  
  static inline IntSize outsetSizeForBlur(float stdDeviation)
@@ -154,5 +152,3 @@ bool FilterOperations::hasFilterThatMovesPixels() const
  }
  
  } // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/platform/graphics/filters/FilterOperations.h b/Source/WebCore/platform/graphics/filters/FilterOperations.h

index 720f665d6bd122877502fbaeaea4ff8dad04decb..424660a2cfb43777ca6522b1be363d07b3f23fb6 100644 (file)
--- a/Source/WebCore/platform/graphics/filters/FilterOperations.h
+++ b/Source/WebCore/platform/graphics/filters/FilterOperations.h
@@ -26,8 +26,6 @@
  #ifndef FilterOperations_h
  #define FilterOperations_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "FilterOperation.h"
  #include "IntRectExtent.h"
  #include <wtf/RefPtr.h>
@@ -78,6 +76,4 @@ private:
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // FilterOperations_h
diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

index 9357a28791a29b5636eaff2b0b924b9c75f752ec..8d624e3eb6e8b130e5acbd4f68510bfcb825ffbf 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
@@ -540,10 +540,8 @@ void GraphicsLayerTextureMapper::commitLayerChanges()
      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);
@@ -665,7 +663,6 @@ void GraphicsLayerTextureMapper::removeAnimation(const String& animationName)
      m_animations.remove(animationName);
  }
  
-#if ENABLE(CSS_FILTERS)
  bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters)
  {
      TextureMapper* textureMapper = m_layer->textureMapper();
@@ -675,7 +672,6 @@ bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters)
      notifyChange(FilterChange);
      return GraphicsLayer::setFilters(filters);
  }
-#endif
  
  void GraphicsLayerTextureMapper::setFixedToViewport(bool fixed)
  {
diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h

index 82f8cab5e9de41beb63a23db9099593d52cd893c..7a82b7da752d54861309ad8bb0b92886f418bf54 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
@@ -91,9 +91,7 @@ public:
      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; }
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapper.h b/Source/WebCore/platform/graphics/texmap/TextureMapper.h

index f431339043607274794ecf0245c5032ba6dd16c9..90d4e649ed5398307564e079e1005674cb4ea14e 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapper.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
@@ -87,9 +87,7 @@ public:
      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;
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

index 24ded1e07fc9b30c01a1be10d10e8aee16218485..7e35789db0df161fede6d84e262c4c2b5a313255 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
@@ -122,9 +122,7 @@ public:
          , previousScissorState(0)
          , previousDepthState(0)
          , sharedData(TextureMapperGLData::SharedGLData::currentSharedGLData(this->context))
-#if ENABLE(CSS_FILTERS)
          , filterInfo(0)
-#endif
      { }
  
      ~TextureMapperGLData();
@@ -143,9 +141,7 @@ public:
      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)
@@ -367,8 +363,6 @@ void TextureMapperGL::drawNumber(int number, const Color& color, const FloatPoin
  #endif
  }
  
-#if ENABLE(CSS_FILTERS)
-
  static TextureMapperShaderProgram::Options optionsForFilterType(FilterOperation::OperationType type, unsigned pass)
  {
      switch (type) {
@@ -512,7 +506,6 @@ static void prepareFilterProgram(TextureMapperShaderProgram* program, const Filt
          break;
      }
  }
-#endif
  
  void TextureMapperGL::drawTexture(const BitmapTexture& texture, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, unsigned exposedEdges)
  {
@@ -523,9 +516,7 @@ void TextureMapperGL::drawTexture(const BitmapTexture& texture, const FloatRect&
          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);
  }
@@ -547,7 +538,6 @@ void TextureMapperGL::drawTexture(Platform3DObject texture, Flags flags, const I
          flags |= ShouldAntialias;
      }
  
-#if ENABLE(CSS_FILTERS)
      RefPtr<FilterOperation> filter = data().filterInfo ? data().filterInfo->filter: 0;
      GC3Duint filterContentTextureID = 0;
  
@@ -558,7 +548,6 @@ void TextureMapperGL::drawTexture(Platform3DObject texture, Flags flags, const I
          if (filter->affectsOpacity())
              flags |= ShouldBlend;
      }
-#endif
  
      if (useAntialiasing || opacity < 1)
          flags |= ShouldBlend;
@@ -566,10 +555,8 @@ void TextureMapperGL::drawTexture(Platform3DObject texture, Flags flags, const I
      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);
  }
@@ -857,7 +844,6 @@ void BitmapTextureGL::updateContents(Image* image, const IntRect& targetRect, co
      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.
@@ -913,7 +899,6 @@ PassRefPtr<BitmapTexture> BitmapTextureGL::applyFilters(TextureMapper* textureMa
      texmapGL->bindSurface(previousSurface.get());
      return resultSurface;
  }
-#endif
  
  static inline TransformationMatrix createProjectionMatrix(const IntSize& size, bool mirrored)
  {
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h

index 83248f86d03af2efb2bedd1a5d39e66779b7d630..08243cb1c20cd7eb14d0dad44800feb1885fb398 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h
@@ -67,9 +67,7 @@ public:
      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; }
  
@@ -155,7 +153,6 @@ public:
      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;
@@ -169,7 +166,6 @@ public:
              { }
      };
      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);
@@ -190,9 +186,7 @@ private:
      void clearIfNeeded();
      void createFboIfNeeded();
  
-#if ENABLE(CSS_FILTERS)
      FilterInfo m_filterInfo;
-#endif
  
      friend class TextureMapperGL;
  };
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp

index 8b8ef1640e0d2fd2990bd136c7169b735bfd9e87..3beeb9f6306783323839cd55c2de3b4222b32ac9 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp
@@ -150,13 +150,11 @@ void TextureMapperImageBuffer::drawNumber(int /* number */, const Color&, const
      notImplemented();
  }
  
-#if ENABLE(CSS_FILTERS)
  PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&)
  {
      ASSERT_NOT_REACHED();
      return this;
  }
-#endif
  
  }
  #endif
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h

index 82df04e86f3125f97b16b1c4ffdf782dcf4be59d..0177ddb7e170520be84b18431624ac49b0deee60 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h
@@ -37,9 +37,7 @@ public:
      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() { }
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

index 6003987d0d7d5bade3e6a20f8fedad5138691b0e..c97582b3c45fd7d3dc471b5818e3d0ca2fea01ba 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
@@ -237,12 +237,10 @@ TransformationMatrix TextureMapperLayer::replicaTransform()
      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)
  {
@@ -265,7 +263,6 @@ void TextureMapperLayer::computeOverlapRegions(Region& overlapRegion, Region& no
      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);
@@ -273,7 +270,6 @@ void TextureMapperLayer::computeOverlapRegions(Region& overlapRegion, Region& no
          boundingRect.expand(outsets.left() + outsets.right(), outsets.top() + outsets.bottom());
          boundingRect.unite(unfilteredTargetRect);
      }
-#endif
  
      TransformationMatrix replicaMatrix;
      if (m_state.replicaLayer) {
@@ -387,9 +383,7 @@ PassRefPtr<BitmapTexture> TextureMapperLayer::paintIntoSurface(const TextureMapp
      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;
  }
@@ -605,12 +599,10 @@ void TextureMapperLayer::setSolidColor(const Color& color)
      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)
  {
@@ -673,10 +665,8 @@ void TextureMapperLayer::syncAnimations()
      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
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h

index 0bf9621397db004acf7d762bb370143a822700e0..140a0ed2c77cd56369cf88ce7628f295ba697742 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h
@@ -101,17 +101,11 @@ public:
      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);
@@ -173,9 +167,7 @@ private:
      // 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 {
@@ -198,9 +190,7 @@ private:
      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);
@@ -222,9 +212,7 @@ private:
          TextureMapperLayer* maskLayer;
          TextureMapperLayer* replicaLayer;
          Color solidColor;
-#if ENABLE(CSS_FILTERS)
          FilterOperations filters;
-#endif
          Color debugBorderColor;
          float debugBorderWidth;
          int repaintCount;
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h

index 3345fc9fe2ead3fb8e17118bd50f36d16811c3be..43a6534becf62bf9a1cbc2a0d650ee9a9693cdbf 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h
@@ -74,13 +74,11 @@ public:
      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&);
  
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

index 6e3f4f91ca8d3aa4432363606ba16ca43a894da1..61ca6e432217fe37418b869e5747b77a8efadc22 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
@@ -76,13 +76,11 @@ void CoordinatedGraphicsLayer::didChangeChildren()
      notifyFlushRequired();
  }
  
-#if ENABLE(CSS_FILTERS)
  void CoordinatedGraphicsLayer::didChangeFilters()
  {
      m_shouldSyncFilters = true;
      notifyFlushRequired();
  }
-#endif
  
  void CoordinatedGraphicsLayer::didChangeImageBacking()
  {
@@ -421,7 +419,6 @@ void CoordinatedGraphicsLayer::setContentsToPlatformLayer(PlatformLayer* platfor
  #endif
  }
  
-#if ENABLE(CSS_FILTERS)
  bool CoordinatedGraphicsLayer::setFilters(const FilterOperations& newFilters)
  {
      if (filters() == newFilters)
@@ -433,7 +430,6 @@ bool CoordinatedGraphicsLayer::setFilters(const FilterOperations& newFilters)
      didChangeFilters();
      return true;
  }
-#endif
  
  void CoordinatedGraphicsLayer::setContentsToSolidColor(const Color& color)
  {
@@ -622,7 +618,6 @@ void CoordinatedGraphicsLayer::syncChildren()
          m_layerState.children.append(toCoordinatedLayerID(children()[i]));
  }
  
-#if ENABLE(CSS_FILTERS)
  void CoordinatedGraphicsLayer::syncFilters()
  {
      if (!m_shouldSyncFilters)
@@ -632,7 +627,6 @@ void CoordinatedGraphicsLayer::syncFilters()
      m_layerState.filters = GraphicsLayer::filters();
      m_layerState.filtersChanged = true;
  }
-#endif
  
  void CoordinatedGraphicsLayer::syncImageBacking()
  {
@@ -788,9 +782,7 @@ void CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly()
      syncAnimations();
      computeTransformedVisibleRect();
      syncChildren();
-#if ENABLE(CSS_FILTERS)
      syncFilters();
-#endif
  #if USE(GRAPHICS_SURFACE)
      syncPlatformLayer();
  #endif
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h

index a6a58f32b4746e275ef51c86465b4be9e68574bf..58fbfc0b9b00be7ff3c6b7776ad38c0060c689b1 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
@@ -101,9 +101,7 @@ public:
      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;
@@ -176,18 +174,14 @@ private:
      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();
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp

index 491403b34262376fa742683e0c86de5247a431b2..673b9e9cece24664b1cee8e80e9cfae9c5555ac7 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp
+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp
@@ -226,7 +226,6 @@ void CoordinatedGraphicsScene::setLayerChildrenIfNeeded(TextureMapperLayer* laye
      layer->setChildren(children);
  }
  
-#if ENABLE(CSS_FILTERS)
  void CoordinatedGraphicsScene::setLayerFiltersIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
  {
      if (!state.filtersChanged)
@@ -234,7 +233,6 @@ void CoordinatedGraphicsScene::setLayerFiltersIfNeeded(TextureMapperLayer* layer
  
      layer->setFilters(state.filters);
  }
-#endif
  
  void CoordinatedGraphicsScene::setLayerState(CoordinatedLayerID id, const CoordinatedGraphicsLayerState& layerState)
  {
@@ -314,9 +312,7 @@ void CoordinatedGraphicsScene::setLayerState(CoordinatedLayerID id, const Coordi
      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);
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h

index 3d8c042c254ebe3a769b57af6d30708f901d6643..164ba5bbf2c2489a692f82b47dcf9e9fb04123ee 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h
+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h
@@ -95,9 +95,7 @@ private:
      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&);
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h

index 7752a7f74ffe85c42688a823fdf9b70a43b5a996..0b5cbb90e158c337a1e51012e7e918a42dca8356 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h
@@ -30,6 +30,7 @@
  #if USE(COORDINATED_GRAPHICS)
  
  #include "Color.h"
+#include "FilterOperations.h"
  #include "FloatRect.h"
  #include "FloatSize.h"
  #include "GraphicsLayerAnimation.h"
@@ -38,10 +39,6 @@
  #include "SurfaceUpdateInfo.h"
  #include "TransformationMatrix.h"
  
-#if ENABLE(CSS_FILTERS)
-#include "FilterOperations.h"
-#endif
-
  #if USE(GRAPHICS_SURFACE)
  #include "GraphicsSurface.h"
  #include "GraphicsSurfaceToken.h"
@@ -148,9 +145,7 @@ struct CoordinatedGraphicsLayerState {
      Color solidColor;
      Color debugBorderColor;
      float debugBorderWidth;
-#if ENABLE(CSS_FILTERS)
      FilterOperations filters;
-#endif
      GraphicsLayerAnimations animations;
      Vector<uint32_t> children;
      Vector<TileCreationInfo> tilesToCreate;
diff --git a/Source/WebCore/rendering/FilterEffectRenderer.cpp b/Source/WebCore/rendering/FilterEffectRenderer.cpp

index 3fadd9853fddb2fee0d549d25df3079b083d502c..f31e7b94b7b51176cf7c3451390b85d60c827077 100644 (file)
--- a/Source/WebCore/rendering/FilterEffectRenderer.cpp
+++ b/Source/WebCore/rendering/FilterEffectRenderer.cpp
@@ -26,8 +26,6 @@
  
  #include "config.h"
  
-#if ENABLE(CSS_FILTERS)
-
  #include "FilterEffectRenderer.h"
  
  #include "CachedSVGDocument.h"
@@ -444,5 +442,3 @@ void FilterEffectRendererHelper::applyFilterEffect(GraphicsContext* destinationC
  }
  
  } // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/rendering/FilterEffectRenderer.h b/Source/WebCore/rendering/FilterEffectRenderer.h

index 60857d89031656af7d20976e3895894436ac9569..5ff898b4065649d0c8647567ad5df22c20af9241 100644 (file)
--- a/Source/WebCore/rendering/FilterEffectRenderer.h
+++ b/Source/WebCore/rendering/FilterEffectRenderer.h
@@ -26,8 +26,6 @@
  #ifndef FilterEffectRenderer_h
  #define FilterEffectRenderer_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "Filter.h"
  #include "FilterEffect.h"
  #include "FilterOperations.h"
@@ -152,6 +150,4 @@ private:
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // FilterEffectRenderer_h
diff --git a/Source/WebCore/rendering/RenderElement.cpp b/Source/WebCore/rendering/RenderElement.cpp

index bdb9d3b4b01c754448fa604d76ceffabf5ef65aa..199a6456ff203317f8e34c413251b83671b69b49 100644 (file)
--- a/Source/WebCore/rendering/RenderElement.cpp
+++ b/Source/WebCore/rendering/RenderElement.cpp
@@ -274,8 +274,7 @@ StyleDifference RenderElement::adjustStyleDifference(StyleDifference diff, unsig
          else if (diff < StyleDifferenceRecompositeLayer)
              diff = StyleDifferenceRecompositeLayer;
      }
-    
-#if ENABLE(CSS_FILTERS)
+
      if ((contextSensitiveProperties & ContextSensitivePropertyFilter) && hasLayer()) {
          RenderLayer* layer = toRenderLayerModelObject(this)->layer();
          if (!layer->isComposited() || layer->paintsWithFilters())
@@ -283,7 +282,6 @@ StyleDifference RenderElement::adjustStyleDifference(StyleDifference diff, unsig
          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
diff --git a/Source/WebCore/rendering/RenderElement.h b/Source/WebCore/rendering/RenderElement.h

index 0b3ce94711e5b2e6d907bf439a8c4a48121e64f3..42b5dc02011fdb4f06ad38b7fdf0c5f5ba8747f6 100644 (file)
--- a/Source/WebCore/rendering/RenderElement.h
+++ b/Source/WebCore/rendering/RenderElement.h
@@ -132,11 +132,7 @@ public:
      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(); }
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp

index 527dfcbe1c31b5293849e774308cb8b02b5d0a84..8c2de9f52c789dd2df01696dd2d8eaf29d4c6c68 100644 (file)
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -52,6 +52,9 @@
  #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"
@@ -83,6 +86,7 @@
  #include "RenderIterator.h"
  #include "RenderLayerBacking.h"
  #include "RenderLayerCompositor.h"
+#include "RenderLayerFilterInfo.h"
  #include "RenderMarquee.h"
  #include "RenderMultiColumnFlowThread.h"
  #include "RenderNamedFlowFragment.h"
@@ -115,13 +119,6 @@
  #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
@@ -189,9 +186,7 @@ RenderLayer::RenderLayer(RenderLayerModelObject& rendererLayerModelObject)
  #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)
@@ -256,10 +251,8 @@ RenderLayer::~RenderLayer()
  
      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.
@@ -318,8 +311,6 @@ bool RenderLayer::canRender3DTransforms() const
      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,
@@ -351,8 +342,6 @@ FilterEffectRenderer* RenderLayer::filterRenderer() const
      return filterInfo ? filterInfo->renderer() : 0;
  }
  
-#endif
-
  void RenderLayer::updateLayerPositionsAfterLayout(const RenderLayer* rootLayer, UpdateLayerPositionsFlags flags)
  {
      RenderGeometryMap geometryMap(UseTransforms);
@@ -1456,8 +1445,6 @@ RenderLayer* RenderLayer::enclosingCompositingLayerForRepaint(IncludeSelfOrNot i
      return 0;
  }
  
-#if ENABLE(CSS_FILTERS)
-
  RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) const
  {
      const RenderLayer* curr = (includeSelf == IncludeSelf) ? this : parent();
@@ -1526,8 +1513,6 @@ bool RenderLayer::hasAncestorWithFilterOutsets() const
      return false;
  }
  
-#endif
-
  RenderLayer* RenderLayer::clippingRootForPainting() const
  {
      if (isComposited())
@@ -1659,9 +1644,7 @@ static LayoutRect transparencyClipBox(const RenderLayer& layer, const RenderLaye
          // 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;
@@ -1677,9 +1660,8 @@ static LayoutRect transparencyClipBox(const RenderLayer& layer, const RenderLaye
      
      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;
  }
  
@@ -3951,8 +3933,6 @@ bool RenderLayer::setupClipPath(GraphicsContext* context, const LayerPaintingInf
      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())
@@ -4010,8 +3990,6 @@ GraphicsContext* RenderLayer::applyFilters(FilterEffectRendererHelper* filterPai
      return originalContext;
  }
  
-#endif
-
  // Helper for the sorting of layers by z-index.
  static inline bool compareZIndex(RenderLayer* first, RenderLayer* second)
  {
@@ -4095,7 +4073,6 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
      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();
@@ -4104,7 +4081,6 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
              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).
@@ -4180,12 +4156,10 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
      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);
@@ -5801,14 +5775,12 @@ LayoutRect RenderLayer::calculateLayerBounds(const RenderLayer* ancestorLayer, c
              }
          }
      }
-    
-#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();
@@ -5849,9 +5821,7 @@ RenderLayerBacking* RenderLayer::ensureBacking()
          m_backing = std::make_unique<RenderLayerBacking>(*this);
          compositor().layerBecameComposited(*this);
  
-#if ENABLE(CSS_FILTERS)
          updateOrRemoveFilterEffectRenderer();
-#endif
      }
      return m_backing.get();
  }
@@ -5862,12 +5832,8 @@ void RenderLayer::clearBacking(bool layerBeingDestroyed)
          compositor().layerBecameNonComposited(*this);
      m_backing = nullptr;
  
-#if ENABLE(CSS_FILTERS)
      if (!layerBeingDestroyed)
          updateOrRemoveFilterEffectRenderer();
-#else
-    UNUSED_PARAM(layerBeingDestroyed);
-#endif
  }
  
  bool RenderLayer::hasCompositedMask() const
@@ -5914,10 +5880,8 @@ bool RenderLayer::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect)
      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))
@@ -6236,9 +6200,7 @@ bool RenderLayer::shouldBeNormalFlowOnly() const
          && !renderer().isPositioned()
          && !renderer().hasTransform()
          && !renderer().hasClipPath()
-#if ENABLE(CSS_FILTERS)
          && !renderer().hasFilter()
-#endif
  #if PLATFORM(IOS)
          && !hasAcceleratedTouchScrolling()
  #endif
@@ -6517,9 +6479,7 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
  #if ENABLE(CSS_COMPOSITING)
      updateBlendMode();
  #endif
-#if ENABLE(CSS_FILTERS)
      updateOrRemoveFilterClients();
-#endif
  
      updateNeedsCompositedScrolling();
  
@@ -6553,7 +6513,6 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
      UNUSED_PARAM(diff);
  #endif
  
-#if ENABLE(CSS_FILTERS)
      updateOrRemoveFilterEffectRenderer();
      bool backingDidCompositeLayers = isComposited() && backing()->canCompositeFilters();
      if (isComposited() && backingDidCompositeLayers && !backing()->canCompositeFilters()) {
@@ -6561,7 +6520,6 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
          // Fallback to drawing them in software.
          setBackingNeedsRepaint();
      }
-#endif
  }
  
  void RenderLayer::updateScrollableAreaSet(bool hasOverflow)
@@ -6690,8 +6648,6 @@ PassRef<RenderStyle> RenderLayer::createReflectionStyle()
      return newStyle;
  }
  
-#if ENABLE(CSS_FILTERS)
-
  void RenderLayer::updateOrRemoveFilterClients()
  {
      if (!hasFilter()) {
@@ -6752,8 +6708,6 @@ void RenderLayer::filterNeedsRepaint()
      renderer().repaint();
  }
  
-#endif
-
  void RenderLayer::paintNamedFlowThreadInsideRegion(GraphicsContext* context, RenderNamedFlowFragment* region, LayoutRect paintDirtyRect, LayoutPoint paintOffset, PaintBehavior paintBehavior, PaintLayerFlags paintFlags)
  {
      LayoutRect regionContentBox = toRenderBox(region->layerOwner()).contentBoxRect();
diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h

index 6b7c254082b54d2a76ffdf3a7cf1ae3a3060b984..be90f55ee33bf019bdd04cf8a139a02b75afc197 100644 (file)
--- a/Source/WebCore/rendering/RenderLayer.h
+++ b/Source/WebCore/rendering/RenderLayer.h
@@ -632,12 +632,10 @@ public:
      // 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
      {
@@ -747,13 +745,9 @@ public:
      // 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;
@@ -792,12 +786,8 @@ public:
      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(); }
@@ -851,11 +841,9 @@ public:
      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; }
@@ -987,10 +975,9 @@ private:
  
      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);
@@ -1128,10 +1115,8 @@ private:
      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();
@@ -1271,9 +1256,7 @@ private:
      bool m_layerListMutationAllowed : 1;
  #endif
  
-#if ENABLE(CSS_FILTERS)
      bool m_hasFilterInfo : 1;
-#endif
  
  #if ENABLE(CSS_COMPOSITING)
      unsigned m_blendMode : 5;
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp

index f4844c52043cd9c2d321cc9e32153554c21aa2ed..d8fe6e73cd18bcb9c7bb42bdbac3535e798db584 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -32,6 +32,7 @@
  #include "CSSPropertyNames.h"
  #include "CachedImage.h"
  #include "Chrome.h"
+#include "FilterEffectRenderer.h"
  #include "FontCache.h"
  #include "FrameView.h"
  #include "GraphicsContext.h"
@@ -61,10 +62,6 @@
  #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
@@ -112,9 +109,7 @@ RenderLayerBacking::RenderLayerBacking(RenderLayer& layer)
      , 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();
@@ -313,9 +308,7 @@ void RenderLayerBacking::createPrimaryGraphicsLayer()
      
      updateOpacity(renderer().style());
      updateTransform(renderer().style());
-#if ENABLE(CSS_FILTERS)
      updateFilters(renderer().style());
-#endif
  #if ENABLE(CSS_COMPOSITING)
      updateBlendMode(renderer().style());
  #endif
@@ -375,12 +368,10 @@ void RenderLayerBacking::updateTransform(const RenderStyle& style)
          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)
@@ -656,10 +647,8 @@ void RenderLayerBacking::updateGeometry()
      // 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);
@@ -2325,20 +2314,14 @@ bool RenderLayerBacking::startAnimation(double timeOffset, const Animation* anim
  {
      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) {
@@ -2358,10 +2341,8 @@ bool RenderLayerBacking::startAnimation(double timeOffset, const Animation* anim
          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())
@@ -2375,10 +2356,8 @@ bool RenderLayerBacking::startAnimation(double timeOffset, const Animation* anim
      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;
  }
@@ -2428,7 +2407,6 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
          }
      }
  
-#if ENABLE(CSS_FILTERS)
      if (property == CSSPropertyWebkitFilter && m_owningLayer.hasFilter()) {
          const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
          if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
@@ -2442,7 +2420,6 @@ bool RenderLayerBacking::startTransition(double timeOffset, CSSPropertyID proper
              }
          }
      }
-#endif
  
      return didAnimate;
  }
@@ -2529,11 +2506,7 @@ CSSPropertyID RenderLayerBacking::graphicsLayerToCSSProperty(AnimatedPropertyID
              cssProperty = CSSPropertyBackgroundColor;
              break;
          case AnimatedPropertyWebkitFilter:
-#if ENABLE(CSS_FILTERS)
              cssProperty = CSSPropertyWebkitFilter;
-#else
-            ASSERT_NOT_REACHED();
-#endif
              break;
          case AnimatedPropertyInvalid:
              ASSERT_NOT_REACHED();
@@ -2550,10 +2523,8 @@ AnimatedPropertyID RenderLayerBacking::cssToGraphicsLayerProperty(CSSPropertyID
              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;
diff --git a/Source/WebCore/rendering/RenderLayerBacking.h b/Source/WebCore/rendering/RenderLayerBacking.h

index cf908ac85de07c7b88dcf5a1837b638d50c3940f..b40ce2a99efd9c097a4944e7e1fae5b7caf3b882 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerBacking.h
+++ b/Source/WebCore/rendering/RenderLayerBacking.h
@@ -231,9 +231,7 @@ public:
      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;
@@ -280,9 +278,7 @@ private:
  
      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
@@ -351,9 +347,7 @@ private:
      bool m_isMainFrameRenderViewLayer;
      bool m_usingTiledCacheLayer;
      bool m_requiresOwnBackingStore;
-#if ENABLE(CSS_FILTERS)
      bool m_canCompositeFilters;
-#endif
      bool m_backgroundLayerPaintsFixedRootBackground;
  
      static bool m_creatingPrimaryGraphicsLayer;
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp

index 2029d6271a19c04f2d133dccd67224c0123aeda0..aae2fbb2efe0c99842c1d71df43644c8e07ea3ff 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -2499,9 +2499,7 @@ bool RenderLayerCompositor::requiresCompositingForAnimation(RenderLayerModelObje
      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);
  }
  
@@ -2536,15 +2534,10 @@ bool RenderLayerCompositor::requiresCompositingForIndirectReason(RenderLayerMode
  
  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
diff --git a/Source/WebCore/rendering/RenderLayerFilterInfo.cpp b/Source/WebCore/rendering/RenderLayerFilterInfo.cpp

index e595dc6a8245e9e8cb603e13b55fdc67b21563c7..8fbb4183bd7e3b013b1e7870a21f15b42c189592 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerFilterInfo.cpp
+++ b/Source/WebCore/rendering/RenderLayerFilterInfo.cpp
@@ -30,7 +30,6 @@
  
  #include "config.h"
  
-#if ENABLE(CSS_FILTERS)
  #include "RenderLayerFilterInfo.h"
  
  #include "CachedSVGDocument.h"
@@ -139,5 +138,3 @@ void RenderLayer::FilterInfo::removeReferenceFilterClients()
  }
  
  } // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/rendering/RenderLayerFilterInfo.h b/Source/WebCore/rendering/RenderLayerFilterInfo.h

index 71e80e3fb9c94939e000faf59d4eccff9bcbc0be..265f73f2eab19aa98c03ee9acc1698596999ba9f 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerFilterInfo.h
+++ b/Source/WebCore/rendering/RenderLayerFilterInfo.h
@@ -31,8 +31,6 @@
  #ifndef RenderLayerFilterInfo_h
  #define RenderLayerFilterInfo_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "CachedResourceHandle.h"
  #include "CachedSVGDocumentClient.h"
  #include "RenderLayer.h"
@@ -89,6 +87,4 @@ private:
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // RenderLayerFilterInfo_h
diff --git a/Source/WebCore/rendering/RenderLayerModelObject.cpp b/Source/WebCore/rendering/RenderLayerModelObject.cpp

index a9290ba95e3ee2160fd92ab26d08dac60c1fe009..f3316ef3b60940c6412d78444854c30aa98f51da 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerModelObject.cpp
+++ b/Source/WebCore/rendering/RenderLayerModelObject.cpp
@@ -117,9 +117,7 @@ void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderS
                      || 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()) {
diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp

index cda881d2f7e41234dff343d7c50442166ef3890c..2459e53e1f2b6fd6c7fbd869172e21aa3638ab14 100644 (file)
--- a/Source/WebCore/rendering/RenderObject.cpp
+++ b/Source/WebCore/rendering/RenderObject.cpp
@@ -1235,8 +1235,6 @@ RenderLayerModelObject* RenderObject::containerForRepaint() const
                  repaintContainer = &compLayer->renderer();
          }
      }
-    
-#if ENABLE(CSS_FILTERS)
      if (view().hasSoftwareFilters()) {
          if (RenderLayer* parentLayer = enclosingLayer()) {
              RenderLayer* enclosingFilterLayer = parentLayer->enclosingFilterLayer();
@@ -1244,7 +1242,6 @@ RenderLayerModelObject* RenderObject::containerForRepaint() const
                  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
@@ -1276,12 +1273,10 @@ void RenderObject::repaintUsingContainer(const RenderLayerModelObject* repaintCo
          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()) {
diff --git a/Source/WebCore/rendering/RenderView.cpp b/Source/WebCore/rendering/RenderView.cpp

index b5cb113345ee5c4d54868e9145da06b20cf6b44f..814473300ea77c6c93f2fd7e6f23ade223d584c3 100644 (file)
--- a/Source/WebCore/rendering/RenderView.cpp
+++ b/Source/WebCore/rendering/RenderView.cpp
@@ -110,9 +110,7 @@ RenderView::RenderView(Document& document, PassRef<RenderStyle> style)
      , 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
diff --git a/Source/WebCore/rendering/RenderView.h b/Source/WebCore/rendering/RenderView.h

index 4768c42d0d80a607796897ab1bebdb2189eaca42..ba1735aa8e4d4517281e09d0e332a9d7001aad7d 100644 (file)
--- a/Source/WebCore/rendering/RenderView.h
+++ b/Source/WebCore/rendering/RenderView.h
@@ -220,10 +220,8 @@ public:
      
      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; }
@@ -362,9 +360,7 @@ private:
      unsigned m_renderCounterCount;
  
      bool m_selectionWasCaret;
-#if ENABLE(CSS_FILTERS)
      bool m_hasSoftwareFilters;
-#endif
  
      HashSet<RenderElement*> m_renderersWithPausedImageAnimation;
  
diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp

index 48e210d9d1ae8b8ee760a4b24b562df3abf2ac0b..78325db2ddb097eef553ace30d6e5e282acb2c01 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -632,10 +632,8 @@ bool RenderStyle::changeRequiresLayout(const RenderStyle* other, unsigned& chang
          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();
@@ -696,13 +694,11 @@ bool RenderStyle::changeRequiresLayerRepaint(const RenderStyle* other, unsigned&
          // 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)
diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h

index 73537efcf4961e60bf51aab7b1972cd78df01929..27bdf3fd9393eb7b6ea263946b610161906410af 100644 (file)
--- a/Source/WebCore/rendering/style/RenderStyle.h
+++ b/Source/WebCore/rendering/style/RenderStyle.h
@@ -55,6 +55,7 @@
  #include "StyleBackgroundData.h"
  #include "StyleBoxData.h"
  #include "StyleDeprecatedFlexibleBoxData.h"
+#include "StyleFilterData.h"
  #include "StyleFlexibleBoxData.h"
  #include "StyleMarqueeData.h"
  #include "StyleMultiColData.h"
@@ -74,10 +75,6 @@
  #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"
@@ -107,10 +104,7 @@ template<typename T, typename U> inline bool compareEqual(const T& t, const U& u
  
  namespace WebCore {
  
-#if ENABLE(CSS_FILTERS)
  class FilterOperations;
-#endif
-
  class BorderData;
  class CounterContent;
  class CursorList;
@@ -568,10 +562,8 @@ public:
          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; }
@@ -1134,13 +1126,9 @@ public:
      
      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); }
@@ -1569,9 +1557,7 @@ public:
  
      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); }
  
@@ -2009,9 +1995,7 @@ public:
      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; }
diff --git a/Source/WebCore/rendering/style/StyleFilterData.cpp b/Source/WebCore/rendering/style/StyleFilterData.cpp

index 77d3efa40983a53d6d8466e68ebc84d7197a9dfc..71cff6228dd12633338778e622c0fc20ab0d2ee7 100644 (file)
--- a/Source/WebCore/rendering/style/StyleFilterData.cpp
+++ b/Source/WebCore/rendering/style/StyleFilterData.cpp
@@ -27,9 +27,6 @@
  #include "StyleFilterData.h"
  
  #include "FEGaussianBlur.h"
-
-#if ENABLE(CSS_FILTERS)
-
  #include "RenderStyle.h"
  
  namespace WebCore {
@@ -56,5 +53,3 @@ bool StyleFilterData::operator==(const StyleFilterData& o) const
  }
  
  } // namespace WebCore
-
-#endif // ENABLE(CSS_FILTERS)
diff --git a/Source/WebCore/rendering/style/StyleFilterData.h b/Source/WebCore/rendering/style/StyleFilterData.h

index 20ec89866eefc69330065a2a4e981b3f71b62c45..e984461a2b8e92f3e10119ffb065412013b09f98 100644 (file)
--- a/Source/WebCore/rendering/style/StyleFilterData.h
+++ b/Source/WebCore/rendering/style/StyleFilterData.h
@@ -26,8 +26,6 @@
  #ifndef StyleFilterData_h
  #define StyleFilterData_h
  
-#if ENABLE(CSS_FILTERS)
-
  #include "FilterOperations.h"
  #include <wtf/PassRefPtr.h>
  #include <wtf/RefCounted.h>
@@ -54,6 +52,4 @@ private:
  
  } // namespace WebCore
  
-#endif // ENABLE(CSS_FILTERS)
-
  #endif // StyleFilterData_h
diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

index 3a24066c494ca62174a18fe39103078f5a824114..2a26216b328e6baa210301dad3920f7264cb252d 100644 (file)
--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
@@ -47,9 +47,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
      , 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())
@@ -119,9 +117,7 @@ inline StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonIn
      , 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)
@@ -216,9 +212,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
          && 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
@@ -348,11 +342,7 @@ bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInher
  
  bool StyleRareNonInheritedData::hasFilters() const
  {
-#if ENABLE(CSS_FILTERS)
      return m_filter.get() && !m_filter->m_operations.isEmpty();
-#else
-    return false;
-#endif
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

index f0254c0982f6c9e7089a5878ecf93e1736086814..f95a38e6d9e0b93c437c321cfdd2a77fd2450127 100644 (file)
--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
@@ -43,9 +43,7 @@ namespace WebCore {
  class AnimationList;
  class ShadowData;
  class StyleDeprecatedFlexibleBoxData;
-#if ENABLE(CSS_FILTERS)
  class StyleFilterData;
-#endif
  class StyleFlexibleBoxData;
  #if ENABLE(CSS_GRID_LAYOUT)
  class StyleGridData;
@@ -120,10 +118,7 @@ public:
      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;
diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

index 5b233c83e20599c5b085d66b258fce413398a85e..c1a4b55446a9663c71579b410cd73fa286391167 100644 (file)
--- a/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
+++ b/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
@@ -115,10 +115,8 @@ void RenderSVGResourceContainer::markAllClientsForInvalidation(InvalidationMode
  
  void RenderSVGResourceContainer::markAllClientLayersForInvalidation()
  {
-#if ENABLE(CSS_FILTERS)
      for (auto* clientLayer : m_clientLayers)
          clientLayer->filterNeedsRepaint();
-#endif
  }
  
  void RenderSVGResourceContainer::markClientForInvalidation(RenderObject& client, InvalidationMode mode)
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog

index 87a755211a98a5414af099bd0a30f776e2fa7829..94db26557cb50465d607d60fbc36f2b5986b9fdc 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

index 84f1bfaa3fe705f6d39c8e4380544191dd54e509..705baafd155c04bef58ebc6e335e980e0c9022af 100644 (file)
--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
@@ -52,7 +52,6 @@ ENABLE_CSP_NEXT = ;
  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 = ;
@@ -272,4 +271,4 @@ ENABLE_LLINT_C_LOOP = ;
  
  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));
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog

index 41c8200ee23896c4b0b324a3837a4247a18eebcc..13a95f485972ccac7efaa5735c6a6c86bf9f84b9 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,33 @@
+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.
diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig

index 84f1bfaa3fe705f6d39c8e4380544191dd54e509..705baafd155c04bef58ebc6e335e980e0c9022af 100644 (file)
--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
@@ -52,7 +52,6 @@ ENABLE_CSP_NEXT = ;
  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 = ;
@@ -272,4 +271,4 @@ ENABLE_LLINT_C_LOOP = ;
  
  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));
diff --git a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp b/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp

index 54ace5961a64ae5d9c2089227de6fbf451899edd..f729f5a78b116a5ec5c2e168887c49666963c198 100644 (file)
--- a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
+++ b/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
@@ -34,6 +34,7 @@
  #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>
@@ -50,10 +51,6 @@
  #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
@@ -63,7 +60,6 @@ using namespace WebKit;
  
  namespace IPC {
  
-#if ENABLE(CSS_FILTERS)
  void ArgumentCoder<WebCore::FilterOperations>::encode(ArgumentEncoder& encoder, const WebCore::FilterOperations& filters)
  {
      encoder << static_cast<uint32_t>(filters.size());
@@ -171,7 +167,6 @@ bool ArgumentCoder<WebCore::FilterOperations>::decode(ArgumentDecoder& decoder,
  
      return true;
  }
-#endif
  
  void ArgumentCoder<TransformOperations>::encode(ArgumentEncoder& encoder, const TransformOperations& transformOperations)
  {
@@ -446,11 +441,9 @@ void ArgumentCoder<GraphicsLayerAnimation>::encode(ArgumentEncoder& encoder, con
          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;
          }
@@ -534,7 +527,6 @@ bool ArgumentCoder<GraphicsLayerAnimation>::decode(ArgumentDecoder& decoder, Gra
              keyframes.insert(TransformAnimationValue::create(keyTime, transform, timingFunction.get()));
              break;
          }
-#if ENABLE(CSS_FILTERS)
          case AnimatedPropertyWebkitFilter: {
              FilterOperations filter;
              if (!decoder.decode(filter))
@@ -542,7 +534,6 @@ bool ArgumentCoder<GraphicsLayerAnimation>::decode(ArgumentDecoder& decoder, Gra
              keyframes.insert(FilterAnimationValue::create(keyTime, filter, timingFunction.get()));
              break;
          }
-#endif
          default:
              break;
          }
@@ -657,10 +648,8 @@ void ArgumentCoder<CoordinatedGraphicsLayerState>::encode(ArgumentEncoder& encod
      if (state.debugBorderWidthChanged)
          encoder << state.debugBorderWidth;
  
-#if ENABLE(CSS_FILTERS)
      if (state.filtersChanged)
          encoder << state.filters;
-#endif
  
      if (state.animationsChanged)
          encoder << state.animations;
@@ -743,10 +732,8 @@ bool ArgumentCoder<CoordinatedGraphicsLayerState>::decode(ArgumentDecoder& decod
      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;
diff --git a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h b/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h

index edc4c38f3e0982b45faabd9cb48fa02edbd6e1b7..af3abefd305305ccf8e7ba112ce8cb4a8cfde64f 100644 (file)
--- a/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h
+++ b/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h
@@ -44,9 +44,7 @@ class TransformationMatrix;
  class TransformOperations;
  struct Length;
  
-#if ENABLE(CSS_FILTERS)
  class FilterOperations;
-#endif
  
  #if USE(GRAPHICS_SURFACE)
  struct GraphicsSurfaceToken;
@@ -55,12 +53,10 @@ 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&);
diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

index 35992e5bb430f685d186cde48ea08500c5bcceb5..ba73ab3075da3fbdfbcc03b9e006893e5e16a102 100644 (file)
--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp
@@ -1576,7 +1576,7 @@ bool ArgumentCoder<StickyPositionViewportConstraints>::decode(ArgumentDecoder& d
      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());
@@ -1707,7 +1707,7 @@ bool ArgumentCoder<FilterOperations>::decode(ArgumentDecoder& decoder, FilterOpe
  
      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)
diff --git a/Source/WebKit2/Shared/WebCoreArgumentCoders.h b/Source/WebKit2/Shared/WebCoreArgumentCoders.h

index 1bea0d1bd79b5297d4354e23842150e9bdbdeb92..9c76ac6e15d08ab742bd7478fe8c10ac43a4e164 100644 (file)
--- a/Source/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/Source/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -374,7 +374,7 @@ template<> struct ArgumentCoder<WebCore::StickyPositionViewportConstraints> {
      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&);
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp b/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp

index f44809384f3c6bb5e4d077814537cbc5b503b39f..e35775677d51a3f37c274b3a44d10df8ac577544 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp
@@ -36,12 +36,10 @@ GraphicsLayerCARemote::~GraphicsLayerCARemote()
  {
  }
  
-#if ENABLE(CSS_FILTERS)
  bool GraphicsLayerCARemote::filtersCanBeComposited(const FilterOperations& filters)
  {
      return PlatformCALayerRemote::filtersCanBeComposited(filters);
  }
-#endif
  
  PassRefPtr<PlatformCALayer> GraphicsLayerCARemote::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
  {
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h b/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h

index c878534f3de7f95efa3e1b392165960215467cf2..8a73f8ccfd1f3beec487bace5e873be9672c1931 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h
+++ b/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h
@@ -42,10 +42,8 @@ public:
      }
  
      virtual ~GraphicsLayerCARemote();
-    
-#if ENABLE(CSS_FILTERS)
+
      virtual bool filtersCanBeComposited(const WebCore::FilterOperations& filters) override;
-#endif
  
  private:
      virtual bool isGraphicsLayerCARemote() const override { return true; }
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h

index f7c5499f1b292c7ed219586f502bfc8d39803ff8..92ebffd93f88181bd9ecd0e1c40fd713b4ca7404 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h
+++ b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h
@@ -91,18 +91,14 @@ public:
      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.
@@ -110,9 +106,7 @@ public:
      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;
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm

index 16b41b0b4ee1d72433bb3be7e7c1d9908ca97d75..58604dafc2c82eec88fff9a773f71ddd155f35b4 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
+++ b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
@@ -482,7 +482,6 @@ void PlatformCAAnimationRemote::setFromValue(const Color& value)
      m_properties.keyValues[0] = KeyframeValue(value);
  }
  
-#if ENABLE(CSS_FILTERS)
  void PlatformCAAnimationRemote::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
  {
      if (animationType() != Basic)
@@ -491,7 +490,6 @@ void PlatformCAAnimationRemote::setFromValue(const FilterOperation* operation, i
      m_properties.keyValues.resize(2);
      m_properties.keyValues[0] = KeyframeValue(operation->clone());
  }
-#endif
  
  void PlatformCAAnimationRemote::copyFromValueFrom(const PlatformCAAnimation* value)
  {
@@ -540,7 +538,6 @@ void PlatformCAAnimationRemote::setToValue(const Color& value)
      m_properties.keyValues[1] = KeyframeValue(value);
  }
  
-#if ENABLE(CSS_FILTERS)
  void PlatformCAAnimationRemote::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
  {
      if (animationType() != Basic)
@@ -551,7 +548,6 @@ void PlatformCAAnimationRemote::setToValue(const FilterOperation* operation, int
      m_properties.keyValues.resize(2);
      m_properties.keyValues[1] = KeyframeValue(operation->clone());
  }
-#endif
  
  void PlatformCAAnimationRemote::copyToValueFrom(const PlatformCAAnimation* value)
  {
@@ -620,7 +616,6 @@ void PlatformCAAnimationRemote::setValues(const Vector<Color>& values)
      m_properties.keyValues = WTF::move(keyframes);
  }
  
-#if ENABLE(CSS_FILTERS)
  void PlatformCAAnimationRemote::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
  {
      UNUSED_PARAM(internalFilterPropertyIndex);
@@ -636,7 +631,6 @@ void PlatformCAAnimationRemote::setValues(const Vector<RefPtr<FilterOperation>>&
      
      m_properties.keyValues = WTF::move(keyframes);
  }
-#endif
  
  void PlatformCAAnimationRemote::copyValuesFrom(const PlatformCAAnimation* value)
  {
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

index 5827a8876a91d49f720d751627d00d14ee3c3740..55831f301728c22effabb42b6390a2b47cd2f205 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp
@@ -132,10 +132,8 @@ void PlatformCALayerRemote::updateClonedLayerProperties(PlatformCALayerRemote& c
      clone.setOpaque(isOpaque());
      clone.setBackgroundColor(backgroundColor());
      clone.setContentsScale(contentsScale());
-#if ENABLE(CSS_FILTERS)
      if (m_properties.filters)
          clone.copyFiltersFrom(this);
-#endif
      clone.updateCustomAppearance(customAppearance());
  }
  
@@ -598,7 +596,6 @@ void PlatformCALayerRemote::setOpacity(float value)
      m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::OpacityChanged);
  }
  
-#if ENABLE(CSS_FILTERS)
  void PlatformCALayerRemote::setFilters(const FilterOperations& filters)
  {
      m_properties.filters = std::make_unique<FilterOperations>(filters);
@@ -627,7 +624,6 @@ bool PlatformCALayerRemote::filtersCanBeComposited(const FilterOperations& filte
  {
      return PlatformCALayerMac::filtersCanBeComposited(filters);
  }
-#endif
  
  void PlatformCALayerRemote::setName(const String& value)
  {
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h

index 9945dfa84bf9f71def478dd11b7aed1ff731a11c..25dd7949a04ada69b16170db62f4fc6262d5ce16 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h
+++ b/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h
@@ -122,11 +122,9 @@ public:
      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;
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake

index c8ec86e6ceebc1138369bf29ef466eb313017efb..0269dfa0c6094d2412b2c0db8d8708b2e7cd2f22 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -70,7 +70,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_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)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake

index 377b8192fb1975f7f8e30c21139a69c4b8442b8e..3fefae7cb5b7101ee9243a0c40e307ab304c49ed 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -110,7 +110,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH OFF)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
  WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_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)
diff --git a/Source/cmake/OptionsMac.cmake b/Source/cmake/OptionsMac.cmake

index cfabf4a722c559bd6a4f856bdc02b2f116825a19..57d99f3387d49d2f84efa2c3cfa973be1fb8dd3b 100644 (file)
--- a/Source/cmake/OptionsMac.cmake
+++ b/Source/cmake/OptionsMac.cmake
@@ -20,7 +20,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSP_NEXT OFF)
  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)
diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake

index 433ab77c91a24992d9dcb64acf2ddad04c44fe84..d90dd9e5e5a5cc30709fc3c3b86144e395005dcf 100644 (file)
--- a/Source/cmake/WebKitFeatures.cmake
+++ b/Source/cmake/WebKitFeatures.cmake
@@ -36,7 +36,6 @@ macro(WEBKIT_OPTION_BEGIN)
      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)
diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake

index 0a9a8edca0db255104a9b630285652b5e1511d7a..393b330f2b5c65e2c04ba401587356785b431ec7 100644 (file)
--- a/Source/cmakeconfig.h.cmake
+++ b/Source/cmakeconfig.h.cmake
@@ -21,7 +21,6 @@
  #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
diff --git a/Tools/ChangeLog b/Tools/ChangeLog

index 7ce628cf97b7d612de925442ab43b6eb17c16c30..2e355152aec8f637f2cfc15b650479d05d7c15e6 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm

index 7c8ad810b6d5c6c61013ae11e1168e6cf46ba872..9a9c32c9fd41a9263a7e12e09986f02ef65f639c 100644 (file)
--- a/Tools/Scripts/webkitperl/FeatureList.pm
+++ b/Tools/Scripts/webkitperl/FeatureList.pm
@@ -178,9 +178,6 @@ my @features = (
      { 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 },
  
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog

index b1f24f797c52e6592082af05634afff5dc388157..06a5c40beeb05fe95d528fca4762c06eaaf9f051 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,13 @@
+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.
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props

index ba687210c872180837ef3de4f13551bf885c9869..657569134f6b453fdcadd414c0e04eda784c1576 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
@@ -12,7 +12,6 @@
      <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>
@@ -89,7 +88,7 @@
    </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>
@@ -137,10 +136,6 @@
        <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>
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props

index 6edddf724b485d232f7259e9b7fc74c3463b2b81..1b54e72f95d2e31fdf9af867f00e4865747eb3d0 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
@@ -12,7 +12,6 @@
      <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>
@@ -88,7 +87,7 @@
    </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>
@@ -136,10 +135,6 @@
        <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>
author	commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Thu, 4 Sep 2014 18:43:39 +0000 (18:43 +0000)
committer	commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Thu, 4 Sep 2014 18:43:39 +0000 (18:43 +0000)
ChangeLog		patch \| blob \| history
LayoutTests/ChangeLog		patch \| blob \| history
LayoutTests/platform/efl/TestExpectations		patch \| blob \| history
Source/JavaScriptCore/ChangeLog		patch \| blob \| history
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig		patch \| blob \| history
Source/WTF/ChangeLog		patch \| blob \| history
Source/WTF/wtf/FeatureDefines.h		patch \| blob \| history
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/Configurations/FeatureDefines.xcconfig		patch \| blob \| history
Source/WebCore/DerivedSources.cpp		patch \| blob \| history
Source/WebCore/WebCore.exp.in		patch \| blob \| history
Source/WebCore/bindings/js/JSCSSValueCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/objc/DOMCSS.mm		patch \| blob \| history
Source/WebCore/css/CSSComputedStyleDeclaration.cpp		patch \| blob \| history
Source/WebCore/css/CSSComputedStyleDeclaration.h		patch \| blob \| history
Source/WebCore/css/CSSFilterImageValue.cpp		patch \| blob \| history
Source/WebCore/css/CSSFilterImageValue.h		patch \| blob \| history
Source/WebCore/css/CSSImageGeneratorValue.cpp		patch \| blob \| history
Source/WebCore/css/CSSParser.cpp		patch \| blob \| history
Source/WebCore/css/CSSParser.h		patch \| blob \| history
Source/WebCore/css/CSSPropertyNames.in		patch \| blob \| history
Source/WebCore/css/CSSValue.cpp		patch \| blob \| history
Source/WebCore/css/CSSValue.h		patch \| blob \| history
Source/WebCore/css/StyleResolver.cpp		patch \| blob \| history
Source/WebCore/css/StyleResolver.h		patch \| blob \| history
Source/WebCore/css/WebKitCSSFilterValue.cpp		patch \| blob \| history
Source/WebCore/css/WebKitCSSFilterValue.h		patch \| blob \| history
Source/WebCore/css/WebKitCSSFilterValue.idl		patch \| blob \| history
Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp		patch \| blob \| history
Source/WebCore/loader/cache/CachedSVGDocumentReference.h		patch \| blob \| history
Source/WebCore/page/FrameView.cpp		patch \| blob \| history
Source/WebCore/page/animation/AnimationBase.cpp		patch \| blob \| history
Source/WebCore/page/animation/AnimationBase.h		patch \| blob \| history
Source/WebCore/page/animation/CSSPropertyAnimation.cpp		patch \| blob \| history
Source/WebCore/page/animation/ImplicitAnimation.cpp		patch \| blob \| history
Source/WebCore/page/animation/ImplicitAnimation.h		patch \| blob \| history
Source/WebCore/page/animation/KeyframeAnimation.cpp		patch \| blob \| history
Source/WebCore/page/animation/KeyframeAnimation.h		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsLayer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsLayer.h		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/GraphicsLayerAnimation.h		patch \| blob \| history
Source/WebCore/platform/graphics/IntRectExtent.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCAFilters.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/PlatformCALayer.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm		patch \| blob \| history
Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm		patch \| blob \| history
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm		patch \| blob \| history
Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h		patch \| blob \| history
Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperation.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperation.h		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperations.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/filters/FilterOperations.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapper.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperGL.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h		patch \| blob \| history
Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h		patch \| blob \| history
Source/WebCore/rendering/FilterEffectRenderer.cpp		patch \| blob \| history
Source/WebCore/rendering/FilterEffectRenderer.h		patch \| blob \| history
Source/WebCore/rendering/RenderElement.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderElement.h		patch \| blob \| history
Source/WebCore/rendering/RenderLayer.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderLayer.h		patch \| blob \| history
Source/WebCore/rendering/RenderLayerBacking.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderLayerBacking.h		patch \| blob \| history
Source/WebCore/rendering/RenderLayerCompositor.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderLayerFilterInfo.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderLayerFilterInfo.h		patch \| blob \| history
Source/WebCore/rendering/RenderLayerModelObject.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderObject.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderView.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderView.h		patch \| blob \| history
Source/WebCore/rendering/style/RenderStyle.cpp		patch \| blob \| history
Source/WebCore/rendering/style/RenderStyle.h		patch \| blob \| history
Source/WebCore/rendering/style/StyleFilterData.cpp		patch \| blob \| history
Source/WebCore/rendering/style/StyleFilterData.h		patch \| blob \| history
Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp		patch \| blob \| history
Source/WebCore/rendering/style/StyleRareNonInheritedData.h		patch \| blob \| history
Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp		patch \| blob \| history
Source/WebKit/mac/ChangeLog		patch \| blob \| history
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig		patch \| blob \| history
Source/WebKit2/ChangeLog		patch \| blob \| history
Source/WebKit2/Configurations/FeatureDefines.xcconfig		patch \| blob \| history
Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp		patch \| blob \| history
Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h		patch \| blob \| history
Source/WebKit2/Shared/WebCoreArgumentCoders.cpp		patch \| blob \| history
Source/WebKit2/Shared/WebCoreArgumentCoders.h		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h		patch \| blob \| history
Source/cmake/OptionsEfl.cmake		patch \| blob \| history
Source/cmake/OptionsGTK.cmake		patch \| blob \| history
Source/cmake/OptionsMac.cmake		patch \| blob \| history
Source/cmake/WebKitFeatures.cmake		patch \| blob \| history
Source/cmakeconfig.h.cmake		patch \| blob \| history
Tools/ChangeLog		patch \| blob \| history
Tools/Scripts/webkitperl/FeatureList.pm		patch \| blob \| history
WebKitLibraries/ChangeLog		patch \| blob \| history
WebKitLibraries/win/tools/vsprops/FeatureDefines.props		patch \| blob \| history
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props		patch \| blob \| history