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 98.0.4758.0 (#950365)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-12-16 17:35:54 -05:00
parent b76badd958
commit dfc0131516
109 changed files with 785 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libcef/browser/native/cursor_util_linux.cc
View File

@@ -5,11 +5,12 @@
#include "libcef/browser/native/cursor_util.h"
#include "ui/base/cursor/cursor_factory.h"
#include "ui/ozone/buildflags.h"
#if defined(USE_X11)
#if BUILDFLAG(OZONE_PLATFORM_X11)
#include "ui/base/x/x11_cursor.h"
#elif defined(USE_OZONE)
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
#include "ui/ozone/common/bitmap_cursor.h"
#endif
namespace cursor_util {
@@ -23,13 +24,13 @@ cef_cursor_handle_t GetPlatformCursor(ui::mojom::CursorType type) {
}
cef_cursor_handle_t ToCursorHandle(scoped_refptr<ui::PlatformCursor> cursor) {
#if defined(USE_X11)
#if BUILDFLAG(OZONE_PLATFORM_X11)
// See https://crbug.com/1029142 for background.
return static_cast<cef_cursor_handle_t>(
ui::X11Cursor::FromPlatformCursor(cursor)->xcursor());
#elif defined(USE_OZONE)
return static_cast<cef_cursor_handle_t>(
ui::BitmapCursorOzone::FromPlatformCursor(cursor)->platform_data());
ui::BitmapCursor::FromPlatformCursor(cursor)->platform_data());
#else
return 0;
#endif