Changeset 294641 in webkit


Ignore:
Timestamp:
May 23, 2022, 8:02:52 AM (3 years ago)
Author:
ntim@apple.com
Message:

[css-ui] Remove support for appearance: media-controls-{dark/light}-bar-background
​https://bugs.webkit.org/show_bug.cgi?id=240756

Reviewed by Antoine Quint.

Reverts r180965 (adapted with new code), this was originally added for old media controls, but was never used.

Marked relevant WPT as passing.

  • LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt: Removed.
  • LayoutTests/compositing/media-controls-bar-appearance-big.html: Removed.
  • LayoutTests/compositing/media-controls-bar-appearance-expected.txt: Removed.
  • LayoutTests/compositing/media-controls-bar-appearance.html: Removed.
  • LayoutTests/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt:
  • LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt:
  • LayoutTests/platform/ios/compositing/media-controls-bar-appearance-expected.txt: Removed.
  • Source/WebCore/css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):

  • Source/WebCore/css/CSSProperties.json:
  • Source/WebCore/css/CSSValueKeywords.in:
  • Source/WebCore/platform/ThemeTypes.cpp:

(WebCore::operator<<):

  • Source/WebCore/platform/ThemeTypes.h:
  • Source/WebCore/platform/graphics/GraphicsLayer.cpp:

(WebCore::operator<<):

  • Source/WebCore/platform/graphics/GraphicsLayer.h:
  • Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::changeLayerTypeTo):
(WebCore::layerTypeForCustomBackdropAppearance): Deleted.
(WebCore::isCustomBackdropLayerType): Deleted.

  • Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h:
  • Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp:

(WebCore::operator<<):

  • Source/WebCore/platform/graphics/ca/PlatformCALayer.h:
  • Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:

(WebCore::PlatformCALayerCocoa::PlatformCALayerCocoa):
(WebCore::PlatformCALayerCocoa::updateCustomAppearance):

  • Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp:

(printLayer):

  • Source/WebCore/rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateConfigurationAfterStyleChange):
(WebCore::RenderLayerBacking::updateCustomAppearance): Deleted.

  • Source/WebCore/rendering/RenderLayerBacking.h:
  • Source/WebKit/Platform/spi/ios/UIKitSPI.h:
  • Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:

(WebKit::RemoteLayerBackingStore::drawInContext):

  • Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm:

(WebKit::updateCustomAppearance):
(WebKit::RemoteLayerTreePropertyApplier::applyHierarchyUpdates):
(WebKit::RemoteLayerTreePropertyApplier::updateMask):

  • Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:

(WebKit::RemoteLayerTreeHost::makeNode):

  • Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:

(WebKit::RemoteLayerTreeHost::makeNode):

  • Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.h:
  • Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm:

(-[WKBackdropView hitTest:withEvent:]): Deleted.
(-[WKBackdropView description]): Deleted.

Canonical link: ​https://commits.webkit.org/250865@main

