- Revision
- 240899
- Author
- simon.fra...@apple.com
- Date
- 2019-02-02 12:05:22 -0800 (Sat, 02 Feb 2019)
Log Message
Rename "scrollingLayer" in RenderLayerBacking to "scrollContainerLayer" for clarity
https://bugs.webkit.org/show_bug.cgi?id=194194
Rubber-stampted by Antti Koivisto.
Our desired terminology is "scrollContainerLayer" for the outer, clipping layer
for scrolling, and "scrolledContentsLayer" for the contents that move when you scroll.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateDebugIndicators):
(WebCore::RenderLayerBacking::destroyGraphicsLayers):
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::setLocationOfScrolledContents):
(WebCore::RenderLayerBacking::updateAfterDescendants):
(WebCore::RenderLayerBacking::updateInternalHierarchy):
(WebCore::RenderLayerBacking::updateDrawsContent):
(WebCore::RenderLayerBacking::updateScrollingLayers):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::didChangePlatformLayerForLayer):
(WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingRole):
(WebCore::LegacyWebKitScrollingLayerCoordinator::registerAllViewportConstrainedLayers):
(WebCore::LegacyWebKitScrollingLayerCoordinator::updateScrollingLayer):
(WebCore::LegacyWebKitScrollingLayerCoordinator::unregisterAllScrollingLayers):
(WebCore::LegacyWebKitScrollingLayerCoordinator::removeScrollingLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240898 => 240899)
--- trunk/Source/WebCore/ChangeLog 2019-02-02 19:53:55 UTC (rev 240898)
+++ trunk/Source/WebCore/ChangeLog 2019-02-02 20:05:22 UTC (rev 240899)
@@ -1,3 +1,31 @@
+2019-02-02 Simon Fraser <simon.fra...@apple.com>
+
+ Rename "scrollingLayer" in RenderLayerBacking to "scrollContainerLayer" for clarity
+ https://bugs.webkit.org/show_bug.cgi?id=194194
+
+ Rubber-stampted by Antti Koivisto.
+
+ Our desired terminology is "scrollContainerLayer" for the outer, clipping layer
+ for scrolling, and "scrolledContentsLayer" for the contents that move when you scroll.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateDebugIndicators):
+ (WebCore::RenderLayerBacking::destroyGraphicsLayers):
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::RenderLayerBacking::setLocationOfScrolledContents):
+ (WebCore::RenderLayerBacking::updateAfterDescendants):
+ (WebCore::RenderLayerBacking::updateInternalHierarchy):
+ (WebCore::RenderLayerBacking::updateDrawsContent):
+ (WebCore::RenderLayerBacking::updateScrollingLayers):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::didChangePlatformLayerForLayer):
+ (WebCore::RenderLayerCompositor::updateScrollingNodeForScrollingRole):
+ (WebCore::LegacyWebKitScrollingLayerCoordinator::registerAllViewportConstrainedLayers):
+ (WebCore::LegacyWebKitScrollingLayerCoordinator::updateScrollingLayer):
+ (WebCore::LegacyWebKitScrollingLayerCoordinator::unregisterAllScrollingLayers):
+ (WebCore::LegacyWebKitScrollingLayerCoordinator::removeScrollingLayer):
+
2019-02-02 Justin Fan <justin_...@apple.com>
[Web GPU] Fix GPURenderPassEncoder::setVertexBuffers and allow overlapping indices with GPUBindGroups
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (240898 => 240899)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-02-02 19:53:55 UTC (rev 240898)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-02-02 20:05:22 UTC (rev 240899)
@@ -391,8 +391,8 @@
if (m_layerForScrollCorner)
m_layerForScrollCorner->setShowDebugBorder(showBorder);
- if (m_scrollingLayer)
- m_scrollingLayer->setShowDebugBorder(showBorder);
+ if (m_scrollContainerLayer)
+ m_scrollContainerLayer->setShowDebugBorder(showBorder);
if (m_scrolledContentsLayer) {
m_scrolledContentsLayer->setShowDebugBorder(showBorder);
@@ -482,7 +482,7 @@
GraphicsLayer::unparentAndClear(m_backgroundLayer);
GraphicsLayer::unparentAndClear(m_childContainmentLayer);
GraphicsLayer::unparentAndClear(m_childClippingMaskLayer);
- GraphicsLayer::unparentAndClear(m_scrollingLayer);
+ GraphicsLayer::unparentAndClear(m_scrollContainerLayer);
GraphicsLayer::unparentAndClear(m_scrolledContentsLayer);
GraphicsLayer::unparentAndClear(m_graphicsLayer);
}
@@ -1090,7 +1090,7 @@
clipLayer->setSize(snappedClippingGraphicsLayer.m_snappedRect.size());
clipLayer->setOffsetFromRenderer(toLayoutSize(clippingBox.location() - snappedClippingGraphicsLayer.m_snapDelta));
- if (m_childClippingMaskLayer && !m_scrollingLayer) {
+ if (m_childClippingMaskLayer && !m_scrollContainerLayer) {
m_childClippingMaskLayer->setSize(clipLayer->size());
m_childClippingMaskLayer->setPosition(FloatPoint());
m_childClippingMaskLayer->setOffsetFromRenderer(clipLayer->offsetFromRenderer());
@@ -1181,7 +1181,7 @@
reflectionBacking->graphicsLayer()->setReplicatedLayerPosition(FloatPoint(layerBounds.location() - reflectionLayerBounds.location()));
}
- if (m_scrollingLayer) {
+ if (m_scrollContainerLayer) {
ASSERT(m_scrolledContentsLayer);
auto& renderBox = downcast<RenderBox>(renderer());
LayoutRect paddingBoxIncludingScrollbar = renderBox.paddingBoxRectIncludingScrollbar();
@@ -1188,8 +1188,8 @@
ScrollOffset scrollOffset = m_owningLayer.scrollOffset();
// FIXME: need to do some pixel snapping here.
- m_scrollingLayer->setPosition(FloatPoint(paddingBoxIncludingScrollbar.location() - compositedBounds().location()));
- m_scrollingLayer->setSize(roundedIntSize(LayoutSize(renderBox.clientWidth(), renderBox.clientHeight())));
+ m_scrollContainerLayer->setPosition(FloatPoint(paddingBoxIncludingScrollbar.location() - compositedBounds().location()));
+ m_scrollContainerLayer->setSize(roundedIntSize(LayoutSize(renderBox.clientWidth(), renderBox.clientHeight())));
updateScrollOffset(scrollOffset);
#if PLATFORM(IOS_FAMILY)
@@ -1196,16 +1196,16 @@
m_scrolledContentsLayer->setPosition({ }); // FIXME: necessary?
#endif
- FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
- m_scrollingLayer->setOffsetFromRenderer(-toFloatSize(paddingBoxIncludingScrollbar.location()));
+ FloatSize oldScrollingLayerOffset = m_scrollContainerLayer->offsetFromRenderer();
+ m_scrollContainerLayer->setOffsetFromRenderer(-toFloatSize(paddingBoxIncludingScrollbar.location()));
if (m_childClippingMaskLayer) {
- m_childClippingMaskLayer->setPosition(m_scrollingLayer->position());
- m_childClippingMaskLayer->setSize(m_scrollingLayer->size());
+ m_childClippingMaskLayer->setPosition(m_scrollContainerLayer->position());
+ m_childClippingMaskLayer->setSize(m_scrollContainerLayer->size());
m_childClippingMaskLayer->setOffsetFromRenderer(-toFloatSize(paddingBoxIncludingScrollbar.location()));
}
- bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
+ bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollContainerLayer->offsetFromRenderer();
IntSize scrollSize(m_owningLayer.scrollWidth(), m_owningLayer.scrollHeight());
if (scrollSize != m_scrolledContentsLayer->size() || paddingBoxOffsetChanged)
@@ -1238,9 +1238,9 @@
{
#if PLATFORM(IOS_FAMILY)
if (setOrSync == ScrollingLayerPositionAction::Sync)
- m_scrollingLayer->syncBoundsOrigin(scrollOffset);
+ m_scrollContainerLayer->syncBoundsOrigin(scrollOffset);
else
- m_scrollingLayer->setBoundsOrigin(scrollOffset);
+ m_scrollContainerLayer->setBoundsOrigin(scrollOffset);
#else
if (setOrSync == ScrollingLayerPositionAction::Sync)
m_scrolledContentsLayer->syncPosition(-scrollOffset);
@@ -1278,9 +1278,9 @@
updateDrawsContent(contentsInfo);
m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || hasVisibleNonCompositedDescendants());
- if (m_scrollingLayer) {
- m_scrollingLayer->setContentsVisible(renderer().style().visibility() == Visibility::Visible);
- m_scrollingLayer->setUserInteractionEnabled(renderer().style().pointerEvents() != PointerEvents::None);
+ if (m_scrollContainerLayer) {
+ m_scrollContainerLayer->setContentsVisible(renderer().style().visibility() == Visibility::Visible);
+ m_scrollContainerLayer->setUserInteractionEnabled(renderer().style().pointerEvents() != PointerEvents::None);
}
}
@@ -1347,9 +1347,9 @@
if (m_childContainmentLayer)
m_graphicsLayer->addChild(*m_childContainmentLayer);
- if (m_scrollingLayer) {
+ if (m_scrollContainerLayer) {
auto* superlayer = m_childContainmentLayer ? m_childContainmentLayer.get() : m_graphicsLayer.get();
- superlayer->addChild(*m_scrollingLayer);
+ superlayer->addChild(*m_scrollContainerLayer);
}
// The clip for child layers does not include space for overflow controls, so they exist as
@@ -1390,10 +1390,10 @@
void RenderLayerBacking::updateDrawsContent(PaintedContentsInfo& contentsInfo)
{
- if (m_scrollingLayer) {
+ if (m_scrollContainerLayer) {
// We don't have to consider overflow controls, because we know that the scrollbars are drawn elsewhere.
// m_graphicsLayer only needs backing store if the non-scrolling parts (background, outlines, borders, shadows etc) need to paint.
- // m_scrollingLayer never has backing store.
+ // m_scrollContainerLayer never has backing store.
// m_scrolledContentsLayer only needs backing store if the scrolled contents need to paint.
bool hasNonScrollingPaintedContent = m_owningLayer.hasVisibleContent() && m_owningLayer.hasVisibleBoxDecorationsOrBackground();
m_graphicsLayer->setDrawsContent(hasNonScrollingPaintedContent);
@@ -1738,14 +1738,14 @@
bool RenderLayerBacking::updateScrollingLayers(bool needsScrollingLayers)
{
- if (needsScrollingLayers == !!m_scrollingLayer)
+ if (needsScrollingLayers == !!m_scrollContainerLayer)
return false;
- if (!m_scrollingLayer) {
+ if (!m_scrollContainerLayer) {
// Outer layer which corresponds with the scroll view.
- m_scrollingLayer = createGraphicsLayer("scrolling container", GraphicsLayer::Type::Scrolling);
- m_scrollingLayer->setDrawsContent(false);
- m_scrollingLayer->setMasksToBounds(true);
+ m_scrollContainerLayer = createGraphicsLayer("scrolling container", GraphicsLayer::Type::Scrolling);
+ m_scrollContainerLayer->setDrawsContent(false);
+ m_scrollContainerLayer->setMasksToBounds(true);
// Inner layer which renders the content that scrolls.
m_scrolledContentsLayer = createGraphicsLayer("scrolled contents");
@@ -1756,14 +1756,14 @@
if (!m_foregroundLayer)
paintPhase |= GraphicsLayerPaintForeground;
m_scrolledContentsLayer->setPaintingPhase(paintPhase);
- m_scrollingLayer->addChild(*m_scrolledContentsLayer);
+ m_scrollContainerLayer->addChild(*m_scrolledContentsLayer);
} else {
compositor().willRemoveScrollingLayerWithBacking(m_owningLayer, *this);
- willDestroyLayer(m_scrollingLayer.get());
+ willDestroyLayer(m_scrollContainerLayer.get());
willDestroyLayer(m_scrolledContentsLayer.get());
- GraphicsLayer::unparentAndClear(m_scrollingLayer);
+ GraphicsLayer::unparentAndClear(m_scrollContainerLayer);
GraphicsLayer::unparentAndClear(m_scrolledContentsLayer);
}
@@ -1770,7 +1770,7 @@
m_graphicsLayer->setPaintingPhase(paintingPhaseForPrimaryLayer());
m_graphicsLayer->setNeedsDisplay(); // Because painting phases changed.
- if (m_scrollingLayer)
+ if (m_scrollContainerLayer)
compositor().didAddScrollingLayer(m_owningLayer);
return true;
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (240898 => 240899)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2019-02-02 19:53:55 UTC (rev 240898)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2019-02-02 20:05:22 UTC (rev 240899)
@@ -104,9 +104,9 @@
bool requiresBackgroundLayer() const { return m_requiresBackgroundLayer; }
void setRequiresBackgroundLayer(bool);
- bool hasScrollingLayer() const { return m_scrollingLayer != nullptr; }
- GraphicsLayer* scrollingLayer() const { return m_scrollingLayer.get(); }
- GraphicsLayer* scrollingContentsLayer() const { return m_scrolledContentsLayer.get(); }
+ bool hasScrollingLayer() const { return m_scrollContainerLayer != nullptr; }
+ GraphicsLayer* scrollContainerLayer() const { return m_scrollContainerLayer.get(); }
+ GraphicsLayer* scrolledContentsLayer() const { return m_scrolledContentsLayer.get(); }
OptionSet<ScrollCoordinationRole> coordinatedScrollingRoles() const;
@@ -385,7 +385,7 @@
RefPtr<GraphicsLayer> m_layerForVerticalScrollbar;
RefPtr<GraphicsLayer> m_layerForScrollCorner;
- RefPtr<GraphicsLayer> m_scrollingLayer; // Only used if the layer is using composited scrolling.
+ RefPtr<GraphicsLayer> m_scrollContainerLayer; // Only used if the layer is using composited scrolling.
RefPtr<GraphicsLayer> m_scrolledContentsLayer; // Only used if the layer is using composited scrolling.
LayoutRect m_compositedBounds;
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (240898 => 240899)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-02-02 19:53:55 UTC (rev 240898)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-02-02 20:05:22 UTC (rev 240899)
@@ -553,7 +553,7 @@
// FIXME: Reorganize the layers and pass the scrollContainerLayer.
nodeLayers = { nullptr, nullptr, m_scrollLayer.get(), fixedRootBackgroundLayer(), clipLayer(), m_rootContentsLayer.get() };
} else
- nodeLayers = { layer.backing()->graphicsLayer(), backing->scrollingLayer(), backing->scrollingContentsLayer() };
+ nodeLayers = { layer.backing()->graphicsLayer(), backing->scrollContainerLayer(), backing->scrolledContentsLayer() };
scrollingCoordinator->setNodeLayers(nodeID, nodeLayers);
}
@@ -4027,7 +4027,7 @@
}
if (changes & ScrollingNodeChangeFlags::Layer)
- scrollingCoordinator->setNodeLayers(newNodeID, { layer.backing()->graphicsLayer(), layer.backing()->scrollingLayer(), layer.backing()->scrollingContentsLayer() });
+ scrollingCoordinator->setNodeLayers(newNodeID, { layer.backing()->graphicsLayer(), layer.backing()->scrollContainerLayer(), layer.backing()->scrolledContentsLayer() });
if (changes & ScrollingNodeChangeFlags::LayerGeometry && treeState.parentNodeID) {
RenderLayer* scrollingAncestorLayer = m_scrollingNodeToLayerMap.get(treeState.parentNodeID.value());
@@ -4235,7 +4235,8 @@
const RenderLayer* enclosingTouchScrollableLayer = nullptr;
if (compositor.isAsyncScrollableStickyLayer(*layer, &enclosingTouchScrollableLayer) && enclosingTouchScrollableLayer) {
ASSERT(enclosingTouchScrollableLayer->isComposited());
- stickyContainerMap.add(layer->backing()->graphicsLayer()->platformLayer(), enclosingTouchScrollableLayer->backing()->scrollingLayer()->platformLayer());
+ // what
+ stickyContainerMap.add(layer->backing()->graphicsLayer()->platformLayer(), enclosingTouchScrollableLayer->backing()->scrollContainerLayer()->platformLayer());
}
} else if (layer->renderer().isFixedPositioned())
constraints = std::make_unique<FixedPositionViewportConstraints>(compositor.computeFixedViewportConstraints(*layer));
@@ -4273,7 +4274,7 @@
bool allowHorizontalScrollbar = !scrollbarHasDisplayNone(layer.horizontalScrollbar());
bool allowVerticalScrollbar = !scrollbarHasDisplayNone(layer.verticalScrollbar());
- m_chromeClient.addOrUpdateScrollingLayer(layer.renderer().element(), backing->scrollingLayer()->platformLayer(), backing->scrollingContentsLayer()->platformLayer(),
+ m_chromeClient.addOrUpdateScrollingLayer(layer.renderer().element(), backing->scrollContainerLayer()->platformLayer(), backing->scrolledContentsLayer()->platformLayer(),
layer.scrollableContentsSize(), allowHorizontalScrollbar, allowVerticalScrollbar);
}
@@ -4296,7 +4297,7 @@
for (auto* layer : m_scrollingLayers) {
auto* backing = layer->backing();
ASSERT(backing);
- m_chromeClient.removeScrollingLayer(layer->renderer().element(), backing->scrollingLayer()->platformLayer(), backing->scrollingContentsLayer()->platformLayer());
+ m_chromeClient.removeScrollingLayer(layer->renderer().element(), backing->scrollContainerLayer()->platformLayer(), backing->scrolledContentsLayer()->platformLayer());
}
}
@@ -4310,9 +4311,9 @@
{
m_scrollingLayersNeedingUpdate.remove(&layer);
if (m_scrollingLayers.remove(&layer)) {
- auto* scrollingLayer = backing.scrollingLayer()->platformLayer();
- auto* contentsLayer = backing.scrollingContentsLayer()->platformLayer();
- m_chromeClient.removeScrollingLayer(layer.renderer().element(), scrollingLayer, contentsLayer);
+ auto* scrollContainerLayer = backing.scrollContainerLayer()->platformLayer();
+ auto* scrolledContentsLayer = backing.scrolledContentsLayer()->platformLayer();
+ m_chromeClient.removeScrollingLayer(layer.renderer().element(), scrollContainerLayer, scrolledContentsLayer);
}
}
