[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41791: Omit the source URL when copying page contents to the clipboard

12 Jul 2023


      richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser


Commits:
6c9e419d by cypherpunks1 at 2023-07-12T14:29:21+00:00
Bug 41791: Omit the source URL when copying page contents to the clipboard

- - - - -


2 changed files:

- dom/base/nsCopySupport.cpp
- widget/windows/nsDataObj.cpp


Changes:

=====================================
dom/base/nsCopySupport.cpp
=====================================
@@ -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


=====================================
widget/windows/nsDataObj.cpp
=====================================
@@ -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;



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c9e419d...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c9e419d...
You're receiving this email because of your account on gitlab.torproject.org.

    

richard (＠richard)

tags

participants (1)