win/linux: Use CursorLoader for loading cursor resources (see issue #3270)
Switch to using aura::CursorLoader which knows how to load system, non-system and pak cursor resources. On Windows, cursors will be loaded via LoadCursor first if available with a fallback to pak file if necessary (like with component builds). On Linux, all non-system cursor resources will be loaded from pak file. Cursors may be loaded asynchronously resulting in the default (pointer) cursor being returned on the first request.
This commit is contained in:
Marshall Greenblatt
parent
d6b2b4b144
commit
b1cd9d1598
|
|
@ -7,12 +7,67 @@
|
|||
#include "libcef/browser/browser_host_base.h"
|
||||
|
||||
#include "content/common/cursors/webcursor.h"
|
||||
#include "content/public/browser/render_widget_host_view.h"
|
||||
#include "ui/base/cursor/cursor_factory.h"
|
||||
#include "ui/base/cursor/mojom/cursor_type.mojom.h"
|
||||
|
||||
#if defined(USE_AURA)
|
||||
#include "ui/aura/cursor/cursor_loader.h"
|
||||
#include "ui/display/display_util.h"
|
||||
#endif
|
||||
|
||||
namespace cursor_util {
|
||||
|
||||
bool OnCursorChange(CefRefPtr<CefBrowser> browser, const ui::Cursor& ui_cursor) {
|
||||
namespace {
|
||||
|
||||
#if defined(USE_AURA)
|
||||
|
||||
display::ScreenInfo GetScreenInfo(CefRefPtr<CefBrowser> browser) {
|
||||
display::ScreenInfo screen_info;
|
||||
|
||||
bool screen_info_set = false;
|
||||
if (auto web_contents =
|
||||
static_cast<CefBrowserHostBase*>(browser.get())->GetWebContents()) {
|
||||
if (auto view = web_contents->GetRenderWidgetHostView()) {
|
||||
const auto screen_infos = view->GetScreenInfos();
|
||||
if (!screen_infos.screen_infos.empty()) {
|
||||
screen_info = screen_infos.current();
|
||||
screen_info_set = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!screen_info_set) {
|
||||
display::DisplayUtil::GetDefaultScreenInfo(&screen_info);
|
||||
}
|
||||
|
||||
return screen_info;
|
||||
}
|
||||
|
||||
display::Display::Rotation OrientationAngleToRotation(
|
||||
uint16_t orientation_angle) {
|
||||
// The Display rotation and the ScreenInfo orientation are not the same
|
||||
// angle. The former is the physical display rotation while the later is the
|
||||
// rotation required by the content to be shown properly on the screen, in
|
||||
// other words, relative to the physical display.
|
||||
if (orientation_angle == 0)
|
||||
return display::Display::ROTATE_0;
|
||||
if (orientation_angle == 90)
|
||||
return display::Display::ROTATE_270;
|
||||
if (orientation_angle == 180)
|
||||
return display::Display::ROTATE_180;
|
||||
if (orientation_angle == 270)
|
||||
return display::Display::ROTATE_90;
|
||||
NOTREACHED();
|
||||
return display::Display::ROTATE_0;
|
||||
}
|
||||
|
||||
#endif // defined(USE_AURA)
|
||||
|
||||
} // namespace
|
||||
|
||||
bool OnCursorChange(CefRefPtr<CefBrowser> browser,
|
||||
const ui::Cursor& ui_cursor) {
|
||||
auto client = browser->GetHost()->GetClient();
|
||||
if (!client)
|
||||
return false;
|
||||
|
|
@ -35,19 +90,32 @@ bool OnCursorChange(CefRefPtr<CefBrowser> browser, const ui::Cursor& ui_cursor)
|
|||
bool handled = false;
|
||||
|
||||
#if defined(USE_AURA)
|
||||
CefCursorHandle platform_cursor;
|
||||
scoped_refptr<ui::PlatformCursor> image_cursor;
|
||||
aura::CursorLoader cursor_loader;
|
||||
scoped_refptr<ui::PlatformCursor> platform_cursor;
|
||||
CefCursorHandle native_cursor = kNullCursorHandle;
|
||||
|
||||
ui::Cursor loaded_cursor = ui_cursor;
|
||||
|
||||
if (ui_cursor.type() == ui::mojom::CursorType::kCustom) {
|
||||
image_cursor = ui::CursorFactory::GetInstance()->CreateImageCursor(
|
||||
platform_cursor = ui::CursorFactory::GetInstance()->CreateImageCursor(
|
||||
ui::mojom::CursorType::kCustom, ui_cursor.custom_bitmap(),
|
||||
ui_cursor.custom_hotspot());
|
||||
platform_cursor = cursor_util::ToCursorHandle(image_cursor);
|
||||
} else {
|
||||
platform_cursor = cursor_util::GetPlatformCursor(ui_cursor.type());
|
||||
const auto& screen_info = GetScreenInfo(browser);
|
||||
cursor_loader.SetDisplayData(
|
||||
OrientationAngleToRotation(screen_info.orientation_angle),
|
||||
screen_info.device_scale_factor);
|
||||
|
||||
// Attempts to load the cursor via the platform or from pak resources.
|
||||
cursor_loader.SetPlatformCursor(&loaded_cursor);
|
||||
platform_cursor = loaded_cursor.platform();
|
||||
}
|
||||
|
||||
handled = handler->OnCursorChange(browser, platform_cursor, cursor_type,
|
||||
if (platform_cursor) {
|
||||
native_cursor = cursor_util::ToCursorHandle(platform_cursor);
|
||||
}
|
||||
|
||||
handled = handler->OnCursorChange(browser, native_cursor, cursor_type,
|
||||
custom_cursor_info);
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
// |web_cursor| owns the resulting |native_cursor|.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
namespace cursor_util {
|
||||
|
||||
#if defined(USE_AURA)
|
||||
cef_cursor_handle_t GetPlatformCursor(ui::mojom::CursorType type);
|
||||
cef_cursor_handle_t ToCursorHandle(scoped_refptr<ui::PlatformCursor> cursor);
|
||||
#endif // defined(USE_AURA)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
#include "libcef/browser/native/cursor_util.h"
|
||||
|
||||
#include "ui/base/cursor/cursor_factory.h"
|
||||
#include "ui/ozone/buildflags.h"
|
||||
|
||||
#if BUILDFLAG(OZONE_PLATFORM_X11)
|
||||
|
|
@ -15,14 +14,6 @@
|
|||
|
||||
namespace cursor_util {
|
||||
|
||||
cef_cursor_handle_t GetPlatformCursor(ui::mojom::CursorType type) {
|
||||
auto cursor = ui::CursorFactory::GetInstance()->GetDefaultCursor(type);
|
||||
if (cursor) {
|
||||
return ToCursorHandle(cursor);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
cef_cursor_handle_t ToCursorHandle(scoped_refptr<ui::PlatformCursor> cursor) {
|
||||
#if BUILDFLAG(OZONE_PLATFORM_X11)
|
||||
// See https://crbug.com/1029142 for background.
|
||||
|
|
|
|||
|
|
@ -4,159 +4,10 @@
|
|||
|
||||
#include "libcef/browser/native/cursor_util.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#include "libcef/common/app_manager.h"
|
||||
|
||||
#include "ui/base/cursor/mojom/cursor_type.mojom.h"
|
||||
#include "ui/base/win/win_cursor.h"
|
||||
#include "ui/resources/grit/ui_unscaled_resources.h"
|
||||
|
||||
namespace cursor_util {
|
||||
|
||||
namespace {
|
||||
|
||||
// From content/common/cursors/webcursor_win.cc.
|
||||
LPCWSTR ToCursorID(ui::mojom::CursorType type) {
|
||||
switch (type) {
|
||||
case ui::mojom::CursorType::kPointer:
|
||||
return IDC_ARROW;
|
||||
case ui::mojom::CursorType::kCross:
|
||||
return IDC_CROSS;
|
||||
case ui::mojom::CursorType::kHand:
|
||||
return IDC_HAND;
|
||||
case ui::mojom::CursorType::kIBeam:
|
||||
return IDC_IBEAM;
|
||||
case ui::mojom::CursorType::kWait:
|
||||
return IDC_WAIT;
|
||||
case ui::mojom::CursorType::kHelp:
|
||||
return IDC_HELP;
|
||||
case ui::mojom::CursorType::kEastResize:
|
||||
return IDC_SIZEWE;
|
||||
case ui::mojom::CursorType::kNorthResize:
|
||||
return IDC_SIZENS;
|
||||
case ui::mojom::CursorType::kNorthEastResize:
|
||||
return IDC_SIZENESW;
|
||||
case ui::mojom::CursorType::kNorthWestResize:
|
||||
return IDC_SIZENWSE;
|
||||
case ui::mojom::CursorType::kSouthResize:
|
||||
return IDC_SIZENS;
|
||||
case ui::mojom::CursorType::kSouthEastResize:
|
||||
return IDC_SIZENWSE;
|
||||
case ui::mojom::CursorType::kSouthWestResize:
|
||||
return IDC_SIZENESW;
|
||||
case ui::mojom::CursorType::kWestResize:
|
||||
return IDC_SIZEWE;
|
||||
case ui::mojom::CursorType::kNorthSouthNoResize:
|
||||
case ui::mojom::CursorType::kNorthSouthResize:
|
||||
return IDC_SIZENS;
|
||||
case ui::mojom::CursorType::kEastWestNoResize:
|
||||
case ui::mojom::CursorType::kEastWestResize:
|
||||
return IDC_SIZEWE;
|
||||
case ui::mojom::CursorType::kNorthEastSouthWestNoResize:
|
||||
case ui::mojom::CursorType::kNorthEastSouthWestResize:
|
||||
return IDC_SIZENESW;
|
||||
case ui::mojom::CursorType::kNorthWestSouthEastNoResize:
|
||||
case ui::mojom::CursorType::kNorthWestSouthEastResize:
|
||||
return IDC_SIZENWSE;
|
||||
case ui::mojom::CursorType::kColumnResize:
|
||||
return MAKEINTRESOURCE(IDC_COLRESIZE);
|
||||
case ui::mojom::CursorType::kRowResize:
|
||||
return MAKEINTRESOURCE(IDC_ROWRESIZE);
|
||||
case ui::mojom::CursorType::kMiddlePanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_MIDDLE);
|
||||
case ui::mojom::CursorType::kEastPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_EAST);
|
||||
case ui::mojom::CursorType::kNorthPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_NORTH);
|
||||
case ui::mojom::CursorType::kNorthEastPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_NORTH_EAST);
|
||||
case ui::mojom::CursorType::kNorthWestPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_NORTH_WEST);
|
||||
case ui::mojom::CursorType::kSouthPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_SOUTH);
|
||||
case ui::mojom::CursorType::kSouthEastPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_SOUTH_EAST);
|
||||
case ui::mojom::CursorType::kSouthWestPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_SOUTH_WEST);
|
||||
case ui::mojom::CursorType::kWestPanning:
|
||||
return MAKEINTRESOURCE(IDC_PAN_WEST);
|
||||
case ui::mojom::CursorType::kMove:
|
||||
return IDC_SIZEALL;
|
||||
case ui::mojom::CursorType::kVerticalText:
|
||||
return MAKEINTRESOURCE(IDC_VERTICALTEXT);
|
||||
case ui::mojom::CursorType::kCell:
|
||||
return MAKEINTRESOURCE(IDC_CELL);
|
||||
case ui::mojom::CursorType::kAlias:
|
||||
return MAKEINTRESOURCE(IDC_ALIAS);
|
||||
case ui::mojom::CursorType::kProgress:
|
||||
return IDC_APPSTARTING;
|
||||
case ui::mojom::CursorType::kNoDrop:
|
||||
return IDC_NO;
|
||||
case ui::mojom::CursorType::kCopy:
|
||||
return MAKEINTRESOURCE(IDC_COPYCUR);
|
||||
case ui::mojom::CursorType::kNotAllowed:
|
||||
return IDC_NO;
|
||||
case ui::mojom::CursorType::kZoomIn:
|
||||
return MAKEINTRESOURCE(IDC_ZOOMIN);
|
||||
case ui::mojom::CursorType::kZoomOut:
|
||||
return MAKEINTRESOURCE(IDC_ZOOMOUT);
|
||||
case ui::mojom::CursorType::kGrab:
|
||||
return MAKEINTRESOURCE(IDC_HAND_GRAB);
|
||||
case ui::mojom::CursorType::kGrabbing:
|
||||
return MAKEINTRESOURCE(IDC_HAND_GRABBING);
|
||||
case ui::mojom::CursorType::kNull:
|
||||
return IDC_NO;
|
||||
case ui::mojom::CursorType::kMiddlePanningVertical:
|
||||
return MAKEINTRESOURCE(IDC_PAN_MIDDLE_VERTICAL);
|
||||
case ui::mojom::CursorType::kMiddlePanningHorizontal:
|
||||
return MAKEINTRESOURCE(IDC_PAN_MIDDLE_HORIZONTAL);
|
||||
// TODO(cef): Find better cursors for these things
|
||||
case ui::mojom::CursorType::kDndNone:
|
||||
return IDC_ARROW;
|
||||
case ui::mojom::CursorType::kDndMove:
|
||||
return IDC_ARROW;
|
||||
case ui::mojom::CursorType::kDndCopy:
|
||||
return IDC_ARROW;
|
||||
case ui::mojom::CursorType::kDndLink:
|
||||
return IDC_ARROW;
|
||||
case ui::mojom::CursorType::kContextMenu:
|
||||
case ui::mojom::CursorType::kCustom:
|
||||
case ui::mojom::CursorType::kNone:
|
||||
NOTIMPLEMENTED();
|
||||
return IDC_ARROW;
|
||||
}
|
||||
NOTREACHED();
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool IsSystemCursorID(LPCWSTR cursor_id) {
|
||||
// Check the range of values from WinUser.h.
|
||||
return cursor_id >= IDC_ARROW && cursor_id <= IDC_HELP;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
cef_cursor_handle_t GetPlatformCursor(ui::mojom::CursorType type) {
|
||||
// Using a dark 1x1 bit bmp kNone cursor may still cause DWM to do composition
|
||||
// work unnecessarily. Better to totally remove it from the screen.
|
||||
// crbug.com/1069698
|
||||
if (type == ui::mojom::CursorType::kNone) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
HMODULE module_handle = NULL;
|
||||
const wchar_t* cursor_id = ToCursorID(type);
|
||||
if (!IsSystemCursorID(cursor_id)) {
|
||||
module_handle =
|
||||
::GetModuleHandle(CefAppManager::Get()->GetResourceDllName());
|
||||
if (!module_handle)
|
||||
module_handle = ::GetModuleHandle(NULL);
|
||||
}
|
||||
|
||||
return LoadCursor(module_handle, cursor_id);
|
||||
}
|
||||
|
||||
cef_cursor_handle_t ToCursorHandle(scoped_refptr<ui::PlatformCursor> cursor) {
|
||||
return ui::WinCursor::FromPlatformCursor(cursor)->hcursor();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue