Title: [197825] trunk/Source/WebCore
- Revision
- 197825
- Author
- [email protected]
- Date
- 2016-03-08 18:05:13 -0800 (Tue, 08 Mar 2016)
Log Message
Delete dead scrolling code
https://bugs.webkit.org/show_bug.cgi?id=155210
Reviewed by Simon Fraser.
No new tests because there is no behavior change.
* page/FrameView.cpp:
(WebCore::FrameView::layerForScrolling): Deleted.
* page/FrameView.h:
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::scrollLayerForScrollableArea): Deleted.
* page/scrolling/ScrollingCoordinator.h:
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::horizontalScrollbar):
(WebCore::ScrollableArea::verticalScrollbar):
(WebCore::ScrollableArea::tiledBacking):
(WebCore::ScrollableArea::layerForHorizontalScrollbar):
(WebCore::ScrollableArea::layerForVerticalScrollbar):
(WebCore::ScrollableArea::layerForScrollCorner):
(WebCore::ScrollableArea::layerForOverhangAreas):
(WebCore::ScrollableArea::layerForScrolling): Deleted.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects): Deleted.
* rendering/RenderLayer.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197824 => 197825)
--- trunk/Source/WebCore/ChangeLog 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/ChangeLog 2016-03-09 02:05:13 UTC (rev 197825)
@@ -1,3 +1,31 @@
+2016-03-08 Myles C. Maxfield <[email protected]>
+
+ Delete dead scrolling code
+ https://bugs.webkit.org/show_bug.cgi?id=155210
+
+ Reviewed by Simon Fraser.
+
+ No new tests because there is no behavior change.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layerForScrolling): Deleted.
+ * page/FrameView.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::scrollLayerForScrollableArea): Deleted.
+ * page/scrolling/ScrollingCoordinator.h:
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::horizontalScrollbar):
+ (WebCore::ScrollableArea::verticalScrollbar):
+ (WebCore::ScrollableArea::tiledBacking):
+ (WebCore::ScrollableArea::layerForHorizontalScrollbar):
+ (WebCore::ScrollableArea::layerForVerticalScrollbar):
+ (WebCore::ScrollableArea::layerForScrollCorner):
+ (WebCore::ScrollableArea::layerForOverhangAreas):
+ (WebCore::ScrollableArea::layerForScrolling): Deleted.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects): Deleted.
+ * rendering/RenderLayer.h:
+
2016-03-08 Oliver Hunt <[email protected]>
Start moving to separated writable and executable mappings in the JIT
Modified: trunk/Source/WebCore/page/FrameView.cpp (197824 => 197825)
--- trunk/Source/WebCore/page/FrameView.cpp 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-03-09 02:05:13 UTC (rev 197825)
@@ -852,14 +852,6 @@
compositor.updateCompositingLayers(CompositingUpdateAfterLayout);
}
-GraphicsLayer* FrameView::layerForScrolling() const
-{
- RenderView* renderView = this->renderView();
- if (!renderView)
- return nullptr;
- return renderView->compositor().scrollLayer();
-}
-
GraphicsLayer* FrameView::layerForHorizontalScrollbar() const
{
RenderView* renderView = this->renderView();
Modified: trunk/Source/WebCore/page/FrameView.h (197824 => 197825)
--- trunk/Source/WebCore/page/FrameView.h 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/page/FrameView.h 2016-03-09 02:05:13 UTC (rev 197825)
@@ -626,7 +626,6 @@
ScrollableArea* enclosingScrollableArea() const override;
IntRect scrollableAreaBoundingBox(bool* = nullptr) const override;
bool scrollAnimatorEnabled() const override;
- GraphicsLayer* layerForScrolling() const override;
GraphicsLayer* layerForHorizontalScrollbar() const override;
GraphicsLayer* layerForVerticalScrollbar() const override;
GraphicsLayer* layerForScrollCorner() const override;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (197824 => 197825)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2016-03-09 02:05:13 UTC (rev 197825)
@@ -209,11 +209,6 @@
updateSynchronousScrollingReasons(frameView);
}
-GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea& scrollableArea)
-{
- return scrollableArea.layerForScrolling();
-}
-
GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView& frameView)
{
if (RenderView* renderView = frameView.frame().contentRenderer())
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (197824 => 197825)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2016-03-09 02:05:13 UTC (rev 197825)
@@ -209,8 +209,6 @@
protected:
explicit ScrollingCoordinator(Page*);
- static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea&);
-
GraphicsLayer* scrollLayerForFrameView(FrameView&);
GraphicsLayer* counterScrollingLayerForFrameView(FrameView&);
GraphicsLayer* insetClipLayerForFrameView(FrameView&);
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (197824 => 197825)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2016-03-09 02:05:13 UTC (rev 197825)
@@ -178,8 +178,8 @@
WEBCORE_EXPORT IntSize scrollbarIntrusion() const;
- virtual Scrollbar* horizontalScrollbar() const { return 0; }
- virtual Scrollbar* verticalScrollbar() const { return 0; }
+ virtual Scrollbar* horizontalScrollbar() const { return nullptr; }
+ virtual Scrollbar* verticalScrollbar() const { return nullptr; }
const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
bool scrollOriginChanged() const { return m_scrollOriginChanged; }
@@ -291,15 +291,15 @@
bool isPinnedVerticallyInDirection(int verticalScrollDelta) const;
#endif
- virtual TiledBacking* tiledBacking() const { return 0; }
+ virtual TiledBacking* tiledBacking() const { return nullptr; }
// True if scrolling happens by moving compositing layers.
virtual bool usesCompositedScrolling() const { return false; }
// True if the contents can be scrolled asynchronously (i.e. by a ScrollingCoordinator).
virtual bool usesAsyncScrolling() const { return false; }
- virtual GraphicsLayer* layerForHorizontalScrollbar() const { return 0; }
- virtual GraphicsLayer* layerForVerticalScrollbar() const { return 0; }
+ virtual GraphicsLayer* layerForHorizontalScrollbar() const { return nullptr; }
+ virtual GraphicsLayer* layerForVerticalScrollbar() const { return nullptr; }
bool hasLayerForHorizontalScrollbar() const;
bool hasLayerForVerticalScrollbar() const;
@@ -322,10 +322,9 @@
virtual void invalidateScrollCornerRect(const IntRect&) = 0;
friend class ScrollingCoordinator;
- virtual GraphicsLayer* layerForScrolling() const { return 0; }
- virtual GraphicsLayer* layerForScrollCorner() const { return 0; }
+ virtual GraphicsLayer* layerForScrollCorner() const { return nullptr; }
#if ENABLE(RUBBER_BANDING)
- virtual GraphicsLayer* layerForOverhangAreas() const { return 0; }
+ virtual GraphicsLayer* layerForOverhangAreas() const { return nullptr; }
#endif
bool hasLayerForScrollCorner() const;
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (197824 => 197825)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-03-09 02:05:13 UTC (rev 197825)
@@ -6051,11 +6051,6 @@
return m_backing && m_backing->hasMaskLayer();
}
-GraphicsLayer* RenderLayer::layerForScrolling() const
-{
- return m_backing ? m_backing->scrollingContentsLayer() : nullptr;
-}
-
GraphicsLayer* RenderLayer::layerForHorizontalScrollbar() const
{
return m_backing ? m_backing->layerForHorizontalScrollbar() : nullptr;
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (197824 => 197825)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-03-09 01:44:47 UTC (rev 197824)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-03-09 02:05:13 UTC (rev 197825)
@@ -610,7 +610,6 @@
RenderLayerBacking* backing() const { return m_backing.get(); }
RenderLayerBacking* ensureBacking();
void clearBacking(bool layerBeingDestroyed = false);
- GraphicsLayer* layerForScrolling() const override;
GraphicsLayer* layerForHorizontalScrollbar() const override;
GraphicsLayer* layerForVerticalScrollbar() const override;
GraphicsLayer* layerForScrollCorner() const override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
