| Index: Source/core/page/scrolling/ScrollingCoordinator.h
|
| diff --git a/Source/core/page/scrolling/ScrollingCoordinator.h b/Source/core/page/scrolling/ScrollingCoordinator.h
|
| index 55586803ca11a42d263416de3a0d88a8b854a28f..8631c2db88628453ba32a46f53e090c41b9d84c5 100644
|
| --- a/Source/core/page/scrolling/ScrollingCoordinator.h
|
| +++ b/Source/core/page/scrolling/ScrollingCoordinator.h
|
| @@ -49,12 +49,13 @@ class Page;
|
| class Region;
|
| class ScrollableArea;
|
|
|
| -class CORE_EXPORT ScrollingCoordinator {
|
| +class CORE_EXPORT ScrollingCoordinator final : public NoBaseWillBeGarbageCollectedFinalized<ScrollingCoordinator> {
|
| WTF_MAKE_NONCOPYABLE(ScrollingCoordinator);
|
| public:
|
| - ~ScrollingCoordinator();
|
| + static PassOwnPtrWillBeRawPtr<ScrollingCoordinator> create(Page*);
|
|
|
| - static PassOwnPtr<ScrollingCoordinator> create(Page*);
|
| + ~ScrollingCoordinator();
|
| + DECLARE_TRACE();
|
|
|
| void willBeDestroyed();
|
|
|
| @@ -126,7 +127,7 @@ protected:
|
| bool isForMainFrame(ScrollableArea*) const;
|
| bool isForViewport(ScrollableArea*) const;
|
|
|
| - Page* m_page;
|
| + RawPtrWillBeMember<Page> m_page;
|
|
|
| // Dirty flags used to idenfity what really needs to be computed after compositing is updated.
|
| bool m_scrollGestureRegionIsDirty;
|
| @@ -150,7 +151,7 @@ private:
|
|
|
| bool frameViewIsDirty() const;
|
|
|
| - using ScrollbarMap = HashMap<ScrollableArea*, OwnPtr<WebScrollbarLayer>>;
|
| + using ScrollbarMap = WillBeHeapHashMap<RawPtrWillBeMember<ScrollableArea>, OwnPtr<WebScrollbarLayer>>;
|
| ScrollbarMap m_horizontalScrollbars;
|
| ScrollbarMap m_verticalScrollbars;
|
| HashSet<const DeprecatedPaintLayer*> m_layersWithTouchRects;
|
|
|