Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 8 insertions, 2 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp b/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
index 7b958bf..02688c5 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp
@@ -51,13 +51,13 @@ typedef HashMap<RefPtr<HistoryItem>, uint64_t> HistoryItemToIDMap;
 
 static IDToHistoryItemMap& idToHistoryItemMap()
 {
-    static IDToHistoryItemMap map;
+    DEFINE_STATIC_LOCAL(IDToHistoryItemMap, map, ());
     return map;
 } 
 
 static HistoryItemToIDMap& historyItemToIDMap()
 {
-    static HistoryItemToIDMap map;
+    DEFINE_STATIC_LOCAL(HistoryItemToIDMap, map, ());
     return map;
 } 
 
@@ -118,6 +118,12 @@ HistoryItem* WebBackForwardListProxy::itemForID(uint64_t itemID)
     return idToHistoryItemMap().get(itemID).get();
 }
 
+uint64_t WebBackForwardListProxy::idForItem(HistoryItem* item)
+{
+    ASSERT(item);
+    return historyItemToIDMap().get(item);
+}
+
 void WebBackForwardListProxy::removeItem(uint64_t itemID)
 {
     IDToHistoryItemMap::iterator it = idToHistoryItemMap().find(itemID);