mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 10:06:28 +01:00
74db00fc89
- Linux ARM builds require use_vaapi=false (see https://crbug.com/1185348) - Windows official builds require use_thin_lto=false (see https://crbug.com/1177001)
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 78d2b362c2d6..93cff0224ce1 100644
|
|
--- ui/base/x/x11_os_exchange_data_provider.cc
|
|
+++ ui/base/x/x11_os_exchange_data_provider.cc
|
|
@@ -122,7 +122,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,
|
|
format_map_.Insert(x11::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
|