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

Unified Diff: Source/core/editing/TextIterator.cpp

Issue 481753002: Use Shadow DOM to display fallback content for images (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated 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
Index: Source/core/editing/TextIterator.cpp
diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp
index 7220a76da1c57feddbd673e2f47d8b210b3bb4b6..2cc7fe79818c85743f79e39c45d7545e12bee844 100644
--- a/Source/core/editing/TextIterator.cpp
+++ b/Source/core/editing/TextIterator.cpp
@@ -37,6 +37,8 @@
#include "core/editing/htmlediting.h"
#include "core/frame/FrameView.h"
#include "core/html/HTMLElement.h"
+#include "core/html/HTMLImageElement.h"
+#include "core/html/HTMLInputElement.h"
#include "core/html/HTMLTextFormControlElement.h"
#include "core/rendering/InlineTextBox.h"
#include "core/rendering/RenderImage.h"
@@ -469,6 +471,7 @@ void TextIterator::advance()
|| (m_node && m_node->isHTMLElement()
&& (isHTMLFormControlElement(toHTMLElement(*m_node))
|| isHTMLLegendElement(toHTMLElement(*m_node))
+ || isHTMLImageElement(toElement(*m_node))
|| isHTMLMeterElement(toHTMLElement(*m_node))
|| isHTMLProgressElement(toHTMLElement(*m_node)))))) {
handledNode = handleReplacedElement();
@@ -831,8 +834,8 @@ bool TextIterator::handleReplacedElement()
m_positionEndOffset = 1;
m_singleCharacterBuffer = 0;
- if (m_emitsImageAltText && renderer->isImage() && renderer->isRenderImage()) {
- m_text = toRenderImage(renderer)->altText();
+ if (m_emitsImageAltText) {
+ m_text = toHTMLElement(m_node)->altText();
if (!m_text.isEmpty()) {
m_textLength = m_text.length();
m_lastCharacter = m_text[m_textLength - 1];
@@ -1409,7 +1412,7 @@ void SimplifiedBackwardsTextIterator::advance()
// FIXME: What about CDATA_SECTION_NODE?
if (renderer->style()->visibility() == VISIBLE && m_offset > 0)
m_handledNode = handleTextNode();
- } else if (renderer && (renderer->isImage() || renderer->isRenderPart())) {
+ } else if (renderer && (isHTMLImageElement(toElement(*m_node)) || isHTMLInputElement(toElement(*m_node)) || renderer->isRenderPart())) {
if (renderer->style()->visibility() == VISIBLE && m_offset > 0)
m_handledNode = handleReplacedElement();
} else {

Powered by Google App Engine
This is Rietveld 408576698