Bug 694503 - image map doesn't get updated when map element is removed as part of container subtree, r=bz

layout/generic/nsImageFrame.cpp

@@ -204,16 +204,22 @@ nsImageFrame::CreateAccessible()
 }
 #endif
 
+void
+nsImageFrame::DisconnectMap()
+{
+  if (mImageMap) {
+    mImageMap->Destroy();
+    NS_RELEASE(mImageMap);
+  }
+}
+
 void
 nsImageFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
   // Tell our image map, if there is one, to clean up
   // This causes the nsImageMap to unregister itself as
   // a DOM listener.
-  if (mImageMap) {
-    mImageMap->Destroy();
-    NS_RELEASE(mImageMap);
-  }
+  DisconnectMap();
 
   // set the frame to null so we don't send messages to a dead object.
   if (mListener) {