Attachment 361051 Details for Bug 194215 – patch

[patch] patch

scroll-layer-enum-rename-3.patch (text/plain), 12.58 KB, created by Antti Koivisto on 2019-02-04 04:09:58 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2019-02-04 04:09:58 PST

Size: 12.58 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 240916)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,30 @@
>+2019-02-04  Antti Koivisto  <antti@apple.com>
>+
>+        Rename GraphicsLayer and PlatformCALayer scrolling layer type enum values to be less ambiguous
>+        https://bugs.webkit.org/show_bug.cgi?id=194215
>+
>+        Reviewed by FrÃ©dÃ©ric Wang.
>+
>+        GraphicsLayer::Type::Scrolling -> GraphicsLayer::Type::ScrollContainer
>+        PlatformCALayer::LayerTypeScrollingLayer -> PlatformCALayer::LayerTypeScrollContainerLayer
>+
>+        * platform/graphics/GraphicsLayer.cpp:
>+        (WebCore::GraphicsLayer::supportsLayerType):
>+        * platform/graphics/GraphicsLayer.h:
>+        * platform/graphics/ca/GraphicsLayerCA.cpp:
>+        (WebCore::GraphicsLayer::supportsLayerType):
>+        (WebCore::GraphicsLayerCA::initialize):
>+        * platform/graphics/ca/PlatformCALayer.cpp:
>+        (WebCore::operator<<):
>+        * platform/graphics/ca/PlatformCALayer.h:
>+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
>+        (WebCore::PlatformCALayerCocoa::PlatformCALayerCocoa):
>+        (WebCore::PlatformCALayerCocoa::commonInit):
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::updateScrollingLayers):
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::RenderLayerCompositor::ensureRootLayer):
>+
> 2019-02-03  Antti Koivisto  <antti@apple.com>
> 
>         [iOS] Tiles not created in large scrollable iframes
>Index: Source/WebCore/platform/graphics/GraphicsLayer.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsLayer.cpp	(revision 240916)
>+++ Source/WebCore/platform/graphics/GraphicsLayer.cpp	(working copy)
>@@ -78,7 +78,7 @@ bool GraphicsLayer::supportsLayerType(Ty
>     switch (type) {
>     case Type::Normal:
>     case Type::PageTiledBacking:
>-    case Type::Scrolling:
>+    case Type::ScrollContainer:
>         return true;
>     case Type::Shape:
>         return false;
>Index: Source/WebCore/platform/graphics/GraphicsLayer.h
>===================================================================
>--- Source/WebCore/platform/graphics/GraphicsLayer.h	(revision 240916)
>+++ Source/WebCore/platform/graphics/GraphicsLayer.h	(working copy)
>@@ -237,7 +237,7 @@ public:
>     enum class Type : uint8_t {
>         Normal,
>         PageTiledBacking,
>-        Scrolling,
>+        ScrollContainer,
>         Shape
>     };
> 
>Index: Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	(revision 240916)
>+++ Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp	(working copy)
>@@ -300,7 +300,7 @@ bool GraphicsLayer::supportsLayerType(Ty
>     switch (type) {
>     case Type::Normal:
>     case Type::PageTiledBacking:
>-    case Type::Scrolling:
>+    case Type::ScrollContainer:
>         return true;
>     case Type::Shape:
> #if PLATFORM(COCOA)
>@@ -417,8 +417,8 @@ void GraphicsLayerCA::initialize(Type la
>     case Type::PageTiledBacking:
>         platformLayerType = PlatformCALayer::LayerType::LayerTypePageTiledBackingLayer;
>         break;
>-    case Type::Scrolling:
>-        platformLayerType = PlatformCALayer::LayerType::LayerTypeScrollingLayer;
>+    case Type::ScrollContainer:
>+        platformLayerType = PlatformCALayer::LayerType::LayerTypeScrollContainerLayer;
>         break;
>     case Type::Shape:
>         platformLayerType = PlatformCALayer::LayerType::LayerTypeShapeLayer;
>Index: Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp	(revision 240916)
>+++ Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp	(working copy)
>@@ -228,8 +228,8 @@ TextStream& operator<<(TextStream& ts, P
>     case PlatformCALayer::LayerTypeShapeLayer:
>         ts << "shape-layer";
>         break;
>-    case PlatformCALayer::LayerTypeScrollingLayer:
>-        ts << "scrolling-layer";
>+    case PlatformCALayer::LayerTypeScrollContainerLayer:
>+        ts << "scroll-container-layer";
>         break;
>     case PlatformCALayer::LayerTypeCustom:
>         ts << "custom-layer";
>Index: Source/WebCore/platform/graphics/ca/PlatformCALayer.h
>===================================================================
>--- Source/WebCore/platform/graphics/ca/PlatformCALayer.h	(revision 240916)
>+++ Source/WebCore/platform/graphics/ca/PlatformCALayer.h	(working copy)
>@@ -75,7 +75,7 @@ public:
>         LayerTypeShapeLayer,
>         LayerTypeLightSystemBackdropLayer,
>         LayerTypeDarkSystemBackdropLayer,
>-        LayerTypeScrollingLayer,
>+        LayerTypeScrollContainerLayer,
>         LayerTypeEditableImageLayer,
>         LayerTypeCustom,
>     };
>Index: Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
>===================================================================
>--- Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm	(revision 240916)
>+++ Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm	(working copy)
>@@ -230,8 +230,8 @@ PlatformCALayerCocoa::PlatformCALayerCoc
>     case LayerTypeRootLayer:
>         layerClass = [CALayer class];
>         break;
>-    case LayerTypeScrollingLayer:
>-        // Scrolling layers only have special behavior with PlatformCALayerRemote.
>+    case LayerTypeScrollContainerLayer:
>+        // Scroll container layers only have special behavior with PlatformCALayerRemote.
>         // fallthrough
>     case LayerTypeEditableImageLayer:
>     case LayerTypeWebLayer:
>@@ -306,7 +306,7 @@ void PlatformCALayerCocoa::commonInit()
>     [m_layer setValue:[NSValue valueWithPointer:this] forKey:platformCALayerPointer];
>     
>     // Clear all the implicit animations on the CALayer
>-    if (m_layerType == LayerTypeAVPlayerLayer || m_layerType == LayerTypeContentsProvidedLayer || m_layerType == LayerTypeScrollingLayer || m_layerType == LayerTypeCustom)
>+    if (m_layerType == LayerTypeAVPlayerLayer || m_layerType == LayerTypeContentsProvidedLayer || m_layerType == LayerTypeScrollContainerLayer || m_layerType == LayerTypeCustom)
>         [m_layer web_disableAllActions];
>     else
>         [m_layer setDelegate:[WebActionDisablingCALayerDelegate shared]];
>Index: Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	(revision 240916)
>+++ Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	(working copy)
>@@ -778,7 +778,7 @@ static void printLayer(StringBuilder& bu
>     case PlatformCALayer::LayerTypeShapeLayer: layerTypeName = "shape-layer"; break;
>     case PlatformCALayer::LayerTypeLightSystemBackdropLayer: layerTypeName = "light-system-backdrop-layer"; break;
>     case PlatformCALayer::LayerTypeDarkSystemBackdropLayer: layerTypeName = "dark-system-backdrop-layer"; break;
>-    case PlatformCALayer::LayerTypeScrollingLayer: layerTypeName = "scrolling-layer"; break;
>+    case PlatformCALayer::LayerTypeScrollContainerLayer: layerTypeName = "scroll-container-layer"; break;
>     case PlatformCALayer::LayerTypeCustom: layerTypeName = "custom-layer"; break;
>     }
> 
>Index: Source/WebCore/rendering/RenderLayerBacking.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerBacking.cpp	(revision 240916)
>+++ Source/WebCore/rendering/RenderLayerBacking.cpp	(working copy)
>@@ -1743,7 +1743,7 @@ bool RenderLayerBacking::updateScrolling
> 
>     if (!m_scrollContainerLayer) {
>         // Outer layer which corresponds with the scroll view.
>-        m_scrollContainerLayer = createGraphicsLayer("scrolling container", GraphicsLayer::Type::Scrolling);
>+        m_scrollContainerLayer = createGraphicsLayer("scroll container", GraphicsLayer::Type::ScrollContainer);
>         m_scrollContainerLayer->setDrawsContent(false);
>         m_scrollContainerLayer->setMasksToBounds(true);
> 
>Index: Source/WebCore/rendering/RenderLayerCompositor.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderLayerCompositor.cpp	(revision 240916)
>+++ Source/WebCore/rendering/RenderLayerCompositor.cpp	(working copy)
>@@ -3441,14 +3441,14 @@ void RenderLayerCompositor::ensureRootLa
>             m_overflowControlsHostLayer->setName("overflow controls host");
> 
>             m_scrolledContentsLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
>-            m_scrolledContentsLayer->setName("scrolled contents layer");
>+            m_scrolledContentsLayer->setName("scrolled contents");
>             m_scrolledContentsLayer->setAnchorPoint({ });
> 
> #if PLATFORM(IOS_FAMILY)
>             if (m_renderView.settings().asyncFrameScrollingEnabled()) {
>-                m_scrollContainerLayer = GraphicsLayer::create(graphicsLayerFactory(), *this, GraphicsLayer::Type::Scrolling);
>+                m_scrollContainerLayer = GraphicsLayer::create(graphicsLayerFactory(), *this, GraphicsLayer::Type::ScrollContainer);
> 
>-                m_scrollContainerLayer->setName("scroll containers layer");
>+                m_scrollContainerLayer->setName("scroll container");
>                 m_scrollContainerLayer->setMasksToBounds(true);
>                 m_scrollContainerLayer->setAnchorPoint({ });
> 
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 240917)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2019-02-04  Antti Koivisto  <antti@apple.com>
>+
>+        Rename GraphicsLayer and PlatformCALayer type enum values to match "scroll container layer" convention
>+        https://bugs.webkit.org/show_bug.cgi?id=194215
>+
>+        Reviewed by FrÃ©dÃ©ric Wang.
>+
>+        * Shared/RemoteLayerTree/RemoteLayerBackingStore.mm:
>+        (WebKit::RemoteLayerBackingStore::drawInContext):
>+        * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
>+        (WebKit::RemoteLayerTreeHost::makeNode):
>+        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
>+        (WebKit::RemoteLayerTreeHost::makeNode):
>+
> 2019-02-03  Antti Koivisto  <antti@apple.com>
> 
>         [iOS] Tiles not created in large scrollable iframes
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm	(revision 240916)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteLayerBackingStore.mm	(working copy)
>@@ -368,7 +368,7 @@ void RemoteLayerBackingStore::drawInCont
>     case WebCore::PlatformCALayer::LayerTypeAVPlayerLayer:
>     case WebCore::PlatformCALayer::LayerTypeContentsProvidedLayer:
>     case WebCore::PlatformCALayer::LayerTypeShapeLayer:
>-    case WebCore::PlatformCALayer::LayerTypeScrollingLayer:
>+    case WebCore::PlatformCALayer::LayerTypeScrollContainerLayer:
>     case WebCore::PlatformCALayer::LayerTypeEditableImageLayer:
>     case WebCore::PlatformCALayer::LayerTypeCustom:
>         ASSERT_NOT_REACHED();
>Index: Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	(revision 240916)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm	(working copy)
>@@ -260,7 +260,7 @@ std::unique_ptr<RemoteLayerTreeNode> Rem
>     case PlatformCALayer::LayerTypeTiledBackingLayer:
>     case PlatformCALayer::LayerTypePageTiledBackingLayer:
>     case PlatformCALayer::LayerTypeTiledBackingTileLayer:
>-    case PlatformCALayer::LayerTypeScrollingLayer:
>+    case PlatformCALayer::LayerTypeScrollContainerLayer:
>     case PlatformCALayer::LayerTypeEditableImageLayer:
>         return RemoteLayerTreeNode::createWithPlainLayer(properties.layerID);
> 
>Index: Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	(revision 240916)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm	(working copy)
>@@ -108,7 +108,7 @@ std::unique_ptr<RemoteLayerTreeNode> Rem
>     case PlatformCALayer::LayerTypeShapeLayer:
>         return makeAdoptingView([[WKShapeView alloc] init]);
> 
>-    case PlatformCALayer::LayerTypeScrollingLayer:
>+    case PlatformCALayer::LayerTypeScrollContainerLayer:
>         if (!m_isDebugLayerTreeHost)
>             return makeAdoptingView([[WKChildScrollView alloc] init]);
>         // The debug indicator parents views under layers, which can cause crashes with UIScrollView.

Actions: View | Formatted Diff | Diff

Attachments on bug 194215: 361045 | 361046 | 361051