| OLD | NEW |
| 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 Loading... |
| 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()); | 46 ASSERT(!m_scrollView); |
| 47 } | 47 } |
| 48 | 48 |
| 49 void AXScrollView::detach() | 49 void AXScrollView::detach() |
| 50 { | 50 { |
| 51 AXObject::detach(); | 51 AXObject::detach(); |
| 52 m_scrollView = 0; | 52 m_scrollView = nullptr; |
| 53 } | 53 } |
| 54 | 54 |
| 55 PassRefPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObjectCacheImpl
& axObjectCache) | 55 PassRefPtrWillBeRawPtr<AXScrollView> AXScrollView::create(FrameView* view, AXObj
ectCacheImpl& axObjectCache) |
| 56 { | 56 { |
| 57 return adoptRef(new AXScrollView(view, axObjectCache)); | 57 return adoptRefWillBeNoop(new AXScrollView(view, axObjectCache)); |
| 58 } | 58 } |
| 59 | 59 |
| 60 AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation) | 60 AXObject* AXScrollView::scrollBar(AccessibilityOrientation orientation) |
| 61 { | 61 { |
| 62 updateScrollbars(); | 62 updateScrollbars(); |
| 63 | 63 |
| 64 switch (orientation) { | 64 switch (orientation) { |
| 65 case AccessibilityOrientationVertical: | 65 case AccessibilityOrientationVertical: |
| 66 return m_verticalScrollbar ? m_verticalScrollbar.get() : 0; | 66 return m_verticalScrollbar ? m_verticalScrollbar.get() : 0; |
| 67 case AccessibilityOrientationHorizontal: | 67 case AccessibilityOrientationHorizontal: |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 return axObjectCache().get(owner); | 246 return axObjectCache().get(owner); |
| 247 | 247 |
| 248 return axObjectCache().get(m_scrollView->frame().pagePopupOwner()); | 248 return axObjectCache().get(m_scrollView->frame().pagePopupOwner()); |
| 249 } | 249 } |
| 250 | 250 |
| 251 ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const | 251 ScrollableArea* AXScrollView::getScrollableAreaIfScrollable() const |
| 252 { | 252 { |
| 253 return m_scrollView; | 253 return m_scrollView; |
| 254 } | 254 } |
| 255 | 255 |
| 256 DEFINE_TRACE(AXScrollView) |
| 257 { |
| 258 visitor->trace(m_scrollView); |
| 259 visitor->trace(m_horizontalScrollbar); |
| 260 visitor->trace(m_verticalScrollbar); |
| 261 AXObject::trace(visitor); |
| 262 } |
| 263 |
| 256 } // namespace blink | 264 } // namespace blink |
| OLD | NEW |