Title: [250427] trunk/Source/WebCore
- Revision
- 250427
- Author
- tsav...@apple.com
- Date
- 2019-09-27 09:25:35 -0700 (Fri, 27 Sep 2019)
Log Message
Unreviewed, rolling out r250415.
Broke iOS debug testing with 50 crashes and 850 API failure
Reverted changeset:
"ScrollingTreeScrollingNode: use LayerRepresentation for
scroll container, scrolled contents layers"
https://bugs.webkit.org/show_bug.cgi?id=202256
https://trac.webkit.org/changeset/250415
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (250426 => 250427)
--- trunk/Source/WebCore/ChangeLog 2019-09-27 16:07:18 UTC (rev 250426)
+++ trunk/Source/WebCore/ChangeLog 2019-09-27 16:25:35 UTC (rev 250427)
@@ -1,3 +1,16 @@
+2019-09-27 Truitt Savell <tsav...@apple.com>
+
+ Unreviewed, rolling out r250415.
+
+ Broke iOS debug testing with 50 crashes and 850 API failure
+
+ Reverted changeset:
+
+ "ScrollingTreeScrollingNode: use LayerRepresentation for
+ scroll container, scrolled contents layers"
+ https://bugs.webkit.org/show_bug.cgi?id=202256
+ https://trac.webkit.org/changeset/250415
+
2019-09-27 Alex Christensen <achristen...@webkit.org>
Move service worker process termination delay disabling from process pool to website data store
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (250426 => 250427)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2019-09-27 16:07:18 UTC (rev 250426)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2019-09-27 16:25:35 UTC (rev 250427)
@@ -100,11 +100,13 @@
if (state.hasChangedProperty(ScrollingStateScrollingNode::ExpectsWheelEventTestTrigger))
m_expectsWheelEventTestTrigger = state.expectsWheelEventTestTrigger();
+#if PLATFORM(COCOA)
if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrollContainerLayer))
m_scrollContainerLayer = state.scrollContainerLayer();
if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer))
m_scrolledContentsLayer = state.scrolledContentsLayer();
+#endif
}
void ScrollingTreeScrollingNode::commitStateAfterChildren(const ScrollingStateNode& stateNode)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (250426 => 250427)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2019-09-27 16:07:18 UTC (rev 250426)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2019-09-27 16:25:35 UTC (rev 250427)
@@ -88,8 +88,10 @@
bool scrollLimitReached(const PlatformWheelEvent&) const;
ScrollingTreeScrollingNode* scrollingNodeForPoint(LayoutPoint) const override;
- const LayerRepresentation& scrollContainerLayer() const { return m_scrollContainerLayer; }
- const LayerRepresentation& scrolledContentsLayer() const { return m_scrolledContentsLayer; }
+#if PLATFORM(COCOA)
+ CALayer *scrollContainerLayer() const { return m_scrollContainerLayer.get(); }
+ CALayer *scrolledContentsLayer() const { return m_scrolledContentsLayer.get(); }
+#endif
protected:
ScrollingTreeScrollingNode(ScrollingTree&, ScrollingNodeType, ScrollingNodeID);
@@ -151,8 +153,10 @@
bool m_expectsWheelEventTestTrigger { false };
bool m_isFirstCommit { true };
- LayerRepresentation m_scrollContainerLayer;
- LayerRepresentation m_scrolledContentsLayer;
+#if PLATFORM(COCOA)
+ RetainPtr<CALayer> m_scrollContainerLayer;
+ RetainPtr<CALayer> m_scrolledContentsLayer;
+#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (250426 => 250427)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2019-09-27 16:07:18 UTC (rev 250426)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2019-09-27 16:25:35 UTC (rev 250427)
@@ -199,7 +199,7 @@
void ScrollingTreeFrameScrollingNodeMac::repositionScrollingLayers()
{
// We use scroll position here because the root content layer is offset to account for scrollOrigin (see FrameView::positionForRootContentLayer).
- static_cast<CALayer*>(scrolledContentsLayer()).position = -currentScrollPosition();
+ scrolledContentsLayer().position = -currentScrollPosition();
}
void ScrollingTreeFrameScrollingNodeMac::repositionRelatedLayers()
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.mm (250426 => 250427)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.mm 2019-09-27 16:07:18 UTC (rev 250426)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeOverflowScrollingNodeMac.mm 2019-09-27 16:25:35 UTC (rev 250427)
@@ -91,7 +91,7 @@
void ScrollingTreeOverflowScrollingNodeMac::repositionScrollingLayers()
{
- [static_cast<CALayer*>(scrollContainerLayer()) _web_setLayerBoundsOrigin:currentScrollOffset()];
+ [scrollContainerLayer() _web_setLayerBoundsOrigin:currentScrollOffset()];
}
void ScrollingTreeOverflowScrollingNodeMac::repositionRelatedLayers()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
