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

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

Issue 1552683002: Enable DumpAccessibilityTree tests to use cross-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaseline last Android test Created 4 years, 11 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 // We want to notify that the combo box has changed its active descendant, 227 // We want to notify that the combo box has changed its active descendant,
228 // but we do not want to change the focus, because focus should remain with the combo box. 228 // but we do not want to change the focus, because focus should remain with the combo box.
229 if (isComboBox()) 229 if (isComboBox())
230 return true; 230 return true;
231 231
232 return shouldFocusActiveDescendant(); 232 return shouldFocusActiveDescendant();
233 } 233 }
234 234
235 ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const 235 ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const
236 { 236 {
237 // FIXME(dmazzoni): the plan is to get rid of AXScrollView, but until 237 if (isWebArea())
238 // this is done, a WebArea delegates its scrolling to its parent scroll view . 238 return documentFrameView();
239 // http://crbug.com/484878
240 if (parentObject() && parentObject()->isAXScrollView())
241 return parentObject()->getScrollableAreaIfScrollable();
242 239
243 if (!m_layoutObject || !m_layoutObject->isBox()) 240 if (!m_layoutObject || !m_layoutObject->isBox())
244 return 0; 241 return 0;
245 242
246 LayoutBox* box = toLayoutBox(m_layoutObject); 243 LayoutBox* box = toLayoutBox(m_layoutObject);
247 if (!box->canBeScrolledAndHasScrollableArea()) 244 if (!box->canBeScrolledAndHasScrollableArea())
248 return 0; 245 return 0;
249 246
250 return box->scrollableArea(); 247 return box->scrollableArea();
251 } 248 }
(...skipping 2281 matching lines...) Expand 10 before | Expand all | Expand 10 after
2533 if (label && label->layoutObject()) { 2530 if (label && label->layoutObject()) {
2534 LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRe ct(); 2531 LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRe ct();
2535 result.unite(labelRect); 2532 result.unite(labelRect);
2536 } 2533 }
2537 } 2534 }
2538 2535
2539 return result; 2536 return result;
2540 } 2537 }
2541 2538
2542 } // namespace blink 2539 } // namespace blink
OLDNEW
« no previous file with comments | « content/test/data/accessibility/readme.txt ('k') | third_party/WebKit/Source/modules/accessibility/AXScrollView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698