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

Side by Side Diff: Source/modules/accessibility/AXListBox.cpp

Issue 1175533004: Refactor: Clear m_axObjectCache when AXObject detaches (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added ASSERT 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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 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 21 matching lines...) Expand all
32 #include "core/html/HTMLOptionElement.h" 32 #include "core/html/HTMLOptionElement.h"
33 #include "core/html/HTMLSelectElement.h" 33 #include "core/html/HTMLSelectElement.h"
34 #include "core/layout/LayoutListBox.h" 34 #include "core/layout/LayoutListBox.h"
35 #include "modules/accessibility/AXListBoxOption.h" 35 #include "modules/accessibility/AXListBoxOption.h"
36 #include "modules/accessibility/AXObjectCacheImpl.h" 36 #include "modules/accessibility/AXObjectCacheImpl.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 using namespace HTMLNames; 40 using namespace HTMLNames;
41 41
42 AXListBox::AXListBox(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCach e) 42 AXListBox::AXListBox(LayoutObject* layoutObject, AXObjectCacheImpl& axObjectCach e)
43 : AXLayoutObject(layoutObject, axObjectCache) 43 : AXLayoutObject(layoutObject, axObjectCache)
44 , m_activeIndex(-1) 44 , m_activeIndex(-1)
45 { 45 {
46 activeIndexChanged(); 46 activeIndexChanged();
47 } 47 }
48 48
49 AXListBox::~AXListBox() 49 AXListBox::~AXListBox()
50 { 50 {
51 } 51 }
52 52
53 PassRefPtr<AXListBox> AXListBox::create(LayoutObject* layoutObject, AXObjectCach eImpl* axObjectCache) 53 PassRefPtr<AXListBox> AXListBox::create(LayoutObject* layoutObject, AXObjectCach eImpl& axObjectCache)
54 { 54 {
55 return adoptRef(new AXListBox(layoutObject, axObjectCache)); 55 return adoptRef(new AXListBox(layoutObject, axObjectCache));
56 } 56 }
57 57
58 AccessibilityRole AXListBox::determineAccessibilityRole() 58 AccessibilityRole AXListBox::determineAccessibilityRole()
59 { 59 {
60 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole) 60 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
61 return m_ariaRole; 61 return m_ariaRole;
62 62
63 return ListBoxRole; 63 return ListBoxRole;
64 } 64 }
65 65
66 AXObject* AXListBox::activeDescendant() const 66 AXObject* AXListBox::activeDescendant() const
67 { 67 {
68 if (!isHTMLSelectElement(node())) 68 if (!isHTMLSelectElement(node()))
69 return nullptr; 69 return nullptr;
70 70
71 HTMLSelectElement* select = toHTMLSelectElement(node()); 71 HTMLSelectElement* select = toHTMLSelectElement(node());
72 int activeIndex = select->activeSelectionEndListIndex(); 72 int activeIndex = select->activeSelectionEndListIndex();
73 if (activeIndex >= 0 && activeIndex < static_cast<int>(select->length())) { 73 if (activeIndex >= 0 && activeIndex < static_cast<int>(select->length())) {
74 HTMLOptionElement* option = select->item(m_activeIndex); 74 HTMLOptionElement* option = select->item(m_activeIndex);
75 return axObjectCache()->get(option); 75 return axObjectCache().get(option);
76 } 76 }
77 77
78 return nullptr; 78 return nullptr;
79 } 79 }
80 80
81 void AXListBox::activeIndexChanged() 81 void AXListBox::activeIndexChanged()
82 { 82 {
83 if (!isHTMLSelectElement(node())) 83 if (!isHTMLSelectElement(node()))
84 return; 84 return;
85 85
86 HTMLSelectElement* select = toHTMLSelectElement(node()); 86 HTMLSelectElement* select = toHTMLSelectElement(node());
87 int activeIndex = select->activeSelectionEndListIndex(); 87 int activeIndex = select->activeSelectionEndListIndex();
88 if (activeIndex == m_activeIndex) 88 if (activeIndex == m_activeIndex)
89 return; 89 return;
90 90
91 m_activeIndex = activeIndex; 91 m_activeIndex = activeIndex;
92 if (!select->focused()) 92 if (!select->focused())
93 return; 93 return;
94 94
95 if (m_activeIndex >= 0 && m_activeIndex < static_cast<int>(select->length()) ) { 95 if (m_activeIndex >= 0 && m_activeIndex < static_cast<int>(select->length()) ) {
96 HTMLOptionElement* option = select->item(m_activeIndex); 96 HTMLOptionElement* option = select->item(m_activeIndex);
97 axObjectCache()->postNotification(option, AXObjectCacheImpl::AXFocusedUI ElementChanged); 97 axObjectCache().postNotification(option, AXObjectCacheImpl::AXFocusedUIE lementChanged);
98 } else { 98 } else {
99 axObjectCache()->postNotification(this, AXObjectCacheImpl::AXFocusedUIEl ementChanged); 99 axObjectCache().postNotification(this, AXObjectCacheImpl::AXFocusedUIEle mentChanged);
100 } 100 }
101 } 101 }
102 102
103 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXListBox.h ('k') | Source/modules/accessibility/AXListBoxOption.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698