Make calls to AtomicString(const String&) explicit in dom/

Source/core/dom/NamedFlowCollection.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * 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 notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 16 matching lines @@
  * SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/NamedFlowCollection.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "core/dom/DOMNamedFlowCollection.h"
 #include "core/dom/Document.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "wtf/text/AtomicString.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 NamedFlowCollection::NamedFlowCollection(Document* document)
     : DocumentLifecycleObserver(document)
 {
     ASSERT(RuntimeEnabledFeatures::cssRegionsEnabled());
 }
 
 Vector<RefPtr<NamedFlow> > NamedFlowCollection::namedFlows()
 {
     Vector<RefPtr<NamedFlow> > namedFlows;
 
     for (NamedFlowSet::iterator it = m_namedFlows.begin(); it != m_namedFlows.end(); ++it) {
         if ((*it)->flowState() == NamedFlow::FlowStateNull)
             continue;
 
         namedFlows.append(RefPtr<NamedFlow>(*it));
     }
 
     return namedFlows;
 }
 
-NamedFlow* NamedFlowCollection::flowByName(const String& flowName)
+// Takes an AtomicString in argument because RenderStyle::flowThread() returns an AtomicString.
+NamedFlow* NamedFlowCollection::flowByName(const AtomicString& flowName)
 {
     NamedFlowSet::iterator it = m_namedFlows.find<NamedFlowHashTranslator>(flowName);
     if (it == m_namedFlows.end() || (*it)->flowState() == NamedFlow::FlowStateNull)
         return 0;
 
     return *it;
 }
 
-PassRefPtr<NamedFlow> NamedFlowCollection::ensureFlowWithName(const String& flowName)
+// Takes an AtomicString in argument because RenderStyle::flowThread() returns an AtomicString.

[eseidel, 2013/12/30 22:31:11]

It would be fine for this to take a String in that case.  This function isn't
asking for an atomized name, only happens to be given one.

When you grab a String or StringImpl out of an AtomicString the underlying impl
is still atomized and caries the isAtomic bit, so converting back into an
AtomicString is cheap.

[Inactive, 2013/12/30 22:39:34]

Yes, I understand that. However, in this particular case, knowing this is an
AtomicString allows us to use AtomicStringHash instead of StringHash (see
changes below in the same file). I am assuming AtomicStringHash is faster?

+PassRefPtr<NamedFlow> NamedFlowCollection::ensureFlowWithName(const AtomicString& flowName)
 {
     NamedFlowSet::iterator it = m_namedFlows.find<NamedFlowHashTranslator>(flowName);
     if (it != m_namedFlows.end()) {
         NamedFlow* namedFlow = *it;
         ASSERT(namedFlow->flowState() == NamedFlow::FlowStateNull);
 
         return namedFlow;
     }
 
     RefPtr<NamedFlow> newFlow = NamedFlow::create(this, flowName);
@@ skipping 28 matching lines @@
     Vector<NamedFlow*> createdFlows;
     for (NamedFlowSet::iterator it = m_namedFlows.begin(); it != m_namedFlows.end(); ++it)
         if ((*it)->flowState() == NamedFlow::FlowStateCreated)
             createdFlows.append(*it);
     return DOMNamedFlowCollection::create(createdFlows);
 }
 
 // The HashFunctions object used by the HashSet to compare between NamedFlows.
 // It is safe to set safeToCompareToEmptyOrDeleted because the HashSet will never contain null pointers or deleted values.
 struct NamedFlowCollection::NamedFlowHashFunctions {
-    static unsigned hash(NamedFlow* key) { return DefaultHash<String>::Hash::hash(key->name()); }
+    static unsigned hash(NamedFlow* key) { return DefaultHash<AtomicString>::Hash::hash(key->name()); }
     static bool equal(NamedFlow* a, NamedFlow* b) { return a->name() == b->name(); }
     static const bool safeToCompareToEmptyOrDeleted = true;
 };
 
 // The HashTranslator is used to lookup a NamedFlow in the set using a name.
 struct NamedFlowCollection::NamedFlowHashTranslator {
-    static unsigned hash(const String& key) { return DefaultHash<String>::Hash::hash(key); }
-    static bool equal(NamedFlow* a, const String& b) { return a->name() == b; }
+    static unsigned hash(const AtomicString& key) { return DefaultHash<AtomicString>::Hash::hash(key); }
+    static bool equal(NamedFlow* a, const AtomicString& b) { return a->name() == b; }
 };
 
 } // namespace WebCore