Location:
trunk
Files:
5 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt

    r294629 r294641  
    4242PASS -webkit-appearance: listitem (invalid)
    4343PASS -webkit-appearance: media-controls-background (invalid)
    44 FAIL -webkit-appearance: media-controls-dark-bar-background (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-controls-dark-bar-background"
     44PASS -webkit-appearance: media-controls-dark-bar-background (invalid)
    4545PASS -webkit-appearance: media-controls-fullscreen-background (invalid)
    46 FAIL -webkit-appearance: media-controls-light-bar-background (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-controls-light-bar-background"
     46PASS -webkit-appearance: media-controls-light-bar-background (invalid)
    4747PASS -webkit-appearance: media-current-time-display (invalid)
    4848PASS -webkit-appearance: media-enter-fullscreen-button (invalid)
    … …  
    205205PASS appearance: listitem (invalid)
    206206PASS appearance: media-controls-background (invalid)
    207 FAIL appearance: media-controls-dark-bar-background (invalid) assert_equals: style.appearance expected "" but got "media-controls-dark-bar-background"
     207PASS appearance: media-controls-dark-bar-background (invalid)
    208208PASS appearance: media-controls-fullscreen-background (invalid)
    209 FAIL appearance: media-controls-light-bar-background (invalid) assert_equals: style.appearance expected "" but got "media-controls-light-bar-background"
     209PASS appearance: media-controls-light-bar-background (invalid)
    210210PASS appearance: media-current-time-display (invalid)
    211211PASS appearance: media-enter-fullscreen-button (invalid)

  • trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-ui/appearance-cssom-001-expected.txt

    r294629 r294641  
    4242PASS -webkit-appearance: listitem (invalid)
    4343PASS -webkit-appearance: media-controls-background (invalid)
    44 FAIL -webkit-appearance: media-controls-dark-bar-background (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-controls-dark-bar-background"
     44PASS -webkit-appearance: media-controls-dark-bar-background (invalid)
    4545PASS -webkit-appearance: media-controls-fullscreen-background (invalid)
    46 FAIL -webkit-appearance: media-controls-light-bar-background (invalid) assert_equals: style.WebkitAppearance (uppercase W) expected "" but got "media-controls-light-bar-background"
     46PASS -webkit-appearance: media-controls-light-bar-background (invalid)
    4747PASS -webkit-appearance: media-current-time-display (invalid)
    4848PASS -webkit-appearance: media-enter-fullscreen-button (invalid)
    … …  
    205205PASS appearance: listitem (invalid)
    206206PASS appearance: media-controls-background (invalid)
    207 FAIL appearance: media-controls-dark-bar-background (invalid) assert_equals: style.appearance expected "" but got "media-controls-dark-bar-background"
     207PASS appearance: media-controls-dark-bar-background (invalid)
    208208PASS appearance: media-controls-fullscreen-background (invalid)
    209 FAIL appearance: media-controls-light-bar-background (invalid) assert_equals: style.appearance expected "" but got "media-controls-light-bar-background"
     209PASS appearance: media-controls-light-bar-background (invalid)
    210210PASS appearance: media-current-time-display (invalid)
    211211PASS appearance: media-enter-fullscreen-button (invalid)

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r294629 r294641  
    490490    case MediaFullScreenVolumeSliderThumbPart:
    491491        m_value.valueID = CSSValueMediaFullscreenVolumeSliderThumb;
    492         break;
    493     case MediaControlsLightBarBackgroundPart:
    494         m_value.valueID = CSSValueMediaControlsLightBarBackground;
    495         break;
    496     case MediaControlsDarkBarBackgroundPart:
    497         m_value.valueID = CSSValueMediaControlsDarkBarBackground;
    498492        break;
    499493    case MenulistPart:

  • trunk/Source/WebCore/css/CSSProperties.json

    r294629 r294641  
    51675167                "default-button",
    51685168                "listbox",
    5169                 "media-controls-dark-bar-background",
    5170                 "media-controls-light-bar-background",
    51715169                "media-fullscreen-volume-slider",
    51725170                "media-fullscreen-volume-slider-thumb",

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r294629 r294641  
    842842default-button
    843843listbox
    844 media-controls-dark-bar-background
    845 media-controls-light-bar-background
    846844media-fullscreen-volume-slider
    847845media-fullscreen-volume-slider-thumb

  • trunk/Source/WebCore/platform/ThemeTypes.cpp

    r294629 r294641  
    4444    case InnerSpinButtonPart: ts << "inner-spin-button-part"; break;
    4545    case ListboxPart: ts << "listbox-part"; break;
    46     case MediaControlsDarkBarBackgroundPart: ts << "media-controls-dark-bar-background-part"; break;
    47     case MediaControlsLightBarBackgroundPart: ts << "media-controls-light-bar-background-part"; break;
    4846    case MediaFullScreenVolumeSliderPart: ts << "media-full-screen-volume-slider-part"; break;
    4947    case MediaFullScreenVolumeSliderThumbPart: ts << "media-full-screen-volume-slider-thumb-part"; break;

  • trunk/Source/WebCore/platform/ThemeTypes.h

    r294629 r294641  
    4343    DefaultButtonPart,
    4444    ListboxPart,
    45     MediaControlsDarkBarBackgroundPart,
    46     MediaControlsLightBarBackgroundPart,
    4745    MediaFullScreenVolumeSliderPart,
    4846    MediaFullScreenVolumeSliderThumbPart,

  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

    r293443 r294641  
    984984    case GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
    985985    case GraphicsLayer::CustomAppearance::ScrollingShadow: ts << "scrolling-shadow"; break;
    986     case GraphicsLayer::CustomAppearance::LightBackdrop: ts << "light-backdrop"; break;
    987     case GraphicsLayer::CustomAppearance::DarkBackdrop: ts << "dark-backdrop"; break;
    988986    }
    989987    return ts;

  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

    r294196 r294641  
    568568        None,
    569569        ScrollingOverhang,
    570         ScrollingShadow,
    571         LightBackdrop,
    572         DarkBackdrop
     570        ScrollingShadow
    573571    };
    574572    virtual void setCustomAppearance(CustomAppearance customAppearance) { m_customAppearance = customAppearance; }
    … …  
    811809        WebCore::GraphicsLayer::CustomAppearance::None,
    812810        WebCore::GraphicsLayer::CustomAppearance::ScrollingOverhang,
    813         WebCore::GraphicsLayer::CustomAppearance::ScrollingShadow,
    814         WebCore::GraphicsLayer::CustomAppearance::LightBackdrop,
    815         WebCore::GraphicsLayer::CustomAppearance::DarkBackdrop
     811        WebCore::GraphicsLayer::CustomAppearance::ScrollingShadow
    816812    >;
    817813};

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r294196 r294641  
    430430    : GraphicsLayer(layerType, client)
    431431    , m_needsFullRepaint(false)
    432     , m_usingBackdropLayerType(false)
    433432    , m_allowsBackingStoreDetaching(true)
    434433    , m_intersectsCoverageRect(false)
    … …  
    19211920}
    19221921
    1923 static PlatformCALayer::LayerType layerTypeForCustomBackdropAppearance(GraphicsLayer::CustomAppearance appearance)
    1924 {
    1925     return appearance == GraphicsLayer::CustomAppearance::LightBackdrop ? PlatformCALayer::LayerTypeLightSystemBackdropLayer : PlatformCALayer::LayerTypeDarkSystemBackdropLayer;
    1926 }
    1927 
    1928 static bool isCustomBackdropLayerType(PlatformCALayer::LayerType layerType)
    1929 {
    1930     return layerType == PlatformCALayer::LayerTypeLightSystemBackdropLayer || layerType == PlatformCALayer::LayerTypeDarkSystemBackdropLayer;
    1931 }
    1932 
    19331922void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool& layerChanged)
    19341923{
    … …  
    19421931
    19431932    bool needTiledLayer = requiresTiledLayer(pageScaleFactor);
    1944     bool needBackdropLayerType = (customAppearance() == CustomAppearance::LightBackdrop || customAppearance() == CustomAppearance::DarkBackdrop);
    19451933
    19461934    PlatformCALayer::LayerType currentLayerType = m_layer->layerType();
    19471935    PlatformCALayer::LayerType neededLayerType = currentLayerType;
    19481936
    1949     if (needBackdropLayerType)
    1950         neededLayerType = layerTypeForCustomBackdropAppearance(customAppearance());
    1951     else if (needTiledLayer)
     1937    if (needTiledLayer)
    19521938        neededLayerType = PlatformCALayer::LayerTypeTiledBackingLayer;
    1953     else if (currentLayerType == PlatformCALayer::LayerTypeTiledBackingLayer || isCustomBackdropLayerType(m_layer->layerType()))
     1939    else if (currentLayerType == PlatformCALayer::LayerTypeTiledBackingLayer)
    19541940        neededLayerType = PlatformCALayer::LayerTypeWebLayer;
    19551941
    … …  
    44044390    m_layer = createPlatformCALayer(newLayerType, this);
    44054391
    4406     m_usingBackdropLayerType = isCustomBackdropLayerType(newLayerType);
    4407 
    44084392    m_layer->adoptSublayers(*oldLayer);
    44094393

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

    r294196 r294641  
    662662
    663663    bool m_needsFullRepaint : 1;
    664     bool m_usingBackdropLayerType : 1;
    665664    bool m_allowsBackingStoreDetaching : 1;
    666665    bool m_intersectsCoverageRect : 1;

  • trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp

    r292810 r294641  
    250250        ts << "custom-layer";
    251251        break;
    252     case PlatformCALayer::LayerTypeLightSystemBackdropLayer:
    253         ts << "light-system-backdrop-layer";
    254         break;
    255     case PlatformCALayer::LayerTypeDarkSystemBackdropLayer:
    256         ts << "dark-system-backdrop-layer";
    257         break;
    258252#if ENABLE(MODEL_ELEMENT)
    259253    case PlatformCALayer::LayerTypeModelLayer:

  • trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

    r287079 r294641  
    8484        LayerTypeBackdropLayer,
    8585        LayerTypeShapeLayer,
    86         LayerTypeLightSystemBackdropLayer,
    87         LayerTypeDarkSystemBackdropLayer,
    8886        LayerTypeScrollContainerLayer,
    8987#if ENABLE(MODEL_ELEMENT)
    … …  
    375373        WebCore::PlatformCALayer::LayerType::LayerTypeBackdropLayer,
    376374        WebCore::PlatformCALayer::LayerType::LayerTypeShapeLayer,
    377         WebCore::PlatformCALayer::LayerType::LayerTypeLightSystemBackdropLayer,
    378         WebCore::PlatformCALayer::LayerType::LayerTypeDarkSystemBackdropLayer,
    379375        WebCore::PlatformCALayer::LayerType::LayerTypeScrollContainerLayer,
    380376#if ENABLE(MODEL_ELEMENT)

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r293443 r294641  
    243243        layerClass = [CABackdropLayer class];
    244244        break;
    245     case LayerTypeLightSystemBackdropLayer:
    246         layerClass = [WebLightSystemBackdropLayer class];
    247         break;
    248     case LayerTypeDarkSystemBackdropLayer:
    249         layerClass = [WebDarkSystemBackdropLayer class];
    250         break;
    251245#else
    252246    case LayerTypeBackdropLayer:
    253     case LayerTypeLightSystemBackdropLayer:
    254     case LayerTypeDarkSystemBackdropLayer:
    255247        ASSERT_NOT_REACHED();
    256248        layerClass = [CALayer class];
    … …  
    10551047    switch (appearance) {
    10561048    case GraphicsLayer::CustomAppearance::None:
    1057     case GraphicsLayer::CustomAppearance::LightBackdrop:
    1058     case GraphicsLayer::CustomAppearance::DarkBackdrop:
    10591049        ScrollbarThemeMac::removeOverhangAreaBackground(platformLayer());
    10601050        ScrollbarThemeMac::removeOverhangAreaShadow(platformLayer());

  • trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp

    r292408 r294641  
    735735    case PlatformCALayer::LayerTypeBackdropLayer: layerTypeName = "backdrop-layer"; break;
    736736    case PlatformCALayer::LayerTypeShapeLayer: layerTypeName = "shape-layer"; break;
    737     case PlatformCALayer::LayerTypeLightSystemBackdropLayer: layerTypeName = "light-system-backdrop-layer"; break;
    738     case PlatformCALayer::LayerTypeDarkSystemBackdropLayer: layerTypeName = "dark-system-backdrop-layer"; break;
    739737    case PlatformCALayer::LayerTypeScrollContainerLayer: layerTypeName = "scroll-container-layer"; break;
    740738    case PlatformCALayer::LayerTypeCustom: layerTypeName = "custom-layer"; break;

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r294615 r294641  
    550550    updateBlendMode(style);
    551551#endif
    552     updateCustomAppearance(style);
    553552    updateContentsScalingFilters(style);
    554553}
    … …  
    784783}
    785784#endif
    786 
    787 void RenderLayerBacking::updateCustomAppearance(const RenderStyle& style)
    788 {
    789     ControlPart appearance = style.effectiveAppearance();
    790     if (appearance == MediaControlsLightBarBackgroundPart)
    791         m_graphicsLayer->setCustomAppearance(GraphicsLayer::CustomAppearance::LightBackdrop);
    792     else if (appearance == MediaControlsDarkBarBackgroundPart)
    793         m_graphicsLayer->setCustomAppearance(GraphicsLayer::CustomAppearance::DarkBackdrop);
    794     else
    795         m_graphicsLayer->setCustomAppearance(GraphicsLayer::CustomAppearance::None);
    796 }
    797785
    798786void RenderLayerBacking::updateContentsScalingFilters(const RenderStyle& style)
    … …  
    995983    updateBlendMode(style);
    996984#endif
    997     updateCustomAppearance(style);
    998985    updateContentsScalingFilters(style);
    999986}

  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r294615 r294641  
    352352    void updateBlendMode(const RenderStyle&);
    353353#endif
    354     void updateCustomAppearance(const RenderStyle&);
    355354    void updateContentsScalingFilters(const RenderStyle&);
    356355

  • trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

    r293142 r294641  
    980980typedef NS_ENUM(NSInteger, _UIBackdropViewStylePrivate) {
    981981    _UIBackdropViewStyle_Light = 2020,
    982     _UIBackdropViewStyle_Dark = 2030
    983982};
    984983
    … …  
    997996- (instancetype)initWithPrivateStyle:(_UIBackdropViewStylePrivate)style;
    998997- (instancetype)initWithSettings:(_UIBackdropViewSettings *)settings;
    999 - (instancetype)initWithFrame:(CGRect)frame privateStyle:(_UIBackdropViewStylePrivate)style;
    1000998@property (nonatomic, strong, readonly) UIView *contentView;
    1001999@end

  • trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm

    r294460 r294641  
    523523        PlatformCALayer::drawLayerContents(context, m_layer, m_paintingRects, flags);
    524524        break;
    525     case PlatformCALayer::LayerTypeDarkSystemBackdropLayer:
    526     case PlatformCALayer::LayerTypeLightSystemBackdropLayer:
    527         // FIXME: These have a more complicated layer hierarchy. We need to paint into
    528         // a child layer in order to see the rendered results.
    529         PlatformCALayer::drawLayerContents(context, m_layer, m_paintingRects, flags);
    530         break;
    531525    case PlatformCALayer::LayerTypeLayer:
    532526    case PlatformCALayer::LayerTypeTransformLayer:

  • trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.mm

    r294160 r294641  
    122122        return kCAFilterTrilinear;
    123123    };
    124    
     124
    125125    ASSERT_NOT_REACHED();
    126126    return 0;
    … …  
    132132    switch (customAppearance) {
    133133    case GraphicsLayer::CustomAppearance::None:
    134     case GraphicsLayer::CustomAppearance::DarkBackdrop:
    135     case GraphicsLayer::CustomAppearance::LightBackdrop:
    136134        ScrollbarThemeMac::removeOverhangAreaBackground(layer);
    137135        ScrollbarThemeMac::removeOverhangAreaShadow(layer);
    … …  
    335333    };
    336334
    337     auto contentView = [&] {
    338         if (properties.customAppearance == GraphicsLayer::CustomAppearance::LightBackdrop || properties.customAppearance == GraphicsLayer::CustomAppearance::DarkBackdrop) {
    339             // This is a UIBackdropView, which should have children attached to
    340             // its content view, not directly on its layers.
    341             return [(_UIBackdropView *)node.uiView() contentView];
    342         }
    343         return node.uiView();
    344     };
    345 
    346335    if (hasViewChildren()) {
    347336        ASSERT(node.uiView());
    348         [contentView() _web_setSubviews:createNSArray(properties.children, [&] (auto& child) -> UIView * {
     337        [node.uiView() _web_setSubviews:createNSArray(properties.children, [&] (auto& child) -> UIView * {
    349338            auto* childNode = relatedLayers.get(child);
    350339            ASSERT(childNode);
    … …  
    383372        return;
    384373
    385     auto maskOwnerLayer = [&] {
    386         CALayer *layer = node.layer();
    387 #if PLATFORM(IOS_FAMILY)
    388         if (properties.customAppearance == GraphicsLayer::CustomAppearance::LightBackdrop || properties.customAppearance == GraphicsLayer::CustomAppearance::DarkBackdrop) {
    389             // This is a UIBackdropView, which means any mask must be applied to the CABackdropLayer rather
    390             // that the view's layer. The backdrop is the first layer child.
    391             if (layer.sublayers.count && [layer.sublayers[0] isKindOfClass:[CABackdropLayer class]])
    392                 layer = layer.sublayers[0];
    393         }
    394 #endif
    395         return layer;
    396     };
     374    auto maskOwnerLayer = node.layer();
    397375
    398376    if (!properties.maskLayerID) {
    399         maskOwnerLayer().mask = nullptr;
     377        maskOwnerLayer.mask = nullptr;
    400378        return;
    401379    }
    … …  
    409387    if (maskLayer.superlayer)
    410388        return;
    411     maskOwnerLayer().mask = maskLayer;
     389    maskOwnerLayer.mask = maskLayer;
    412390}
    413391

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm

    r286943 r294641  
    304304
    305305    case PlatformCALayer::LayerTypeBackdropLayer:
    306     case PlatformCALayer::LayerTypeLightSystemBackdropLayer:
    307     case PlatformCALayer::LayerTypeDarkSystemBackdropLayer:
    308306#if ENABLE(FILTERS_LEVEL_2)
    309307        return makeWithLayer(adoptNS([[CABackdropLayer alloc] init]));

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm

    r293031 r294641  
    6363
    6464    case PlatformCALayer::LayerTypeBackdropLayer:
    65         return makeWithView(adoptNS([[WKSimpleBackdropView alloc] init]));
    66 
    67     case PlatformCALayer::LayerTypeLightSystemBackdropLayer:
    68         return makeWithView(adoptNS([[WKBackdropView alloc] initWithFrame:CGRectZero privateStyle:_UIBackdropViewStyle_Light]));
    69 
    70     case PlatformCALayer::LayerTypeDarkSystemBackdropLayer:
    71         return makeWithView(adoptNS([[WKBackdropView alloc] initWithFrame:CGRectZero privateStyle:_UIBackdropViewStyle_Dark]));
     65        return makeWithView(adoptNS([[WKBackdropView alloc] init]));
    7266
    7367    case PlatformCALayer::LayerTypeTransformLayer:

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.h

    r274302 r294641  
    4646@end
    4747
    48 @interface WKSimpleBackdropView : WKCompositingView
     48@interface WKBackdropView : WKCompositingView
    4949@end
    5050
    … …  
    5959
    6060@interface WKUIRemoteView : _UIRemoteView <WKContentControlled>
    61 @end
    62 
    63 @interface WKBackdropView : _UIBackdropView <WKContentControlled>
    6461@end
    6562

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm

    r279402 r294641  
    344344@end
    345345
    346 @implementation WKSimpleBackdropView
     346@implementation WKBackdropView
    347347
    348348+ (Class)layerClass
    … …  
    417417@end
    418418
    419 @implementation WKBackdropView
    420 
    421 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
    422 {
    423     return [self _web_findDescendantViewAtPoint:point withEvent:event];
    424 }
    425 
    426 - (NSString *)description
    427 {
    428     return WebKit::RemoteLayerTreeNode::appendLayerDescription(super.description, self.layer);
    429 }
    430 
    431 @end
    432 
    433419@implementation WKChildScrollView
    434420
Note: See TracChangeset for help on using the changeset viewer.