Make Element::attributes() less error-prone and simplify call sites

Source/core/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 736 matching lines @@
         fragment->parseXML(markup, 0, AllowScriptingContent);
 
     Element* parsedElement = fragment->firstChild() && fragment->firstChild()->isElementNode() ? toElement(fragment->firstChild()) : 0;
     if (!parsedElement) {
         *errorString = "Could not parse value as attributes";
         return;
     }
 
     String caseAdjustedName = name ? (shouldIgnoreCase ? name->lower() : *name) : String();
 
-    if (!parsedElement->hasAttributes() && name) {
+    AttributeCollection attributes = parsedElement->attributes();
+    if (attributes.isEmpty() && name) {
         m_domEditor->removeAttribute(element, caseAdjustedName, errorString);
         return;
     }
 
     bool foundOriginalAttribute = false;
-    AttributeCollection attributes = parsedElement->attributes();
     AttributeCollection::const_iterator end = attributes.end();
     for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it) {
         // Add attribute pair
         String attributeName = it->name().toString();
         if (shouldIgnoreCase)
             attributeName = attributeName.lower();
         foundOriginalAttribute |= name && attributeName == caseAdjustedName;
         if (!m_domEditor->setAttribute(element, attributeName, it->value(), errorString))
             return;
     }
@@ skipping 235 matching lines @@
             case Node::ELEMENT_NODE: {
                 if ((!startTagFound && !endTagFound && (node->nodeName().findIgnoringCase(tagNameQuery) != kNotFound))
                     || (startTagFound && endTagFound && equalIgnoringCase(node->nodeName(), tagNameQuery))
                     || (startTagFound && !endTagFound && node->nodeName().startsWith(tagNameQuery, false))
                     || (!startTagFound && endTagFound && node->nodeName().endsWith(tagNameQuery, false))) {
                     resultCollector.add(node);
                     break;
                 }
                 // Go through all attributes and serialize them.
                 const Element* element = toElement(node);
-                if (!element->hasAttributes())
-                    break;
-
                 AttributeCollection attributes = element->attributes();
                 AttributeCollection::const_iterator end = attributes.end();
                 for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it) {
                     // Add attribute pair
                     if (it->localName().find(whitespaceTrimmedQuery, 0, false) != kNotFound) {
                         resultCollector.add(node);
                         break;
                     }
                     size_t foundPosition = it->value().find(attributeQuery, 0, false);
                     if (foundPosition != kNotFound) {
@@ skipping 605 matching lines @@
             value->setChildren(children.release());
     }
 
     return value.release();
 }
 
 PassRefPtr<TypeBuilder::Array<String> > InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
 {
     RefPtr<TypeBuilder::Array<String> > attributesValue = TypeBuilder::Array<String>::create();
     // Go through all attributes and serialize them.
-    if (!element->hasAttributes())
-        return attributesValue.release();
     AttributeCollection attributes = element->attributes();
     AttributeCollection::const_iterator end = attributes.end();
     for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it) {
         // Add attribute pair
         attributesValue->addItem(it->name().toString());
         attributesValue->addItem(it->value());
     }
     return attributesValue.release();
 }
 
@@ skipping 504 matching lines @@
     visitor->trace(m_searchResults);
 #endif
     visitor->trace(m_history);
     visitor->trace(m_domEditor);
     visitor->trace(m_listener);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink