Simpler return value of HashTable::add/HashMap:add and others

Source/core/rendering/FastTextAutosizer.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 261 matching lines @@
     AtomicString fingerprint = m_fingerprintMapper.get(block);
     if (fingerprint.isNull())
         return 0;
 
     BlockSet* roots = &m_fingerprintMapper.getBlocks(fingerprint);
     if (roots->size() < 2)
         return 0;
 
     SuperclusterMap::AddResult addResult = m_superclusters.add(fingerprint, PassOwnPtr<Supercluster>());
     if (!addResult.isNewEntry)
-        return addResult.iterator->value.get();
+        return addResult.storedValue->value.get();
 
     Supercluster* supercluster = new Supercluster(roots);
-    addResult.iterator->value = adoptPtr(supercluster);
+    addResult.storedValue->value = adoptPtr(supercluster);
     return supercluster;
 }
 
 const RenderBlock* FastTextAutosizer::deepestCommonAncestor(BlockSet& blocks)
 {
     // Find the lowest common ancestor of blocks.
     // Note: this could be improved to not be O(b*h) for b blocks and tree height h.
     HashCountedSet<const RenderBlock*> ancestors;
     for (BlockSet::iterator it = blocks.begin(); it != blocks.end(); ++it) {
         for (const RenderBlock* block = (*it); block; block = block->containingBlock()) {
@@ skipping 199 matching lines @@
     ASSERT(!m_clusterStack.isEmpty());
     return m_clusterStack.last().get();
 }
 
 void FastTextAutosizer::FingerprintMapper::add(const RenderBlock* block, AtomicString fingerprint)
 {
     m_fingerprints.set(block, fingerprint);
 
     ReverseFingerprintMap::AddResult addResult = m_blocksForFingerprint.add(fingerprint, PassOwnPtr<BlockSet>());
     if (addResult.isNewEntry)
-        addResult.iterator->value = adoptPtr(new BlockSet);
-    addResult.iterator->value->add(block);
+        addResult.storedValue->value = adoptPtr(new BlockSet);
+    addResult.storedValue->value->add(block);
 }
 
 void FastTextAutosizer::FingerprintMapper::remove(const RenderBlock* block)
 {
     AtomicString fingerprint = m_fingerprints.take(block);
     if (fingerprint.isNull())
         return;
 
     ReverseFingerprintMap::iterator blocksIter = m_blocksForFingerprint.find(fingerprint);
     BlockSet& blocks = *blocksIter->value;
@@ skipping 13 matching lines @@
 }
 
 RenderObject* FastTextAutosizer::nextChildSkippingChildrenOfBlocks(const RenderObject* current, const RenderObject* stayWithin)
 {
     if (current == stayWithin || !current->isRenderBlock())
         return current->nextInPreOrder(stayWithin);
     return current->nextInPreOrderAfterChildren(stayWithin);
 }
 
 } // namespace WebCore