Bug 626411 - Selecting a section of URL, then clicking "Delete" stays at refresh, instead of "go"; r=roc a=blocking-final+

--HG--
extra : rebase_source : 09c7a68d030c819afe7086fe22f2c83620e881eb

editor/libeditor/text/nsPlaintextEditor.cpp

@@ -743,12 +743,12 @@ NS_IMETHODIMP nsPlaintextEditor::DeleteSelection(nsIEditor::EDirection aAction)
 
   nsresult result;
 
+  FireTrustedInputEvent trusted(this, aAction != eNone);
+
   // delete placeholder txns merge.
   nsAutoPlaceHolderBatch batch(this, nsGkAtoms::DeleteTxnName);
   nsAutoRules beginRulesSniffing(this, kOpDeleteSelection, aAction);
 
-  FireTrustedInputEvent trusted(this, aAction != eNone);
-
   // pre-process
   nsCOMPtr<nsISelection> selection;
   result = GetSelection(getter_AddRefs(selection));
@@ -1215,10 +1215,10 @@ nsPlaintextEditor::Undo(PRUint32 aCount)
   // Protect the edit rules object from dying
   nsCOMPtr<nsIEditRules> kungFuDeathGrip(mRules);
 
-  nsAutoUpdateViewBatch beginViewBatching(this);
-
   FireTrustedInputEvent trusted(this);
 
+  nsAutoUpdateViewBatch beginViewBatching(this);
+
   ForceCompositionEnd();
 
   nsAutoRules beginRulesSniffing(this, kOpUndo, nsIEditor::eNone);
@@ -1244,10 +1244,10 @@ nsPlaintextEditor::Redo(PRUint32 aCount)
   // Protect the edit rules object from dying
   nsCOMPtr<nsIEditRules> kungFuDeathGrip(mRules);
 
-  nsAutoUpdateViewBatch beginViewBatching(this);
-
   FireTrustedInputEvent trusted(this);
 
+  nsAutoUpdateViewBatch beginViewBatching(this);
+
   ForceCompositionEnd();
 
   nsAutoRules beginRulesSniffing(this, kOpRedo, nsIEditor::eNone);