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

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

Issue 2526133003: [CANCELED] Ensure clean style for hasEditableLevel when it doesn't break other stuff (Closed)
Patch Set: Fri Nov 25 14:48:44 JST 2016 Created 4 years 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 207 }
208 208
209 ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const { 209 ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const {
210 if (isWebArea()) 210 if (isWebArea())
211 return documentFrameView(); 211 return documentFrameView();
212 212
213 if (!m_layoutObject || !m_layoutObject->isBox()) 213 if (!m_layoutObject || !m_layoutObject->isBox())
214 return 0; 214 return 0;
215 215
216 LayoutBox* box = toLayoutBox(m_layoutObject); 216 LayoutBox* box = toLayoutBox(m_layoutObject);
217 if (!box->canBeScrolledAndHasScrollableArea()) 217 {
218 return 0; 218 AutoReset<bool> inAXScope(checkingEditableStyleFromAXIndicator(), true);
219 if (!box->canBeScrolledAndHasScrollableArea())
220 return 0;
221 }
219 222
220 return box->getScrollableArea(); 223 return box->getScrollableArea();
221 } 224 }
222 225
223 static bool isImageOrAltText(LayoutBoxModelObject* box, Node* node) { 226 static bool isImageOrAltText(LayoutBoxModelObject* box, Node* node) {
224 if (box && box->isImage()) 227 if (box && box->isImage())
225 return true; 228 return true;
226 if (isHTMLImageElement(node)) 229 if (isHTMLImageElement(node))
227 return true; 230 return true;
228 if (isHTMLInputElement(node) && 231 if (isHTMLInputElement(node) &&
(...skipping 2242 matching lines...) Expand 10 before | Expand all | Expand 10 after
2471 2474
2472 bool AXLayoutObject::elementAttributeValue( 2475 bool AXLayoutObject::elementAttributeValue(
2473 const QualifiedName& attributeName) const { 2476 const QualifiedName& attributeName) const {
2474 if (!m_layoutObject) 2477 if (!m_layoutObject)
2475 return false; 2478 return false;
2476 2479
2477 return equalIgnoringCase(getAttribute(attributeName), "true"); 2480 return equalIgnoringCase(getAttribute(attributeName), "true");
2478 } 2481 }
2479 2482
2480 } // namespace blink 2483 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698