Skip to content
Snippets Groups Projects
Verified Commit 5154bd18 authored by cypherpunks1's avatar cypherpunks1 Committed by Pier Angelo Vendrame
Browse files

Bug 41791: Omit the source URL when copying page contents to the clipboard

parent c40a7c76
No related branches found
No related tags found
1 merge request!1135Bug 43084: Rebased stable onto 115.15.0esr
......@@ -284,6 +284,7 @@ static nsresult CreateTransferable(
NS_ENSURE_SUCCESS(rv, rv);
}
#if !defined(BASE_BROWSER_VERSION)
// Try and get source URI of the items that are being dragged
nsIURI* uri = aDocument.GetDocumentURI();
if (uri) {
......@@ -304,6 +305,7 @@ static nsresult CreateTransferable(
NS_ENSURE_SUCCESS(rv, rv);
}
}
#endif
} else {
if (!aEncodedDocumentWithContext.mSerializationForTextUnicode.IsEmpty()) {
// Add the unicode DataFlavor to the transferable
......
......@@ -520,11 +520,13 @@ nsDataObj::nsDataObj(nsIURI* uri)
m_enumFE = new CEnumFormatEtc();
m_enumFE->AddRef();
#if !defined(BASE_BROWSER_VERSION)
if (uri) {
// A URI was obtained, so pass this through to the DataObject
// so it can create a SourceURL for CF_HTML flavour
uri->GetSpec(mSourceURL);
}
#endif
}
//-----------------------------------------------------
// destruction
......@@ -1978,6 +1980,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML,
*outPlatformHTML = nullptr;
nsDependentCString inHTMLString(inOurHTML);
#if !defined(BASE_BROWSER_VERSION)
// Do we already have mSourceURL from a drag?
if (mSourceURL.IsEmpty()) {
nsAutoString url;
......@@ -1985,6 +1988,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML,
AppendUTF16toUTF8(url, mSourceURL);
}
#endif
constexpr auto kStartHTMLPrefix = "Version:0.9\r\nStartHTML:"_ns;
constexpr auto kEndHTMLPrefix = "\r\nEndHTML:"_ns;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment