Changeset 175687 in webkit
- Timestamp:
- Nov 5, 2014 11:43:41 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r175672 r175687 1 2014-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 1 15 2014-11-04 Dean Jackson <dino@apple.com> 2 16 -
trunk/LayoutTests/platform/efl/TestExpectations
r175672 r175687 446 446 media/encrypted-media/encrypted-media-not-loaded.html [ WontFix ] 447 447 media/encrypted-media/encrypted-media-syntax.html [ WontFix ] 448 449 # No support for Filters Level 2 on EFL yet450 Bug(EFL) css3/filters/backdrop [ Skip ]451 448 452 449 #//////////////////////////////////////////////////////////////////////////////////////// -
trunk/LayoutTests/platform/gtk/TestExpectations
r175672 r175687 443 443 444 444 webkit.org/b/133806 svg/masking/mask-transformed-text-missing.svg [ ImageOnlyFailure ] 445 446 # No support for Filters Level 2 on GTK yet447 Bug(GTK) css3/filters/backdrop [ Skip ]448 445 449 446 #//////////////////////////////////////////////////////////////////////////////////////// -
trunk/LayoutTests/platform/mac-mavericks/TestExpectations
r175672 r175687 1 1 # This test should only be run on Yosemite or later. 2 2 platform/mac/editing/input/undo-grouping-on-text-insertion.html [ Skip ] 3 4 # Backdrop filters are not supported on Mavericks5 css3/filters/backdrop [ Skip ] -
trunk/LayoutTests/platform/win/TestExpectations
r175672 r175687 45 45 css3/filters/filter-is-on-subpixel-position.html 46 46 css3/masking/clip-path-filter.html 47 css3/filters/backdrop48 47 49 48 # Remove from list after enabling CANVAS_PATH -
trunk/Source/WebCore/ChangeLog
r175686 r175687 1 2014-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 1 15 2014-11-04 Ada Chan <adachan@apple.com> 2 16 -
trunk/Source/WebCore/WebCore.exp.in
r175686 r175687 550 550 __ZN7WebCore15GraphicsContextD1Ev 551 551 __ZN7WebCore15GraphicsLayerCA10initializeEv 552 __ZN7WebCore15GraphicsLayerCA18setBackdropFiltersERKNS_16FilterOperationsE553 552 __ZN7WebCore15GraphicsLayerCA10setFiltersERKNS_16FilterOperationsE 554 553 __ZN7WebCore15GraphicsLayerCA10setOpacityEf -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r175672 r175687 292 292 CSSPropertyWebkitJustifySelf, 293 293 CSSPropertyWebkitFilter, 294 #if ENABLE(FILTERS_LEVEL_2)295 CSSPropertyWebkitBackdropFilter,296 #endif297 294 CSSPropertyWebkitFontKerning, 298 295 CSSPropertyWebkitFontSmoothing, … … 1603 1600 case CSSPropertyWebkitTransform: 1604 1601 case CSSPropertyWebkitFilter: 1605 #if ENABLE(FILTERS_LEVEL_2)1606 case CSSPropertyWebkitBackdropFilter:1607 #endif1608 1602 return true; 1609 1603 case CSSPropertyMargin: { … … 2898 2892 case CSSPropertyWebkitFilter: 2899 2893 return valueForFilter(style.get(), style->filter()); 2900 #if ENABLE(FILTERS_LEVEL_2)2901 case CSSPropertyWebkitBackdropFilter:2902 return valueForFilter(style.get(), style->backdropFilter());2903 #endif2904 2894 #if ENABLE(CSS_COMPOSITING) 2905 2895 case CSSPropertyMixBlendMode: -
trunk/Source/WebCore/css/CSSParser.cpp
r175672 r175687 2456 2456 break; 2457 2457 case CSSPropertyWebkitFilter: 2458 #if ENABLE(FILTERS_LEVEL_2)2459 case CSSPropertyWebkitBackdropFilter:2460 #endif2461 2458 if (id == CSSValueNone) 2462 2459 validPrimitive = true; -
trunk/Source/WebCore/css/CSSPropertyNames.in
r175672 r175687 372 372 justify-content [NewStyleBuilder] 373 373 -webkit-justify-content = justify-content 374 #if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2375 -webkit-backdrop-filter376 #endif377 374 -webkit-justify-self 378 375 -webkit-font-size-delta -
trunk/Source/WebCore/css/StyleResolver.cpp
r175672 r175687 1260 1260 || style.boxReflect() 1261 1261 || style.hasFilter() 1262 #if ENABLE(FILTERS_LEVEL_2)1263 || style.hasBackdropFilter()1264 #endif1265 1262 || style.hasBlendMode() 1266 1263 || style.hasIsolation() … … 1356 1353 || style.overflowY() != OVISIBLE 1357 1354 || style.hasFilter() 1358 #if ENABLE(FILTERS_LEVEL_2)1359 || style.hasBackdropFilter()1360 #endif1361 1355 || style.hasBlendMode())) 1362 1356 style.setTransformStyle3D(TransformStyle3DFlat); … … 2708 2702 return; 2709 2703 } 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 #endif2720 2704 2721 2705 #if ENABLE(CSS_GRID_LAYOUT) -
trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp
r175672 r175687 363 363 m_filterFunctionListsMatch = false; 364 364 365 #if ENABLE(FILTERS_LEVEL_2)366 if (m_keyframes.size() < 2 || (!m_keyframes.containsProperty(CSSPropertyWebkitFilter) && !m_keyframes.containsProperty(CSSPropertyWebkitBackdropFilter)))367 #else368 365 if (m_keyframes.size() < 2 || !m_keyframes.containsProperty(CSSPropertyWebkitFilter)) 369 #endif370 366 return; 371 367 -
trunk/Source/WebCore/platform/graphics/GraphicsLayer.h
r175672 r175687 326 326 virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; } 327 327 328 bool needsBackdrop() const { return !m_backdropFilters.isEmpty(); }329 330 328 // The color used to paint the layer background. Pass an invalid color to remove it. 331 329 // Note that this covers the entire layer. Use setContentsToSolidColor() if the color should … … 345 343 346 344 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 348 347 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; }352 348 353 349 #if ENABLE(CSS_COMPOSITING) … … 523 519 // needs to notifiy the change to the platform layer as needed. 524 520 void clearFilters() { m_filters.clear(); } 525 void clearBackdropFilters() { m_backdropFilters.clear(); }526 521 527 522 // Given a KeyframeValueList containing filterOperations, return true if the operations are valid. … … 570 565 571 566 FilterOperations m_filters; 572 FilterOperations m_backdropFilters;573 567 574 568 #if ENABLE(CSS_COMPOSITING) -
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
r175672 r175687 303 303 #endif 304 304 } 305 305 306 306 PassRefPtr<PlatformCALayer> GraphicsLayerCA::createPlatformCALayer(PlatformCALayer::LayerType layerType, PlatformCALayerClient* owner) 307 307 { … … 377 377 if (m_structuralLayer) 378 378 m_structuralLayer->setOwner(nullptr); 379 380 if (m_backdropLayer) 381 m_backdropLayer->setOwner(nullptr); 382 379 383 380 removeCloneLayers(); 384 381 … … 571 568 for (size_t i = 0; i < numAnimations; ++i) { 572 569 const LayerPropertyAnimation& currAnimation = propertyAnimations[i]; 573 570 574 571 if (currAnimation.m_property == AnimatedPropertyWebkitTransform || currAnimation.m_property == AnimatedPropertyOpacity 575 572 || currAnimation.m_property == AnimatedPropertyBackgroundColor … … 689 686 } 690 687 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 711 688 #if ENABLE(CSS_COMPOSITING) 712 689 void GraphicsLayerCA::setBlendMode(BlendMode blendMode) … … 823 800 if (createdAnimations) 824 801 noteLayerPropertyChanged(AnimationChanged); 825 802 826 803 return createdAnimations; 827 804 } … … 1289 1266 1290 1267 // 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)) 1292 1269 updateStructuralLayer(); 1293 1270 … … 1337 1314 if (m_uncommittedChanges & FiltersChanged) 1338 1315 updateFilters(); 1339 1340 if (m_uncommittedChanges & BackdropFiltersChanged)1341 updateBackdropFilters();1342 1316 1343 1317 #if ENABLE(CSS_COMPOSITING) … … 1427 1401 m_structuralLayer->setName("Replica flattening layer " + name()); 1428 1402 break; 1429 case StructuralLayerForBackdrop:1430 m_structuralLayer->setName("Backdrop hosting layer " + name());1431 break;1432 1403 case NoStructuralLayer: 1433 1404 break; … … 1454 1425 1455 1426 if (m_structuralLayer) { 1456 if (m_backdropLayer)1457 structuralLayerChildren.append(m_backdropLayer);1458 1459 1427 if (m_replicaLayer) 1460 1428 structuralLayerChildren.append(downcast<GraphicsLayerCA>(*m_replicaLayer).primaryLayer()); … … 1542 1510 m_layer->setBounds(adjustedBounds); 1543 1511 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 }1550 1512 1551 1513 if (LayerMap* layerCloneMap = m_layerClones.get()) { … … 1679 1641 } 1680 1642 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 1693 1643 #if ENABLE(CSS_COMPOSITING) 1694 1644 void GraphicsLayerCA::updateBlendMode() … … 1721 1671 | BackfaceVisibilityChanged 1722 1672 | FiltersChanged 1723 | BackdropFiltersChanged1724 1673 | OpacityChanged; 1725 1674 … … 1801 1750 if (isReplicated()) 1802 1751 return StructuralLayerForReplicaFlattening; 1803 1804 if (needsBackdrop()) 1805 return StructuralLayerForBackdrop; 1806 1752 1807 1753 return NoStructuralLayer; 1808 1754 } … … 2317 2263 { 2318 2264 ASSERT(valueList.property() != AnimatedPropertyWebkitTransform && (!supportsAcceleratedFilterAnimations() || valueList.property() != AnimatedPropertyWebkitFilter)); 2319 2265 2320 2266 bool isKeyframe = valueList.size() > 2; 2321 2267 bool valuesOK; … … 3054 3000 | AcceleratesDrawingChanged 3055 3001 | FiltersChanged 3056 | BackdropFiltersChanged3057 3002 | MaskLayerChanged 3058 3003 | OpacityChanged -
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
r175672 r175687 106 106 virtual bool filtersCanBeComposited(const FilterOperations&); 107 107 108 WEBCORE_EXPORT virtual bool setBackdropFilters(const FilterOperations&) override;109 110 108 #if ENABLE(CSS_COMPOSITING) 111 109 WEBCORE_EXPORT virtual void setBlendMode(BlendMode) override; … … 205 203 void updateOpacityOnLayer(); 206 204 void updateFilters(); 207 void updateBackdropFilters();208 205 209 206 #if ENABLE(CSS_COMPOSITING) … … 387 384 NoStructuralLayer = 0, 388 385 StructuralLayerForPreserves3D, 389 StructuralLayerForReplicaFlattening, 390 StructuralLayerForBackdrop 386 StructuralLayerForReplicaFlattening 391 387 }; 392 388 void ensureStructuralLayer(StructuralLayerPurpose); … … 432 428 VisibleRectChanged = 1LLU << 25, 433 429 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 441 436 }; 442 437 typedef uint64_t LayerChangeFlags; … … 452 447 RefPtr<PlatformCALayer> m_contentsClippingLayer; // A layer used to clip inner content 453 448 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.455 449 456 450 // References to clones of our layers, for replicated layers. -
trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h
r175672 r175687 78 78 LayerTypeAVPlayerLayer, 79 79 LayerTypeWebGLLayer, 80 LayerTypeBackdropLayer,81 80 LayerTypeCustom 82 81 }; -
trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
r175672 r175687 63 63 #endif 64 64 65 #if ENABLE(FILTERS_LEVEL_2)66 @interface CABackdropLayer : CALayer67 @end68 #endif69 65 70 66 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation) … … 237 233 case LayerTypeTransformLayer: 238 234 layerClass = [CATransformLayer class]; 239 break;240 case LayerTypeBackdropLayer:241 #if ENABLE(FILTERS_LEVEL_2)242 layerClass = [CABackdropLayer class];243 #else244 ASSERT_NOT_REACHED();245 layerClass = [CALayer class];246 #endif247 235 break; 248 236 case LayerTypeWebTiledLayer: -
trunk/Source/WebCore/rendering/RenderElement.h
r175672 r175687 123 123 124 124 // Returns true if this renderer requires a new stacking context. 125 bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasB ackdropFilter() || hasBlendMode(); }125 bool createsGroup() const { return isTransparent() || hasMask() || hasFilter() || hasBlendMode(); } 126 126 127 127 bool isTransparent() const { return style().opacity() < 1.0f; } … … 138 138 139 139 bool hasFilter() const { return style().hasFilter(); } 140 bool hasBackdropFilter() const141 {142 #if ENABLE(FILTERS_LEVEL_2)143 return style().hasBackdropFilter();144 #else145 return false;146 #endif147 }148 140 149 141 #if ENABLE(CSS_COMPOSITING) -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r175672 r175687 316 316 bool RenderLayer::paintsWithFilters() const 317 317 { 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 318 321 if (!renderer().hasFilter()) 319 322 return false; … … 6216 6219 && !renderer().hasClipPath() 6217 6220 && !renderer().hasFilter() 6218 && !renderer().hasBackdropFilter()6219 6221 #if PLATFORM(IOS) 6220 6222 && !hasAcceleratedTouchScrolling() -
trunk/Source/WebCore/rendering/RenderLayer.h
r175672 r175687 792 792 void filterNeedsRepaint(); 793 793 bool hasFilter() const { return renderer().hasFilter(); } 794 bool hasBackdropFilter() const795 {796 #if ENABLE(FILTERS_LEVEL_2)797 return renderer().hasBackdropFilter();798 #else799 return false;800 #endif801 }802 794 803 795 #if ENABLE(CSS_COMPOSITING) -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r175672 r175687 113 113 , m_requiresOwnBackingStore(true) 114 114 , m_canCompositeFilters(false) 115 #if ENABLE(FILTERS_LEVEL_2)116 , m_canCompositeBackdropFilters(false)117 #endif118 115 , m_backgroundLayerPaintsFixedRootBackground(false) 119 116 { … … 315 312 updateTransform(renderer().style()); 316 313 updateFilters(renderer().style()); 317 #if ENABLE(FILTERS_LEVEL_2)318 updateBackdropFilters(renderer().style());319 #endif320 314 #if ENABLE(CSS_COMPOSITING) 321 315 updateBlendMode(renderer().style()); … … 381 375 m_canCompositeFilters = m_graphicsLayer->setFilters(style.filter()); 382 376 } 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 #endif390 377 391 378 #if ENABLE(CSS_COMPOSITING) … … 666 653 667 654 updateFilters(style); 668 #if ENABLE(FILTERS_LEVEL_2) 669 updateBackdropFilters(style); 670 #endif 655 671 656 #if ENABLE(CSS_COMPOSITING) 672 657 updateBlendMode(style); -
trunk/Source/WebCore/rendering/RenderLayerBacking.h
r175672 r175687 233 233 234 234 bool canCompositeFilters() const { return m_canCompositeFilters; } 235 #if ENABLE(FILTERS_LEVEL_2)236 bool canCompositeBackdropFilters() const { return m_canCompositeBackdropFilters; }237 #endif238 235 239 236 // Return an estimate of the backing store area (in pixels) allocated by this object's GraphicsLayers. … … 283 280 void updateTransform(const RenderStyle&); 284 281 void updateFilters(const RenderStyle&); 285 #if ENABLE(FILTERS_LEVEL_2)286 void updateBackdropFilters(const RenderStyle&);287 #endif288 282 #if ENABLE(CSS_COMPOSITING) 289 283 void updateBlendMode(const RenderStyle&); … … 355 349 bool m_requiresOwnBackingStore; 356 350 bool m_canCompositeFilters; 357 #if ENABLE(FILTERS_LEVEL_2)358 bool m_canCompositeBackdropFilters;359 #endif360 351 bool m_backgroundLayerPaintsFixedRootBackground; 361 352 -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r175679 r175687 2181 2181 || renderer.hasReflection() 2182 2182 || renderer.hasFilter() 2183 || renderer.hasBackdropFilter()2184 2183 #if PLATFORM(IOS) 2185 2184 || requiresCompositingForScrolling(layer) … … 2187 2186 ) 2188 2187 return true; 2189 2188 2189 2190 2190 if (layer.mustCompositeForIndirectReasons()) { 2191 2191 RenderLayer::IndirectCompositingReason reason = layer.indirectCompositingReason(); … … 2274 2274 reasons |= CompositingReasonReflectionWithCompositedDescendants; 2275 2275 2276 if (renderer->hasFilter() || renderer->hasBackdropFilter())2276 if (renderer->hasFilter()) 2277 2277 reasons |= CompositingReasonFilterWithCompositedDescendants; 2278 2278 … … 2595 2595 bool RenderLayerCompositor::requiresCompositingForFilters(RenderLayerModelObject& renderer) const 2596 2596 { 2597 #if ENABLE(FILTERS_LEVEL_2)2598 if (renderer.hasBackdropFilter())2599 return true;2600 #endif2601 2602 2597 if (!(m_compositingTriggers & ChromeClient::FilterTrigger)) 2603 2598 return false; -
trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp
r175672 r175687 115 115 ) 116 116 layer()->repaintIncludingDescendants(); 117 } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter() || newStyle.hasBackdropFilter()) {117 } else if (newStyle.hasTransform() || newStyle.opacity() < 1 || newStyle.hasFilter()) { 118 118 // If we don't have a layer yet, but we are going to get one because of transform or opacity, 119 119 // then we need to repaint the old position of the object. -
trunk/Source/WebCore/rendering/style/RenderStyle.cpp
r175672 r175687 639 639 return true; 640 640 641 #if ENABLE(FILTERS_LEVEL_2)642 if (rareNonInheritedData->hasBackdropFilters() != other.rareNonInheritedData->hasBackdropFilters())643 return true;644 #endif645 646 641 const QuotesData* quotesDataA = rareInheritedData->quotes.get(); 647 642 const QuotesData* quotesDataB = other.rareInheritedData->quotes.get(); -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r175672 r175687 1117 1117 const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; } 1118 1118 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 #else1125 bool hasBackdropFilter() const { return false; }1126 #endif1127 1119 1128 1120 #if ENABLE(CSS_COMPOSITING) … … 1556 1548 1557 1549 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 #endif1561 1550 1562 1551 void setTabSize(unsigned size) { SET_VAR(rareInheritedData, m_tabSize, size); } … … 2007 1996 #endif 2008 1997 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 #endif2012 1998 #if ENABLE(CSS_COMPOSITING) 2013 1999 static BlendMode initialBlendMode() { return BlendModeNormal; } -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r175672 r175687 50 50 , m_transform(StyleTransformData::create()) 51 51 , m_filter(StyleFilterData::create()) 52 #if ENABLE(FILTERS_LEVEL_2)53 , m_backdropFilter(StyleFilterData::create())54 #endif55 52 #if ENABLE(CSS_GRID_LAYOUT) 56 53 , m_grid(StyleGridData::create()) … … 123 120 , m_transform(o.m_transform) 124 121 , m_filter(o.m_filter) 125 #if ENABLE(FILTERS_LEVEL_2)126 , m_backdropFilter(o.m_backdropFilter)127 #endif128 122 #if ENABLE(CSS_GRID_LAYOUT) 129 123 , m_grid(o.m_grid) … … 221 215 && m_transform == o.m_transform 222 216 && m_filter == o.m_filter 223 #if ENABLE(FILTERS_LEVEL_2)224 && m_backdropFilter == o.m_backdropFilter225 #endif226 217 #if ENABLE(CSS_GRID_LAYOUT) 227 218 && m_grid == o.m_grid … … 356 347 } 357 348 358 #if ENABLE(FILTERS_LEVEL_2)359 bool StyleRareNonInheritedData::hasBackdropFilters() const360 {361 return m_backdropFilter.get() && !m_backdropFilter->m_operations.isEmpty();362 }363 #endif364 365 349 } // namespace WebCore -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r175672 r175687 95 95 bool transitionDataEquivalent(const StyleRareNonInheritedData&) const; 96 96 bool hasFilters() const; 97 #if ENABLE(FILTERS_LEVEL_2)98 bool hasBackdropFilters() const;99 #endif100 97 bool hasOpacity() const { return opacity < 1; } 101 98 … … 123 120 DataRef<StyleTransformData> m_transform; // Transform properties (rotate, scale, skew, etc.) 124 121 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 #endif128 122 129 123 #if ENABLE(CSS_GRID_LAYOUT) -
trunk/Source/WebKit2/ChangeLog
r175686 r175687 1 2014-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 1 15 2014-11-04 Ada Chan <adachan@apple.com> 2 16 -
trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
r175672 r175687 349 349 case PlatformCALayer::LayerTypeAVPlayerLayer: 350 350 case PlatformCALayer::LayerTypeWebGLLayer: 351 case PlatformCALayer::LayerTypeBackdropLayer:352 351 case PlatformCALayer::LayerTypeCustom: 353 352 ASSERT_NOT_REACHED(); -
trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
r175672 r175687 1181 1181 ts << "root-layer"; 1182 1182 break; 1183 case PlatformCALayer::LayerTypeBackdropLayer:1184 ts << "backdrop-layer";1185 break;1186 1183 case PlatformCALayer::LayerTypeAVPlayerLayer: 1187 1184 ts << "av-player-layer (context-id " << createdLayer.hostingContextID << ")"; -
trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm
r175672 r175687 37 37 @interface CALayer(WKLayerInternal) 38 38 - (void)setContextId:(uint32_t)contextID; 39 @end40 41 @interface CABackdropLayer : CALayer42 39 @end 43 40 … … 108 105 @end 109 106 110 @interface WKBackdropView : WKCompositingView111 @end112 113 @implementation WKBackdropView114 + (Class)layerClass115 {116 return [CABackdropLayer self];117 }118 119 @end120 121 107 @interface WKRemoteView : WKCompositingView 122 108 @end … … 166 152 view = adoptNS([[WKCompositingView alloc] init]); 167 153 break; 168 case PlatformCALayer::LayerTypeBackdropLayer:169 view = adoptNS([[WKBackdropView alloc] init]);170 break;171 154 case PlatformCALayer::LayerTypeTransformLayer: 172 155 view = adoptNS([[WKTransformView alloc] init]); -
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm
r175672 r175687 42 42 #endif 43 43 44 #if ENABLE(FILTERS_LEVEL_2)45 @interface CABackdropLayer : CALayer46 @end47 #endif48 49 44 using namespace WebCore; 50 45 … … 228 223 layer = adoptNS([[CATransformLayer alloc] init]); 229 224 break; 230 case PlatformCALayer::LayerTypeBackdropLayer:231 #if ENABLE(FILTERS_LEVEL_2)232 layer = adoptNS([[CABackdropLayer alloc] init]);233 #else234 ASSERT_NOT_REACHED();235 layer = adoptNS([[CALayer alloc] init]);236 #endif237 break;238 225 case PlatformCALayer::LayerTypeCustom: 239 226 case PlatformCALayer::LayerTypeAVPlayerLayer: -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r175672 r175687 230 230 ThreeDTransformTrigger | 231 231 VideoTrigger | 232 PluginTrigger| 232 PluginTrigger| 233 233 CanvasTrigger | 234 234 #if PLATFORM(IOS)
Note: See TracChangeset
for help on using the changeset viewer.