Index: Source/core/editing/TextIterator.cpp |
diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp |
index 2cc7fe79818c85743f79e39c45d7545e12bee844..7220a76da1c57feddbd673e2f47d8b210b3bb4b6 100644 |
--- a/Source/core/editing/TextIterator.cpp |
+++ b/Source/core/editing/TextIterator.cpp |
@@ -37,8 +37,6 @@ |
#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" |
@@ -471,7 +469,6 @@ |
|| (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(); |
@@ -834,8 +831,8 @@ |
m_positionEndOffset = 1; |
m_singleCharacterBuffer = 0; |
- if (m_emitsImageAltText) { |
- m_text = toHTMLElement(m_node)->altText(); |
+ if (m_emitsImageAltText && renderer->isImage() && renderer->isRenderImage()) { |
+ m_text = toRenderImage(renderer)->altText(); |
if (!m_text.isEmpty()) { |
m_textLength = m_text.length(); |
m_lastCharacter = m_text[m_textLength - 1]; |
@@ -1412,7 +1409,7 @@ |
// FIXME: What about CDATA_SECTION_NODE? |
if (renderer->style()->visibility() == VISIBLE && m_offset > 0) |
m_handledNode = handleTextNode(); |
- } else if (renderer && (isHTMLImageElement(toElement(*m_node)) || isHTMLInputElement(toElement(*m_node)) || renderer->isRenderPart())) { |
+ } else if (renderer && (renderer->isImage() || renderer->isRenderPart())) { |
if (renderer->style()->visibility() == VISIBLE && m_offset > 0) |
m_handledNode = handleReplacedElement(); |
} else { |