Title: [244068] trunk/Source/WebCore
- Revision
- 244068
- Author
- [email protected]
- Date
- 2019-04-08 23:23:21 -0700 (Mon, 08 Apr 2019)
Log Message
Remove some iOS #ifdefs around sticky-related code
https://bugs.webkit.org/show_bug.cgi?id=196726
Reviewed by Zalan Bujtas.
Now that async overflow scrolling can be enabled on macOS, RenderLayerCompositor::isAsyncScrollableStickyLayer()
should not have iOS-only code.
The answer to the FIXME in RenderLayerCompositor::computeStickyViewportConstraints is obvious: composited
overflow:scroll can be the container for sticky. The assertion can be removed.
* rendering/RenderLayer.cpp: Fix spacing in some logging.
(WebCore::outputPaintOrderTreeRecursive):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::isAsyncScrollableStickyLayer const):
(WebCore::RenderLayerCompositor::computeStickyViewportConstraints const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (244067 => 244068)
--- trunk/Source/WebCore/ChangeLog 2019-04-09 03:23:15 UTC (rev 244067)
+++ trunk/Source/WebCore/ChangeLog 2019-04-09 06:23:21 UTC (rev 244068)
@@ -1,3 +1,22 @@
+2019-04-08 Simon Fraser <[email protected]>
+
+ Remove some iOS #ifdefs around sticky-related code
+ https://bugs.webkit.org/show_bug.cgi?id=196726
+
+ Reviewed by Zalan Bujtas.
+
+ Now that async overflow scrolling can be enabled on macOS, RenderLayerCompositor::isAsyncScrollableStickyLayer()
+ should not have iOS-only code.
+
+ The answer to the FIXME in RenderLayerCompositor::computeStickyViewportConstraints is obvious: composited
+ overflow:scroll can be the container for sticky. The assertion can be removed.
+
+ * rendering/RenderLayer.cpp: Fix spacing in some logging.
+ (WebCore::outputPaintOrderTreeRecursive):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::isAsyncScrollableStickyLayer const):
+ (WebCore::RenderLayerCompositor::computeStickyViewportConstraints const):
+
2019-04-08 Don Olmstead <[email protected]>
[CMake][WinCairo] Separate copied headers into different directories
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (244067 => 244068)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2019-04-09 03:23:15 UTC (rev 244067)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2019-04-09 06:23:21 UTC (rev 244068)
@@ -6838,6 +6838,7 @@
if (!first)
stream << ", ";
stream << "vc " << viewportConstrainedNodeID;
+ first = false;
}
if (positionedNodeID) {
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (244067 => 244068)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-04-09 03:23:15 UTC (rev 244067)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-04-09 06:23:21 UTC (rev 244068)
@@ -2834,15 +2834,12 @@
auto* enclosingOverflowLayer = layer.enclosingOverflowClipLayer(ExcludeSelf);
-#if PLATFORM(IOS_FAMILY)
if (enclosingOverflowLayer && enclosingOverflowLayer->hasCompositedScrollableOverflow()) {
if (enclosingAcceleratedOverflowLayer)
*enclosingAcceleratedOverflowLayer = enclosingOverflowLayer;
return true;
}
-#else
- UNUSED_PARAM(enclosingAcceleratedOverflowLayer);
-#endif
+
// If the layer is inside normal overflow, it's not async-scrollable.
if (enclosingOverflowLayer)
return false;
@@ -3888,11 +3885,6 @@
StickyPositionViewportConstraints RenderLayerCompositor::computeStickyViewportConstraints(RenderLayer& layer) const
{
ASSERT(layer.isComposited());
-#if !PLATFORM(IOS_FAMILY)
- // We should never get here for stickies constrained by an enclosing clipping layer.
- // FIXME: Why does this assertion fail on iOS?
- ASSERT(!layer.enclosingOverflowClipLayer(ExcludeSelf));
-#endif
auto& renderer = downcast<RenderBoxModelObject>(layer.renderer());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
