bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 85.0.4183.0 (#782793)

Browse Source 
- Windows: 10.0.19041 SDK is now required.
- macOS: 10.15.1 SDK (at least Xcode 11.2) is now required.
- Remove CefMediaSource::IsValid and CefMediaSink::IsValid which would
  always return true.
This commit is contained in:
Marshall Greenblatt
2020-07-08 13:23:29 -04:00
parent 03c9156c80
commit 6573df6cc3
146 changed files with 726 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/common/drag_data_impl.cc
View File

@@ -81,12 +81,12 @@ CefString CefDragDataImpl::GetLinkMetadata() {
CefString CefDragDataImpl::GetFragmentText() {
base::AutoLock lock_scope(lock_);
return data_.text.is_null() ? CefString() : CefString(data_.text.string());
return data_.text ? CefString(*data_.text) : CefString();
}
CefString CefDragDataImpl::GetFragmentHtml() {
base::AutoLock lock_scope(lock_);
return data_.html.is_null() ? CefString() : CefString(data_.html.string());
return data_.html ? CefString(*data_.html) : CefString();
}
CefString CefDragDataImpl::GetFragmentBaseURL() {
@@ -96,8 +96,7 @@ CefString CefDragDataImpl::GetFragmentBaseURL() {
CefString CefDragDataImpl::GetFileName() {
base::AutoLock lock_scope(lock_);
base::Optional<base::FilePath> filename =
data_.GetSafeFilenameForImageFileContents();
auto filename = data_.GetSafeFilenameForImageFileContents();
return filename ? CefString(filename->value()) : CefString();
}
@@ -148,13 +147,13 @@ void CefDragDataImpl::SetLinkMetadata(const CefString& data) {
void CefDragDataImpl::SetFragmentText(const CefString& text) {
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
data_.text = base::NullableString16(text.ToString16(), false);
data_.text = text.ToString16();
}
void CefDragDataImpl::SetFragmentHtml(const CefString& fragment) {
base::AutoLock lock_scope(lock_);
CHECK_READONLY_RETURN_VOID();
data_.html = base::NullableString16(fragment.ToString16(), false);
data_.html = fragment.ToString16();
}
void CefDragDataImpl::SetFragmentBaseURL(const CefString& fragment) {