Merge 95093 - 2011-09-13 Pavel Feldman <pfeldman@google.com>

Source/WebCore/inspector/InspectorPageAgent.cpp

Index: Source/WebCore/inspector/InspectorPageAgent.cpp
===================================================================
--- Source/WebCore/inspector/InspectorPageAgent.cpp	(revision 96037)
+++ Source/WebCore/inspector/InspectorPageAgent.cpp	(working copy)
@@ -558,7 +558,12 @@
 
 void InspectorPageAgent::frameDetached(Frame* frame)
 {
-    m_frontend->frameDetached(frameId(frame));
+    HashMap<Frame*, String>::iterator iterator = m_frameToIdentifier.find(frame);
+    if (iterator != m_frameToIdentifier.end()) {
+        m_frontend->frameDetached(iterator->second);
+        m_identifierToFrame.remove(iterator->second);
+        m_frameToIdentifier.remove(iterator);
+    }
 }
 
 Frame* InspectorPageAgent::mainFrame()
@@ -596,15 +601,6 @@
     return identifier;
 }
 
-void InspectorPageAgent::frameDestroyed(Frame* frame)
-{
-    HashMap<Frame*, String>::iterator iterator = m_frameToIdentifier.find(frame);
-    if (iterator != m_frameToIdentifier.end()) {
-        m_identifierToFrame.remove(iterator->second);
-        m_frameToIdentifier.remove(iterator);
-    }
-}
-
 void InspectorPageAgent::loaderDetachedFromFrame(DocumentLoader* loader)
 {
     HashMap<DocumentLoader*, String>::iterator iterator = m_loaderToIdentifier.find(loader);