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

Unified Diff: Source/modules/accessibility/AXScrollView.cpp

Issue 1072273006: Oilpan: Prepare moving AXObject to heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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/modules/accessibility/AXScrollView.cpp
diff --git a/Source/modules/accessibility/AXScrollView.cpp b/Source/modules/accessibility/AXScrollView.cpp
index 168c8565b53e01fa9d5c29e4ef4415cc859ebf98..96363ad25a042ee97b638b6ae665cc72bf36bbf7 100644
--- a/Source/modules/accessibility/AXScrollView.cpp
+++ b/Source/modules/accessibility/AXScrollView.cpp
@@ -43,18 +43,20 @@ AXScrollView::AXScrollView(FrameView* view, AXObjectCacheImpl* axObjectCache)
AXScrollView::~AXScrollView()
{
+#if !ENABLE(OILPAN)
ASSERT(isDetached());
+#endif
}
void AXScrollView::detach()
{
AXObject::detach();
- m_scrollView = 0;
+ m_scrollView = nullptr;
}
-PassRefPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObjectCacheImpl* axObjectCache)
+PassRefPtrWillBeRawPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObjectCacheImpl* axObjectCache)
{
- return adoptRef(new AXScrollView(view, axObjectCache));
+ return adoptRefWillBeNoop(new AXScrollView(view, axObjectCache));
}
AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation)
@@ -259,4 +261,12 @@ void AXScrollView::scrollTo(const IntPoint& point) const
m_scrollView->setScrollPosition(point);
}
+DEFINE_TRACE(AXScrollView)
+{
+ AXObject::trace(visitor);
+ visitor->trace(m_scrollView);
+ visitor->trace(m_horizontalScrollbar);
+ visitor->trace(m_verticalScrollbar);
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698