mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
24c2f2fa38
- CefURLRequest::Create is no longer supported in the renderer process (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead. - Mac platform definitions have been changed from `MACOSX` to `MAC` (see https://crbug.com/1105907) and related CMake macro names have been updated. The old `OS_MACOSX` define is still set in code and CMake for backwards compatibility. - Linux ARM build is currently broken (see https://crbug.com/1123214).
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 ef6463f78c6c..fa9020caea8d 100644
|
|
--- ui/base/x/x11_os_exchange_data_provider.cc
|
|
+++ ui/base/x/x11_os_exchange_data_provider.cc
|
|
@@ -120,7 +120,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
|