Bug 977950. Fix dragging of text to work again. r=smaug

This commit is contained in:
Boris Zbarsky 2014-02-28 08:57:13 -05:00
parent 87db9c0f0f
commit 40e78a51ea
3 changed files with 3 additions and 4 deletions

View File

@ -320,7 +320,7 @@ NS_IMETHODIMP
DataTransfer::GetFiles(nsIDOMFileList** aFileList) DataTransfer::GetFiles(nsIDOMFileList** aFileList)
{ {
ErrorResult rv; ErrorResult rv;
*aFileList = GetFiles(rv); NS_IF_ADDREF(*aFileList = GetFiles(rv));
return rv.ErrorCode(); return rv.ErrorCode();
} }

View File

@ -87,7 +87,6 @@ DragEvent::InitDragEvent(const nsAString& aType,
nsIDOMDataTransfer* aDataTransfer) nsIDOMDataTransfer* aDataTransfer)
{ {
nsCOMPtr<DataTransfer> dataTransfer = do_QueryInterface(aDataTransfer); nsCOMPtr<DataTransfer> dataTransfer = do_QueryInterface(aDataTransfer);
NS_ENSURE_ARG(dataTransfer);
nsresult rv = nsresult rv =
MouseEvent::InitMouseEvent(aType, aCanBubble, aCancelable, aView, aDetail, MouseEvent::InitMouseEvent(aType, aCanBubble, aCancelable, aView, aDetail,

View File

@ -2337,9 +2337,9 @@ nsEventStateManager::DoDefaultDragStart(nsPresContext* aPresContext,
// target of the mouse event. If one wasn't set in the // target of the mouse event. If one wasn't set in the
// aDataTransfer during the event handler, just use the original // aDataTransfer during the event handler, just use the original
// target instead. // target instead.
nsCOMPtr<Element> dragTarget = aDataTransfer->GetDragTarget(); nsCOMPtr<nsIContent> dragTarget = aDataTransfer->GetDragTarget();
if (!dragTarget) { if (!dragTarget) {
dragTarget = do_QueryInterface(aDragTarget); dragTarget = aDragTarget;
if (!dragTarget) if (!dragTarget)
return false; return false;
} }