mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
a584bd187b
- Mac: Xcode 12.2 and the MacOS 11.0 SDK are now required for building. - MacOS 10.10 (Yosemite) is no longer supported (see https://crbug.com/1126056). - Flash is no longer supported (see https://www.chromium.org/flash-roadmap).
15 lines
643 B
Diff
15 lines
643 B
Diff
diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
|
|
index d76cbc9d28cf..935008dc722e 100644
|
|
--- ui/base/x/x11_os_exchange_data_provider.cc
|
|
+++ ui/base/x/x11_os_exchange_data_provider.cc
|
|
@@ -121,7 +121,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
|
|
format_map_.Insert(gfx::GetAtom(kMimeTypeMozillaURL), mem);
|
|
|
|
// Set a string fallback as well.
|
|
- SetString(spec);
|
|
+ if (!HasString())
|
|
+ SetString(spec);
|
|
|
|
// Return early if this drag already contains file contents (this implies
|
|
// that file contents must be populated before URLs). Nautilus (and possibly
|