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..b490a2c15147933d15c402671ea6ad4c73d64208 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) |
@@ -99,6 +99,15 @@ ScrollingCoordinator::~ScrollingCoordinator() |
{ |
} |
+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) |
{ |
if (!m_page->mainFrame()->isLocalFrame() || !m_page->deprecatedLocalMainFrame()->view()) |