Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1126)

Unified Diff: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 1215973002: Oilpan: improve ScrollableArea handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: clear out animators on DeprecatedPaintLayerScrollableArea dispose Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()
{
haraken 2015/06/30 10:30:35 Not mandatory, but it would be a good idea to add
sof 2015/06/30 11:34:09 Added
}
+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())

Powered by Google App Engine
This is Rietveld 408576698