mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 09:37:37 +01:00
c6111d5947
- Improve ordering of CefLoadHandler callbacks. OnLoadingStateChange will be called before and after all calls to OnLoadStart and OnLoadEnd. OnLoadStart/OnLoadEnd calls will occur as matching pairs (see http://crbug.com/539952#c2). - Remove the |requesting_url| argument to CefGeolocationHandler:: OnCancelGeolocationPermission. Clients can use the |request_id| argument to track this information themselves. - Fix a crash when loading the PDF extension in multiple browsers with a custom CefRequestContext (issue #1757).
15 lines
623 B
Diff
15 lines
623 B
Diff
diff --git os_exchange_data_provider_aurax11.cc os_exchange_data_provider_aurax11.cc
|
|
index e2bba47..ea698fa3 100644
|
|
--- os_exchange_data_provider_aurax11.cc
|
|
+++ os_exchange_data_provider_aurax11.cc
|
|
@@ -159,7 +159,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,
|
|
format_map_.Insert(atom_cache_.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
|