Move parts of core/dom to C++11

Source/core/dom/PresentationAttributeStyle.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "platform/Timer.h"
 #include "wtf/HashFunctions.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/CString.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 struct PresentationAttributeCacheKey {
-    PresentationAttributeCacheKey() : tagName(0) { }
+    PresentationAttributeCacheKey() : tagName(nullptr) { }
     StringImpl* tagName;
     Vector<std::pair<StringImpl*, AtomicString>, 3> attributesAndValues;
 };
 
 static bool operator!=(const PresentationAttributeCacheKey& a, const PresentationAttributeCacheKey& b)
 {
     if (a.tagName != b.tagName)
         return true;
     return a.attributesAndValues != b.attributesAndValues;
 }
 
 struct PresentationAttributeCacheEntry final : public NoBaseWillBeGarbageCollectedFinalized<PresentationAttributeCacheEntry> {
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     void trace(Visitor* visitor) { visitor->trace(value); }
 
     PresentationAttributeCacheKey key;
     RefPtrWillBeMember<StylePropertySet> value;
 };
 
-typedef WillBeHeapHashMap<unsigned, OwnPtrWillBeMember<PresentationAttributeCacheEntry>, AlreadyHashed> PresentationAttributeCache;
+using PresentationAttributeCache = WillBeHeapHashMap<unsigned, OwnPtrWillBeMember<PresentationAttributeCacheEntry>, AlreadyHashed>;
 static PresentationAttributeCache& presentationAttributeCache()
 {
     DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<PresentationAttributeCache>, cache, (adoptPtrWillBeNoop(new PresentationAttributeCache())));
     return *cache;
 }
 
 class PresentationAttributeCacheCleaner {
     WTF_MAKE_NONCOPYABLE(PresentationAttributeCacheCleaner); WTF_MAKE_FAST_ALLOCATED;
 public:
     PresentationAttributeCacheCleaner()
@@ skipping 40 matching lines @@
 
 static void makePresentationAttributeCacheKey(Element& element, PresentationAttributeCacheKey& result)
 {
     // FIXME: Enable for SVG.
     if (!element.isHTMLElement())
         return;
     // Interpretation of the size attributes on <input> depends on the type attribute.
     if (isHTMLInputElement(element))
         return;
     AttributeCollection attributes = element.attributesWithoutUpdate();
-    AttributeCollection::iterator end = attributes.end();
-    for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it) {
-        if (!element.isPresentationAttribute(it->name()))
+    for (const Attribute& attr : attributes) {
+        if (!element.isPresentationAttribute(attr.name()))
             continue;
-        if (!it->namespaceURI().isNull())
+        if (!attr.namespaceURI().isNull())
             return;
         // FIXME: Background URL may depend on the base URL and can't be shared. Disallow caching.
-        if (it->name() == backgroundAttr)
+        if (attr.name() == backgroundAttr)
             return;
-        result.attributesAndValues.append(std::make_pair(it->localName().impl(), it->value()));
+        result.attributesAndValues.append(std::make_pair(attr.localName().impl(), attr.value()));
     }
     if (result.attributesAndValues.isEmpty())
         return;
     // Attribute order doesn't matter. Sort for easy equality comparison.
     std::sort(result.attributesAndValues.begin(), result.attributesAndValues.end(), attributeNameSort);
     // The cache key is non-null when the tagName is set.
     result.tagName = element.localName().impl();
 }
 
 static unsigned computePresentationAttributeCacheHash(const PresentationAttributeCacheKey& key)
@@ skipping 15 matching lines @@
     makePresentationAttributeCacheKey(element, cacheKey);
 
     unsigned cacheHash = computePresentationAttributeCacheHash(cacheKey);
 
     PresentationAttributeCache::ValueType* cacheValue;
     if (cacheHash) {
         cacheValue = presentationAttributeCache().add(cacheHash, nullptr).storedValue;
         if (cacheValue->value && cacheValue->value->key != cacheKey)
             cacheHash = 0;
     } else {
-        cacheValue = 0;
+        cacheValue = nullptr;
     }
 
     RefPtrWillBeRawPtr<StylePropertySet> style = nullptr;
     if (cacheHash && cacheValue->value) {
         style = cacheValue->value->value;
         cacheCleaner.didHitPresentationAttributeCache();
     } else {
         style = MutableStylePropertySet::create(element.isSVGElement() ? SVGAttributeMode : HTMLAttributeMode);
         AttributeCollection attributes = element.attributesWithoutUpdate();
-        AttributeCollection::iterator end = attributes.end();
-        for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it)
-            element.collectStyleForPresentationAttribute(it->name(), it->value(), toMutableStylePropertySet(style));
+        for (const Attribute& attr : attributes)
+            element.collectStyleForPresentationAttribute(attr.name(), attr.value(), toMutableStylePropertySet(style));
     }
 
     if (!cacheHash || cacheValue->value)
         return style.release();
 
     OwnPtrWillBeRawPtr<PresentationAttributeCacheEntry> newEntry = adoptPtrWillBeNoop(new PresentationAttributeCacheEntry);
     newEntry->key = cacheKey;
     newEntry->value = style;
 
     static const unsigned presentationAttributeCacheMaximumSize = 4096;
     if (presentationAttributeCache().size() > presentationAttributeCacheMaximumSize) {
         // FIXME: Discarding the entire cache when it gets too big is probably bad
         // since it creates a perf "cliff". Perhaps we should use an LRU?
         presentationAttributeCache().clear();
         presentationAttributeCache().set(cacheHash, newEntry.release());
     } else {
         cacheValue->value = newEntry.release();
     }
 
     return style.release();
 }
 
 } // namespace blink