mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 100.0.4896.0 (#972766)
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
#include "include/views/cef_overlay_controller.h"
|
||||
#include "include/views/cef_view.h"
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
#include "ui/views/view_observer.h"
|
||||
#include "ui/views/widget/widget_delegate.h"
|
||||
|
||||
|
@@ -59,8 +59,8 @@ class UserData : public base::SupportsUserData::Data {
|
||||
// gain a ref-counted reference to the CefView and the CefView will keep an
|
||||
// unowned reference to the views::View. Destruction of the views::View will
|
||||
// release the ref-counted reference to the CefView.
|
||||
static std::unique_ptr<views::View> PassOwnership(CefRefPtr<CefView> cef_view)
|
||||
WARN_UNUSED_RESULT {
|
||||
[[nodiscard]] static std::unique_ptr<views::View> PassOwnership(
|
||||
CefRefPtr<CefView> cef_view) {
|
||||
DCHECK(cef_view->IsValid());
|
||||
DCHECK(!cef_view->IsAttached());
|
||||
|
||||
|
@@ -61,8 +61,8 @@ views::View* GetFor(CefRefPtr<CefView> view);
|
||||
// views::View will keep a ref-counted reference to |view|, and |view| will keep
|
||||
// an un-owned reference to the views::View. These references will reset when
|
||||
// the views::View object is deleted or when ResumeOwnership() is called.
|
||||
std::unique_ptr<views::View> PassOwnership(CefRefPtr<CefView> view)
|
||||
WARN_UNUSED_RESULT;
|
||||
[[nodiscard]] std::unique_ptr<views::View> PassOwnership(
|
||||
CefRefPtr<CefView> view);
|
||||
|
||||
// Causes |view| to resume ownership of the views::View object. Should be called
|
||||
// after removing the views::View object from its previous parent.
|
||||
|
@@ -671,6 +671,5 @@ void CefWindowImpl::CreateWidget() {
|
||||
// The Widget and root View are owned by the native window. Therefore don't
|
||||
// keep an owned reference.
|
||||
std::unique_ptr<views::View> view_ptr = view_util::PassOwnership(this);
|
||||
views::View* view = view_ptr.release();
|
||||
ALLOW_UNUSED_LOCAL(view);
|
||||
[[maybe_unused]] views::View* view = view_ptr.release();
|
||||
}
|
||||
|
Reference in New Issue
Block a user