Changeset 175687 in webkit


Ignore:
Timestamp:
Nov 5, 2014 11:43:41 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r175672.
https://bugs.webkit.org/show_bug.cgi?id=138455

Tries to make backdrop layers on every layer, asserts on
Mavericks (Requested by smfr on #webkit).

Reverted changeset:

"[filters2] Support for backdrop-filter"
https://bugs.webkit.org/show_bug.cgi?id=138384
http://trac.webkit.org/changeset/175672

Location:
trunk
Files:
1 deleted
34 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r175672 r175687  
     12014-11-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r175672.
     4        https://bugs.webkit.org/show_bug.cgi?id=138455
     5
     6        Tries to make backdrop layers on every layer, asserts on
     7        Mavericks (Requested by smfr on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[filters2] Support for backdrop-filter"
     12        https://bugs.webkit.org/show_bug.cgi?id=138384
     13        http://trac.webkit.org/changeset/175672
     14
    1152014-11-04  Dean Jackson  <dino@apple.com>
    216
  • trunk/LayoutTests/platform/efl/TestExpectations

    r175672 r175687  
    446446media/encrypted-media/encrypted-media-not-loaded.html [ WontFix ]
    447447media/encrypted-media/encrypted-media-syntax.html [ WontFix ]
    448 
    449 # No support for Filters Level 2 on EFL yet
    450 Bug(EFL) css3/filters/backdrop [ Skip ]
    451448
    452449#////////////////////////////////////////////////////////////////////////////////////////
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r175672 r175687  
    443443
    444444webkit.org/b/133806 svg/masking/mask-transformed-text-missing.svg [ ImageOnlyFailure ]
    445 
    446 # No support for Filters Level 2 on GTK yet
    447 Bug(GTK) css3/filters/backdrop [ Skip ]
    448445
    449446#////////////////////////////////////////////////////////////////////////////////////////
  • trunk/LayoutTests/platform/mac-mavericks/TestExpectations

    r175672 r175687  
    11# This test should only be run on Yosemite or later.
    22platform/mac/editing/input/undo-grouping-on-text-insertion.html [ Skip ]
    3 
    4 # Backdrop filters are not supported on Mavericks
    5 css3/filters/backdrop [ Skip ]
  • trunk/LayoutTests/platform/win/TestExpectations

    r175672 r175687  
    4545css3/filters/filter-is-on-subpixel-position.html
    4646css3/masking/clip-path-filter.html
    47 css3/filters/backdrop
    4847
    4948# Remove from list after enabling CANVAS_PATH
  • trunk/Source/WebCore/ChangeLog

    r175686 r175687  
     12014-11-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r175672.
     4        https://bugs.webkit.org/show_bug.cgi?id=138455
     5
     6        Tries to make backdrop layers on every layer, asserts on
     7        Mavericks (Requested by smfr on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[filters2] Support for backdrop-filter"
     12        https://bugs.webkit.org/show_bug.cgi?id=138384
     13        http://trac.webkit.org/changeset/175672
     14
    1152014-11-04  Ada Chan  <adachan@apple.com>
    216
  • trunk/Source/WebCore/WebCore.exp.in

    r175686 r175687  
    550550__ZN7WebCore15GraphicsContextD1Ev
    551551__ZN7WebCore15GraphicsLayerCA10initializeEv
    552 __ZN7WebCore15GraphicsLayerCA18setBackdropFiltersERKNS_16FilterOperationsE
    553552__ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE
    554553__ZN7WebCore15GraphicsLayerCA10setOpacityEf
  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r175672 r175687  
    292292    CSSPropertyWebkitJustifySelf,
    293293    CSSPropertyWebkitFilter,
    294 #if ENABLE(FILTERS_LEVEL_2)
    295     CSSPropertyWebkitBackdropFilter,
    296 #endif
    297294    CSSPropertyWebkitFontKerning,
    298295    CSSPropertyWebkitFontSmoothing,
     
    16031600    case CSSPropertyWebkitTransform:
    16041601    case CSSPropertyWebkitFilter:
    1605 #if ENABLE(FILTERS_LEVEL_2)
    1606     case CSSPropertyWebkitBackdropFilter:
    1607 #endif
    16081602        return true;
    16091603    case CSSPropertyMargin: {
     
    28982892        case CSSPropertyWebkitFilter:
    28992893            return valueForFilter(style.get(), style->filter());
    2900 #if ENABLE(FILTERS_LEVEL_2)
    2901         case CSSPropertyWebkitBackdropFilter:
    2902             return valueForFilter(style.get(), style->backdropFilter());
    2903 #endif
    29042894#if ENABLE(CSS_COMPOSITING)
    29052895        case CSSPropertyMixBlendMode:
  • trunk/Source/WebCore/css/CSSParser.cpp

    r175672 r175687  
    24562456        break;
    24572457    case CSSPropertyWebkitFilter:
    2458 #if ENABLE(FILTERS_LEVEL_2)
    2459     case CSSPropertyWebkitBackdropFilter:
    2460 #endif
    24612458        if (id == CSSValueNone)
    24622459            validPrimitive = true;
  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r175672 r175687  
    372372justify-content [NewStyleBuilder]
    373373-webkit-justify-content = justify-content
    374 #if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
    375 -webkit-backdrop-filter
    376 #endif
    377374-webkit-justify-self
    378375-webkit-font-size-delta
  • trunk/Source/WebCore/css/StyleResolver.cpp

    r175672 r175687  
    12601260        || style.boxReflect()
    12611261        || style.hasFilter()
    1262 #if ENABLE(FILTERS_LEVEL_2)
    1263         || style.hasBackdropFilter()
    1264 #endif
    12651262        || style.hasBlendMode()
    12661263        || style.hasIsolation()
     
    13561353        || style.overflowY() != OVISIBLE
    13571354        || style.hasFilter()
    1358 #if ENABLE(FILTERS_LEVEL_2)
    1359         || style.hasBackdropFilter()
    1360 #endif
    13611355        || style.hasBlendMode()))
    13621356        style.setTransformStyle3D(TransformStyle3DFlat);
     
    27082702        return;
    27092703    }
    2710 
    2711 #if ENABLE(FILTERS_LEVEL_2)
    2712     case CSSPropertyWebkitBackdropFilter: {
    2713         HANDLE_INHERIT_AND_INITIAL(backdropFilter, BackdropFilter);
    2714         FilterOperations operations;
    2715         if (createFilterOperations(value, operations))
    2716             state.style()->setBackdropFilter(operations);
    2717         return;
    2718     }
    2719 #endif
    27202704
    27212705#if ENABLE(CSS_GRID_LAYOUT)
  • trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp

    r175672 r175687  
    363363    m_filterFunctionListsMatch = false;
    364364
    365 #if ENABLE(FILTERS_LEVEL_2)
    366     if (m_keyframes.size() < 2 || (!m_keyframes.containsProperty(CSSPropertyWebkitFilter) && !m_keyframes.containsProperty(CSSPropertyWebkitBackdropFilter)))
    367 #else
    368365    if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyWebkitFilter))
    369 #endif
    370366        return;
    371367
  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

    r175672 r175687  
    326326    virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; }
    327327
    328     bool needsBackdrop() const { return !m_backdropFilters.isEmpty(); }
    329 
    330328    // The color used to paint the layer background. Pass an invalid color to remove it.
    331329    // Note that this covers the entire layer. Use setContentsToSolidColor() if the color should
     
    345343
    346344    const FilterOperations& filters() const { return m_filters; }
    347     // Returns true if filter can be rendered by the compositor.
     345   
     346    // Returns true if filter can be rendered by the compositor
    348347    virtual bool setFilters(const FilterOperations& filters) { m_filters = filters; return true; }
    349 
    350     const FilterOperations& backdropFilters() const { return m_backdropFilters; }
    351     virtual bool setBackdropFilters(const FilterOperations& filters) { m_backdropFilters = filters; return true; }
    352348
    353349#if ENABLE(CSS_COMPOSITING)
     
    523519    // needs to notifiy the change to the platform layer as needed.
    524520    void clearFilters() { m_filters.clear(); }
    525     void clearBackdropFilters() { m_backdropFilters.clear(); }
    526521
    527522    // Given a KeyframeValueList containing filterOperations, return true if the operations are valid.
     
    570565   
    571566    FilterOperations m_filters;
    572     FilterOperations m_backdropFilters;
    573567
    574568#if ENABLE(CSS_COMPOSITING)
  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r175672 r175687  
    303303#endif
    304304}
    305 
     305   
    306306PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner)
    307307{
     
    377377    if (m_structuralLayer)
    378378        m_structuralLayer->setOwner(nullptr);
    379 
    380     if (m_backdropLayer)
    381         m_backdropLayer->setOwner(nullptr);
    382 
     379   
    383380    removeCloneLayers();
    384381
     
    571568        for (size_t i = 0; i < numAnimations; ++i) {
    572569            const LayerPropertyAnimation& currAnimation = propertyAnimations[i];
    573 
     570           
    574571            if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity
    575572                    || currAnimation.m_property == AnimatedPropertyBackgroundColor
     
    689686}
    690687
    691 bool GraphicsLayerCA::setBackdropFilters(const FilterOperations& filterOperations)
    692 {
    693     bool canCompositeFilters = filtersCanBeComposited(filterOperations);
    694 
    695     if (m_backdropFilters == filterOperations)
    696         return canCompositeFilters;
    697 
    698     // Filters cause flattening, so we should never have filters on a layer with preserves3D().
    699     ASSERT(!filterOperations.size() || !preserves3D());
    700 
    701     if (canCompositeFilters)
    702         GraphicsLayer::setBackdropFilters(filterOperations);
    703     else {
    704         // FIXME: This would clear the backdrop filters if we had a software implementation.
    705         clearBackdropFilters();
    706     }
    707     noteLayerPropertyChanged(BackdropFiltersChanged);
    708     return canCompositeFilters;
    709 }
    710 
    711688#if ENABLE(CSS_COMPOSITING)
    712689void GraphicsLayerCA::setBlendMode(BlendMode blendMode)
     
    823800    if (createdAnimations)
    824801        noteLayerPropertyChanged(AnimationChanged);
    825 
     802       
    826803    return createdAnimations;
    827804}
     
    12891266
    12901267    // Need to handle Preserves3DChanged first, because it affects which layers subsequent properties are applied to
    1291     if (m_uncommittedChanges & (Preserves3DChanged | ReplicatedLayerChanged | BackdropFiltersChanged))
     1268    if (m_uncommittedChanges & (Preserves3DChanged | ReplicatedLayerChanged))
    12921269        updateStructuralLayer();
    12931270
     
    13371314    if (m_uncommittedChanges & FiltersChanged)
    13381315        updateFilters();
    1339 
    1340     if (m_uncommittedChanges & BackdropFiltersChanged)
    1341         updateBackdropFilters();
    13421316
    13431317#if ENABLE(CSS_COMPOSITING)
     
    14271401        m_structuralLayer->setName("Replica flattening layer " + name());
    14281402        break;
    1429     case StructuralLayerForBackdrop:
    1430         m_structuralLayer->setName("Backdrop hosting layer " + name());
    1431         break;
    14321403    case NoStructuralLayer:
    14331404        break;
     
    14541425
    14551426    if (m_structuralLayer) {
    1456         if (m_backdropLayer)
    1457             structuralLayerChildren.append(m_backdropLayer);
    1458 
    14591427        if (m_replicaLayer)
    14601428            structuralLayerChildren.append(downcast<GraphicsLayerCA>(*m_replicaLayer).primaryLayer());
     
    15421510    m_layer->setBounds(adjustedBounds);
    15431511    m_layer->setAnchorPoint(scaledAnchorPoint);
    1544 
    1545     if (m_backdropLayer) {
    1546         m_backdropLayer->setPosition(adjustedPosition);
    1547         m_backdropLayer->setBounds(adjustedBounds);
    1548         m_backdropLayer->setAnchorPoint(scaledAnchorPoint);
    1549     }
    15501512
    15511513    if (LayerMap* layerCloneMap = m_layerClones.get()) {
     
    16791641}
    16801642
    1681 void GraphicsLayerCA::updateBackdropFilters()
    1682 {
    1683     if (!m_backdropLayer) {
    1684         m_backdropLayer = createPlatformCALayer(PlatformCALayer::LayerTypeBackdropLayer, this);
    1685         m_backdropLayer->setPosition(m_layer->position());
    1686         m_backdropLayer->setBounds(m_layer->bounds());
    1687         m_backdropLayer->setAnchorPoint(m_layer->anchorPoint());
    1688         m_backdropLayer->setMasksToBounds(true);
    1689     }
    1690     m_backdropLayer->setFilters(m_backdropFilters);
    1691 }
    1692 
    16931643#if ENABLE(CSS_COMPOSITING)
    16941644void GraphicsLayerCA::updateBlendMode()
     
    17211671        | BackfaceVisibilityChanged
    17221672        | FiltersChanged
    1723         | BackdropFiltersChanged
    17241673        | OpacityChanged;
    17251674
     
    18011750    if (isReplicated())
    18021751        return StructuralLayerForReplicaFlattening;
    1803 
    1804     if (needsBackdrop())
    1805         return StructuralLayerForBackdrop;
    1806 
     1752   
    18071753    return NoStructuralLayer;
    18081754}
     
    23172263{
    23182264    ASSERT(valueList.property() != AnimatedPropertyWebkitTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter));
    2319 
     2265   
    23202266    bool isKeyframe = valueList.size() > 2;
    23212267    bool valuesOK;
     
    30543000        | AcceleratesDrawingChanged
    30553001        | FiltersChanged
    3056         | BackdropFiltersChanged
    30573002        | MaskLayerChanged
    30583003        | OpacityChanged
  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

    r175672 r175687  
    106106    virtual bool filtersCanBeComposited(const FilterOperations&);
    107107
    108     WEBCORE_EXPORT virtual bool setBackdropFilters(const FilterOperations&) override;
    109 
    110108#if ENABLE(CSS_COMPOSITING)
    111109    WEBCORE_EXPORT virtual void setBlendMode(BlendMode) override;
     
    205203    void updateOpacityOnLayer();
    206204    void updateFilters();
    207     void updateBackdropFilters();
    208205
    209206#if ENABLE(CSS_COMPOSITING)
     
    387384        NoStructuralLayer = 0,
    388385        StructuralLayerForPreserves3D,
    389         StructuralLayerForReplicaFlattening,
    390         StructuralLayerForBackdrop
     386        StructuralLayerForReplicaFlattening
    391387    };
    392388    void ensureStructuralLayer(StructuralLayerPurpose);
     
    432428        VisibleRectChanged = 1LLU << 25,
    433429        FiltersChanged = 1LLU << 26,
    434         BackdropFiltersChanged = 1LLU << 27,
    435         TilingAreaChanged = 1LLU << 28,
    436         TilesAdded = 1LLU < 29,
    437         DebugIndicatorsChanged = 1LLU << 30,
    438         CustomAppearanceChanged = 1LLU << 31,
    439         CustomBehaviorChanged = 1LLU << 32,
    440         BlendModeChanged = 1LLU << 33
     430        TilingAreaChanged = 1LLU << 27,
     431        TilesAdded = 1LLU < 28,
     432        DebugIndicatorsChanged = 1LLU << 29,
     433        CustomAppearanceChanged = 1LLU << 30,
     434        CustomBehaviorChanged = 1LLU << 31,
     435        BlendModeChanged = 1LLU << 32
    441436    };
    442437    typedef uint64_t LayerChangeFlags;
     
    452447    RefPtr<PlatformCALayer> m_contentsClippingLayer; // A layer used to clip inner content
    453448    RefPtr<PlatformCALayer> m_contentsLayer; // A layer used for inner content, like image and video
    454     RefPtr<PlatformCALayer> m_backdropLayer; // The layer used for backdrop rendering, if necessary.
    455449
    456450    // References to clones of our layers, for replicated layers.
  • trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

    r175672 r175687  
    7878        LayerTypeAVPlayerLayer,
    7979        LayerTypeWebGLLayer,
    80         LayerTypeBackdropLayer,
    8180        LayerTypeCustom
    8281    };
  • trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

    r175672 r175687  
    6363#endif
    6464
    65 #if ENABLE(FILTERS_LEVEL_2)
    66 @interface CABackdropLayer : CALayer
    67 @end
    68 #endif
    6965
    7066SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
     
    237233    case LayerTypeTransformLayer:
    238234        layerClass = [CATransformLayer class];
    239         break;
    240     case LayerTypeBackdropLayer:
    241 #if ENABLE(FILTERS_LEVEL_2)
    242         layerClass = [CABackdropLayer class];
    243 #else
    244         ASSERT_NOT_REACHED();
    245         layerClass = [CALayer class];
    246 #endif
    247235        break;
    248236    case LayerTypeWebTiledLayer:
  • trunk/Source/WebCore/rendering/RenderElement.h

    r175672 r175687  
    123123
    124124    // Returns true if this renderer requires a new stacking context.
    125     bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasBackdropFilter() || hasBlendMode(); }
     125    bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasBlendMode(); }
    126126
    127127    bool isTransparent() const { return style().opacity() < 1.0f; }
     
    138138
    139139    bool hasFilter() const { return style().hasFilter(); }
    140     bool hasBackdropFilter() const
    141     {
    142 #if ENABLE(FILTERS_LEVEL_2)
    143         return style().hasBackdropFilter();
    144 #else
    145         return false;
    146 #endif
    147     }
    148140
    149141#if ENABLE(CSS_COMPOSITING)
  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r175672 r175687  
    316316bool RenderLayer::paintsWithFilters() const
    317317{
     318    // FIXME: Eventually there will be cases where we paint with filters even without accelerated compositing,
     319    // and this whole function won't be inside the #if below.
     320
    318321    if (!renderer().hasFilter())
    319322        return false;
     
    62166219        && !renderer().hasClipPath()
    62176220        && !renderer().hasFilter()
    6218         && !renderer().hasBackdropFilter()
    62196221#if PLATFORM(IOS)
    62206222        && !hasAcceleratedTouchScrolling()
  • trunk/Source/WebCore/rendering/RenderLayer.h

    r175672 r175687  
    792792    void filterNeedsRepaint();
    793793    bool hasFilter() const { return renderer().hasFilter(); }
    794     bool hasBackdropFilter() const
    795     {
    796 #if ENABLE(FILTERS_LEVEL_2)
    797         return renderer().hasBackdropFilter();
    798 #else
    799         return false;
    800 #endif
    801     }
    802794
    803795#if ENABLE(CSS_COMPOSITING)
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r175672 r175687  
    113113    , m_requiresOwnBackingStore(true)
    114114    , m_canCompositeFilters(false)
    115 #if ENABLE(FILTERS_LEVEL_2)
    116     , m_canCompositeBackdropFilters(false)
    117 #endif
    118115    , m_backgroundLayerPaintsFixedRootBackground(false)
    119116{
     
    315312    updateTransform(renderer().style());
    316313    updateFilters(renderer().style());
    317 #if ENABLE(FILTERS_LEVEL_2)
    318     updateBackdropFilters(renderer().style());
    319 #endif
    320314#if ENABLE(CSS_COMPOSITING)
    321315    updateBlendMode(renderer().style());
     
    381375    m_canCompositeFilters = m_graphicsLayer->setFilters(style.filter());
    382376}
    383 
    384 #if ENABLE(FILTERS_LEVEL_2)
    385 void RenderLayerBacking::updateBackdropFilters(const RenderStyle& style)
    386 {
    387     m_canCompositeBackdropFilters = m_graphicsLayer->setBackdropFilters(style.backdropFilter());
    388 }
    389 #endif
    390377
    391378#if ENABLE(CSS_COMPOSITING)
     
    666653
    667654    updateFilters(style);
    668 #if ENABLE(FILTERS_LEVEL_2)
    669     updateBackdropFilters(style);
    670 #endif
     655
    671656#if ENABLE(CSS_COMPOSITING)
    672657    updateBlendMode(style);
  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r175672 r175687  
    233233
    234234    bool canCompositeFilters() const { return m_canCompositeFilters; }
    235 #if ENABLE(FILTERS_LEVEL_2)
    236     bool canCompositeBackdropFilters() const { return m_canCompositeBackdropFilters; }
    237 #endif
    238235
    239236    // Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers.
     
    283280    void updateTransform(const RenderStyle&);
    284281    void updateFilters(const RenderStyle&);
    285 #if ENABLE(FILTERS_LEVEL_2)
    286     void updateBackdropFilters(const RenderStyle&);
    287 #endif
    288282#if ENABLE(CSS_COMPOSITING)
    289283    void updateBlendMode(const RenderStyle&);
     
    355349    bool m_requiresOwnBackingStore;
    356350    bool m_canCompositeFilters;
    357 #if ENABLE(FILTERS_LEVEL_2)
    358     bool m_canCompositeBackdropFilters;
    359 #endif
    360351    bool m_backgroundLayerPaintsFixedRootBackground;
    361352
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r175679 r175687  
    21812181        || renderer.hasReflection()
    21822182        || renderer.hasFilter()
    2183         || renderer.hasBackdropFilter()
    21842183#if PLATFORM(IOS)
    21852184        || requiresCompositingForScrolling(layer)
     
    21872186        )
    21882187        return true;
    2189 
     2188       
     2189   
    21902190    if (layer.mustCompositeForIndirectReasons()) {
    21912191        RenderLayer::IndirectCompositingReason reason = layer.indirectCompositingReason();
     
    22742274            reasons |= CompositingReasonReflectionWithCompositedDescendants;
    22752275
    2276         if (renderer->hasFilter() || renderer->hasBackdropFilter())
     2276        if (renderer->hasFilter())
    22772277            reasons |= CompositingReasonFilterWithCompositedDescendants;
    22782278
     
    25952595bool RenderLayerCompositor::requiresCompositingForFilters(RenderLayerModelObject& renderer) const
    25962596{
    2597 #if ENABLE(FILTERS_LEVEL_2)
    2598     if (renderer.hasBackdropFilter())
    2599         return true;
    2600 #endif
    2601 
    26022597    if (!(m_compositingTriggers & ChromeClient::FilterTrigger))
    26032598        return false;
  • trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp

    r175672 r175687  
    115115                    )
    116116                layer()->repaintIncludingDescendants();
    117             } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter() || newStyle.hasBackdropFilter()) {
     117            } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter()) {
    118118                // If we don't have a layer yet, but we are going to get one because of transform or opacity,
    119119                //  then we need to repaint the old position of the object.
  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r175672 r175687  
    639639        return true;
    640640
    641 #if ENABLE(FILTERS_LEVEL_2)
    642     if (rareNonInheritedData->hasBackdropFilters() != other.rareNonInheritedData->hasBackdropFilters())
    643         return true;
    644 #endif
    645 
    646641    const QuotesData* quotesDataA = rareInheritedData->quotes.get();
    647642    const QuotesData* quotesDataB = other.rareInheritedData->quotes.get();
  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r175672 r175687  
    11171117    const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
    11181118    bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
    1119 
    1120 #if ENABLE(FILTERS_LEVEL_2)
    1121     FilterOperations& mutableBackdropFilter() { return rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; }
    1122     const FilterOperations& backdropFilter() const { return rareNonInheritedData->m_backdropFilter->m_operations; }
    1123     bool hasBackdropFilter() const { return !rareNonInheritedData->m_backdropFilter->m_operations.operations().isEmpty(); }
    1124 #else
    1125     bool hasBackdropFilter() const { return false; }
    1126 #endif
    11271119
    11281120#if ENABLE(CSS_COMPOSITING)
     
    15561548
    15571549    void setFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_filter, m_operations, ops); }
    1558 #if ENABLE(FILTERS_LEVEL_2)
    1559     void setBackdropFilter(const FilterOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_backdropFilter, m_operations, ops); }
    1560 #endif
    15611550
    15621551    void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); }
     
    20071996#endif
    20081997    static const FilterOperations& initialFilter() { DEPRECATED_DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
    2009 #if ENABLE(FILTERS_LEVEL_2)
    2010     static const FilterOperations& initialBackdropFilter() { DEPRECATED_DEFINE_STATIC_LOCAL(FilterOperations, ops, ()); return ops; }
    2011 #endif
    20121998#if ENABLE(CSS_COMPOSITING)
    20131999    static BlendMode initialBlendMode() { return BlendModeNormal; }
  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r175672 r175687  
    5050    , m_transform(StyleTransformData::create())
    5151    , m_filter(StyleFilterData::create())
    52 #if ENABLE(FILTERS_LEVEL_2)
    53     , m_backdropFilter(StyleFilterData::create())
    54 #endif
    5552#if ENABLE(CSS_GRID_LAYOUT)
    5653    , m_grid(StyleGridData::create())
     
    123120    , m_transform(o.m_transform)
    124121    , m_filter(o.m_filter)
    125 #if ENABLE(FILTERS_LEVEL_2)
    126     , m_backdropFilter(o.m_backdropFilter)
    127 #endif
    128122#if ENABLE(CSS_GRID_LAYOUT)
    129123    , m_grid(o.m_grid)
     
    221215        && m_transform == o.m_transform
    222216        && m_filter == o.m_filter
    223 #if ENABLE(FILTERS_LEVEL_2)
    224         && m_backdropFilter == o.m_backdropFilter
    225 #endif
    226217#if ENABLE(CSS_GRID_LAYOUT)
    227218        && m_grid == o.m_grid
     
    356347}
    357348
    358 #if ENABLE(FILTERS_LEVEL_2)
    359 bool StyleRareNonInheritedData::hasBackdropFilters() const
    360 {
    361     return m_backdropFilter.get() && !m_backdropFilter->m_operations.isEmpty();
    362 }
    363 #endif
    364 
    365349} // namespace WebCore
  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

    r175672 r175687  
    9595    bool transitionDataEquivalent(const StyleRareNonInheritedData&) const;
    9696    bool hasFilters() const;
    97 #if ENABLE(FILTERS_LEVEL_2)
    98     bool hasBackdropFilters() const;
    99 #endif
    10097    bool hasOpacity() const { return opacity < 1; }
    10198
     
    123120    DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.)
    124121    DataRef<StyleFilterData> m_filter; // Filter operations (url, sepia, blur, etc.)
    125 #if ENABLE(FILTERS_LEVEL_2)
    126     DataRef<StyleFilterData> m_backdropFilter; // Filter operations (url, sepia, blur, etc.)
    127 #endif
    128122
    129123#if ENABLE(CSS_GRID_LAYOUT)
  • trunk/Source/WebKit2/ChangeLog

    r175686 r175687  
     12014-11-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r175672.
     4        https://bugs.webkit.org/show_bug.cgi?id=138455
     5
     6        Tries to make backdrop layers on every layer, asserts on
     7        Mavericks (Requested by smfr on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[filters2] Support for backdrop-filter"
     12        https://bugs.webkit.org/show_bug.cgi?id=138384
     13        http://trac.webkit.org/changeset/175672
     14
    1152014-11-04  Ada Chan  <adachan@apple.com>
    216
  • trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm

    r175672 r175687  
    349349    case PlatformCALayer::LayerTypeAVPlayerLayer:
    350350    case PlatformCALayer::LayerTypeWebGLLayer:
    351     case PlatformCALayer::LayerTypeBackdropLayer:
    352351    case PlatformCALayer::LayerTypeCustom:
    353352        ASSERT_NOT_REACHED();
  • trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

    r175672 r175687  
    11811181                ts << "root-layer";
    11821182                break;
    1183             case PlatformCALayer::LayerTypeBackdropLayer:
    1184                 ts << "backdrop-layer";
    1185                 break;
    11861183            case PlatformCALayer::LayerTypeAVPlayerLayer:
    11871184                ts << "av-player-layer (context-id " << createdLayer.hostingContextID << ")";
  • trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm

    r175672 r175687  
    3737@interface CALayer(WKLayerInternal)
    3838- (void)setContextId:(uint32_t)contextID;
    39 @end
    40 
    41 @interface CABackdropLayer : CALayer
    4239@end
    4340
     
    108105@end
    109106
    110 @interface WKBackdropView : WKCompositingView
    111 @end
    112 
    113 @implementation WKBackdropView
    114 + (Class)layerClass
    115 {
    116     return [CABackdropLayer self];
    117 }
    118 
    119 @end
    120 
    121107@interface WKRemoteView : WKCompositingView
    122108@end
     
    166152            view = adoptNS([[WKCompositingView alloc] init]);
    167153        break;
    168     case PlatformCALayer::LayerTypeBackdropLayer:
    169         view = adoptNS([[WKBackdropView alloc] init]);
    170         break;
    171154    case PlatformCALayer::LayerTypeTransformLayer:
    172155        view = adoptNS([[WKTransformView alloc] init]);
  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm

    r175672 r175687  
    4242#endif
    4343
    44 #if ENABLE(FILTERS_LEVEL_2)
    45 @interface CABackdropLayer : CALayer
    46 @end
    47 #endif
    48 
    4944using namespace WebCore;
    5045
     
    228223        layer = adoptNS([[CATransformLayer alloc] init]);
    229224        break;
    230     case PlatformCALayer::LayerTypeBackdropLayer:
    231 #if ENABLE(FILTERS_LEVEL_2)
    232         layer = adoptNS([[CABackdropLayer alloc] init]);
    233 #else
    234         ASSERT_NOT_REACHED();
    235         layer = adoptNS([[CALayer alloc] init]);
    236 #endif
    237         break;
    238225    case PlatformCALayer::LayerTypeCustom:
    239226    case PlatformCALayer::LayerTypeAVPlayerLayer:
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r175672 r175687  
    230230            ThreeDTransformTrigger |
    231231            VideoTrigger |
    232             PluginTrigger|
     232            PluginTrigger| 
    233233            CanvasTrigger |
    234234#if PLATFORM(IOS)
Note: See TracChangeset for help on using the changeset viewer.