Changeset 105216 in webkit
- Timestamp:
- Jan 17, 2012 4:59:02 PM (12 years ago)
- Location:
- branches/safari-534.54-branch/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/safari-534.54-branch/Source/WebCore/ChangeLog
r105215 r105216 1 2011-1-17 Lucas Forschler <lforschler@apple.com> 2 3 Merge 97303 4 5 2011-10-12 Chris Fleizach <cfleizach@apple.com> 6 7 AX: CrashTracer: [USER] 296 crashes in WebProcess at com.apple.WebCore: WebCore::AccessibilityScrollbar::document const + 29 8 https://bugs.webkit.org/show_bug.cgi?id=69936 9 10 AX Scrollbars have a weak pointer to their parent. They need to become AccessibilityMockObjects, so that they can 11 participate in the detachFromParent() methods that happens when those parents go away. 12 Could not reproduce the crash, but the backtrace is unequivocal. 13 14 Reviewed by Darin Adler. 15 16 * accessibility/AccessibilityScrollView.cpp: 17 (WebCore::AccessibilityScrollView::removeChildScrollbar): 18 * accessibility/AccessibilityScrollbar.cpp: 19 (WebCore::AccessibilityScrollbar::AccessibilityScrollbar): 20 * accessibility/AccessibilityScrollbar.h: 21 (WebCore::AccessibilityScrollbar::scrollbar): 22 (WebCore::AccessibilityScrollbar::isAccessibilityScrollbar): 23 1 24 2011-1-17 Lucas Forschler <lforschler@apple.com> 2 25 -
branches/safari-534.54-branch/Source/WebCore/accessibility/AccessibilityScrollView.cpp
r86451 r105216 100 100 { 101 101 size_t pos = m_children.find(scrollbar); 102 if (pos != WTF::notFound) 102 if (pos != WTF::notFound) { 103 m_children[pos]->detachFromParent(); 103 104 m_children.remove(pos); 105 } 104 106 } 105 107 -
branches/safari-534.54-branch/Source/WebCore/accessibility/AccessibilityScrollbar.cpp
r76378 r105216 39 39 AccessibilityScrollbar::AccessibilityScrollbar(Scrollbar* scrollbar) 40 40 : m_scrollbar(scrollbar) 41 , m_parent(0)42 41 { 43 42 ASSERT(scrollbar); -
branches/safari-534.54-branch/Source/WebCore/accessibility/AccessibilityScrollbar.h
r75031 r105216 30 30 #define AccessibilityScrollbar_h 31 31 32 #include "Accessibility Object.h"32 #include "AccessibilityMockObject.h" 33 33 34 34 namespace WebCore { … … 36 36 class Scrollbar; 37 37 38 class AccessibilityScrollbar : public Accessibility Object {38 class AccessibilityScrollbar : public AccessibilityMockObject { 39 39 public: 40 40 static PassRefPtr<AccessibilityScrollbar> create(Scrollbar*); 41 41 42 42 Scrollbar* scrollbar() const { return m_scrollbar.get(); } 43 void setParent(AccessibilityObject* parent) { m_parent = parent; }44 43 45 44 private: … … 51 50 52 51 virtual bool isAccessibilityScrollbar() const { return true; } 53 virtual AccessibilityObject* parentObject() const { return m_parent; }54 52 virtual IntRect elementRect() const; 55 53 … … 65 63 RefPtr<Scrollbar> m_scrollbar; 66 64 AccessibilityOrientation m_orientation; 67 AccessibilityObject* m_parent;68 65 }; 69 66
Note: See TracChangeset
for help on using the changeset viewer.