Fix for https://bugs.webkit.org/show_bug.cgi?id=39574
Complete the merge of NamedMappedAttrMap into NamedNodeMap.
Reviewed by Oliver Hunt.
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::canShareStyleWithElement):
(WebCore::CSSStyleSelector::styleForElement):
* dom/Element.cpp:
(WebCore::Element::createAttributeMap):
* dom/NamedMappedAttrMap.cpp: Removed.
* dom/NamedMappedAttrMap.h: Removed.
* dom/NamedNodeMap.cpp:
(WebCore::NamedNodeMap::setClass):
(WebCore::NamedNodeMap::declCount):
(WebCore::NamedNodeMap::mapsEquivalent):
(WebCore::NamedNodeMap::mappedMapsEquivalent):
* dom/NamedNodeMap.h:
(WebCore::NamedNodeMap::create):
(WebCore::NamedNodeMap::clearClass):
(WebCore::NamedNodeMap::classNames):
(WebCore::NamedNodeMap::hasMappedAttributes):
(WebCore::NamedNodeMap::declRemoved):
(WebCore::NamedNodeMap::declAdded):
(WebCore::NamedNodeMap::NamedNodeMap):
* dom/StyledElement.h:
(WebCore::StyledElement::mappedAttributes):
* html/HTML5Token.h:
* html/HTML5Tokenizer.cpp:
(WebCore::convertToOldStyle):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::setInputType):
* html/HTMLParser.cpp:
(WebCore::HTMLParser::handleIsindex):
* html/HTMLTokenizer.cpp:
(WebCore::Token::addAttribute):
(WebCore::HTMLTokenizer::processToken):
* html/HTMLTokenizer.h:
* html/HTMLViewSourceDocument.cpp:
(WebCore::HTMLViewSourceDocument::createContainingTable):
(WebCore::HTMLViewSourceDocument::addSpanWithClassName):
(WebCore::HTMLViewSourceDocument::addLine):
(WebCore::HTMLViewSourceDocument::addLink):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60052 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/html/HTMLTokenizer.h b/WebCore/html/HTMLTokenizer.h
index 92e071e..dc03cf2 100644
--- a/WebCore/html/HTMLTokenizer.h
+++ b/WebCore/html/HTMLTokenizer.h
@@ -26,8 +26,8 @@
#include "CachedResourceClient.h"
#include "CachedResourceHandle.h"
-#include "NamedMappedAttrMap.h"
#include "MappedAttributeEntry.h"
+#include "NamedNodeMap.h"
#include "SegmentedString.h"
#include "Timer.h"
#include "Tokenizer.h"
@@ -83,7 +83,7 @@
void addViewSourceChar(UChar c) { if (!m_sourceInfo.get()) m_sourceInfo.set(new Vector<UChar>); m_sourceInfo->append(c); }
- RefPtr<NamedMappedAttrMap> attrs;
+ RefPtr<NamedNodeMap> attrs;
RefPtr<StringImpl> text;
AtomicString tagName;
bool beginTag;
