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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 25 matching lines...) Expand all
36 36
37 AXScrollView::AXScrollView(FrameView* view, AXObjectCacheImpl& axObjectCache) 37 AXScrollView::AXScrollView(FrameView* view, AXObjectCacheImpl& axObjectCache)
38 : AXObject(axObjectCache) 38 : AXObject(axObjectCache)
39 , m_scrollView(view) 39 , m_scrollView(view)
40 , m_childrenDirty(false) 40 , m_childrenDirty(false)
41 { 41 {
42 } 42 }
43 43
44 AXScrollView::~AXScrollView() 44 AXScrollView::~AXScrollView()
45 { 45 {
46 ASSERT(isDetached());
47 } 46 }
48 47
49 void AXScrollView::detach() 48 void AXScrollView::detach()
50 { 49 {
51 AXObject::detach(); 50 AXObject::detach();
52 m_scrollView = 0; 51 m_scrollView = nullptr;
53 } 52 }
54 53
55 PassRefPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObjectCacheImpl & axObjectCache) 54 PassRefPtrWillBeRawPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObj ectCacheImpl& axObjectCache)
56 { 55 {
57 return adoptRef(new AXScrollView(view, axObjectCache)); 56 return adoptRefWillBeNoop(new AXScrollView(view, axObjectCache));
58 } 57 }
59 58
60 AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation) 59 AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation)
61 { 60 {
62 updateScrollbars(); 61 updateScrollbars();
63 62
64 switch (orientation) { 63 switch (orientation) {
65 case AccessibilityOrientationVertical: 64 case AccessibilityOrientationVertical:
66 return m_verticalScrollbar ? m_verticalScrollbar.get() : 0; 65 return m_verticalScrollbar ? m_verticalScrollbar.get() : 0;
67 case AccessibilityOrientationHorizontal: 66 case AccessibilityOrientationHorizontal:
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 return axObjectCache().get(owner); 245 return axObjectCache().get(owner);
247 246
248 return axObjectCache().get(m_scrollView->frame().pagePopupOwner()); 247 return axObjectCache().get(m_scrollView->frame().pagePopupOwner());
249 } 248 }
250 249
251 ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const 250 ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const
252 { 251 {
253 return m_scrollView; 252 return m_scrollView;
254 } 253 }
255 254
255 DEFINE_TRACE(AXScrollView)
256 {
257 visitor->trace(m_scrollView);
258 visitor->trace(m_horizontalScrollbar);
259 visitor->trace(m_verticalScrollbar);
260 AXObject::trace(visitor);
261 }
262
256 } // namespace blink 263 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698