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

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, 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
« no previous file with comments | « Source/modules/accessibility/AXScrollView.h ('k') | Source/modules/accessibility/AXScrollbar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/accessibility/AXScrollView.cpp
diff --git a/Source/modules/accessibility/AXScrollView.cpp b/Source/modules/accessibility/AXScrollView.cpp
index e3e6aaefce1d9b9c6785eaab80e6fb5ddb02e551..abfa02a50399c34cf502ffe65b88ed6a8bcd3e2e 100644
--- a/Source/modules/accessibility/AXScrollView.cpp
+++ b/Source/modules/accessibility/AXScrollView.cpp
@@ -43,18 +43,18 @@ AXScrollView::AXScrollView(FrameView* view, AXObjectCacheImpl& axObjectCache)
AXScrollView::~AXScrollView()
{
- ASSERT(isDetached());
+ ASSERT(!m_scrollView);
}
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)
@@ -253,4 +253,12 @@ ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const
return m_scrollView;
}
+DEFINE_TRACE(AXScrollView)
+{
+ visitor->trace(m_scrollView);
+ visitor->trace(m_horizontalScrollbar);
+ visitor->trace(m_verticalScrollbar);
+ AXObject::trace(visitor);
+}
+
} // namespace blink
« no previous file with comments | « Source/modules/accessibility/AXScrollView.h ('k') | Source/modules/accessibility/AXScrollbar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698