richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser
Commits:
- 
5b4fa6e2
by cypherpunks1 at 2023-07-12T14:27:48+00:00
2 changed files:
Changes:
| ... | ... | @@ -284,6 +284,7 @@ static nsresult CreateTransferable( | 
| 284 | 284 |        NS_ENSURE_SUCCESS(rv, rv);
 | 
| 285 | 285 |      }
 | 
| 286 | 286 | |
| 287 | +#if !defined(BASE_BROWSER_VERSION)
 | |
| 287 | 288 |      // Try and get source URI of the items that are being dragged
 | 
| 288 | 289 |      nsIURI* uri = aDocument.GetDocumentURI();
 | 
| 289 | 290 |      if (uri) {
 | 
| ... | ... | @@ -304,6 +305,7 @@ static nsresult CreateTransferable( | 
| 304 | 305 |          NS_ENSURE_SUCCESS(rv, rv);
 | 
| 305 | 306 |        }
 | 
| 306 | 307 |      }
 | 
| 308 | +#endif
 | |
| 307 | 309 |    } else {
 | 
| 308 | 310 |      if (!aEncodedDocumentWithContext.mSerializationForTextUnicode.IsEmpty()) {
 | 
| 309 | 311 |        // Add the unicode DataFlavor to the transferable
 | 
| ... | ... | @@ -520,11 +520,13 @@ nsDataObj::nsDataObj(nsIURI* uri) | 
| 520 | 520 |    m_enumFE = new CEnumFormatEtc();
 | 
| 521 | 521 |    m_enumFE->AddRef();
 | 
| 522 | 522 | |
| 523 | +#if !defined(BASE_BROWSER_VERSION)
 | |
| 523 | 524 |    if (uri) {
 | 
| 524 | 525 |      // A URI was obtained, so pass this through to the DataObject
 | 
| 525 | 526 |      // so it can create a SourceURL for CF_HTML flavour
 | 
| 526 | 527 |      uri->GetSpec(mSourceURL);
 | 
| 527 | 528 |    }
 | 
| 529 | +#endif
 | |
| 528 | 530 |  }
 | 
| 529 | 531 |  //-----------------------------------------------------
 | 
| 530 | 532 |  // destruction
 | 
| ... | ... | @@ -1978,6 +1980,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, | 
| 1978 | 1980 |    *outPlatformHTML = nullptr;
 | 
| 1979 | 1981 |    nsDependentCString inHTMLString(inOurHTML);
 | 
| 1980 | 1982 | |
| 1983 | +#if !defined(BASE_BROWSER_VERSION)
 | |
| 1981 | 1984 |    // Do we already have mSourceURL from a drag?
 | 
| 1982 | 1985 |    if (mSourceURL.IsEmpty()) {
 | 
| 1983 | 1986 |      nsAutoString url;
 | 
| ... | ... | @@ -1985,6 +1988,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, | 
| 1985 | 1988 | |
| 1986 | 1989 |      AppendUTF16toUTF8(url, mSourceURL);
 | 
| 1987 | 1990 |    }
 | 
| 1991 | +#endif
 | |
| 1988 | 1992 | |
| 1989 | 1993 |    constexpr auto kStartHTMLPrefix = "Version:0.9\r\nStartHTML:"_ns;
 | 
| 1990 | 1994 |    constexpr auto kEndHTMLPrefix = "\r\nEndHTML:"_ns;
 |