diff --git a/mozilla/editor/idl/nsIContentFilter.idl b/mozilla/editor/idl/nsIContentFilter.idl index 2b28fc456af..de1a8e276fb 100644 --- a/mozilla/editor/idl/nsIContentFilter.idl +++ b/mozilla/editor/idl/nsIContentFilter.idl @@ -91,6 +91,7 @@ interface nsIContentFilter : nsISupports * * @param mimeType the mimetype used for retrieving data * @param contentSourceURL location where docFragment came from + * @param sourceDocument document where content came from (can be null) * @param willDeleteSelection tells hook if selection will/should be deleted * @param docFragment fragment of node to be inserted * @param contentStartNode node under which content to be inserted begins @@ -104,6 +105,7 @@ interface nsIContentFilter : nsISupports void notifyOfInsertion(in AString mimeType, in nsIURL contentSourceURL, + in nsIDOMDocument sourceDocument, in PRBool willDeleteSelection, inout nsIDOMNode docFragment, inout nsIDOMNode contentStartNode, diff --git a/mozilla/editor/idl/nsIHTMLEditor.idl b/mozilla/editor/idl/nsIHTMLEditor.idl index 10ed62e4ccc..e96da3aa54e 100644 --- a/mozilla/editor/idl/nsIHTMLEditor.idl +++ b/mozilla/editor/idl/nsIHTMLEditor.idl @@ -258,6 +258,7 @@ interface nsIHTMLEditor : nsISupports * @param aContextStr Context of insertion * @param aInfoStr Related info to aInputString * @param aFlavor Transferable flavor, can be "" + * @param aSourceDoc document where input was dragged from (may be null) * @param aDestinationNode location for insertion (such as when dropped) * @param aDestinationOffset used with aDestNode to determine insert location * @param aDeleteSelection used with aDestNode during drag&drop @@ -268,6 +269,7 @@ interface nsIHTMLEditor : nsISupports in AString aContextStr, in AString aInfoStr, in AString aFlavor, + in nsIDOMDocument aSourceDoc, in nsIDOMNode aDestinationNode, in long aDestinationOffset, in boolean aDeleteSelection); diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.h b/mozilla/editor/libeditor/html/nsHTMLEditor.h index cceebeb21b9..c5927e28938 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.h +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.h @@ -194,6 +194,7 @@ public: const nsAString & aContextStr, const nsAString & aInfoStr, const nsAString & aFlavor, + nsIDOMDocument *aSourceDoc, nsIDOMNode *aDestinationNode, PRInt32 aDestinationOffset, PRBool aDeleteSelection); @@ -685,6 +686,7 @@ protected: NS_IMETHOD PrepareHTMLTransferable(nsITransferable **transferable, PRBool havePrivFlavor); nsresult PutDragDataInTransferable(nsITransferable **aTransferable); NS_IMETHOD InsertFromTransferable(nsITransferable *transferable, + nsIDOMDocument *aSourceDoc, const nsAString & aContextStr, const nsAString & aInfoStr, nsIDOMNode *aDestinationNode, @@ -693,6 +695,7 @@ protected: PRBool HavePrivateHTMLFlavor( nsIClipboard *clipboard ); nsresult ParseCFHTML(nsCString & aCfhtml, PRUnichar **aStuffToPaste, PRUnichar **aCfcontext); nsresult DoContentFilterCallback(const nsAString &aFlavor, + nsIDOMDocument *aSourceDoc, PRBool aWillDeleteSelection, nsIDOMNode **aFragmentAsNode, nsIDOMNode **aFragStartNode,