Bug 1473029, remove the region arguments from InvokeDragSession and InvokeDragSessionWithImage, r=mstange
This commit is contained in:
@@ -312,7 +312,6 @@ NS_IMETHODIMP
|
||||
nsDragService::InvokeDragSession(nsINode *aDOMNode,
|
||||
const nsACString& aPrincipalURISpec,
|
||||
nsIArray * aArrayTransferables,
|
||||
nsIScriptableRegion * aRegion,
|
||||
uint32_t aActionType,
|
||||
nsContentPolicyType aContentPolicyType =
|
||||
nsIContentPolicy::TYPE_OTHER)
|
||||
@@ -328,7 +327,7 @@ nsDragService::InvokeDragSession(nsINode *aDOMNode,
|
||||
|
||||
return nsBaseDragService::InvokeDragSession(aDOMNode, aPrincipalURISpec,
|
||||
aArrayTransferables,
|
||||
aRegion, aActionType,
|
||||
aActionType,
|
||||
aContentPolicyType);
|
||||
}
|
||||
|
||||
@@ -351,9 +350,6 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
|
||||
if (!sourceList)
|
||||
return NS_OK;
|
||||
|
||||
// stored temporarily until the drag-begin signal has been received
|
||||
mSourceRegion = aRegion;
|
||||
|
||||
// save our action type
|
||||
GdkDragAction action = GDK_ACTION_DEFAULT;
|
||||
|
||||
@@ -396,8 +392,6 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
|
||||
1,
|
||||
&event);
|
||||
|
||||
mSourceRegion = nullptr;
|
||||
|
||||
nsresult rv;
|
||||
if (context) {
|
||||
StartDragSession();
|
||||
@@ -1723,7 +1717,7 @@ void nsDragService::SetDragIcon(GdkDragContext* aContext)
|
||||
LayoutDeviceIntRect dragRect;
|
||||
nsPresContext* pc;
|
||||
RefPtr<SourceSurface> surface;
|
||||
DrawDrag(mSourceNode, mSourceRegion, mScreenPosition,
|
||||
DrawDrag(mSourceNode, mRegion, mScreenPosition,
|
||||
&dragRect, &surface, &pc);
|
||||
if (!pc)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user