Changeset 175949 in webkit

Timestamp:

Nov 11, 2014, 9:40:07 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175602 - Avoid double hash table lookup in SpaceSplitStringData::create()
​https://bugs.webkit.org/show_bug.cgi?id=138396

Reviewed by Ryosuke Niwa.

Avoid double hash table lookup in SpaceSplitStringData::create() by
calling HashMap::add() and using the AddResult, instead of calling
HashMap::get() then HashMap::add().

No new tests, no behavior change.

• dom/SpaceSplitString.cpp:

(WebCore::SpaceSplitStringData::create):

Location:

releases/WebKitGTK/webkit-2.6/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/SpaceSplitString.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-04  Chris Dumez  <cdumez@apple.com>
+
+        Avoid double hash table lookup in SpaceSplitStringData::create()
+        https://bugs.webkit.org/show_bug.cgi?id=138396
+
+        Reviewed by Ryosuke Niwa.
+
+        Avoid double hash table lookup in SpaceSplitStringData::create() by
+        calling HashMap::add() and using the AddResult, instead of calling
+        HashMap::get() then HashMap::add().
+
+        No new tests, no behavior change.
+
+        * dom/SpaceSplitString.cpp:
+        (WebCore::SpaceSplitStringData::create):
+
 2014-11-04  Andreas Kling  <akling@apple.com>
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/dom/SpaceSplitString.cpp

@@ -193 +193 @@
     ASSERT(!keyString.isNull());
 
-    auto& table = spaceSplitStringTable();
-    if (SpaceSplitStringData* data = table.get(keyString))
-        return data;
+    auto addResult = spaceSplitStringTable().add(keyString, nullptr);
+    if (!addResult.isNewEntry)
+        return addResult.iterator->value;
 
     // Nothing in the cache? Let's create a new SpaceSplitStringData if the input has something useful.
@@ -207 +207 @@
 
     RefPtr<SpaceSplitStringData> spaceSplitStringData = create(keyString, tokenCount);
-    table.add(keyString, spaceSplitStringData.get());
+    addResult.iterator->value = spaceSplitStringData.get();
     return spaceSplitStringData.release();
 }