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

Side by Side Diff: third_party/WebKit/Source/modules/accessibility/AXScrollView.cpp

Issue 1207613004: Fix leaking AXNodeObjects when sub document detaches (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 5 years, 1 month 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) 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 return false; 164 return false;
165 165
166 if (ignoredReasons) 166 if (ignoredReasons)
167 return webArea->computeAccessibilityIsIgnored(ignoredReasons); 167 return webArea->computeAccessibilityIsIgnored(ignoredReasons);
168 168
169 return true; 169 return true;
170 } 170 }
171 171
172 void AXScrollView::addChildren() 172 void AXScrollView::addChildren()
173 { 173 {
174 ASSERT(!isDetached());
174 ASSERT(!m_haveChildren); 175 ASSERT(!m_haveChildren);
175 m_haveChildren = true; 176 m_haveChildren = true;
176 177
177 AXObject* webArea = webAreaObject(); 178 AXObject* webArea = webAreaObject();
178 if (webArea && !webArea->accessibilityIsIgnored()) 179 if (webArea && !webArea->accessibilityIsIgnored())
179 m_children.append(webArea); 180 m_children.append(webArea);
180 181
181 updateScrollbars(); 182 updateScrollbars();
182 } 183 }
183 184
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 FrameView* AXScrollView::documentFrameView() const 219 FrameView* AXScrollView::documentFrameView() const
219 { 220 {
220 if (!m_scrollView || !m_scrollView->isFrameView()) 221 if (!m_scrollView || !m_scrollView->isFrameView())
221 return 0; 222 return 0;
222 223
223 return m_scrollView; 224 return m_scrollView;
224 } 225 }
225 226
226 AXObject* AXScrollView::computeParent() const 227 AXObject* AXScrollView::computeParent() const
227 { 228 {
229 ASSERT(!isDetached());
228 if (!m_scrollView || !m_scrollView->isFrameView()) 230 if (!m_scrollView || !m_scrollView->isFrameView())
229 return 0; 231 return 0;
230 232
231 // FIXME: Broken for OOPI. 233 // FIXME: Broken for OOPI.
232 HTMLFrameOwnerElement* owner = m_scrollView->frame().deprecatedLocalOwner(); 234 HTMLFrameOwnerElement* owner = m_scrollView->frame().deprecatedLocalOwner();
233 if (owner && owner->layoutObject()) 235 if (owner && owner->layoutObject())
234 return axObjectCache().getOrCreate(owner); 236 return axObjectCache().getOrCreate(owner);
235 237
236 return axObjectCache().getOrCreate(m_scrollView->frame().pagePopupOwner()); 238 return axObjectCache().getOrCreate(m_scrollView->frame().pagePopupOwner());
237 } 239 }
(...skipping 17 matching lines...) Expand all
255 257
256 DEFINE_TRACE(AXScrollView) 258 DEFINE_TRACE(AXScrollView)
257 { 259 {
258 visitor->trace(m_scrollView); 260 visitor->trace(m_scrollView);
259 visitor->trace(m_horizontalScrollbar); 261 visitor->trace(m_horizontalScrollbar);
260 visitor->trace(m_verticalScrollbar); 262 visitor->trace(m_verticalScrollbar);
261 AXObject::trace(visitor); 263 AXObject::trace(visitor);
262 } 264 }
263 265
264 } // namespace blink 266 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698