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

Unified Diff: Source/modules/accessibility/AXRenderObject.cpp

Issue 757583002: Revert of Use Shadow DOM to display fallback content for images (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderImage.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/accessibility/AXRenderObject.cpp
diff --git a/Source/modules/accessibility/AXRenderObject.cpp b/Source/modules/accessibility/AXRenderObject.cpp
index d0ba4a20d0fbf07854c40fd8e61307735d87f43e..aaccaacbfc23aac6aa405be6ee28755266f7de4e 100644
--- a/Source/modules/accessibility/AXRenderObject.cpp
+++ b/Source/modules/accessibility/AXRenderObject.cpp
@@ -253,17 +253,6 @@
return box->scrollableArea();
}
-static bool isImageOrAltText(RenderBoxModelObject* box, Node* node)
-{
- if (box && box->isImage())
- return true;
- if (isHTMLImageElement(node))
- return true;
- if (isHTMLInputElement(node) && toHTMLInputElement(node)->hasFallbackContent())
- return true;
- return false;
-}
-
AccessibilityRole AXRenderObject::determineAccessibilityRole()
{
if (!m_renderer)
@@ -279,7 +268,7 @@
RenderBoxModelObject* cssBox = renderBoxModelObject();
if (node && node->isLink()) {
- if (isImageOrAltText(cssBox, node))
+ if (cssBox && cssBox->isImage())
return ImageMapRole;
return LinkRole;
}
@@ -300,7 +289,7 @@
return LegendRole;
if (m_renderer->isText())
return StaticTextRole;
- if (isImageOrAltText(cssBox, node)) {
+ if (cssBox && cssBox->isImage()) {
if (isHTMLInputElement(node))
return ariaHasPopup() ? PopUpButtonRole : ButtonRole;
if (isSVGImage())
@@ -791,7 +780,7 @@
return true;
}
- if (isNativeImage() && isImageOrAltText(toRenderBoxModelObject(m_renderer), node)) {
+ if (isNativeImage() && m_renderer->isImage()) {
// check for one-dimensional image
RenderImage* image = toRenderImage(m_renderer);
if (image->height() <= 1 || image->width() <= 1)
« no previous file with comments | « Source/core/rendering/RenderImage.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698