diff options
author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/dom/CharacterData.cpp | |
parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/dom/CharacterData.cpp')
-rw-r--r-- | WebCore/dom/CharacterData.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/dom/CharacterData.cpp b/WebCore/dom/CharacterData.cpp index 0ce4170..54e1888 100644 --- a/WebCore/dom/CharacterData.cpp +++ b/WebCore/dom/CharacterData.cpp @@ -31,13 +31,13 @@ namespace WebCore { CharacterData::CharacterData(Document *doc, bool isText) - : EventTargetNode(doc, false, false, isText) + : Node(doc, false, false, isText) , m_data(StringImpl::empty()) { } CharacterData::CharacterData(Document* document, const String& text, bool isText) - : EventTargetNode(document, false, false, isText) + : Node(document, false, false, isText) { m_data = text.impl() ? text.impl() : StringImpl::empty(); } @@ -224,7 +224,7 @@ bool CharacterData::rendererIsNeeded(RenderStyle *style) { if (!m_data || !length()) return false; - return EventTargetNode::rendererIsNeeded(style); + return Node::rendererIsNeeded(style); } bool CharacterData::offsetInCharacters() const |