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

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

Issue 1213203002: Move AXObjectCache::remove so it is after ContainerNode::detach Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 m_mapElement = nullptr; 63 m_mapElement = nullptr;
64 } 64 }
65 65
66 PassRefPtrWillBeRawPtr<AXImageMapLink> AXImageMapLink::create(AXObjectCacheImpl& axObjectCache) 66 PassRefPtrWillBeRawPtr<AXImageMapLink> AXImageMapLink::create(AXObjectCacheImpl& axObjectCache)
67 { 67 {
68 return adoptRefWillBeNoop(new AXImageMapLink(axObjectCache)); 68 return adoptRefWillBeNoop(new AXImageMapLink(axObjectCache));
69 } 69 }
70 70
71 AXObject* AXImageMapLink::computeParent() const 71 AXObject* AXImageMapLink::computeParent() const
72 { 72 {
73 ASSERT(!isDetached());
73 if (m_parent) 74 if (m_parent)
74 return m_parent; 75 return m_parent;
75 76
76 if (!m_mapElement.get() || !m_mapElement->layoutObject()) 77 if (!m_mapElement.get() || !m_mapElement->layoutObject())
77 return 0; 78 return 0;
78 79
79 return axObjectCache().getOrCreate(m_mapElement->layoutObject()); 80 return axObjectCache().getOrCreate(m_mapElement->layoutObject());
80 } 81 }
81 82
82 AccessibilityRole AXImageMapLink::roleValue() const 83 AccessibilityRole AXImageMapLink::roleValue() const
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 152 }
152 153
153 DEFINE_TRACE(AXImageMapLink) 154 DEFINE_TRACE(AXImageMapLink)
154 { 155 {
155 visitor->trace(m_areaElement); 156 visitor->trace(m_areaElement);
156 visitor->trace(m_mapElement); 157 visitor->trace(m_mapElement);
157 AXMockObject::trace(visitor); 158 AXMockObject::trace(visitor);
158 } 159 }
159 160
160 } // namespace blink 161 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXARIAGrid.cpp ('k') | Source/modules/accessibility/AXInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698