diff options
author | Steve Block <steveblock@google.com> | 2011-06-08 08:26:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-08 08:26:01 -0700 |
commit | 3742ac093d35d923c81693096ab6671e9b147700 (patch) | |
tree | c2add9100f789dad45ef1ec5328bddde02c47a4c /Source/WebCore/html/parser/HTMLToken.h | |
parent | 901401d90459bc22580842455d4588b9a697514d (diff) | |
parent | e5926f4a0d6adc9ad4a75824129f117181953560 (diff) | |
download | external_webkit-3742ac093d35d923c81693096ab6671e9b147700.zip external_webkit-3742ac093d35d923c81693096ab6671e9b147700.tar.gz external_webkit-3742ac093d35d923c81693096ab6671e9b147700.tar.bz2 |
Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78
* changes:
Merge WebKit at r82507: Update ThirdPartyProject.prop
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
Merge WebKit at r82507: Work around a V8 bug
Merge WebKit at r82507: JNIType renamed to JavaType
Merge WebKit at r82507: IconDatabaseClient interface expanded
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
Merge WebKit at r82507: Node::isContentEditable() renamed
Merge WebKit at r82507: Use icon database through IconDatabaseBase
Merge WebKit at r82507: toInputElement() is now a member of Node
Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
Merge WebKit at r82507: StringImpl::computeHash() removed
Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
Merge WebKit at r82507: Path::strokeBoundingRect() is now const
Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
Merge WebKit at r82507: Fix conflicts due to new StorageTracker
Merge WebKit at r82507: Fix conflicts
Merge WebKit at r82507: Fix makefiles
Merge WebKit at r82507: Initial merge by git
Diffstat (limited to 'Source/WebCore/html/parser/HTMLToken.h')
-rw-r--r-- | Source/WebCore/html/parser/HTMLToken.h | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/Source/WebCore/html/parser/HTMLToken.h b/Source/WebCore/html/parser/HTMLToken.h index aa16ab2..49ec312 100644 --- a/Source/WebCore/html/parser/HTMLToken.h +++ b/Source/WebCore/html/parser/HTMLToken.h @@ -398,27 +398,7 @@ public: case HTMLToken::EndTag: { m_selfClosing = token.selfClosing(); m_name = AtomicString(token.name().data(), token.name().size()); - const HTMLToken::AttributeList& attributes = token.attributes(); - for (HTMLToken::AttributeList::const_iterator iter = attributes.begin(); - iter != attributes.end(); ++iter) { - if (!iter->m_name.isEmpty()) { - String name(iter->m_name.data(), iter->m_name.size()); - String value(iter->m_value.data(), iter->m_value.size()); - ASSERT(iter->m_nameRange.m_start); - ASSERT(iter->m_nameRange.m_end); - ASSERT(iter->m_valueRange.m_start); - ASSERT(iter->m_valueRange.m_end); - RefPtr<Attribute> mappedAttribute = Attribute::createMapped(name, value); - if (!m_attributes) { - m_attributes = NamedNodeMap::create(); - // Reserving capacity here improves the parser - // benchmark. It might be worth experimenting with - // the constant to see where the optimal point is. - m_attributes->reserveInitialCapacity(10); - } - m_attributes->insertAttribute(mappedAttribute.release(), false); - } - } + initializeAttributes(token.attributes()); break; } case HTMLToken::Comment: @@ -513,6 +493,8 @@ public: private: HTMLToken::Type m_type; + void initializeAttributes(const HTMLToken::AttributeList& attributes); + bool usesName() const { return m_type == HTMLToken::StartTag || m_type == HTMLToken::EndTag || m_type == HTMLToken::DOCTYPE; @@ -548,6 +530,30 @@ private: RefPtr<NamedNodeMap> m_attributes; }; +inline void AtomicHTMLToken::initializeAttributes(const HTMLToken::AttributeList& attributes) +{ + size_t size = attributes.size(); + if (!size) + return; + + m_attributes = NamedNodeMap::create(); + m_attributes->reserveInitialCapacity(size); + for (size_t i = 0; i < size; ++i) { + const HTMLToken::Attribute& attribute = attributes[i]; + if (attribute.m_name.isEmpty()) + continue; + + ASSERT(attribute.m_nameRange.m_start); + ASSERT(attribute.m_nameRange.m_end); + ASSERT(attribute.m_valueRange.m_start); + ASSERT(attribute.m_valueRange.m_end); + + String name(attribute.m_name.data(), attribute.m_name.size()); + String value(attribute.m_value.data(), attribute.m_value.size()); + m_attributes->insertAttribute(Attribute::createMapped(name, value), false); + } +} + } #endif |