Index: Source/core/page/scrolling/ScrollingCoordinator.cpp |
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
index 258bedecc7330c93d6ac3e8a2ef72ce86f769339..21d9228c1f761e6b57241ab688d372f7e14188f2 100644 |
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp |
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
@@ -80,9 +80,9 @@ WebLayer* toWebLayer(blink::GraphicsLayer* layer) |
namespace blink { |
-PassOwnPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page) |
+PassOwnPtrWillBeRawPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page) |
{ |
- return adoptPtr(new ScrollingCoordinator(page)); |
+ return adoptPtrWillBeNoop(new ScrollingCoordinator(page)); |
} |
ScrollingCoordinator::ScrollingCoordinator(Page* page) |
@@ -97,6 +97,16 @@ ScrollingCoordinator::ScrollingCoordinator(Page* page) |
ScrollingCoordinator::~ScrollingCoordinator() |
{ |
+ ASSERT(!m_page); |
+} |
+ |
+DEFINE_TRACE(ScrollingCoordinator) |
+{ |
+ visitor->trace(m_page); |
+#if ENABLE(OILPAN) |
+ visitor->trace(m_horizontalScrollbars); |
+ visitor->trace(m_verticalScrollbars); |
+#endif |
} |
void ScrollingCoordinator::setShouldHandleScrollGestureOnMainThreadRegion(const Region& region) |