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

Source/WebCore/inspector/InspectorPageAgent.cpp

 /*
  * Copyright (C) 2011 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 540 matching lines @@
      m_frontend->loadEventFired(currentTime());
 }
 
 void InspectorPageAgent::frameNavigated(DocumentLoader* loader)
 {
     m_frontend->frameNavigated(buildObjectForFrame(loader->frame()), loaderId(loader));
 }
 
 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()
 {
     return m_page->mainFrame();
 }
 
 Frame* InspectorPageAgent::frameForId(const String& frameId)
 {
     return frameId.isEmpty() ? 0 : m_identifierToFrame.get(frameId);
@@ skipping 17 matching lines @@
     if (!loader)
         return "";
     String identifier = m_loaderToIdentifier.get(loader);
     if (identifier.isNull()) {
         identifier = IdentifiersFactory::createIdentifier();
         m_loaderToIdentifier.set(loader, identifier);
     }
     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);
     if (iterator != m_loaderToIdentifier.end())
         m_loaderToIdentifier.remove(iterator);
 }
 
 PassRefPtr<InspectorObject> InspectorPageAgent::buildObjectForFrame(Frame* frame)
 {
     RefPtr<InspectorObject> frameObject = InspectorObject::create();
@@ skipping 39 matching lines @@
             result->setArray("childFrames", childrenArray);
         }
         childrenArray->pushObject(buildObjectForFrameTree(child));
     }
     return result;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)