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

Unified Diff: Source/core/dom/NamedNodeMap.cpp

Issue 436603003: Make Element::attributes() less error-prone and simplify call sites (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Take feedback into consideration Created 6 years, 4 months 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
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/dom/Node.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/NamedNodeMap.cpp
diff --git a/Source/core/dom/NamedNodeMap.cpp b/Source/core/dom/NamedNodeMap.cpp
index 91655e3a9e3351414e00b5c92721a03a9a9af86b..04c6fbcfea3d74b989ff55d120f9b64baf8de0c8 100644
--- a/Source/core/dom/NamedNodeMap.cpp
+++ b/Source/core/dom/NamedNodeMap.cpp
@@ -58,7 +58,7 @@ PassRefPtrWillBeRawPtr<Node> NamedNodeMap::getNamedItemNS(const AtomicString& na
PassRefPtrWillBeRawPtr<Node> NamedNodeMap::removeNamedItem(const AtomicString& name, ExceptionState& exceptionState)
{
- size_t index = m_element->hasAttributes() ? m_element->attributes().findIndex(name, m_element->shouldIgnoreAttributeCase()) : kNotFound;
+ size_t index = m_element->attributes().findIndex(name, m_element->shouldIgnoreAttributeCase());
if (index == kNotFound) {
exceptionState.throwDOMException(NotFoundError, "No item with name '" + name + "' was found.");
return nullptr;
@@ -68,7 +68,7 @@ PassRefPtrWillBeRawPtr<Node> NamedNodeMap::removeNamedItem(const AtomicString& n
PassRefPtrWillBeRawPtr<Node> NamedNodeMap::removeNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName, ExceptionState& exceptionState)
{
- size_t index = m_element->hasAttributes() ? m_element->attributes().findIndex(QualifiedName(nullAtom, localName, namespaceURI)) : kNotFound;
+ size_t index = m_element->attributes().findIndex(QualifiedName(nullAtom, localName, namespaceURI));
if (index == kNotFound) {
exceptionState.throwDOMException(NotFoundError, "No item with name '" + namespaceURI + "::" + localName + "' was found.");
return nullptr;
@@ -99,8 +99,6 @@ PassRefPtrWillBeRawPtr<Node> NamedNodeMap::setNamedItemNS(Node* node, ExceptionS
PassRefPtrWillBeRawPtr<Node> NamedNodeMap::item(unsigned index) const
{
- if (!m_element->hasAttributes())
- return nullptr;
AttributeCollection attributes = m_element->attributes();
if (index >= attributes.size())
return nullptr;
@@ -109,8 +107,6 @@ PassRefPtrWillBeRawPtr<Node> NamedNodeMap::item(unsigned index) const
size_t NamedNodeMap::length() const
{
- if (!m_element->hasAttributes())
- return 0;
return m_element->attributes().size();
}
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698