Fix for 56136 -- when reloading the editor page because of a charset change, call the predestroy notification, so that listeners (e.g. the UI update timer) can tear themselves down. r=akkana, sr=kin

editor/base/nsEditorShell.cpp

@@ -349,6 +349,12 @@ nsEditorShell::ResetEditingState()
   // one URL into the content area. Let's tear down what we have, and rip 'em a
   // new one.
 
+  nsCOMPtr<nsIEditor> editor(do_QueryInterface(mEditor));
+  if (editor)
+  {
+    editor->PreDestroy();
+  }
+
   // Unload existing stylesheets
   nsCOMPtr<nsIEditorStyleSheets> styleSheets = do_QueryInterface(mEditor);
   if (styleSheets)

editor/composer/src/nsEditorShell.cpp

@@ -349,6 +349,12 @@ nsEditorShell::ResetEditingState()
   // one URL into the content area. Let's tear down what we have, and rip 'em a
   // new one.
 
+  nsCOMPtr<nsIEditor> editor(do_QueryInterface(mEditor));
+  if (editor)
+  {
+    editor->PreDestroy();
+  }
+
   // Unload existing stylesheets
   nsCOMPtr<nsIEditorStyleSheets> styleSheets = do_QueryInterface(mEditor);
   if (styleSheets)