Commit 779beefa authored by cypherpunks1's avatar cypherpunks1 Committed by henry
Browse files

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

parent b3997cfe

dom/base/nsCopySupport.cpp

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,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) {
@@ -308,6 +309,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

+4 −0
Original line number Diff line number Diff line
@@ -526,11 +526,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
@@ -1994,6 +1996,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;
@@ -2001,6 +2004,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;