mozilla-central: changeset 218174:05ef711f1e133fac24f5b56dd0d53f5c680c62f6

author	Mats Palmgren <mats@mozilla.com>
	Mon, 01 Dec 2014 15:55:16 +0000
changeset 218174	05ef711f1e133fac24f5b56dd0d53f5c680c62f6
parent 218173	fdc27ab62b4f67fbe31dd6ca446e425a1de121f3
child 218175	265e01c7ff55061403da9877f84499b33df34587
push id	27919
push user	philringnalda@gmail.com
push date	Tue, 02 Dec 2014 03:07:26 +0000
treeherder	mozilla-central@265e01c7ff55 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	roc
bugs	1105184
milestone	37.0a1
first release with	nightly linux32 22ad8a162cf3 / 37.0a1 / 20141202030201 / files nightly linux64 22ad8a162cf3 / 37.0a1 / 20141202030201 / files nightly mac 22ad8a162cf3 / 37.0a1 / 20141202030201 / files nightly win32 22ad8a162cf3 / 37.0a1 / 20141202030201 / files nightly win64 22ad8a162cf3 / 37.0a1 / 20141202030201 / files
last release without	nightly linux32 af5fc587f98b / 37.0a1 / 20141201030207 / files nightly linux64 af5fc587f98b / 37.0a1 / 20141201030207 / files nightly mac af5fc587f98b / 37.0a1 / 20141201030207 / files nightly win32 af5fc587f98b / 37.0a1 / 20141201030207 / files nightly win64 af5fc587f98b / 37.0a1 / 20141201030207 / files

--- a/editor/libeditor/nsEditorEventListener.cpp
+++ b/editor/libeditor/nsEditorEventListener.cpp
@@ -808,16 +808,20 @@ nsEditorEventListener::DragEnter(nsIDOMD
 
   nsCOMPtr<nsIPresShell> presShell = GetPresShell();
   NS_ENSURE_TRUE(presShell, NS_OK);
 
   if (!mCaret) {
     mCaret = new nsCaret();
     mCaret->Init(presShell);
     mCaret->SetCaretReadOnly(true);
+    // This is to avoid the requirement that the Selection is Collapsed which
+    // it can't be when dragging a selection in the same shell.
+    // See nsCaret::IsVisible().
+    mCaret->SetVisibilityDuringSelection(true);
   }
 
   presShell->SetCaret(mCaret);
 
   return DragOver(aDragEvent);
 }
 
 nsresult