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

Side by Side Diff: Source/modules/accessibility/AXMenuList.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) 2010 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2010 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
30 #include "modules/accessibility/AXMenuListPopup.h" 30 #include "modules/accessibility/AXMenuListPopup.h"
31 #include "modules/accessibility/AXObjectCacheImpl.h" 31 #include "modules/accessibility/AXObjectCacheImpl.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 AXMenuList::AXMenuList(LayoutMenuList* layoutObject, AXObjectCacheImpl* axObject Cache) 35 AXMenuList::AXMenuList(LayoutMenuList* layoutObject, AXObjectCacheImpl* axObject Cache)
36 : AXLayoutObject(layoutObject, axObjectCache) 36 : AXLayoutObject(layoutObject, axObjectCache)
37 { 37 {
38 } 38 }
39 39
40 PassRefPtr<AXMenuList> AXMenuList::create(LayoutMenuList* layoutObject, AXObject CacheImpl* axObjectCache) 40 PassRefPtrWillBeRawPtr<AXMenuList> AXMenuList::create(LayoutMenuList* layoutObje ct, AXObjectCacheImpl* axObjectCache)
41 { 41 {
42 return adoptRef(new AXMenuList(layoutObject, axObjectCache)); 42 return adoptRefWillBeNoop(new AXMenuList(layoutObject, axObjectCache));
43 } 43 }
44 44
45 AccessibilityRole AXMenuList::determineAccessibilityRole() 45 AccessibilityRole AXMenuList::determineAccessibilityRole()
46 { 46 {
47 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole) 47 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
48 return m_ariaRole; 48 return m_ariaRole;
49 49
50 return PopUpButtonRole; 50 return PopUpButtonRole;
51 } 51 }
52 52
(...skipping 28 matching lines...) Expand all
81 m_haveChildren = true; 81 m_haveChildren = true;
82 82
83 AXObjectCacheImpl* cache = axObjectCache(); 83 AXObjectCacheImpl* cache = axObjectCache();
84 84
85 AXObject* list = cache->getOrCreate(MenuListPopupRole); 85 AXObject* list = cache->getOrCreate(MenuListPopupRole);
86 if (!list) 86 if (!list)
87 return; 87 return;
88 88
89 toAXMockObject(list)->setParent(this); 89 toAXMockObject(list)->setParent(this);
90 if (list->accessibilityIsIgnored()) { 90 if (list->accessibilityIsIgnored()) {
91 #if ENABLE(OILPAN)
92 cache->remove(list);
93 #else
91 cache->remove(list->axObjectID()); 94 cache->remove(list->axObjectID());
95 #endif
92 return; 96 return;
93 } 97 }
94 98
95 m_children.append(list); 99 m_children.append(list);
96 100
97 list->addChildren(); 101 list->addChildren();
98 } 102 }
99 103
100 bool AXMenuList::isCollapsed() const 104 bool AXMenuList::isCollapsed() const
101 { 105 {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 return; 158 return;
155 159
156 AXMenuListPopup* popup = toAXMenuListPopup(children()[0].get()); 160 AXMenuListPopup* popup = toAXMenuListPopup(children()[0].get());
157 popup->didHide(); 161 popup->didHide();
158 162
159 if (node() && node()->focused()) 163 if (node() && node()->focused())
160 axObjectCache()->postNotification(this, AXObjectCacheImpl::AXFocusedUIEl ementChanged); 164 axObjectCache()->postNotification(this, AXObjectCacheImpl::AXFocusedUIEl ementChanged);
161 } 165 }
162 166
163 } // namespace blink 167 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698