<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173268] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173268">173268</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-04 11:43:39 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove CSS_FILTERS flag
https://bugs.webkit.org/show_bug.cgi?id=136529
Patch by Eva Balazsfalvi <evab.u-szeged@partner.samsung.com> on 2014-09-04
Reviewed by Dirk Schulze.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
No new tests, no behaviour changed.
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.cpp:
* WebCore.exp.in:
* bindings/js/JSCSSValueCustom.cpp:
(WebCore::toJS):
* bindings/objc/DOMCSS.mm:
(kitClass):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForFilter):
(WebCore::isLayoutDependent):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSComputedStyleDeclaration.h:
* css/CSSFilterImageValue.cpp:
* css/CSSFilterImageValue.h:
* css/CSSImageGeneratorValue.cpp:
(WebCore::CSSImageGeneratorValue::image):
(WebCore::CSSImageGeneratorValue::isFixedSize):
(WebCore::CSSImageGeneratorValue::fixedSize):
(WebCore::CSSImageGeneratorValue::isPending):
(WebCore::CSSImageGeneratorValue::knownToBeOpaque):
(WebCore::CSSImageGeneratorValue::loadSubimages):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGeneratedImage):
(WebCore::CSSParser::parseFilterImage):
(WebCore::CSSParser::parseFilter):
* css/CSSParser.h:
* css/CSSPropertyNames.in:
* css/CSSValue.cpp:
(WebCore::CSSValue::hasFailedOrCanceledSubresources):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::cloneForCSSOM):
* css/CSSValue.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::State::clear):
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::generatedOrPendingFromValue):
(WebCore::StyleResolver::loadPendingResources):
* css/StyleResolver.h:
* css/WebKitCSSFilterValue.cpp:
* css/WebKitCSSFilterValue.h:
* css/WebKitCSSFilterValue.idl:
* loader/cache/CachedSVGDocumentReference.cpp:
* loader/cache/CachedSVGDocumentReference.h:
* page/FrameView.cpp:
(WebCore::FrameView::scrollContentsFastPath):
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::AnimationBase):
* page/animation/AnimationBase.h:
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFilter):
(WebCore::blendFunc):
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::reset):
(WebCore::ImplicitAnimation::checkForMatchingFilterFunctionLists):
* page/animation/ImplicitAnimation.h:
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::KeyframeAnimation):
(WebCore::KeyframeAnimation::checkForMatchingFilterFunctionLists):
* page/animation/KeyframeAnimation.h:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::validateFilterOperations):
* platform/graphics/GraphicsLayer.h:
* platform/graphics/GraphicsLayerAnimation.cpp:
(WebCore::applyFilterAnimation):
(WebCore::GraphicsLayerAnimation::applyInternal):
* platform/graphics/GraphicsLayerAnimation.h:
* platform/graphics/IntRectExtent.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::propertyIdToString):
(WebCore::supportsAcceleratedFilterAnimations):
(WebCore::GraphicsLayerCA::filtersCanBeComposited):
(WebCore::GraphicsLayerCA::moveOrCopyAnimations):
(WebCore::GraphicsLayerCA::setFilters):
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateFilters):
(WebCore::GraphicsLayerCA::ensureStructuralLayer):
(WebCore::GraphicsLayerCA::createFilterAnimationsFromKeyframes):
(WebCore::GraphicsLayerCA::setFilterAnimationKeyframes):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/PlatformCAAnimation.h:
* platform/graphics/ca/PlatformCAFilters.h:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/mac/PlatformCAAnimationMac.h:
* platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
(PlatformCAAnimationMac::setFromValue):
(PlatformCAAnimationMac::setToValue):
(PlatformCAAnimationMac::setValues):
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
(PlatformCAFilters::animatedFilterPropertyName):
* platform/graphics/ca/mac/PlatformCALayerMac.h:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::clone):
(PlatformCALayerMac::filtersCanBeComposited):
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimationWin::setFromValue):
(PlatformCAAnimationWin::setToValue):
(PlatformCAAnimationWin::setValues):
* platform/graphics/ca/win/PlatformCAAnimationWin.h:
* platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
(PlatformCAFilters::animatedFilterPropertyName):
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::clone):
* platform/graphics/ca/win/PlatformCALayerWin.h:
* platform/graphics/filters/FilterOperation.cpp:
* platform/graphics/filters/FilterOperation.h:
* platform/graphics/filters/FilterOperations.cpp:
* platform/graphics/filters/FilterOperations.h:
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
(WebCore::GraphicsLayerTextureMapper::setFilters):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
* platform/graphics/texmap/TextureMapper.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGLData::TextureMapperGLData):
(WebCore::prepareFilterProgram):
(WebCore::TextureMapperGL::drawTexture):
(WebCore::BitmapTextureGL::applyFilters):
* platform/graphics/texmap/TextureMapperGL.h:
* platform/graphics/texmap/TextureMapperImageBuffer.cpp:
(WebCore::BitmapTextureImageBuffer::applyFilters):
* platform/graphics/texmap/TextureMapperImageBuffer.h:
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::setAnimatedFilters):
(WebCore::TextureMapperLayer::computeOverlapRegions):
(WebCore::TextureMapperLayer::paintIntoSurface):
(WebCore::TextureMapperLayer::setFilters):
(WebCore::TextureMapperLayer::syncAnimations):
* platform/graphics/texmap/TextureMapperLayer.h:
(WebCore::TextureMapperLayer::hasFilters):
* platform/graphics/texmap/TextureMapperShaderProgram.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::didChangeFilters):
(WebCore::CoordinatedGraphicsLayer::setFilters):
(WebCore::CoordinatedGraphicsLayer::syncFilters):
(WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
(WebCore::CoordinatedGraphicsScene::setLayerFiltersIfNeeded):
(WebCore::CoordinatedGraphicsScene::setLayerState):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
* rendering/FilterEffectRenderer.cpp:
* rendering/FilterEffectRenderer.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::adjustStyleDifference):
* rendering/RenderElement.h:
(WebCore::RenderElement::hasFilter): Deleted.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::~RenderLayer):
(WebCore::transparencyClipBox):
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::RenderLayerBacking):
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateFilters):
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::startAnimation):
(WebCore::RenderLayerBacking::startTransition):
(WebCore::RenderLayerBacking::graphicsLayerToCSSProperty):
(WebCore::RenderLayerBacking::cssToGraphicsLayerProperty):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
(WebCore::RenderLayerCompositor::requiresCompositingForFilters):
* rendering/RenderLayerFilterInfo.cpp:
* rendering/RenderLayerFilterInfo.h:
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::styleWillChange):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containerForRepaint):
(WebCore::RenderObject::repaintUsingContainer):
* rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
* rendering/RenderView.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
(WebCore::RenderStyle::changeRequiresLayerRepaint):
* rendering/style/RenderStyle.h:
* rendering/style/StyleFilterData.cpp:
* rendering/style/StyleFilterData.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
(WebCore::StyleRareNonInheritedData::hasFilters):
* rendering/style/StyleRareNonInheritedData.h:
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::markAllClientLayersForInvalidation):
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
(IPC::ArgumentCoder<WebCore::FilterOperations>::decode):
(IPC::ArgumentCoder<GraphicsLayerAnimation>::encode):
(IPC::ArgumentCoder<GraphicsLayerAnimation>::decode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::encode):
(IPC::ArgumentCoder<CoordinatedGraphicsLayerState>::decode):
* Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h:
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebCoreArgumentCoders.h:
* WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp:
(WebKit::GraphicsLayerCARemote::filtersCanBeComposited):
* WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
(WebKit::PlatformCAAnimationRemote::setFromValue):
(WebKit::PlatformCAAnimationRemote::setToValue):
(WebKit::PlatformCAAnimationRemote::setValues):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::updateClonedLayerProperties):
(WebKit::PlatformCALayerRemote::filtersCanBeComposited):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* Scripts/webkitperl/FeatureList.pm:
WebKitLibraries:
* win/tools/vsprops/FeatureDefines.props:
* win/tools/vsprops/FeatureDefinesCairo.props:
LayoutTests:
* platform/efl/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSValueCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSmm">trunk/Source/WebCore/bindings/objc/DOMCSS.mm</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationh">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValueh">trunk/Source/WebCore/css/CSSFilterImageValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValuecpp">trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSFilterValuecpp">trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSFilterValueh">trunk/Source/WebCore/css/WebKitCSSFilterValue.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSFilterValueidl">trunk/Source/WebCore/css/WebKitCSSFilterValue.idl</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferenceh">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBasecpp">trunk/Source/WebCore/page/animation/AnimationBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBaseh">trunk/Source/WebCore/page/animation/AnimationBase.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationcpp">trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationh">trunk/Source/WebCore/page/animation/ImplicitAnimation.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationh">trunk/Source/WebCore/page/animation/KeyframeAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationcpp">trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationh">trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRectExtenth">trunk/Source/WebCore/platform/graphics/IntRectExtent.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAAnimationMach">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAAnimationMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMach">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCAAnimationWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCAAnimationWinh">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCAFiltersWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinh">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationcpp">trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh">trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationscpp">trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationsh">trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBuffercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBufferh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsScenecpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsSceneh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsStateh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingFilterEffectRenderercpp">trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFilterEffectRendererh">trunk/Source/WebCore/rendering/FilterEffectRenderer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfocpp">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerFilterInfoh">trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjectcpp">trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleFilterDatacpp">trunk/Source/WebCore/rendering/style/StyleFilterData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleFilterDatah">trunk/Source/WebCore/rendering/style/StyleFilterData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCodersh">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemotemm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-01 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] Build warning by INTERFACE_LINK_LIBRARIES
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/LayoutTests/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> XMLHttpRequest always defaults Content-Type to application/xml, while it should depend on data type
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -288,7 +288,6 @@
</span><span class="cx"> # Bug in the test itself, as the input box can be big enough for the given coordinates to be inside it.
</span><span class="cx"> Bug(EFL) fast/forms/input-text-click-outside.html
</span><span class="cx">
</span><del>-# CSS Filters support not yet enabled (needs ENABLE_CSS_FILTERS).
</del><span class="cx"> webkit.org/b/85465 css3/filters [ Skip ]
</span><span class="cx"> webkit.org/b/85465 compositing/filters [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173248.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><del>-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
</del><span class="cx"> ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="lines">@@ -272,4 +271,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_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));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_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));
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WTF/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173201.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -372,10 +372,6 @@
</span><span class="cx"> #define ENABLE_CSS_COMPOSITING 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_CSS_FILTERS)
-#define ENABLE_CSS_FILTERS 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CSS_IMAGE_ORIENTATION)
</span><span class="cx"> #define ENABLE_CSS_IMAGE_ORIENTATION 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,208 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-09-04 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove iOS specific disk image cache
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><del>-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
</del><span class="cx"> ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="lines">@@ -272,4 +271,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_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));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_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));
</ins></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -494,9 +494,7 @@
</span><span class="cx"> #include "JSValidityState.cpp"
</span><span class="cx"> #include "JSVoidCallback.cpp"
</span><span class="cx"> #include "JSWebKitAnimationEvent.cpp"
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> #include "JSWebKitCSSFilterValue.cpp"
</span><del>-#endif
</del><span class="cx"> #include "JSWebKitCSSKeyframeRule.cpp"
</span><span class="cx"> #include "JSWebKitCSSKeyframesRule.cpp"
</span><span class="cx"> #include "JSWebKitCSSTransformValue.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -683,6 +683,7 @@
</span><span class="cx"> __ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
</span><span class="cx"> __ZN7WebCore16FilterOperationsC1Ev
</span><ins>+__ZN7WebCore16FilterOperationsaSERKS0_
</ins><span class="cx"> __ZN7WebCore16FontPlatformDataD1Ev
</span><span class="cx"> __ZN7WebCore16FrameLoadRequestC1EPNS_5FrameERKNS_15ResourceRequestERKNS_14SubstituteDataE
</span><span class="cx"> __ZN7WebCore16HTMLInputElement13setAutofilledEb
</span><span class="lines">@@ -3008,10 +3009,6 @@
</span><span class="cx"> __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12DOMWindowCSSE
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-__ZN7WebCore16FilterOperationsaSERKS0_
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode22setVerticalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode24setHorizontalSnapOffsetsERKN3WTF6VectorIfLm0ENS1_15CrashOnOverflowEEE
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSValueCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/bindings/js/JSCSSValueCustom.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -33,16 +33,13 @@
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSSVGColor.h"
</span><span class="cx"> #include "JSSVGPaint.h"
</span><ins>+#include "JSWebKitCSSFilterValue.h"
</ins><span class="cx"> #include "JSWebKitCSSTransformValue.h"
</span><span class="cx"> #include "SVGColor.h"
</span><span class="cx"> #include "SVGPaint.h"
</span><ins>+#include "WebKitCSSFilterValue.h"
</ins><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "JSWebKitCSSFilterValue.h"
-#include "WebKitCSSFilterValue.h"
-#endif
-
</del><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -87,10 +84,8 @@
</span><span class="cx">
</span><span class="cx"> if (value->isWebKitCSSTransformValue())
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSTransformValue, value);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> else if (value->isWebKitCSSFilterValue())
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSFilterValue, value);
</span><del>-#endif
</del><span class="cx"> else if (value->isValueList())
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, CSSValueList, value);
</span><span class="cx"> else if (value->isSVGPaint())
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSS.mm (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSS.mm 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/bindings/objc/DOMCSS.mm 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -48,14 +48,11 @@
</span><span class="cx"> #import "DOMCSSValueList.h"
</span><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMStyleSheetInternal.h"
</span><ins>+#import "DOMWebKitCSSFilterValue.h"
</ins><span class="cx"> #import "DOMWebKitCSSKeyframeRule.h"
</span><span class="cx"> #import "DOMWebKitCSSKeyframesRule.h"
</span><span class="cx"> #import "DOMWebKitCSSTransformValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#import "DOMWebKitCSSFilterValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> #import "DOMWebKitCSSRegionRule.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -126,10 +123,8 @@
</span><span class="cx"> case WebCore::CSSValue::CSS_VALUE_LIST:
</span><span class="cx"> if (impl->isWebKitCSSTransformValue())
</span><span class="cx"> return [DOMWebKitCSSTransformValue class];
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (impl->isWebKitCSSFilterValue())
</span><span class="cx"> return [DOMWebKitCSSFilterValue class];
</span><del>-#endif
</del><span class="cx"> return [DOMCSSValueList class];
</span><span class="cx"> case WebCore::CSSValue::CSS_INHERIT:
</span><span class="cx"> case WebCore::CSSValue::CSS_INITIAL:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> #include "StyleProperties.h"
</span><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><ins>+#include "WebKitCSSFilterValue.h"
</ins><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx"> #include "WebKitFontFamilyNames.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -77,10 +78,6 @@
</span><span class="cx"> #include "ShapeValue.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> #include "DashboardRegion.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -283,9 +280,6 @@
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> CSSPropertyWebkitDashboardRegion,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
- CSSPropertyWebkitFilter,
-#endif
</del><span class="cx"> CSSPropertyWebkitAlignContent,
</span><span class="cx"> CSSPropertyWebkitAlignItems,
</span><span class="cx"> CSSPropertyWebkitAlignSelf,
</span><span class="lines">@@ -296,6 +290,7 @@
</span><span class="cx"> CSSPropertyWebkitFlexWrap,
</span><span class="cx"> CSSPropertyWebkitJustifyContent,
</span><span class="cx"> CSSPropertyWebkitJustifySelf,
</span><ins>+ CSSPropertyWebkitFilter,
</ins><span class="cx"> CSSPropertyWebkitFontKerning,
</span><span class="cx"> CSSPropertyWebkitFontSmoothing,
</span><span class="cx"> CSSPropertyWebkitFontVariantLigatures,
</span><span class="lines">@@ -883,7 +878,6 @@
</span><span class="cx"> return WTF::move(list);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> PassRef<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderStyle* style, const FilterOperations& filterOperations, AdjustPixelValuesForComputedStyle adjust)
</span><span class="cx"> {
</span><span class="cx"> if (filterOperations.operations().isEmpty())
</span><span class="lines">@@ -974,7 +968,6 @@
</span><span class="cx">
</span><span class="cx"> return WTF::move(list);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> static PassRef<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const RenderStyle* style)
</span><span class="lines">@@ -1618,9 +1611,7 @@
</span><span class="cx"> case CSSPropertyWebkitPerspectiveOrigin:
</span><span class="cx"> case CSSPropertyWebkitTransformOrigin:
</span><span class="cx"> case CSSPropertyWebkitTransform:
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case CSSPropertyWebkitFilter:
</span><del>-#endif
</del><span class="cx"> return true;
</span><span class="cx"> case CSSPropertyMargin: {
</span><span class="cx"> if (!renderer || !renderer->isBox())
</span><span class="lines">@@ -2917,10 +2908,8 @@
</span><span class="cx"> case CSSPropertyWebkitShapeOutside:
</span><span class="cx"> return shapePropertyValue(style.get(), style->shapeOutside());
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case CSSPropertyWebkitFilter:
</span><span class="cx"> return valueForFilter(style.get(), style->filter());
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> case CSSPropertyMixBlendMode:
</span><span class="cx"> return cssValuePool().createValue(style->blendMode());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> bool useFixedFontDefaultSize() const;
</span><span class="cx"> bool propertyMatches(CSSPropertyID, const CSSValue*) const;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> static PassRef<CSSValue> valueForFilter(const RenderStyle*, const FilterOperations&, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // The styled node is either the node passed into computedPropertyValue, or the
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CSSFilterImageValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="lines">@@ -168,5 +166,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #ifndef CSSFilterImageValue_h
</span><span class="cx"> #define CSSFilterImageValue_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "CSSImageGeneratorValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CachedImageClient.h"
</span><span class="lines">@@ -123,6 +121,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // CSSFilterImageValue_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -112,10 +112,8 @@
</span><span class="cx"> return toCSSCanvasValue(this)->image(renderer, size);
</span><span class="cx"> case CrossfadeClass:
</span><span class="cx"> return toCSSCrossfadeValue(this)->image(renderer, size);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return toCSSFilterImageValue(this)->image(renderer, size);
</span><del>-#endif
</del><span class="cx"> case LinearGradientClass:
</span><span class="cx"> return toCSSLinearGradientValue(this)->image(renderer, size);
</span><span class="cx"> case RadialGradientClass:
</span><span class="lines">@@ -133,10 +131,8 @@
</span><span class="cx"> return toCSSCanvasValue(this)->isFixedSize();
</span><span class="cx"> case CrossfadeClass:
</span><span class="cx"> return toCSSCrossfadeValue(this)->isFixedSize();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return toCSSFilterImageValue(this)->isFixedSize();
</span><del>-#endif
</del><span class="cx"> case LinearGradientClass:
</span><span class="cx"> return toCSSLinearGradientValue(this)->isFixedSize();
</span><span class="cx"> case RadialGradientClass:
</span><span class="lines">@@ -154,10 +150,8 @@
</span><span class="cx"> return toCSSCanvasValue(this)->fixedSize(renderer);
</span><span class="cx"> case CrossfadeClass:
</span><span class="cx"> return toCSSCrossfadeValue(this)->fixedSize(renderer);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return toCSSFilterImageValue(this)->fixedSize(renderer);
</span><del>-#endif
</del><span class="cx"> case LinearGradientClass:
</span><span class="cx"> return toCSSLinearGradientValue(this)->fixedSize(renderer);
</span><span class="cx"> case RadialGradientClass:
</span><span class="lines">@@ -175,10 +169,8 @@
</span><span class="cx"> return toCSSCrossfadeValue(this)->isPending();
</span><span class="cx"> case CanvasClass:
</span><span class="cx"> return toCSSCanvasValue(this)->isPending();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return toCSSFilterImageValue(this)->isPending();
</span><del>-#endif
</del><span class="cx"> case LinearGradientClass:
</span><span class="cx"> return toCSSLinearGradientValue(this)->isPending();
</span><span class="cx"> case RadialGradientClass:
</span><span class="lines">@@ -196,10 +188,8 @@
</span><span class="cx"> return toCSSCrossfadeValue(this)->knownToBeOpaque(renderer);
</span><span class="cx"> case CanvasClass:
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return toCSSFilterImageValue(this)->knownToBeOpaque(renderer);
</span><del>-#endif
</del><span class="cx"> case LinearGradientClass:
</span><span class="cx"> return toCSSLinearGradientValue(this)->knownToBeOpaque(renderer);
</span><span class="cx"> case RadialGradientClass:
</span><span class="lines">@@ -219,11 +209,9 @@
</span><span class="cx"> case CanvasClass:
</span><span class="cx"> toCSSCanvasValue(this)->loadSubimages(cachedResourceLoader);
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> toCSSFilterImageValue(this)->loadSubimages(cachedResourceLoader);
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> case LinearGradientClass:
</span><span class="cx"> toCSSLinearGradientValue(this)->loadSubimages(cachedResourceLoader);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><ins>+#include "WebKitCSSFilterValue.h"
</ins><span class="cx"> #include "WebKitCSSKeyframeRule.h"
</span><span class="cx"> #include "WebKitCSSKeyframesRule.h"
</span><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="lines">@@ -100,10 +101,6 @@
</span><span class="cx"> #include "CSSImageSetValue.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> #include "LengthRepeat.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -2456,7 +2453,6 @@
</span><span class="cx"> case CSSPropertyWebkitBoxOrdinalGroup:
</span><span class="cx"> validPrimitive = validUnit(value, FInteger | FNonNeg, CSSStrictMode) && value->fValue;
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case CSSPropertyWebkitFilter:
</span><span class="cx"> if (id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span><span class="lines">@@ -2468,7 +2464,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> case CSSPropertyMixBlendMode:
</span><span class="cx"> if (cssCompositingEnabled())
</span><span class="lines">@@ -8709,15 +8704,12 @@
</span><span class="cx"> if (equalIgnoringCase(val->function->name, "-webkit-cross-fade("))
</span><span class="cx"> return parseCrossfade(valueList, value);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (equalIgnoringCase(val->function->name, "-webkit-filter("))
</span><span class="cx"> return parseFilterImage(valueList, value);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool CSSParser::parseFilterImage(CSSParserValueList* valueList, RefPtr<CSSValue>& filter)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CSSFilterImageValue> result;
</span><span class="lines">@@ -8758,7 +8750,6 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool CSSParser::parseCrossfade(CSSParserValueList* valueList, RefPtr<CSSValue>& crossfade)
</span><span class="cx"> {
</span><span class="lines">@@ -9267,8 +9258,6 @@
</span><span class="cx"> return valueID >= CSSValueClear && valueID <= CSSValueXor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> static void filterInfoForName(const CSSParserString& name, WebKitCSSFilterValue::FilterOperationType& filterType, unsigned& maximumArgumentCount)
</span><span class="cx"> {
</span><span class="cx"> if (equalIgnoringCase(name, "grayscale("))
</span><span class="lines">@@ -9430,7 +9419,6 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> static bool validFlowName(const String& flowName)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSParser.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -34,16 +34,13 @@
</span><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "MediaQuery.h"
</span><span class="cx"> #include "SourceSizeList.h"
</span><ins>+#include "WebKitCSSFilterValue.h"
</ins><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> #include "CSSGridTemplateAreasValue.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -263,12 +260,10 @@
</span><span class="cx"> PassRefPtr<CSSValue> parseImageSet();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool parseFilterImage(CSSParserValueList*, RefPtr<CSSValue>&);
</span><span class="cx">
</span><span class="cx"> bool parseFilter(CSSParserValueList*, RefPtr<CSSValue>&);
</span><span class="cx"> PassRefPtr<WebKitCSSFilterValue> parseBuiltinFilterArguments(CSSParserValueList*, WebKitCSSFilterValue::FilterOperationType);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> parseClipPath();
</span><span class="cx">
</span><span class="lines">@@ -639,9 +634,7 @@
</span><span class="cx"> double parsedDouble(CSSParserValue*, ReleaseParsedCalcValueCondition releaseCalc = DoNotReleaseParsedCalcValue);
</span><span class="cx">
</span><span class="cx"> friend class TransformOperationInfo;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> friend class FilterOperationInfo;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> CSSPropertyID cssPropertyID(const CSSParserString&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -292,9 +292,7 @@
</span><span class="cx"> mix-blend-mode
</span><span class="cx"> isolation
</span><span class="cx"> #endif
</span><del>-#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS
</del><span class="cx"> -webkit-filter
</span><del>-#endif
</del><span class="cx"> -webkit-align-content
</span><span class="cx"> -webkit-align-items
</span><span class="cx"> -webkit-align-self
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -135,10 +135,8 @@
</span><span class="cx"> return toCSSImageValue(this)->hasFailedOrCanceledSubresources();
</span><span class="cx"> if (classType() == CrossfadeClass)
</span><span class="cx"> return toCSSCrossfadeValue(this)->hasFailedOrCanceledSubresources();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (classType() == FilterImageClass)
</span><span class="cx"> return toCSSFilterImageValue(this)->hasFailedOrCanceledSubresources();
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class="cx"> if (classType() == ImageSetClass)
</span><span class="cx"> return toCSSImageSetValue(this)->hasFailedOrCanceledSubresources();
</span><span class="lines">@@ -169,10 +167,8 @@
</span><span class="cx"> return compareCSSValues<CSSCanvasValue>(*this, other);
</span><span class="cx"> case CursorImageClass:
</span><span class="cx"> return compareCSSValues<CSSCursorImageValue>(*this, other);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return compareCSSValues<CSSFilterImageValue>(*this, other);
</span><del>-#endif
</del><span class="cx"> case FontClass:
</span><span class="cx"> return compareCSSValues<CSSFontValue>(*this, other);
</span><span class="cx"> case FontFaceSrcClass:
</span><span class="lines">@@ -223,10 +219,8 @@
</span><span class="cx"> case ImageSetClass:
</span><span class="cx"> return compareCSSValues<CSSImageSetValue>(*this, other);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case WebKitCSSFilterClass:
</span><span class="cx"> return compareCSSValues<WebKitCSSFilterValue>(*this, other);
</span><del>-#endif
</del><span class="cx"> case SVGColorClass:
</span><span class="cx"> return compareCSSValues<SVGColor>(*this, other);
</span><span class="cx"> case SVGPaintClass:
</span><span class="lines">@@ -259,10 +253,8 @@
</span><span class="cx"> return toCSSCanvasValue(this)->customCSSText();
</span><span class="cx"> case CursorImageClass:
</span><span class="cx"> return toCSSCursorImageValue(this)->customCSSText();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> return toCSSFilterImageValue(this)->customCSSText();
</span><del>-#endif
</del><span class="cx"> case FontClass:
</span><span class="cx"> return toCSSFontValue(this)->customCSSText();
</span><span class="cx"> case FontFaceSrcClass:
</span><span class="lines">@@ -313,10 +305,8 @@
</span><span class="cx"> case ImageSetClass:
</span><span class="cx"> return toCSSImageSetValue(this)->customCSSText();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case WebKitCSSFilterClass:
</span><span class="cx"> return toWebKitCSSFilterValue(this)->customCSSText();
</span><del>-#endif
</del><span class="cx"> case SVGColorClass:
</span><span class="cx"> return toSVGColor(this)->customCSSText();
</span><span class="cx"> case SVGPaintClass:
</span><span class="lines">@@ -421,14 +411,12 @@
</span><span class="cx"> delete toCSSImageSetValue(this);
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> delete toCSSFilterImageValue(this);
</span><span class="cx"> return;
</span><span class="cx"> case WebKitCSSFilterClass:
</span><span class="cx"> delete toWebKitCSSFilterValue(this);
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx"> case SVGColorClass:
</span><span class="cx"> delete toSVGColor(this);
</span><span class="cx"> return;
</span><span class="lines">@@ -449,10 +437,8 @@
</span><span class="cx"> case ImageClass:
</span><span class="cx"> case CursorImageClass:
</span><span class="cx"> return toCSSImageValue(this)->cloneForCSSOM();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case WebKitCSSFilterClass:
</span><span class="cx"> return toWebKitCSSFilterValue(this)->cloneForCSSOM();
</span><del>-#endif
</del><span class="cx"> case WebKitCSSTransformClass:
</span><span class="cx"> return toWebKitCSSTransformValue(this)->cloneForCSSOM();
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/CSSValue.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -93,10 +93,8 @@
</span><span class="cx"> bool isWebKitCSSTransformValue() const { return m_classType == WebKitCSSTransformClass; }
</span><span class="cx"> bool isLineBoxContainValue() const { return m_classType == LineBoxContainClass; }
</span><span class="cx"> bool isCalcValue() const {return m_classType == CalculationClass; }
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool isFilterImageValue() const { return m_classType == FilterImageClass; }
</span><span class="cx"> bool isWebKitCSSFilterValue() const { return m_classType == WebKitCSSFilterClass; }
</span><del>-#endif // ENABLE(CSS_FILTERS)
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> bool isGridTemplateAreasValue() const { return m_classType == GridTemplateAreasClass; }
</span><span class="cx"> bool isGridLineNamesValue() const { return m_classType == GridLineNamesClass; }
</span><span class="lines">@@ -134,9 +132,7 @@
</span><span class="cx"> // Image generator classes.
</span><span class="cx"> CanvasClass,
</span><span class="cx"> CrossfadeClass,
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterImageClass,
</span><del>-#endif
</del><span class="cx"> LinearGradientClass,
</span><span class="cx"> RadialGradientClass,
</span><span class="cx">
</span><span class="lines">@@ -171,9 +167,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class="cx"> ImageSetClass,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> WebKitCSSFilterClass,
</span><del>-#endif
</del><span class="cx"> WebKitCSSTransformClass,
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> GridLineNamesClass,
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #include "DeprecatedStyleBuilder.h"
</span><span class="cx"> #include "DocumentStyleSheetCollection.h"
</span><span class="cx"> #include "ElementRuleCollector.h"
</span><ins>+#include "FilterOperation.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -128,6 +129,7 @@
</span><span class="cx"> #include "UserAgentStyleSheets.h"
</span><span class="cx"> #include "ViewportStyleResolver.h"
</span><span class="cx"> #include "VisitedLinkState.h"
</span><ins>+#include "WebKitCSSFilterValue.h"
</ins><span class="cx"> #include "WebKitCSSKeyframeRule.h"
</span><span class="cx"> #include "WebKitCSSKeyframesRule.h"
</span><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="lines">@@ -138,11 +140,6 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "FilterOperation.h"
-#include "WebKitCSSFilterValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> #include "CSSGridLineNamesValue.h"
</span><span class="cx"> #include "CSSGridTemplateAreasValue.h"
</span><span class="lines">@@ -236,9 +233,7 @@
</span><span class="cx"> m_parentStyle = nullptr;
</span><span class="cx"> m_regionForStyling = nullptr;
</span><span class="cx"> m_pendingImageProperties.clear();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> m_filtersWithPendingSVGDocuments.clear();
</span><del>-#endif
</del><span class="cx"> m_cssToLengthConversionData = CSSToLengthConversionData();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2670,7 +2665,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case CSSPropertyWebkitFilter: {
</span><span class="cx"> HANDLE_INHERIT_AND_INITIAL(filter, Filter);
</span><span class="cx"> FilterOperations operations;
</span><span class="lines">@@ -2678,7 +2672,7 @@
</span><span class="cx"> state.style()->setFilter(operations);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridAutoColumns: {
</span><span class="cx"> HANDLE_INHERIT_AND_INITIAL(gridAutoColumns, GridAutoColumns);
</span><span class="lines">@@ -3274,12 +3268,11 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleImage> StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue& value)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (value.isFilterImageValue()) {
</span><span class="cx"> // FilterImage needs to calculate FilterOperations.
</span><span class="cx"> toCSSFilterImageValue(value).createFilterOperations(this);
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> if (value.isPending()) {
</span><span class="cx"> m_state.pendingImageProperties().set(property, &value);
</span><span class="cx"> return StylePendingImage::create(&value);
</span><span class="lines">@@ -3485,7 +3478,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> static FilterOperation::OperationType filterOperationForType(WebKitCSSFilterValue::FilterOperationType type)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -3675,8 +3667,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> PassRefPtr<StyleImage> StyleResolver::loadPendingImage(const StylePendingImage& pendingImage, const ResourceLoaderOptions& options)
</span><span class="cx"> {
</span><span class="cx"> if (auto imageValue = pendingImage.cssImageValue())
</span><span class="lines">@@ -3837,10 +3827,8 @@
</span><span class="cx"> // Start loading images referenced by this style.
</span><span class="cx"> loadPendingImages();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> // Start loading the SVG Documents referenced by this style.
</span><span class="cx"> loadPendingSVGDocuments();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> inLoadPendingResources = false;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/StyleResolver.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -238,10 +238,8 @@
</span><span class="cx">
</span><span class="cx"> void clearCachedPropertiesAffectedByViewportUnits();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool createFilterOperations(CSSValue* inValue, FilterOperations& outOperations);
</span><span class="cx"> void loadPendingSVGDocuments();
</span><del>-#endif // ENABLE(CSS_FILTERS)
</del><span class="cx">
</span><span class="cx"> void loadPendingResources();
</span><span class="cx">
</span><span class="lines">@@ -382,9 +380,8 @@
</span><span class="cx"> bool applyPropertyToRegularStyle() const { return m_applyPropertyToRegularStyle; }
</span><span class="cx"> bool applyPropertyToVisitedLinkStyle() const { return m_applyPropertyToVisitedLinkStyle; }
</span><span class="cx"> PendingImagePropertyMap& pendingImageProperties() { return m_pendingImageProperties; }
</span><del>-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> Vector<RefPtr<ReferenceFilterOperation>>& filtersWithPendingSVGDocuments() { return m_filtersWithPendingSVGDocuments; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
</span><span class="cx"> CSSValue* lineHeightValue() { return m_lineHeightValue; }
</span><span class="lines">@@ -431,9 +428,9 @@
</span><span class="cx"> bool m_applyPropertyToVisitedLinkStyle;
</span><span class="cx">
</span><span class="cx"> PendingImagePropertyMap m_pendingImageProperties;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> Vector<RefPtr<ReferenceFilterOperation>> m_filtersWithPendingSVGDocuments;
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> CSSValue* m_lineHeightValue;
</span><span class="cx"> bool m_fontDirty;
</span><span class="cx"> bool m_fontSizeHasViewportUnits;
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSFilterValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -101,5 +99,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSFilterValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSFilterValue.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef WebKitCSSFilterValue_h
</span><span class="cx"> #define WebKitCSSFilterValue_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "CSSValueList.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -76,6 +74,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSFilterValueidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSFilterValue.idl (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSFilterValue.idl 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/css/WebKitCSSFilterValue.idl 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=CSS_FILTERS,
</del><span class="cx"> DoNotCheckConstants,
</span><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> ] interface WebKitCSSFilterValue : CSSValueList {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CachedSVGDocumentReference.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #include "CachedResourceRequest.h"
</span><span class="lines">@@ -64,5 +63,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGDocumentReferenceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef CachedSVGDocumentReference_h
</span><span class="cx"> #define CachedSVGDocumentReference_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedSVGDocumentClient.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -55,6 +54,4 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // CachedSVGDocumentReference_h
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1784,13 +1784,12 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (layer->hasAncestorWithFilterOutsets()) {
</span><span class="cx"> // If the fixed layer has a blur/drop-shadow filter applied on at least one of its parents, we cannot
</span><span class="cx"> // scroll using the fast path, otherwise the outsets of the filter will be moved around the page.
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> IntRect updateRect = snappedIntRect(layer->repaintRectIncludingNonCompositingDescendants());
</span><span class="cx"> updateRect = contentsToRootView(updateRect);
</span><span class="cx"> if (!isCompositedContentLayer && clipsRepaints())
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -72,9 +72,7 @@
</span><span class="cx"> : m_animationState(AnimationState::New)
</span><span class="cx"> , m_isAccelerated(false)
</span><span class="cx"> , m_transformFunctionListValid(false)
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , m_filterFunctionListsMatch(false)
</span><del>-#endif
</del><span class="cx"> , m_startTime(0)
</span><span class="cx"> , m_pauseTime(-1)
</span><span class="cx"> , m_requestedStartTime(0)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/AnimationBase.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -185,9 +185,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: rename this using the "lists match" terminology.
</span><span class="cx"> bool isTransformFunctionListValid() const { return m_transformFunctionListValid; }
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool filterFunctionListsMatch() const { return m_filterFunctionListsMatch; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Freeze the animation; used by DumpRenderTree.
</span><span class="cx"> void freezeAtTime(double t);
</span><span class="lines">@@ -242,9 +240,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_isAccelerated;
</span><span class="cx"> bool m_transformFunctionListValid;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool m_filterFunctionListsMatch;
</span><del>-#endif
</del><span class="cx"> double m_startTime;
</span><span class="cx"> double m_pauseTime;
</span><span class="cx"> double m_requestedStartTime;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -161,7 +161,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> static inline PassRefPtr<FilterOperation> blendFunc(const AnimationBase* anim, FilterOperation* fromOp, FilterOperation* toOp, double progress, bool blendToPassthrough = false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(toOp);
</span><span class="lines">@@ -224,7 +223,6 @@
</span><span class="cx"> result.get().setFilterOperations(filterResult);
</span><span class="cx"> return StyleGeneratedImage::create(WTF::move(result));
</span><span class="cx"> }
</span><del>-#endif // ENABLE(CSS_FILTERS)
</del><span class="cx">
</span><span class="cx"> static inline EVisibility blendFunc(const AnimationBase* anim, EVisibility from, EVisibility to, double progress)
</span><span class="cx"> {
</span><span class="lines">@@ -299,7 +297,6 @@
</span><span class="cx"> CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
</span><span class="cx"> CSSImageGeneratorValue& toGenerated = toStyleGeneratedImage(to)->imageValue();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (fromGenerated.isFilterImageValue() && toGenerated.isFilterImageValue()) {
</span><span class="cx"> // Animation of generated images just possible if input images are equal.
</span><span class="cx"> // Otherwise fall back to cross fade animation.
</span><span class="lines">@@ -308,7 +305,6 @@
</span><span class="cx"> if (fromFilter.equalInputImages(toFilter) && fromFilter.cachedImage())
</span><span class="cx"> return blendFilter(anim, fromFilter.cachedImage(), fromFilter.filterOperations(), toFilter.filterOperations(), progress);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (fromGenerated.isCrossfadeValue() && toGenerated.isCrossfadeValue()) {
</span><span class="cx"> CSSCrossfadeValue& fromCrossfade = toCSSCrossfadeValue(fromGenerated);
</span><span class="lines">@@ -319,7 +315,6 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Add support for animation between two *gradient() functions.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=119956
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> } else if (from->isGeneratedImage() && to->isCachedImage()) {
</span><span class="cx"> CSSImageGeneratorValue& fromGenerated = toStyleGeneratedImage(from)->imageValue();
</span><span class="cx"> if (fromGenerated.isFilterImageValue()) {
</span><span class="lines">@@ -335,7 +330,6 @@
</span><span class="cx"> if (toFilter.cachedImage() && toStyleCachedImage(from)->cachedImage() == toFilter.cachedImage())
</span><span class="cx"> return blendFilter(anim, toFilter.cachedImage(), FilterOperations(), toFilter.filterOperations(), progress);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> // FIXME: Add interpolation between image source and cross-fade.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,7 +551,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> class PropertyWrapperAcceleratedFilter : public PropertyWrapper<const FilterOperations&> {
</span><span class="cx"> public:
</span><span class="cx"> PropertyWrapperAcceleratedFilter()
</span><span class="lines">@@ -572,7 +565,6 @@
</span><span class="cx"> dst->setFilter(blendFunc(anim, a->filter(), b->filter(), progress));
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static inline size_t shadowListLength(const ShadowData* shadow)
</span><span class="cx"> {
</span><span class="lines">@@ -1221,10 +1213,7 @@
</span><span class="cx">
</span><span class="cx"> new PropertyWrapperAcceleratedOpacity(),
</span><span class="cx"> new PropertyWrapperAcceleratedTransform(),
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> new PropertyWrapperAcceleratedFilter(),
</span><del>-#endif
-
</del><span class="cx"> new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -181,9 +181,7 @@
</span><span class="cx">
</span><span class="cx"> // set the transform animation list
</span><span class="cx"> validateTransformFunctionList();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> checkForMatchingFilterFunctionLists();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImplicitAnimation::setOverridden(bool b)
</span><span class="lines">@@ -244,7 +242,6 @@
</span><span class="cx"> m_transformFunctionListValid = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void ImplicitAnimation::checkForMatchingFilterFunctionLists()
</span><span class="cx"> {
</span><span class="cx"> m_filterFunctionListsMatch = false;
</span><span class="lines">@@ -268,7 +265,6 @@
</span><span class="cx"> // Filter lists match.
</span><span class="cx"> m_filterFunctionListsMatch = true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> double ImplicitAnimation::timeToNextService()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -79,9 +79,7 @@
</span><span class="cx"> bool sendTransitionEvent(const AtomicString&, double elapsedTime);
</span><span class="cx">
</span><span class="cx"> void validateTransformFunctionList();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void checkForMatchingFilterFunctionLists();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ImplicitAnimation(const Animation&, CSSPropertyID, RenderElement*, CompositeAnimation*, RenderStyle*);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -53,9 +53,7 @@
</span><span class="cx">
</span><span class="cx"> // Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
</span><span class="cx"> validateTransformFunctionList();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> checkForMatchingFilterFunctionLists();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> KeyframeAnimation::~KeyframeAnimation()
</span><span class="lines">@@ -361,7 +359,6 @@
</span><span class="cx"> m_transformFunctionListValid = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void KeyframeAnimation::checkForMatchingFilterFunctionLists()
</span><span class="cx"> {
</span><span class="cx"> m_filterFunctionListsMatch = false;
</span><span class="lines">@@ -400,7 +397,6 @@
</span><span class="cx">
</span><span class="cx"> m_filterFunctionListsMatch = true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> double KeyframeAnimation::timeToNextService()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -78,9 +78,7 @@
</span><span class="cx"> virtual bool affectsProperty(CSSPropertyID) const override;
</span><span class="cx">
</span><span class="cx"> void validateTransformFunctionList();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void checkForMatchingFilterFunctionLists();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> KeyframeAnimation(const Animation&, RenderElement*, int index, CompositeAnimation*, RenderStyle* unanimatedStyle);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -440,7 +440,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> static inline const FilterOperations& filterOperationsAt(const KeyframeValueList& valueList, size_t index)
</span><span class="cx"> {
</span><span class="cx"> return static_cast<const FilterAnimationValue&>(valueList.at(index)).value();
</span><span class="lines">@@ -478,7 +477,6 @@
</span><span class="cx">
</span><span class="cx"> return firstIndex;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // An "invalid" list is one whose functions don't match, and therefore has to be animated as a Matrix
</span><span class="cx"> // The hasBigRotation flag will always return false if isValid is false. Otherwise hasBigRotation is
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "Animation.h"
</span><span class="cx"> #include "Color.h"
</span><ins>+#include "FilterOperations.h"
</ins><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FloatPoint3D.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="lines">@@ -39,10 +40,6 @@
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "FilterOperations.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> #include "GraphicsTypes.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -145,7 +142,6 @@
</span><span class="cx"> TransformOperations m_value;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> // Used to store one filter value in a keyframe list.
</span><span class="cx"> // FIXME: Should be moved to its own header file.
</span><span class="cx"> class FilterAnimationValue : public AnimationValue {
</span><span class="lines">@@ -171,7 +167,6 @@
</span><span class="cx">
</span><span class="cx"> FilterOperations m_value;
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Used to store a series of values in a keyframe list.
</span><span class="cx"> // Values will all be of the same type, which can be inferred from the property.
</span><span class="lines">@@ -356,12 +351,10 @@
</span><span class="cx"> float opacity() const { return m_opacity; }
</span><span class="cx"> virtual void setOpacity(float opacity) { m_opacity = opacity; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> const FilterOperations& filters() const { return m_filters; }
</span><span class="cx">
</span><span class="cx"> // Returns true if filter can be rendered by the compositor
</span><span class="cx"> virtual bool setFilters(const FilterOperations& filters) { m_filters = filters; return true; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode blendMode() const { return m_blendMode; }
</span><span class="lines">@@ -531,7 +524,6 @@
</span><span class="cx"> // Should be called from derived class destructors. Should call willBeDestroyed() on super.
</span><span class="cx"> WEBCORE_EXPORT virtual void willBeDestroyed();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> // This method is used by platform GraphicsLayer classes to clear the filters
</span><span class="cx"> // when compositing is not done in hardware. It is not virtual, so the caller
</span><span class="cx"> // needs to notifiy the change to the platform layer as needed.
</span><span class="lines">@@ -539,7 +531,6 @@
</span><span class="cx">
</span><span class="cx"> // Given a KeyframeValueList containing filterOperations, return true if the operations are valid.
</span><span class="cx"> static int validateFilterOperations(const KeyframeValueList&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Given a list of TransformAnimationValues, see if all the operations for each keyframe match. If so
</span><span class="cx"> // return the index of the KeyframeValueList entry that has that list of operations (it may not be
</span><span class="lines">@@ -582,9 +573,7 @@
</span><span class="cx"> float m_opacity;
</span><span class="cx"> float m_zPosition;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterOperations m_filters;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode m_blendMode;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> static inline PassRefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation* toOp, double progress, const FloatSize& size, bool blendToPassthrough = false)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(toOp);
</span><span class="lines">@@ -73,7 +72,6 @@
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static bool shouldReverseAnimationValue(Animation::AnimationDirection direction, int loopCount)
</span><span class="cx"> {
</span><span class="lines">@@ -235,11 +233,9 @@
</span><span class="cx"> case AnimatedPropertyWebkitTransform:
</span><span class="cx"> client->setAnimatedTransform(applyTransformAnimation(static_cast<const TransformAnimationValue&>(from).value(), static_cast<const TransformAnimationValue&>(to).value(), progress, m_boxSize, m_listsMatch));
</span><span class="cx"> return;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case AnimatedPropertyWebkitFilter:
</span><span class="cx"> client->setAnimatedFilters(applyFilterAnimation(static_cast<const FilterAnimationValue&>(from).value(), static_cast<const FilterAnimationValue&>(to).value(), progress, m_boxSize));
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerAnimation.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -34,9 +34,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual void setAnimatedTransform(const TransformationMatrix&) = 0;
</span><span class="cx"> virtual void setAnimatedOpacity(float) = 0;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setAnimatedFilters(const FilterOperations&) = 0;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> GraphicsLayerAnimation()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRectExtenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRectExtent.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRectExtent.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/IntRectExtent.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #ifndef IntRectExtent_h
</span><span class="cx"> #define IntRectExtent_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "LayoutRect.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -107,6 +105,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // IntRectExtent_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -243,11 +243,7 @@
</span><span class="cx"> case AnimatedPropertyBackgroundColor:
</span><span class="cx"> return "backgroundColor";
</span><span class="cx"> case AnimatedPropertyWebkitFilter:
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> return "filters";
</span><del>-#else
- ASSERT_NOT_REACHED();
-#endif
</del><span class="cx"> case AnimatedPropertyInvalid:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -275,7 +271,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS) || !ASSERT_DISABLED
</del><span class="cx"> static inline bool supportsAcceleratedFilterAnimations()
</span><span class="cx"> {
</span><span class="cx"> // <rdar://problem/10907251> - WebKit2 doesn't support CA animations of CI filters on Lion and below
</span><span class="lines">@@ -285,7 +280,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient& client)
</span><span class="cx"> {
</span><span class="lines">@@ -300,7 +294,6 @@
</span><span class="cx"> return graphicsLayer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool GraphicsLayerCA::filtersCanBeComposited(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -309,7 +302,6 @@
</span><span class="cx"> return PlatformCALayerWin::filtersCanBeComposited(filters);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> {
</span><span class="lines">@@ -578,9 +570,7 @@
</span><span class="cx">
</span><span class="cx"> if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity
</span><span class="cx"> || currAnimation.m_property == AnimatedPropertyBackgroundColor
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> || currAnimation.m_property == AnimatedPropertyWebkitFilter
</span><del>-#endif
</del><span class="cx"> )
</span><span class="cx"> moveOrCopyLayerAnimation(operation, animationIdentifier(currAnimation.m_name, currAnimation.m_property, currAnimation.m_index, currAnimation.m_subIndex), fromLayer, toLayer);
</span><span class="cx"> }
</span><span class="lines">@@ -673,7 +663,6 @@
</span><span class="cx"> noteLayerPropertyChanged(OpacityChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool GraphicsLayerCA::setFilters(const FilterOperations& filterOperations)
</span><span class="cx"> {
</span><span class="cx"> bool canCompositeFilters = filtersCanBeComposited(filterOperations);
</span><span class="lines">@@ -695,7 +684,6 @@
</span><span class="cx"> }
</span><span class="cx"> return canCompositeFilters;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void GraphicsLayerCA::setBlendMode(BlendMode blendMode)
</span><span class="lines">@@ -802,12 +790,10 @@
</span><span class="cx"> bool createdAnimations = false;
</span><span class="cx"> if (valueList.property() == AnimatedPropertyWebkitTransform)
</span><span class="cx"> createdAnimations = createTransformAnimationsFromKeyframes(valueList, anim, animationName, timeOffset, boxSize);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> else if (valueList.property() == AnimatedPropertyWebkitFilter) {
</span><span class="cx"> if (supportsAcceleratedFilterAnimations())
</span><span class="cx"> createdAnimations = createFilterAnimationsFromKeyframes(valueList, anim, animationName, timeOffset);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> else
</span><span class="cx"> createdAnimations = createAnimationFromKeyframes(valueList, anim, animationName, timeOffset);
</span><span class="cx">
</span><span class="lines">@@ -1324,11 +1310,9 @@
</span><span class="cx">
</span><span class="cx"> if (m_uncommittedChanges & OpacityChanged)
</span><span class="cx"> updateOpacityOnLayer();
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> if (m_uncommittedChanges & FiltersChanged)
</span><span class="cx"> updateFilters();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> if (m_uncommittedChanges & BlendModeChanged)
</span><span class="lines">@@ -1641,7 +1625,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void GraphicsLayerCA::updateFilters()
</span><span class="cx"> {
</span><span class="cx"> m_layer->setFilters(m_filters);
</span><span class="lines">@@ -1656,7 +1639,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void GraphicsLayerCA::updateBlendMode()
</span><span class="lines">@@ -1687,9 +1669,7 @@
</span><span class="cx"> | ChildrenTransformChanged
</span><span class="cx"> | ChildrenChanged
</span><span class="cx"> | BackfaceVisibilityChanged
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> | FiltersChanged
</span><del>-#endif
</del><span class="cx"> | OpacityChanged;
</span><span class="cx">
</span><span class="cx"> if (purpose == NoStructuralLayer) {
</span><span class="lines">@@ -2378,7 +2358,6 @@
</span><span class="cx"> return validMatrices;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& valueList, const FilterOperation* operation, const Animation* animation, const String& animationName, int animationIndex, double timeOffset)
</span><span class="cx"> {
</span><span class="cx"> bool isKeyframe = valueList.size() > 2;
</span><span class="lines">@@ -2442,7 +2421,6 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCAAnimation> GraphicsLayerCA::createBasicAnimation(const Animation* anim, const String& keyPath, bool additive)
</span><span class="cx"> {
</span><span class="lines">@@ -2695,7 +2673,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool GraphicsLayerCA::setFilterAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(valueList.size() == 2);
</span><span class="lines">@@ -2768,7 +2745,6 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::suspendAnimations(double time)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -102,10 +102,8 @@
</span><span class="cx"> // return true if we started an animation
</span><span class="cx"> WEBCORE_EXPORT virtual void setOpacity(float) override;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> WEBCORE_EXPORT virtual bool setFilters(const FilterOperations&) override;
</span><span class="cx"> virtual bool filtersCanBeComposited(const FilterOperations&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> WEBCORE_EXPORT virtual void setBlendMode(BlendMode) override;
</span><span class="lines">@@ -203,10 +201,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void layerDidDisplay(PlatformCALayer*);
</span><span class="cx"> void updateOpacityOnLayer();
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void updateFilters();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void updateBlendMode();
</span><span class="lines">@@ -230,9 +225,7 @@
</span><span class="cx">
</span><span class="cx"> bool createAnimationFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset);
</span><span class="cx"> bool createTransformAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset, const FloatSize& boxSize);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool createFilterAnimationsFromKeyframes(const KeyframeValueList&, const Animation*, const String& animationName, double timeOffset);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Return autoreleased animation (use RetainPtr?)
</span><span class="cx"> PassRefPtr<PlatformCAAnimation> createBasicAnimation(const Animation*, const String& keyPath, bool additive);
</span><span class="lines">@@ -247,10 +240,8 @@
</span><span class="cx"> bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const FloatSize& boxSize);
</span><span class="cx"> bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const FloatSize& boxSize);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool setFilterAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, int internalFilterPropertyIndex);
</span><span class="cx"> bool setFilterAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, int internalFilterPropertyIndex, FilterOperation::OperationType);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isRunningTransformAnimation() const;
</span><span class="cx">
</span><span class="lines">@@ -406,9 +397,7 @@
</span><span class="cx"> void moveOrCopyAnimations(MoveOrCopy, PlatformCALayer * fromLayer, PlatformCALayer * toLayer);
</span><span class="cx">
</span><span class="cx"> bool appendToUncommittedAnimations(const KeyframeValueList&, const TransformOperations*, const Animation*, const String& animationName, const FloatSize& boxSize, int animationIndex, double timeOffset, bool isMatrixAnimation);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, double timeOffset);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> enum LayerChange {
</span><span class="cx"> NoChange = 0,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -93,18 +93,14 @@
</span><span class="cx"> virtual void setFromValue(const WebCore::TransformationMatrix&) = 0;
</span><span class="cx"> virtual void setFromValue(const FloatPoint3D&) = 0;
</span><span class="cx"> virtual void setFromValue(const WebCore::Color&) = 0;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) = 0;
</span><del>-#endif
</del><span class="cx"> virtual void copyFromValueFrom(const PlatformCAAnimation*) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void setToValue(float) = 0;
</span><span class="cx"> virtual void setToValue(const WebCore::TransformationMatrix&) = 0;
</span><span class="cx"> virtual void setToValue(const FloatPoint3D&) = 0;
</span><span class="cx"> virtual void setToValue(const WebCore::Color&) = 0;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) = 0;
</span><del>-#endif
</del><span class="cx"> virtual void copyToValueFrom(const PlatformCAAnimation*) = 0;
</span><span class="cx">
</span><span class="cx"> // Keyframe-animation properties.
</span><span class="lines">@@ -112,9 +108,7 @@
</span><span class="cx"> virtual void setValues(const Vector<WebCore::TransformationMatrix>&) = 0;
</span><span class="cx"> virtual void setValues(const Vector<FloatPoint3D>&) = 0;
</span><span class="cx"> virtual void setValues(const Vector<WebCore::Color>&) = 0;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) = 0;
</span><del>-#endif
</del><span class="cx"> virtual void copyValuesFrom(const PlatformCAAnimation*) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void setKeyTimes(const Vector<float>&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAFiltersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef PlatformCAFilters_h
</span><span class="cx"> #define PlatformCAFilters_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "FilterOperations.h"
</span><span class="cx"> #include "GraphicsTypes.h"
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="lines">@@ -64,6 +62,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // PlatformCAFilters_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -181,11 +181,8 @@
</span><span class="cx">
</span><span class="cx"> virtual float opacity() const = 0;
</span><span class="cx"> virtual void setOpacity(float) = 0;
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFilters(const FilterOperations&) = 0;
</span><span class="cx"> virtual void copyFiltersFrom(const PlatformCALayer*) = 0;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> virtual void setBlendMode(BlendMode) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAAnimationMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -99,18 +99,14 @@
</span><span class="cx"> virtual void setFromValue(const WebCore::TransformationMatrix&) override;
</span><span class="cx"> virtual void setFromValue(const FloatPoint3D&) override;
</span><span class="cx"> virtual void setFromValue(const WebCore::Color&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyFromValueFrom(const PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setToValue(float) override;
</span><span class="cx"> virtual void setToValue(const WebCore::TransformationMatrix&) override;
</span><span class="cx"> virtual void setToValue(const FloatPoint3D&) override;
</span><span class="cx"> virtual void setToValue(const WebCore::Color&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyToValueFrom(const PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> // Keyframe-animation properties.
</span><span class="lines">@@ -118,9 +114,7 @@
</span><span class="cx"> virtual void setValues(const Vector<WebCore::TransformationMatrix>&) override;
</span><span class="cx"> virtual void setValues(const Vector<FloatPoint3D>&) override;
</span><span class="cx"> virtual void setValues(const Vector<WebCore::Color>&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyValuesFrom(const PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setKeyTimes(const Vector<float>&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAAnimationMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -387,13 +387,11 @@
</span><span class="cx"> [static_cast<CABasicAnimation*>(m_animation.get()) setFromValue:array];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationMac::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<id> value = PlatformCAFilters::filterValueForOperation(operation, internalFilterPropertyIndex);
</span><span class="cx"> [static_cast<CABasicAnimation*>(m_animation.get()) setFromValue:value.get()];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationMac::copyFromValueFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span><span class="lines">@@ -446,13 +444,11 @@
</span><span class="cx"> [static_cast<CABasicAnimation*>(m_animation.get()) setToValue:array];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationMac::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<id> value = PlatformCAFilters::filterValueForOperation(operation, internalFilterPropertyIndex);
</span><span class="cx"> [static_cast<CABasicAnimation*>(m_animation.get()) setToValue:value.get()];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationMac::copyToValueFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span><span class="lines">@@ -526,7 +522,6 @@
</span><span class="cx"> [static_cast<CAKeyframeAnimation*>(m_animation.get()) setValues:array];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationMac::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> if (animationType() != Keyframe)
</span><span class="lines">@@ -540,7 +535,6 @@
</span><span class="cx"> }
</span><span class="cx"> [static_cast<CAKeyframeAnimation*>(m_animation.get()) setValues:array];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationMac::copyValuesFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCAFiltersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #import "PlatformCAFilters.h"
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "FloatConversion.h"
</span><span class="lines">@@ -669,5 +667,3 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -117,12 +117,9 @@
</span><span class="cx">
</span><span class="cx"> virtual float opacity() const override;
</span><span class="cx"> virtual void setOpacity(float) override;
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFilters(const FilterOperations&) override;
</span><span class="cx"> WEBCORE_EXPORT static bool filtersCanBeComposited(const FilterOperations&);
</span><span class="cx"> virtual void copyFiltersFrom(const PlatformCALayer*) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> virtual void setBlendMode(BlendMode) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -320,9 +320,7 @@
</span><span class="cx"> newLayer->setOpaque(isOpaque());
</span><span class="cx"> newLayer->setBackgroundColor(backgroundColor());
</span><span class="cx"> newLayer->setContentsScale(contentsScale());
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> newLayer->copyFiltersFrom(this);
</span><del>-#endif
</del><span class="cx"> newLayer->updateCustomAppearance(customAppearance());
</span><span class="cx">
</span><span class="cx"> if (type == LayerTypeAVPlayerLayer) {
</span><span class="lines">@@ -710,7 +708,6 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCALayerMac::setFilters(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> PlatformCAFilters::setFiltersOnLayer(platformLayer(), filters);
</span><span class="lines">@@ -746,7 +743,6 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void PlatformCALayerMac::setBlendMode(BlendMode blendMode)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCAAnimationWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -374,12 +374,10 @@
</span><span class="cx"> CACFAnimationSetFromValue(m_animation.get(), v.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationWin::setFromValue(const FilterOperation*, int)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Hardware filter animation not implemented on Windows
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationWin::copyFromValueFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span><span class="lines">@@ -427,12 +425,10 @@
</span><span class="cx"> CACFAnimationSetToValue(m_animation.get(), v.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationWin::setToValue(const FilterOperation*, int)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Hardware filter animation not implemented on Windows
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationWin::copyToValueFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span><span class="lines">@@ -501,12 +497,10 @@
</span><span class="cx"> CACFAnimationSetValues(m_animation.get(), array.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationWin::setValues(const Vector<RefPtr<FilterOperation> >&, int)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Hardware filter animation not implemented on Windows
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationWin::copyValuesFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCAAnimationWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -89,18 +89,14 @@
</span><span class="cx"> virtual void setFromValue(const WebCore::TransformationMatrix&) override;
</span><span class="cx"> virtual void setFromValue(const FloatPoint3D&) override;
</span><span class="cx"> virtual void setFromValue(const WebCore::Color&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFromValue(const FilterOperation*, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyFromValueFrom(const PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setToValue(float) override;
</span><span class="cx"> virtual void setToValue(const WebCore::TransformationMatrix&) override;
</span><span class="cx"> virtual void setToValue(const FloatPoint3D&) override;
</span><span class="cx"> virtual void setToValue(const WebCore::Color&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setToValue(const FilterOperation*, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyToValueFrom(const PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> // Keyframe-animation properties.
</span><span class="lines">@@ -108,9 +104,7 @@
</span><span class="cx"> virtual void setValues(const Vector<WebCore::TransformationMatrix>&) override;
</span><span class="cx"> virtual void setValues(const Vector<FloatPoint3D>&) override;
</span><span class="cx"> virtual void setValues(const Vector<WebCore::Color>&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setValues(const Vector<RefPtr<FilterOperation>>&, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyValuesFrom(const PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setKeyTimes(const Vector<float>&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCAFiltersWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -24,9 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "PlatformCAFilters.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -47,5 +44,3 @@
</span><span class="cx"> // Hardware filter animation not implemented on Windows.
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -182,9 +182,7 @@
</span><span class="cx"> newLayer->setOpaque(isOpaque());
</span><span class="cx"> newLayer->setBackgroundColor(backgroundColor());
</span><span class="cx"> newLayer->setContentsScale(contentsScale());
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> newLayer->copyFiltersFrom(this);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return newLayer;
</span><span class="cx"> }
</span><span class="lines">@@ -545,8 +543,6 @@
</span><span class="cx"> setNeedsCommit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> void PlatformCALayerWin::setFilters(const FilterOperations&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -555,8 +551,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> void PlatformCALayerWin::setName(const String& value)
</span><span class="cx"> {
</span><span class="cx"> CACFLayerSetName(m_layer.get(), value.createCFString().get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -109,11 +109,9 @@
</span><span class="cx"> virtual float opacity() const override;
</span><span class="cx"> virtual void setOpacity(float) override;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFilters(const FilterOperations&) override;
</span><span class="cx"> static bool filtersCanBeComposited(const FilterOperations&) { return false; }
</span><span class="cx"> virtual void copyFiltersFrom(const PlatformCALayer*) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> virtual void setName(const String&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> #include "FilterOperation.h"
</span><span class="cx">
</span><span class="cx"> #include "AnimationUtilities.h"
</span><span class="lines">@@ -195,5 +193,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef FilterOperation_h
</span><span class="cx"> #define FilterOperation_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "Color.h"
</span><span class="cx"> #include "FilterEffect.h"
</span><span class="cx"> #include "LayoutSize.h"
</span><span class="lines">@@ -359,6 +357,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // FilterOperation_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "LengthFunctions.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static inline IntSize outsetSizeForBlur(float stdDeviation)
</span><span class="lines">@@ -154,5 +152,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef FilterOperations_h
</span><span class="cx"> #define FilterOperations_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "FilterOperation.h"
</span><span class="cx"> #include "IntRectExtent.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -78,6 +76,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // FilterOperations_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -540,10 +540,8 @@
</span><span class="cx"> if (m_changeMask & BackgroundColorChange)
</span><span class="cx"> m_layer->setSolidColor(solidColor());
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (m_changeMask & FilterChange)
</span><span class="cx"> m_layer->setFilters(filters());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (m_changeMask & BackingStoreChange)
</span><span class="cx"> m_layer->setBackingStore(m_backingStore);
</span><span class="lines">@@ -665,7 +663,6 @@
</span><span class="cx"> m_animations.remove(animationName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> TextureMapper* textureMapper = m_layer->textureMapper();
</span><span class="lines">@@ -675,7 +672,6 @@
</span><span class="cx"> notifyChange(FilterChange);
</span><span class="cx"> return GraphicsLayer::setFilters(filters);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void GraphicsLayerTextureMapper::setFixedToViewport(bool fixed)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -91,9 +91,7 @@
</span><span class="cx"> void setIsScrollable(bool);
</span><span class="cx"> bool isScrollable() const { return m_isScrollable; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual bool setFilters(const FilterOperations&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setFixedToViewport(bool);
</span><span class="cx"> bool fixedToViewport() const { return m_fixedToViewport; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -87,9 +87,7 @@
</span><span class="cx"> inline int numberOfBytes() const { return size().width() * size().height() * bpp() >> 3; }
</span><span class="cx"> inline bool isOpaque() const { return !(m_flags & SupportsAlpha); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&) { return this; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> IntSize m_contentSize;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -122,9 +122,7 @@
</span><span class="cx"> , previousScissorState(0)
</span><span class="cx"> , previousDepthState(0)
</span><span class="cx"> , sharedData(TextureMapperGLData::SharedGLData::currentSharedGLData(this->context))
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , filterInfo(0)
</span><del>-#endif
</del><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> ~TextureMapperGLData();
</span><span class="lines">@@ -143,9 +141,7 @@
</span><span class="cx"> RefPtr<SharedGLData> sharedData;
</span><span class="cx"> RefPtr<BitmapTexture> currentSurface;
</span><span class="cx"> HashMap<const void*, Platform3DObject> vbos;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> const BitmapTextureGL::FilterInfo* filterInfo;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Platform3DObject TextureMapperGLData::getStaticVBO(GC3Denum target, GC3Dsizeiptr size, const void* data)
</span><span class="lines">@@ -367,8 +363,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> static TextureMapperShaderProgram::Options optionsForFilterType(FilterOperation::OperationType type, unsigned pass)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -512,7 +506,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void TextureMapperGL::drawTexture(const BitmapTexture& texture, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, unsigned exposedEdges)
</span><span class="cx"> {
</span><span class="lines">@@ -523,9 +516,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const BitmapTextureGL& textureGL = static_cast<const BitmapTextureGL&>(texture);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> TemporaryChange<const BitmapTextureGL::FilterInfo*> filterInfo(data().filterInfo, textureGL.filterInfo());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> drawTexture(textureGL.id(), textureGL.isOpaque() ? 0 : ShouldBlend, textureGL.size(), targetRect, matrix, opacity, exposedEdges);
</span><span class="cx"> }
</span><span class="lines">@@ -547,7 +538,6 @@
</span><span class="cx"> flags |= ShouldAntialias;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> RefPtr<FilterOperation> filter = data().filterInfo ? data().filterInfo->filter: 0;
</span><span class="cx"> GC3Duint filterContentTextureID = 0;
</span><span class="cx">
</span><span class="lines">@@ -558,7 +548,6 @@
</span><span class="cx"> if (filter->affectsOpacity())
</span><span class="cx"> flags |= ShouldBlend;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (useAntialiasing || opacity < 1)
</span><span class="cx"> flags |= ShouldBlend;
</span><span class="lines">@@ -566,10 +555,8 @@
</span><span class="cx"> RefPtr<TextureMapperShaderProgram> program;
</span><span class="cx"> program = data().sharedGLData().getShaderProgram(options);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (filter)
</span><span class="cx"> prepareFilterProgram(program.get(), *filter.get(), data().filterInfo->pass, textureSize, filterContentTextureID);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> drawTexturedQuadWithProgram(program.get(), texture, flags, textureSize, targetRect, modelViewMatrix, opacity);
</span><span class="cx"> }
</span><span class="lines">@@ -857,7 +844,6 @@
</span><span class="cx"> updateContents(imageData, targetRect, offset, bytesPerLine, updateContentsFlag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void TextureMapperGL::drawFiltered(const BitmapTexture& sampler, const BitmapTexture* contentTexture, const FilterOperation& filter, int pass)
</span><span class="cx"> {
</span><span class="cx"> // For standard filters, we always draw the whole texture without transformations.
</span><span class="lines">@@ -913,7 +899,6 @@
</span><span class="cx"> texmapGL->bindSurface(previousSurface.get());
</span><span class="cx"> return resultSurface;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static inline TransformationMatrix createProjectionMatrix(const IntSize& size, bool mirrored)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -67,9 +67,7 @@
</span><span class="cx"> virtual PassRefPtr<BitmapTexture> createTexture() override;
</span><span class="cx"> inline GraphicsContext3D* graphicsContext3D() const { return m_context3D.get(); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void drawFiltered(const BitmapTexture& sourceTexture, const BitmapTexture* contentTexture, const FilterOperation&, int pass);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setEnableEdgeDistanceAntialiasing(bool enabled) { m_enableEdgeDistanceAntialiasing = enabled; }
</span><span class="cx">
</span><span class="lines">@@ -155,7 +153,6 @@
</span><span class="cx"> virtual void updateContents(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag);
</span><span class="cx"> virtual bool isBackedByOpenGL() const { return true; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&) override;
</span><span class="cx"> struct FilterInfo {
</span><span class="cx"> RefPtr<FilterOperation> filter;
</span><span class="lines">@@ -169,7 +166,6 @@
</span><span class="cx"> { }
</span><span class="cx"> };
</span><span class="cx"> const FilterInfo* filterInfo() const { return &m_filterInfo; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateContentsNoSwizzle(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, unsigned bytesPerPixel = 4, Platform3DObject glFormat = GraphicsContext3D::RGBA);
</span><span class="lines">@@ -190,9 +186,7 @@
</span><span class="cx"> void clearIfNeeded();
</span><span class="cx"> void createFboIfNeeded();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterInfo m_filterInfo;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> friend class TextureMapperGL;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -150,13 +150,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -37,9 +37,7 @@
</span><span class="cx"> virtual void updateContents(Image*, const IntRect&, const IntPoint&, UpdateContentsFlag);
</span><span class="cx"> virtual void updateContents(TextureMapper*, GraphicsLayer*, const IntRect& target, const IntPoint& offset, UpdateContentsFlag);
</span><span class="cx"> virtual void updateContents(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> BitmapTextureImageBuffer() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -237,12 +237,10 @@
</span><span class="cx"> return TransformationMatrix(m_state.replicaLayer->m_currentTransform.combined()).multiply(m_currentTransform.combined().inverse());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void TextureMapperLayer::setAnimatedFilters(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> m_currentFilters = filters;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static void resolveOverlaps(Region newRegion, Region& overlapRegion, Region& nonOverlapRegion)
</span><span class="cx"> {
</span><span class="lines">@@ -265,7 +263,6 @@
</span><span class="cx"> else if (m_contentsLayer || m_state.solidColor.alpha())
</span><span class="cx"> boundingRect = m_state.contentsRect;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (m_currentFilters.hasOutsets()) {
</span><span class="cx"> FilterOutsets outsets = m_currentFilters.outsets();
</span><span class="cx"> IntRect unfilteredTargetRect(boundingRect);
</span><span class="lines">@@ -273,7 +270,6 @@
</span><span class="cx"> boundingRect.expand(outsets.left() + outsets.right(), outsets.top() + outsets.bottom());
</span><span class="cx"> boundingRect.unite(unfilteredTargetRect);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> TransformationMatrix replicaMatrix;
</span><span class="cx"> if (m_state.replicaLayer) {
</span><span class="lines">@@ -387,9 +383,7 @@
</span><span class="cx"> paintSelfAndChildren(paintOptions);
</span><span class="cx"> if (m_state.maskLayer)
</span><span class="cx"> m_state.maskLayer->applyMask(options);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> surface = surface->applyFilters(options.textureMapper, m_currentFilters);
</span><del>-#endif
</del><span class="cx"> options.textureMapper->bindSurface(surface.get());
</span><span class="cx"> return surface;
</span><span class="cx"> }
</span><span class="lines">@@ -605,12 +599,10 @@
</span><span class="cx"> m_state.solidColor = color;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void TextureMapperLayer::setFilters(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> m_state.filters = filters;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void TextureMapperLayer::setDebugVisuals(bool showDebugBorders, const Color& debugBorderColor, float debugBorderWidth, bool showRepaintCounter)
</span><span class="cx"> {
</span><span class="lines">@@ -673,10 +665,8 @@
</span><span class="cx"> if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyOpacity))
</span><span class="cx"> m_currentOpacity = m_state.opacity;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (!m_animations.hasActiveAnimationsOfType(AnimatedPropertyWebkitFilter))
</span><span class="cx"> m_currentFilters = m_state.filters;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TextureMapperLayer::isAncestorFixedToViewport() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -101,17 +101,11 @@
</span><span class="cx"> void setSolidColor(const Color&);
</span><span class="cx"> void setContentsTileSize(const FloatSize&);
</span><span class="cx"> void setContentsTilePhase(const FloatPoint&);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void setFilters(const FilterOperations&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool hasFilters() const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> return !m_currentFilters.isEmpty();
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setDebugVisuals(bool showDebugBorders, const Color& debugBorderColor, float debugBorderWidth, bool showRepaintCounter);
</span><span class="lines">@@ -173,9 +167,7 @@
</span><span class="cx"> // GraphicsLayerAnimation::Client
</span><span class="cx"> virtual void setAnimatedTransform(const TransformationMatrix&) override;
</span><span class="cx"> virtual void setAnimatedOpacity(float) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setAnimatedFilters(const FilterOperations&) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isVisible() const;
</span><span class="cx"> enum ContentsLayerCount {
</span><span class="lines">@@ -198,9 +190,7 @@
</span><span class="cx"> TextureMapperPlatformLayer* m_contentsLayer;
</span><span class="cx"> GraphicsLayerTransform m_currentTransform;
</span><span class="cx"> float m_currentOpacity;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterOperations m_currentFilters;
</span><del>-#endif
</del><span class="cx"> float m_centerZ;
</span><span class="cx">
</span><span class="cx"> template<class HitTestCondition> TextureMapperLayer* hitTest(const FloatPoint&, HitTestCondition);
</span><span class="lines">@@ -222,9 +212,7 @@
</span><span class="cx"> TextureMapperLayer* maskLayer;
</span><span class="cx"> TextureMapperLayer* replicaLayer;
</span><span class="cx"> Color solidColor;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterOperations filters;
</span><del>-#endif
</del><span class="cx"> Color debugBorderColor;
</span><span class="cx"> float debugBorderWidth;
</span><span class="cx"> int repaintCount;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperShaderProgramh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -74,13 +74,11 @@
</span><span class="cx"> TEXMAP_DECLARE_SAMPLER(sampler)
</span><span class="cx"> TEXMAP_DECLARE_SAMPLER(mask)
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> TEXMAP_DECLARE_UNIFORM(filterAmount)
</span><span class="cx"> TEXMAP_DECLARE_UNIFORM(gaussianKernel)
</span><span class="cx"> TEXMAP_DECLARE_UNIFORM(blurRadius)
</span><span class="cx"> TEXMAP_DECLARE_UNIFORM(shadowOffset)
</span><span class="cx"> TEXMAP_DECLARE_SAMPLER(contentTexture)
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setMatrix(GC3Duint, const TransformationMatrix&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -76,13 +76,11 @@
</span><span class="cx"> notifyFlushRequired();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void CoordinatedGraphicsLayer::didChangeFilters()
</span><span class="cx"> {
</span><span class="cx"> m_shouldSyncFilters = true;
</span><span class="cx"> notifyFlushRequired();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::didChangeImageBacking()
</span><span class="cx"> {
</span><span class="lines">@@ -421,7 +419,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool CoordinatedGraphicsLayer::setFilters(const FilterOperations& newFilters)
</span><span class="cx"> {
</span><span class="cx"> if (filters() == newFilters)
</span><span class="lines">@@ -433,7 +430,6 @@
</span><span class="cx"> didChangeFilters();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::setContentsToSolidColor(const Color& color)
</span><span class="cx"> {
</span><span class="lines">@@ -622,7 +618,6 @@
</span><span class="cx"> m_layerState.children.append(toCoordinatedLayerID(children()[i]));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void CoordinatedGraphicsLayer::syncFilters()
</span><span class="cx"> {
</span><span class="cx"> if (!m_shouldSyncFilters)
</span><span class="lines">@@ -632,7 +627,6 @@
</span><span class="cx"> m_layerState.filters = GraphicsLayer::filters();
</span><span class="cx"> m_layerState.filtersChanged = true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::syncImageBacking()
</span><span class="cx"> {
</span><span class="lines">@@ -788,9 +782,7 @@
</span><span class="cx"> syncAnimations();
</span><span class="cx"> computeTransformedVisibleRect();
</span><span class="cx"> syncChildren();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> syncFilters();
</span><del>-#endif
</del><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> syncPlatformLayer();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -101,9 +101,7 @@
</span><span class="cx"> virtual void deviceOrPageScaleFactorChanged() override;
</span><span class="cx"> virtual void flushCompositingState(const FloatRect&) override;
</span><span class="cx"> virtual void flushCompositingStateForThisLayerOnly() override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual bool setFilters(const FilterOperations&) override;
</span><del>-#endif
</del><span class="cx"> virtual bool addAnimation(const KeyframeValueList&, const FloatSize&, const Animation*, const String&, double) override;
</span><span class="cx"> virtual void pauseAnimation(const String&, double) override;
</span><span class="cx"> virtual void removeAnimation(const String&) override;
</span><span class="lines">@@ -176,18 +174,14 @@
</span><span class="cx"> void didChangeAnimations();
</span><span class="cx"> void didChangeGeometry();
</span><span class="cx"> void didChangeChildren();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void didChangeFilters();
</span><del>-#endif
</del><span class="cx"> void didChangeImageBacking();
</span><span class="cx">
</span><span class="cx"> void resetLayerState();
</span><span class="cx"> void syncLayerState();
</span><span class="cx"> void syncAnimations();
</span><span class="cx"> void syncChildren();
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void syncFilters();
</span><del>-#endif
</del><span class="cx"> void syncImageBacking();
</span><span class="cx"> void computeTransformedVisibleRect();
</span><span class="cx"> void updateContentBuffers();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -226,7 +226,6 @@
</span><span class="cx"> layer->setChildren(children);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void CoordinatedGraphicsScene::setLayerFiltersIfNeeded(TextureMapperLayer* layer, const CoordinatedGraphicsLayerState& state)
</span><span class="cx"> {
</span><span class="cx"> if (!state.filtersChanged)
</span><span class="lines">@@ -234,7 +233,6 @@
</span><span class="cx">
</span><span class="cx"> layer->setFilters(state.filters);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsScene::setLayerState(CoordinatedLayerID id, const CoordinatedGraphicsLayerState& layerState)
</span><span class="cx"> {
</span><span class="lines">@@ -314,9 +312,7 @@
</span><span class="cx"> createTilesIfNeeded(layer, layerState);
</span><span class="cx"> removeTilesIfNeeded(layer, layerState);
</span><span class="cx"> updateTilesIfNeeded(layer, layerState);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> setLayerFiltersIfNeeded(layer, layerState);
</span><del>-#endif
</del><span class="cx"> setLayerAnimationsIfNeeded(layer, layerState);
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> syncPlatformLayerIfNeeded(layer, layerState);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsSceneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -95,9 +95,7 @@
</span><span class="cx"> void updateTilesIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
</span><span class="cx"> void createTilesIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
</span><span class="cx"> void removeTilesIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void setLayerFiltersIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
</span><del>-#endif
</del><span class="cx"> void setLayerAnimationsIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> void createPlatformLayerIfNeeded(TextureMapperLayer*, const CoordinatedGraphicsLayerState&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #include "Color.h"
</span><ins>+#include "FilterOperations.h"
</ins><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "GraphicsLayerAnimation.h"
</span><span class="lines">@@ -38,10 +39,6 @@
</span><span class="cx"> #include "SurfaceUpdateInfo.h"
</span><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "FilterOperations.h"
-#endif
-
</del><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> #include "GraphicsSurface.h"
</span><span class="cx"> #include "GraphicsSurfaceToken.h"
</span><span class="lines">@@ -148,9 +145,7 @@
</span><span class="cx"> Color solidColor;
</span><span class="cx"> Color debugBorderColor;
</span><span class="cx"> float debugBorderWidth;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterOperations filters;
</span><del>-#endif
</del><span class="cx"> GraphicsLayerAnimations animations;
</span><span class="cx"> Vector<uint32_t> children;
</span><span class="cx"> Vector<TileCreationInfo> tilesToCreate;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "FilterEffectRenderer.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><span class="lines">@@ -444,5 +442,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingFilterEffectRendererh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FilterEffectRenderer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef FilterEffectRenderer_h
</span><span class="cx"> #define FilterEffectRenderer_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "Filter.h"
</span><span class="cx"> #include "FilterEffect.h"
</span><span class="cx"> #include "FilterOperations.h"
</span><span class="lines">@@ -152,6 +150,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // FilterEffectRenderer_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -274,8 +274,7 @@
</span><span class="cx"> else if (diff < StyleDifferenceRecompositeLayer)
</span><span class="cx"> diff = StyleDifferenceRecompositeLayer;
</span><span class="cx"> }
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> if ((contextSensitiveProperties & ContextSensitivePropertyFilter) && hasLayer()) {
</span><span class="cx"> RenderLayer* layer = toRenderLayerModelObject(this)->layer();
</span><span class="cx"> if (!layer->isComposited() || layer->paintsWithFilters())
</span><span class="lines">@@ -283,7 +282,6 @@
</span><span class="cx"> else if (diff < StyleDifferenceRecompositeLayer)
</span><span class="cx"> diff = StyleDifferenceRecompositeLayer;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // The answer to requiresLayer() for plugins, iframes, and canvas can change without the actual
</span><span class="cx"> // style changing, since it depends on whether we decide to composite these elements. When the
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -132,11 +132,7 @@
</span><span class="cx"> bool hasClipPath() const { return style().clipPath(); }
</span><span class="cx"> bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool hasFilter() const { return style().hasFilter(); }
</span><del>-#else
- bool hasFilter() const { return false; }
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool hasBlendMode() const { return style().hasBlendMode(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> #include "DocumentEventQueue.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "EventHandler.h"
</span><ins>+#include "FEColorMatrix.h"
+#include "FEMerge.h"
+#include "FilterEffectRenderer.h"
</ins><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "FloatPoint3D.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="lines">@@ -83,6 +86,7 @@
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="cx"> #include "RenderLayerBacking.h"
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><ins>+#include "RenderLayerFilterInfo.h"
</ins><span class="cx"> #include "RenderMarquee.h"
</span><span class="cx"> #include "RenderMultiColumnFlowThread.h"
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="lines">@@ -115,13 +119,6 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "FEColorMatrix.h"
-#include "FEMerge.h"
-#include "FilterEffectRenderer.h"
-#include "RenderLayerFilterInfo.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> #include "AxisScrollSnapOffsets.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -189,9 +186,7 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_layerListMutationAllowed(true)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , m_hasFilterInfo(false)
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_blendMode(BlendModeNormal)
</span><span class="cx"> , m_hasNotIsolatedCompositedBlendingDescendants(false)
</span><span class="lines">@@ -256,10 +251,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_reflection)
</span><span class="cx"> removeReflection();
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> FilterInfo::remove(*this);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Child layers will be deleted by their corresponding render objects, so
</span><span class="cx"> // we don't need to delete them ourselves.
</span><span class="lines">@@ -318,8 +311,6 @@
</span><span class="cx"> return compositor().canRender3DTransforms();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> bool RenderLayer::paintsWithFilters() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Eventually there will be cases where we paint with filters even without accelerated compositing,
</span><span class="lines">@@ -351,8 +342,6 @@
</span><span class="cx"> return filterInfo ? filterInfo->renderer() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> void RenderLayer::updateLayerPositionsAfterLayout(const RenderLayer* rootLayer, UpdateLayerPositionsFlags flags)
</span><span class="cx"> {
</span><span class="cx"> RenderGeometryMap geometryMap(UseTransforms);
</span><span class="lines">@@ -1456,8 +1445,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) const
</span><span class="cx"> {
</span><span class="cx"> const RenderLayer* curr = (includeSelf == IncludeSelf) ? this : parent();
</span><span class="lines">@@ -1526,8 +1513,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> RenderLayer* RenderLayer::clippingRootForPainting() const
</span><span class="cx"> {
</span><span class="cx"> if (isComposited())
</span><span class="lines">@@ -1659,9 +1644,7 @@
</span><span class="cx"> // paints unfragmented.
</span><span class="cx"> LayoutRect clipRect = layer.boundingBox(&layer);
</span><span class="cx"> expandClipRectForDescendantsAndReflection(clipRect, layer, &layer, transparencyBehavior, paintBehavior);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> layer.renderer().style().filterOutsets().expandRect(clipRect);
</span><del>-#endif
</del><span class="cx"> LayoutRect result = transform.mapRect(clipRect);
</span><span class="cx"> if (!paginationLayer)
</span><span class="cx"> return result;
</span><span class="lines">@@ -1677,9 +1660,8 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect clipRect = layer.boundingBox(rootLayer, layer.offsetFromAncestor(rootLayer), transparencyBehavior == HitTestingTransparencyClipBox ? RenderLayer::UseFragmentBoxesIncludingCompositing : RenderLayer::UseFragmentBoxesExcludingCompositing);
</span><span class="cx"> expandClipRectForDescendantsAndReflection(clipRect, layer, rootLayer, transparencyBehavior, paintBehavior);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> layer.renderer().style().filterOutsets().expandRect(clipRect);
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> return clipRect;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3951,8 +3933,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> std::unique_ptr<FilterEffectRendererHelper> RenderLayer::setupFilters(GraphicsContext* context, LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed)
</span><span class="cx"> {
</span><span class="cx"> if (context->paintingDisabled())
</span><span class="lines">@@ -4010,8 +3990,6 @@
</span><span class="cx"> return originalContext;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> // Helper for the sorting of layers by z-index.
</span><span class="cx"> static inline bool compareZIndex(RenderLayer* first, RenderLayer* second)
</span><span class="cx"> {
</span><span class="lines">@@ -4095,7 +4073,6 @@
</span><span class="cx"> LayerPaintingInfo localPaintingInfo(paintingInfo);
</span><span class="cx">
</span><span class="cx"> GraphicsContext* transparencyLayerContext = context;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> std::unique_ptr<FilterEffectRendererHelper> filterPainter = setupFilters(context, localPaintingInfo, paintFlags, offsetFromRoot, rootRelativeBounds, rootRelativeBoundsComputed);
</span><span class="cx"> if (filterPainter) {
</span><span class="cx"> context = filterPainter->filterContext();
</span><span class="lines">@@ -4104,7 +4081,6 @@
</span><span class="cx"> beginTransparencyLayers(transparencyLayerContext, localPaintingInfo, paintingInfo.paintDirtyRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // If this layer's renderer is a child of the subtreePaintRoot, we render unconditionally, which
</span><span class="cx"> // is done by passing a nil subtreePaintRoot down to our renderer (as if no subtreePaintRoot was ever set).
</span><span class="lines">@@ -4180,12 +4156,10 @@
</span><span class="cx"> if (isPaintingOverlayScrollbars)
</span><span class="cx"> paintOverflowControlsForFragments(layerFragments, context, localPaintingInfo);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (filterPainter) {
</span><span class="cx"> context = applyFilters(filterPainter.get(), transparencyLayerContext, localPaintingInfo, layerFragments);
</span><span class="cx"> filterPainter = nullptr;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Make sure that we now use the original transparency context.
</span><span class="cx"> ASSERT(transparencyLayerContext == context);
</span><span class="lines">@@ -5801,14 +5775,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> // FIXME: We can optimize the size of the composited layers, by not enlarging
</span><span class="cx"> // filtered areas with the outsets if we know that the filter is going to render in hardware.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=81239
</span><span class="cx"> if (flags & IncludeLayerFilterOutsets)
</span><span class="cx"> renderer().style().filterOutsets().expandRect(unionBounds);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if ((flags & IncludeSelfTransform) && paintsWithTransform(PaintBehaviorNormal)) {
</span><span class="cx"> TransformationMatrix* affineTrans = transform();
</span><span class="lines">@@ -5849,9 +5821,7 @@
</span><span class="cx"> m_backing = std::make_unique<RenderLayerBacking>(*this);
</span><span class="cx"> compositor().layerBecameComposited(*this);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> updateOrRemoveFilterEffectRenderer();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> return m_backing.get();
</span><span class="cx"> }
</span><span class="lines">@@ -5862,12 +5832,8 @@
</span><span class="cx"> compositor().layerBecameNonComposited(*this);
</span><span class="cx"> m_backing = nullptr;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (!layerBeingDestroyed)
</span><span class="cx"> updateOrRemoveFilterEffectRenderer();
</span><del>-#else
- UNUSED_PARAM(layerBeingDestroyed);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::hasCompositedMask() const
</span><span class="lines">@@ -5914,10 +5880,8 @@
</span><span class="cx"> if (renderer().style().visibility() != VISIBLE)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (paintsWithFilters() && renderer().style().filter().hasFilterThatAffectsOpacity())
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // FIXME: Handle simple transforms.
</span><span class="cx"> if (paintsWithTransform(PaintBehaviorNormal))
</span><span class="lines">@@ -6236,9 +6200,7 @@
</span><span class="cx"> && !renderer().isPositioned()
</span><span class="cx"> && !renderer().hasTransform()
</span><span class="cx"> && !renderer().hasClipPath()
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> && !renderer().hasFilter()
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> && !hasAcceleratedTouchScrolling()
</span><span class="cx"> #endif
</span><span class="lines">@@ -6517,9 +6479,7 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> updateBlendMode();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> updateOrRemoveFilterClients();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> updateNeedsCompositedScrolling();
</span><span class="cx">
</span><span class="lines">@@ -6553,7 +6513,6 @@
</span><span class="cx"> UNUSED_PARAM(diff);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> updateOrRemoveFilterEffectRenderer();
</span><span class="cx"> bool backingDidCompositeLayers = isComposited() && backing()->canCompositeFilters();
</span><span class="cx"> if (isComposited() && backingDidCompositeLayers && !backing()->canCompositeFilters()) {
</span><span class="lines">@@ -6561,7 +6520,6 @@
</span><span class="cx"> // Fallback to drawing them in software.
</span><span class="cx"> setBackingNeedsRepaint();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayer::updateScrollableAreaSet(bool hasOverflow)
</span><span class="lines">@@ -6690,8 +6648,6 @@
</span><span class="cx"> return newStyle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> void RenderLayer::updateOrRemoveFilterClients()
</span><span class="cx"> {
</span><span class="cx"> if (!hasFilter()) {
</span><span class="lines">@@ -6752,8 +6708,6 @@
</span><span class="cx"> renderer().repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> void RenderLayer::paintNamedFlowThreadInsideRegion(GraphicsContext* context, RenderNamedFlowFragment* region, LayoutRect paintDirtyRect, LayoutPoint paintOffset, PaintBehavior paintBehavior, PaintLayerFlags paintFlags)
</span><span class="cx"> {
</span><span class="cx"> LayoutRect regionContentBox = toRenderBox(region->layerOwner()).contentBoxRect();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -632,12 +632,10 @@
</span><span class="cx"> // Ancestor compositing layer, excluding this.
</span><span class="cx"> RenderLayer* ancestorCompositingLayer() const { return enclosingCompositingLayer(ExcludeSelf); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> RenderLayer* enclosingFilterLayer(IncludeSelfOrNot = IncludeSelf) const;
</span><span class="cx"> RenderLayer* enclosingFilterRepaintLayer() const;
</span><span class="cx"> void setFilterBackendNeedsRepaintingInRect(const LayoutRect&);
</span><span class="cx"> bool hasAncestorWithFilterOutsets() const;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool canUseConvertToLayerCoords() const
</span><span class="cx"> {
</span><span class="lines">@@ -747,13 +745,9 @@
</span><span class="cx"> // Bounds used for layer overlap testing in RenderLayerCompositor.
</span><span class="cx"> LayoutRect overlapBounds() const { return overlapBoundsIncludeChildren() ? calculateLayerBounds(this, LayoutSize()) : localBoundingBox(); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> // If true, this layer's children are included in its bounds for overlap testing.
</span><span class="cx"> // We can't rely on the children's positions if this layer has a filter that could have moved the children's pixels around.
</span><span class="cx"> bool overlapBoundsIncludeChildren() const { return hasFilter() && renderer().style().filter().hasFilterThatMovesPixels(); }
</span><del>-#else
- bool overlapBoundsIncludeChildren() const { return false; }
-#endif
</del><span class="cx">
</span><span class="cx"> // Can pass offsetFromRoot if known.
</span><span class="cx"> LayoutRect calculateLayerBounds(const RenderLayer* ancestorLayer, const LayoutSize& offsetFromRoot, CalculateLayerBoundsFlags = DefaultCalculateLayerBoundsFlags) const;
</span><span class="lines">@@ -792,12 +786,8 @@
</span><span class="cx"> bool preserves3D() const { return renderer().style().transformStyle3D() == TransformStyle3DPreserve3D; }
</span><span class="cx"> bool has3DTransform() const { return m_transform && !m_transform->isAffine(); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void filterNeedsRepaint();
</span><span class="cx"> bool hasFilter() const { return renderer().hasFilter(); }
</span><del>-#else
- bool hasFilter() const { return false; }
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool hasBlendMode() const { return renderer().hasBlendMode(); }
</span><span class="lines">@@ -851,11 +841,9 @@
</span><span class="cx"> bool containsDirtyOverlayScrollbars() const { return m_containsDirtyOverlayScrollbars; }
</span><span class="cx"> void setContainsDirtyOverlayScrollbars(bool dirtyScrollbars) { m_containsDirtyOverlayScrollbars = dirtyScrollbars; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool paintsWithFilters() const;
</span><span class="cx"> bool requiresFullLayerImageForFilters() const;
</span><span class="cx"> FilterEffectRenderer* filterRenderer() const;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> bool layerListMutationAllowed() const { return m_layerListMutationAllowed; }
</span><span class="lines">@@ -987,10 +975,9 @@
</span><span class="cx">
</span><span class="cx"> bool setupFontSubpixelQuantization(GraphicsContext*, bool& didQuantizeFonts);
</span><span class="cx"> bool setupClipPath(GraphicsContext*, const LayerPaintingInfo&, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> std::unique_ptr<FilterEffectRendererHelper> setupFilters(GraphicsContext*, LayerPaintingInfo&, PaintLayerFlags, const LayoutSize& offsetFromRoot, LayoutRect& rootRelativeBounds, bool& rootRelativeBoundsComputed);
</span><span class="cx"> GraphicsContext* applyFilters(FilterEffectRendererHelper*, GraphicsContext* originalContext, LayerPaintingInfo&, LayerFragments&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void paintLayer(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
</span><span class="cx"> void paintFixedLayersInNamedFlows(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
</span><span class="lines">@@ -1128,10 +1115,8 @@
</span><span class="cx"> bool paintingInsideReflection() const { return m_paintingInsideReflection; }
</span><span class="cx"> void setPaintingInsideReflection(bool b) { m_paintingInsideReflection = b; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void updateOrRemoveFilterClients();
</span><span class="cx"> void updateOrRemoveFilterEffectRenderer();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void updateAncestorChainHasBlendingDescendants();
</span><span class="lines">@@ -1271,9 +1256,7 @@
</span><span class="cx"> bool m_layerListMutationAllowed : 1;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool m_hasFilterInfo : 1;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> unsigned m_blendMode : 5;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "Chrome.h"
</span><ins>+#include "FilterEffectRenderer.h"
</ins><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="lines">@@ -61,10 +62,6 @@
</span><span class="cx"> #include "TiledBacking.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "FilterEffectRenderer.h"
-#endif
-
</del><span class="cx"> #if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -112,9 +109,7 @@
</span><span class="cx"> , m_isMainFrameRenderViewLayer(false)
</span><span class="cx"> , m_usingTiledCacheLayer(false)
</span><span class="cx"> , m_requiresOwnBackingStore(true)
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , m_canCompositeFilters(false)
</span><del>-#endif
</del><span class="cx"> , m_backgroundLayerPaintsFixedRootBackground(false)
</span><span class="cx"> {
</span><span class="cx"> Page* page = renderer().frame().page();
</span><span class="lines">@@ -313,9 +308,7 @@
</span><span class="cx">
</span><span class="cx"> updateOpacity(renderer().style());
</span><span class="cx"> updateTransform(renderer().style());
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> updateFilters(renderer().style());
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> updateBlendMode(renderer().style());
</span><span class="cx"> #endif
</span><span class="lines">@@ -375,12 +368,10 @@
</span><span class="cx"> m_graphicsLayer->setTransform(t);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void RenderLayerBacking::updateFilters(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> m_canCompositeFilters = m_graphicsLayer->setFilters(style.filter());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void RenderLayerBacking::updateBlendMode(const RenderStyle& style)
</span><span class="lines">@@ -656,10 +647,8 @@
</span><span class="cx"> // Set opacity, if it is not animating.
</span><span class="cx"> if (!renderer().animation().isRunningAcceleratedAnimationOnRenderer(&renderer(), CSSPropertyOpacity, AnimationBase::Running | AnimationBase::Paused | AnimationBase::FillingFowards))
</span><span class="cx"> updateOpacity(style);
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> updateFilters(style);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> updateBlendMode(style);
</span><span class="lines">@@ -2325,20 +2314,14 @@
</span><span class="cx"> {
</span><span class="cx"> bool hasOpacity = keyframes.containsProperty(CSSPropertyOpacity);
</span><span class="cx"> bool hasTransform = renderer().isBox() && keyframes.containsProperty(CSSPropertyWebkitTransform);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool hasFilter = keyframes.containsProperty(CSSPropertyWebkitFilter);
</span><del>-#else
- bool hasFilter = false;
-#endif
</del><span class="cx">
</span><span class="cx"> if (!hasOpacity && !hasTransform && !hasFilter)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
</span><span class="cx"> KeyframeValueList opacityVector(AnimatedPropertyOpacity);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> KeyframeValueList filterVector(AnimatedPropertyWebkitFilter);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> size_t numKeyframes = keyframes.size();
</span><span class="cx"> for (size_t i = 0; i < numKeyframes; ++i) {
</span><span class="lines">@@ -2358,10 +2341,8 @@
</span><span class="cx"> if ((hasOpacity && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyOpacity))
</span><span class="cx"> opacityVector.insert(FloatAnimationValue::create(key, keyframeStyle->opacity(), tf));
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if ((hasFilter && isFirstOrLastKeyframe) || currentKeyframe.containsProperty(CSSPropertyWebkitFilter))
</span><span class="cx"> filterVector.insert(FilterAnimationValue::create(key, keyframeStyle->filter(), tf));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (renderer().frame().page() && !renderer().frame().page()->settings().acceleratedCompositedAnimationsEnabled())
</span><span class="lines">@@ -2375,10 +2356,8 @@
</span><span class="cx"> if (hasOpacity && m_graphicsLayer->addAnimation(opacityVector, IntSize(), anim, keyframes.animationName(), timeOffset))
</span><span class="cx"> didAnimate = true;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (hasFilter && m_graphicsLayer->addAnimation(filterVector, IntSize(), anim, keyframes.animationName(), timeOffset))
</span><span class="cx"> didAnimate = true;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return didAnimate;
</span><span class="cx"> }
</span><span class="lines">@@ -2428,7 +2407,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (property == CSSPropertyWebkitFilter && m_owningLayer.hasFilter()) {
</span><span class="cx"> const Animation* filterAnim = toStyle->transitionForProperty(CSSPropertyWebkitFilter);
</span><span class="cx"> if (filterAnim && !filterAnim->isEmptyOrZeroDuration()) {
</span><span class="lines">@@ -2442,7 +2420,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return didAnimate;
</span><span class="cx"> }
</span><span class="lines">@@ -2529,11 +2506,7 @@
</span><span class="cx"> cssProperty = CSSPropertyBackgroundColor;
</span><span class="cx"> break;
</span><span class="cx"> case AnimatedPropertyWebkitFilter:
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> cssProperty = CSSPropertyWebkitFilter;
</span><del>-#else
- ASSERT_NOT_REACHED();
-#endif
</del><span class="cx"> break;
</span><span class="cx"> case AnimatedPropertyInvalid:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -2550,10 +2523,8 @@
</span><span class="cx"> return AnimatedPropertyOpacity;
</span><span class="cx"> case CSSPropertyBackgroundColor:
</span><span class="cx"> return AnimatedPropertyBackgroundColor;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case CSSPropertyWebkitFilter:
</span><span class="cx"> return AnimatedPropertyWebkitFilter;
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> // It's fine if we see other css properties here; they are just not accelerated.
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -231,9 +231,7 @@
</span><span class="cx"> GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }
</span><span class="cx"> GraphicsLayer* layerForScrollCorner() const { return m_layerForScrollCorner.get(); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool canCompositeFilters() const { return m_canCompositeFilters; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers.
</span><span class="cx"> double backingStoreMemoryEstimate() const;
</span><span class="lines">@@ -280,9 +278,7 @@
</span><span class="cx">
</span><span class="cx"> void updateOpacity(const RenderStyle&);
</span><span class="cx"> void updateTransform(const RenderStyle&);
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void updateFilters(const RenderStyle&);
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> void updateBlendMode(const RenderStyle&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -351,9 +347,7 @@
</span><span class="cx"> bool m_isMainFrameRenderViewLayer;
</span><span class="cx"> bool m_usingTiledCacheLayer;
</span><span class="cx"> bool m_requiresOwnBackingStore;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool m_canCompositeFilters;
</span><del>-#endif
</del><span class="cx"> bool m_backgroundLayerPaintsFixedRootBackground;
</span><span class="cx">
</span><span class="cx"> static bool m_creatingPrimaryGraphicsLayer;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -2499,9 +2499,7 @@
</span><span class="cx"> AnimationController& animController = renderer.animation();
</span><span class="cx"> return (animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyOpacity, activeAnimationState)
</span><span class="cx"> && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitFilter, activeAnimationState)
</span><del>-#endif // CSS_FILTERS
</del><span class="cx"> || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform, activeAnimationState);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2536,15 +2534,10 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::requiresCompositingForFilters(RenderLayerModelObject& renderer) const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (!(m_compositingTriggers & ChromeClient::FilterTrigger))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return renderer.hasFilter();
</span><del>-#else
- UNUSED_PARAM(renderer);
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::isAsyncScrollableStickyLayer(const RenderLayer& layer, const RenderLayer** enclosingAcceleratedOverflowLayer) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> #include "RenderLayerFilterInfo.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedSVGDocument.h"
</span><span class="lines">@@ -139,5 +138,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerFilterInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #ifndef RenderLayerFilterInfo_h
</span><span class="cx"> #define RenderLayerFilterInfo_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "CachedResourceHandle.h"
</span><span class="cx"> #include "CachedSVGDocumentClient.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="lines">@@ -89,6 +87,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // RenderLayerFilterInfo_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -117,9 +117,7 @@
</span><span class="cx"> || oldStyle->hasClip() != newStyle.hasClip()
</span><span class="cx"> || oldStyle->opacity() != newStyle.opacity()
</span><span class="cx"> || oldStyle->transform() != newStyle.transform()
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> || oldStyle->filter() != newStyle.filter()
</span><del>-#endif
</del><span class="cx"> )
</span><span class="cx"> layer()->repaintIncludingDescendants();
</span><span class="cx"> } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1235,8 +1235,6 @@
</span><span class="cx"> repaintContainer = &compLayer->renderer();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (view().hasSoftwareFilters()) {
</span><span class="cx"> if (RenderLayer* parentLayer = enclosingLayer()) {
</span><span class="cx"> RenderLayer* enclosingFilterLayer = parentLayer->enclosingFilterLayer();
</span><span class="lines">@@ -1244,7 +1242,6 @@
</span><span class="cx"> return &enclosingFilterLayer->renderer();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // If we have a flow thread, then we need to do individual repaints within the RenderRegions instead.
</span><span class="cx"> // Return the flow thread as a repaint container in order to create a chokepoint that allows us to change
</span><span class="lines">@@ -1276,12 +1273,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (repaintContainer->hasFilter() && repaintContainer->layer() && repaintContainer->layer()->requiresFullLayerImageForFilters()) {
</span><span class="cx"> repaintContainer->layer()->setFilterBackendNeedsRepaintingInRect(r);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RenderView& v = view();
</span><span class="cx"> if (repaintContainer->isRenderView()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -110,9 +110,7 @@
</span><span class="cx"> , m_renderQuoteHead(0)
</span><span class="cx"> , m_renderCounterCount(0)
</span><span class="cx"> , m_selectionWasCaret(false)
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , m_hasSoftwareFilters(false)
</span><del>-#endif
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , m_selectionRectGatherer(*this)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -220,10 +220,8 @@
</span><span class="cx">
</span><span class="cx"> ImageQualityController& imageQualityController();
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void setHasSoftwareFilters(bool hasSoftwareFilters) { m_hasSoftwareFilters = hasSoftwareFilters; }
</span><span class="cx"> bool hasSoftwareFilters() const { return m_hasSoftwareFilters; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> uint64_t rendererCount() const { return m_rendererCount; }
</span><span class="cx"> void didCreateRenderer() { ++m_rendererCount; }
</span><span class="lines">@@ -362,9 +360,7 @@
</span><span class="cx"> unsigned m_renderCounterCount;
</span><span class="cx">
</span><span class="cx"> bool m_selectionWasCaret;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool m_hasSoftwareFilters;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> HashSet<RenderElement*> m_renderersWithPausedImageAnimation;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -632,10 +632,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (rareNonInheritedData->hasFilters() != other->rareNonInheritedData->hasFilters())
</span><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> const QuotesData* quotesDataA = rareInheritedData->quotes.get();
</span><span class="cx"> const QuotesData* quotesDataB = other->rareInheritedData->quotes.get();
</span><span class="lines">@@ -696,13 +694,11 @@
</span><span class="cx"> // Don't return; keep looking for another change.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (rareNonInheritedData->m_filter.get() != other->rareNonInheritedData->m_filter.get()
</span><span class="cx"> && *rareNonInheritedData->m_filter.get() != *other->rareNonInheritedData->m_filter.get()) {
</span><span class="cx"> changedContextSensitiveProperties |= ContextSensitivePropertyFilter;
</span><span class="cx"> // Don't return; keep looking for another change.
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (rareNonInheritedData->m_mask != other->rareNonInheritedData->m_mask
</span><span class="cx"> || rareNonInheritedData->m_maskBoxImage != other->rareNonInheritedData->m_maskBoxImage)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> #include "StyleBackgroundData.h"
</span><span class="cx"> #include "StyleBoxData.h"
</span><span class="cx"> #include "StyleDeprecatedFlexibleBoxData.h"
</span><ins>+#include "StyleFilterData.h"
</ins><span class="cx"> #include "StyleFlexibleBoxData.h"
</span><span class="cx"> #include "StyleMarqueeData.h"
</span><span class="cx"> #include "StyleMultiColData.h"
</span><span class="lines">@@ -74,10 +75,6 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include "StyleFilterData.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> #include "StyleGridData.h"
</span><span class="cx"> #include "StyleGridItemData.h"
</span><span class="lines">@@ -107,10 +104,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> class FilterOperations;
</span><del>-#endif
-
</del><span class="cx"> class BorderData;
</span><span class="cx"> class CounterContent;
</span><span class="cx"> class CursorList;
</span><span class="lines">@@ -568,10 +562,8 @@
</span><span class="cx"> return imageOutsets(maskBoxImage());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool hasFilterOutsets() const { return hasFilter() && filter().hasOutsets(); }
</span><span class="cx"> FilterOutsets filterOutsets() const { return hasFilter() ? filter().outsets() : FilterOutsets(); }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Order rtlOrdering() const { return static_cast<Order>(inherited_flags.m_rtlOrdering); }
</span><span class="cx"> void setRTLOrdering(Order o) { inherited_flags.m_rtlOrdering = o; }
</span><span class="lines">@@ -1134,13 +1126,9 @@
</span><span class="cx">
</span><span class="cx"> ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
</span><span class="cx"> const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
</span><span class="cx"> bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
</span><del>-#else
- bool hasFilter() const { return false; }
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> BlendMode blendMode() const { return static_cast<BlendMode>(rareNonInheritedData->m_effectiveBlendMode); }
</span><span class="lines">@@ -1569,9 +1557,7 @@
</span><span class="cx">
</span><span class="cx"> void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_rubyPosition, position); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_filter, m_operations, ops); }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); }
</span><span class="cx">
</span><span class="lines">@@ -2009,9 +1995,7 @@
</span><span class="cx"> static const Vector<StyleDashboardRegion>& initialDashboardRegions();
</span><span class="cx"> static const Vector<StyleDashboardRegion>& noneDashboardRegions();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> static const FilterOperations& initialFilter() { DEPRECATED_DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> static BlendMode initialBlendMode() { return BlendModeNormal; }
</span><span class="cx"> static Isolation initialIsolation() { return IsolationAuto; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleFilterDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleFilterData.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleFilterData.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/style/StyleFilterData.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx"> #include "StyleFilterData.h"
</span><span class="cx">
</span><span class="cx"> #include "FEGaussianBlur.h"
</span><del>-
-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "RenderStyle.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -56,5 +53,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_FILTERS)
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleFilterDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleFilterData.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleFilterData.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/style/StyleFilterData.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef StyleFilterData_h
</span><span class="cx"> #define StyleFilterData_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #include "FilterOperations.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -54,6 +52,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_FILTERS)
-
</del><span class="cx"> #endif // StyleFilterData_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -47,9 +47,7 @@
</span><span class="cx"> , m_marquee(StyleMarqueeData::create())
</span><span class="cx"> , m_multiCol(StyleMultiColData::create())
</span><span class="cx"> , m_transform(StyleTransformData::create())
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , m_filter(StyleFilterData::create())
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> , m_grid(StyleGridData::create())
</span><span class="cx"> , m_gridItem(StyleGridItemData::create())
</span><span class="lines">@@ -119,9 +117,7 @@
</span><span class="cx"> , m_marquee(o.m_marquee)
</span><span class="cx"> , m_multiCol(o.m_multiCol)
</span><span class="cx"> , m_transform(o.m_transform)
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> , m_filter(o.m_filter)
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> , m_grid(o.m_grid)
</span><span class="cx"> , m_gridItem(o.m_gridItem)
</span><span class="lines">@@ -216,9 +212,7 @@
</span><span class="cx"> && m_marquee == o.m_marquee
</span><span class="cx"> && m_multiCol == o.m_multiCol
</span><span class="cx"> && m_transform == o.m_transform
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> && m_filter == o.m_filter
</span><del>-#endif
</del><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> && m_grid == o.m_grid
</span><span class="cx"> && m_gridItem == o.m_gridItem
</span><span class="lines">@@ -348,11 +342,7 @@
</span><span class="cx">
</span><span class="cx"> bool StyleRareNonInheritedData::hasFilters() const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> return m_filter.get() && !m_filter->m_operations.isEmpty();
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -43,9 +43,7 @@
</span><span class="cx"> class AnimationList;
</span><span class="cx"> class ShadowData;
</span><span class="cx"> class StyleDeprecatedFlexibleBoxData;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> class StyleFilterData;
</span><del>-#endif
</del><span class="cx"> class StyleFlexibleBoxData;
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> class StyleGridData;
</span><span class="lines">@@ -120,10 +118,7 @@
</span><span class="cx"> DataRef<StyleMarqueeData> m_marquee; // Marquee properties
</span><span class="cx"> DataRef<StyleMultiColData> m_multiCol; // CSS3 multicol properties
</span><span class="cx"> DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.)
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, etc.)
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> DataRef<StyleGridData> m_grid;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -115,10 +115,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGResourceContainer::markAllClientLayersForInvalidation()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> for (auto* clientLayer : m_clientLayers)
</span><span class="cx"> clientLayer->filterNeedsRepaint();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGResourceContainer::markClientForInvalidation(RenderObject& client, InvalidationMode mode)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-04 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove iOS specific disk image cache
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><del>-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
</del><span class="cx"> ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="lines">@@ -272,4 +271,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_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));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_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));
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173245.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><del>-ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
</del><span class="cx"> ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="lines">@@ -272,4 +271,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_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));
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_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));
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <WebCore/Animation.h>
</span><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <WebCore/CoordinatedGraphicsState.h>
</span><ins>+#include <WebCore/FilterOperations.h>
</ins><span class="cx"> #include <WebCore/FloatPoint3D.h>
</span><span class="cx"> #include <WebCore/GraphicsLayerAnimation.h>
</span><span class="cx"> #include <WebCore/IdentityTransformOperation.h>
</span><span class="lines">@@ -50,10 +51,6 @@
</span><span class="cx"> #include <WebCore/TransformationMatrix.h>
</span><span class="cx"> #include <WebCore/TranslateTransformOperation.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
-#include <WebCore/FilterOperations.h>
-#endif
-
</del><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> #include <WebCore/GraphicsSurface.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -63,7 +60,6 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void ArgumentCoder<WebCore::FilterOperations>::encode(ArgumentEncoder& encoder, const WebCore::FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<uint32_t>(filters.size());
</span><span class="lines">@@ -171,7 +167,6 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void ArgumentCoder<TransformOperations>::encode(ArgumentEncoder& encoder, const TransformOperations& transformOperations)
</span><span class="cx"> {
</span><span class="lines">@@ -446,11 +441,9 @@
</span><span class="cx"> case AnimatedPropertyWebkitTransform:
</span><span class="cx"> encoder << static_cast<const TransformAnimationValue&>(value).value();
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case AnimatedPropertyWebkitFilter:
</span><span class="cx"> encoder << static_cast<const FilterAnimationValue&>(value).value();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -534,7 +527,6 @@
</span><span class="cx"> keyframes.insert(TransformAnimationValue::create(keyTime, transform, timingFunction.get()));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> case AnimatedPropertyWebkitFilter: {
</span><span class="cx"> FilterOperations filter;
</span><span class="cx"> if (!decoder.decode(filter))
</span><span class="lines">@@ -542,7 +534,6 @@
</span><span class="cx"> keyframes.insert(FilterAnimationValue::create(keyTime, filter, timingFunction.get()));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -657,10 +648,8 @@
</span><span class="cx"> if (state.debugBorderWidthChanged)
</span><span class="cx"> encoder << state.debugBorderWidth;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (state.filtersChanged)
</span><span class="cx"> encoder << state.filters;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (state.animationsChanged)
</span><span class="cx"> encoder << state.animations;
</span><span class="lines">@@ -743,10 +732,8 @@
</span><span class="cx"> if (state.debugBorderWidthChanged && !decoder.decode(state.debugBorderWidth))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (state.filtersChanged && !decoder.decode(state.filters))
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (state.animationsChanged && !decoder.decode(state.animations))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -44,9 +44,7 @@
</span><span class="cx"> class TransformOperations;
</span><span class="cx"> struct Length;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> class FilterOperations;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> struct GraphicsSurfaceToken;
</span><span class="lines">@@ -55,12 +53,10 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> template<> struct ArgumentCoder<WebCore::FilterOperations> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::TransformOperations> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::TransformOperations&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1576,7 +1576,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
</del><ins>+#if !USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> void ArgumentCoder<FilterOperation>::encode(ArgumentEncoder& encoder, const FilterOperation& filter)
</span><span class="cx"> {
</span><span class="cx"> encoder.encodeEnum(filter.type());
</span><span class="lines">@@ -1707,7 +1707,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif // ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
</del><ins>+#endif // !USE(COORDINATED_GRAPHICS)
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> void ArgumentCoder<IDBDatabaseMetadata>::encode(ArgumentEncoder& encoder, const IDBDatabaseMetadata& metadata)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::StickyPositionViewportConstraints&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
</del><ins>+#if !USE(COORDINATED_GRAPHICS)
</ins><span class="cx"> template<> struct ArgumentCoder<WebCore::FilterOperations> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -36,12 +36,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> bool GraphicsLayerCARemote::filtersCanBeComposited(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> return PlatformCALayerRemote::filtersCanBeComposited(filters);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCARemote::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -42,10 +42,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~GraphicsLayerCARemote();
</span><del>-
-#if ENABLE(CSS_FILTERS)
</del><ins>+
</ins><span class="cx"> virtual bool filtersCanBeComposited(const WebCore::FilterOperations& filters) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isGraphicsLayerCARemote() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -91,18 +91,14 @@
</span><span class="cx"> virtual void setFromValue(const WebCore::TransformationMatrix&) override;
</span><span class="cx"> virtual void setFromValue(const WebCore::FloatPoint3D&) override;
</span><span class="cx"> virtual void setFromValue(const WebCore::Color&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFromValue(const WebCore::FilterOperation*, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyFromValueFrom(const WebCore::PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setToValue(float) override;
</span><span class="cx"> virtual void setToValue(const WebCore::TransformationMatrix&) override;
</span><span class="cx"> virtual void setToValue(const WebCore::FloatPoint3D&) override;
</span><span class="cx"> virtual void setToValue(const WebCore::Color&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setToValue(const WebCore::FilterOperation*, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyToValueFrom(const WebCore::PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> // Keyframe-animation properties.
</span><span class="lines">@@ -110,9 +106,7 @@
</span><span class="cx"> virtual void setValues(const Vector<WebCore::TransformationMatrix>&) override;
</span><span class="cx"> virtual void setValues(const Vector<WebCore::FloatPoint3D>&) override;
</span><span class="cx"> virtual void setValues(const Vector<WebCore::Color>&) override;
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setValues(const Vector<RefPtr<WebCore::FilterOperation>>&, int internalFilterPropertyIndex) override;
</span><del>-#endif
</del><span class="cx"> virtual void copyValuesFrom(const WebCore::PlatformCAAnimation*) override;
</span><span class="cx">
</span><span class="cx"> virtual void setKeyTimes(const Vector<float>&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemotemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -482,7 +482,6 @@
</span><span class="cx"> m_properties.keyValues[0] = KeyframeValue(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationRemote::setFromValue(const FilterOperation* operation, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> if (animationType() != Basic)
</span><span class="lines">@@ -491,7 +490,6 @@
</span><span class="cx"> m_properties.keyValues.resize(2);
</span><span class="cx"> m_properties.keyValues[0] = KeyframeValue(operation->clone());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationRemote::copyFromValueFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span><span class="lines">@@ -540,7 +538,6 @@
</span><span class="cx"> m_properties.keyValues[1] = KeyframeValue(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationRemote::setToValue(const FilterOperation* operation, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> if (animationType() != Basic)
</span><span class="lines">@@ -551,7 +548,6 @@
</span><span class="cx"> m_properties.keyValues.resize(2);
</span><span class="cx"> m_properties.keyValues[1] = KeyframeValue(operation->clone());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationRemote::copyToValueFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span><span class="lines">@@ -620,7 +616,6 @@
</span><span class="cx"> m_properties.keyValues = WTF::move(keyframes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCAAnimationRemote::setValues(const Vector<RefPtr<FilterOperation>>& values, int internalFilterPropertyIndex)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(internalFilterPropertyIndex);
</span><span class="lines">@@ -636,7 +631,6 @@
</span><span class="cx">
</span><span class="cx"> m_properties.keyValues = WTF::move(keyframes);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCAAnimationRemote::copyValuesFrom(const PlatformCAAnimation* value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -132,10 +132,8 @@
</span><span class="cx"> clone.setOpaque(isOpaque());
</span><span class="cx"> clone.setBackgroundColor(backgroundColor());
</span><span class="cx"> clone.setContentsScale(contentsScale());
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> if (m_properties.filters)
</span><span class="cx"> clone.copyFiltersFrom(this);
</span><del>-#endif
</del><span class="cx"> clone.updateCustomAppearance(customAppearance());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -598,7 +596,6 @@
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::OpacityChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> void PlatformCALayerRemote::setFilters(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> m_properties.filters = std::make_unique<FilterOperations>(filters);
</span><span class="lines">@@ -627,7 +624,6 @@
</span><span class="cx"> {
</span><span class="cx"> return PlatformCALayerMac::filtersCanBeComposited(filters);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setName(const String& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -122,11 +122,9 @@
</span><span class="cx"> virtual float opacity() const override;
</span><span class="cx"> virtual void setOpacity(float) override;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_FILTERS)
</del><span class="cx"> virtual void setFilters(const WebCore::FilterOperations&) override;
</span><span class="cx"> static bool filtersCanBeComposited(const WebCore::FilterOperations&);
</span><span class="cx"> virtual void copyFiltersFrom(const WebCore::PlatformCALayer*) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> virtual void setBlendMode(WebCore::BlendMode) override;
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_CONDITIONAL_RULES ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/cmake/OptionsMac.cmake 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_FILTERS ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_BOX_DECORATION_BREAK "Toggle Box Decoration break (CSS Backgrounds and Borders) support" ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_COMPOSITING "Toggle CSS COMPOSITING support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_DEVICE_ADAPTATION "Toggle CSS Device Adaptation support" OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_CSS_FILTERS "Toggle CSS Filters support" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_GRID_LAYOUT "Toggle CSS Grid Layout support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_ORIENTATION "Toggle CSS image-orientation support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Source/cmakeconfig.h.cmake 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_COMPOSITING
</span><del>-#cmakedefine01 ENABLE_CSS_FILTERS
</del><span class="cx"> #cmakedefine01 ENABLE_CSS_GRID_LAYOUT
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Tools/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173201.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -178,9 +178,6 @@
</span><span class="cx"> { option => "css-shapes", desc => "Toggle CSS Shapes support",
</span><span class="cx"> define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
</span><span class="cx">
</span><del>- { option => "css-filters", desc => "Toggle CSS Filters support",
- define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isIOSWebKit() || isEfl() || isGtk()), value => \$cssFiltersSupport },
-
</del><span class="cx"> { option => "css-grid-layout", desc => "Toggle CSS Grid Layout support",
</span><span class="cx"> define => "ENABLE_CSS_GRID_LAYOUT", default => 1, value => \$cssGridLayoutSupport },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/WebKitLibraries/ChangeLog 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-08-27 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Link error.
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> <ENABLE_CSS3_TEXT />
</span><span class="cx"> <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
</span><span class="cx"> <ENABLE_CSS_COMPOSITING />
</span><del>- <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
</del><span class="cx"> <ENABLE_CSS_GRID_LAYOUT>ENABLE_CSS_GRID_LAYOUT</ENABLE_CSS_GRID_LAYOUT>
</span><span class="cx"> <ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
</span><span class="cx"> <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
</span><span class="lines">@@ -89,7 +88,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -137,10 +136,6 @@
</span><span class="cx"> <Value>$(ENABLE_CSS_COMPOSITING)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><del>- <BuildMacro Include="ENABLE_CSS_FILTERS">
- <Value>$(ENABLE_CSS_FILTERS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
</del><span class="cx"> <BuildMacro Include="ENABLE_CSS_IMAGE_SET">
</span><span class="cx"> <Value>$(ENABLE_CSS_IMAGE_SET)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props (173267 => 173268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props 2014-09-04 18:27:01 UTC (rev 173267)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props 2014-09-04 18:43:39 UTC (rev 173268)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> <ENABLE_CSS3_TEXT />
</span><span class="cx"> <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
</span><span class="cx"> <ENABLE_CSS_COMPOSITING />
</span><del>- <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
</del><span class="cx"> <ENABLE_CSS_GRID_LAYOUT>ENABLE_CSS_GRID_LAYOUT</ENABLE_CSS_GRID_LAYOUT>
</span><span class="cx"> <ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
</span><span class="cx"> <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
</span><span class="lines">@@ -88,7 +87,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -136,10 +135,6 @@
</span><span class="cx"> <Value>$(ENABLE_CSS_COMPOSITING)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><del>- <BuildMacro Include="ENABLE_CSS_FILTERS">
- <Value>$(ENABLE_CSS_FILTERS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
</del><span class="cx"> <BuildMacro Include="ENABLE_CSS_IMAGE_SET">
</span><span class="cx"> <Value>$(ENABLE_CSS_IMAGE_SET)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span></span></pre>
</div>
</div>
</body>
</html>