mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-12 10:00:37 +01:00
3000bc8748
This change adds Chrome runtime support on Windows and Linux for creating a browser parented to a native window supplied by the client application. Expected API usage and window behavior is similar to what already exists with the Alloy runtime. The parent window handle should be specified by using CefWindowInfo::SetAsChild in combination with the CefBrowserHost::CreateBrowser and CefLifeSpanHandler::OnBeforePopup callbacks. The previously existing behavior of creating a fully-featured Chrome browser window when empty CefWindowInfo is used with CreateBrowser remains unchanged and Views is still the preferred API for creating top-level Chrome windows with custom styling (e.g. title bar only, frameless, etc). The cefclient Popup Window test with a native parent window continues to crash on Linux with both the Alloy and Chrome runtimes (see issue #3165). Also adds Chrome runtime support for CefDisplayHandler::OnCursorChange. To test: - Run `cefclient --enable-chrome-runtime [--use-views]` for the default (and previously existing) Views-based behavior. - Run `cefclient --enable-chrome-runtime --use-native` for the new native parent window behavior. - Run `cefclient --enable-chrome-runtime --use-native --no-activate` and the window will not be activated (take input focus) on launch (Windows only). - Run `cefclient --enable-chrome-runtime [--use-views|--use-native] --mouse-cursor-change-disabled` and the mouse cursor will not change on mouseover of DOM elements.
66 lines
2.4 KiB
C++
66 lines
2.4 KiB
C++
// Copyright 2020 The Chromium Embedded Framework Authors. Portions copyright
|
|
// 2012 The Chromium Authors. All rights reserved. Use of this source code is
|
|
// governed by a BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "libcef/browser/native/cursor_util.h"
|
|
|
|
#include "libcef/browser/browser_host_base.h"
|
|
|
|
#include "content/common/cursors/webcursor.h"
|
|
#include "ui/base/cursor/cursor_factory.h"
|
|
#include "ui/base/cursor/mojom/cursor_type.mojom.h"
|
|
|
|
namespace cursor_util {
|
|
|
|
bool OnCursorChange(CefRefPtr<CefBrowser> browser, const ui::Cursor& ui_cursor) {
|
|
auto client = browser->GetHost()->GetClient();
|
|
if (!client)
|
|
return false;
|
|
auto handler = client->GetDisplayHandler();
|
|
if (!handler)
|
|
return false;
|
|
|
|
const cef_cursor_type_t cursor_type =
|
|
static_cast<cef_cursor_type_t>(ui_cursor.type());
|
|
CefCursorInfo custom_cursor_info;
|
|
if (ui_cursor.type() == ui::mojom::CursorType::kCustom) {
|
|
custom_cursor_info.hotspot.x = ui_cursor.custom_hotspot().x();
|
|
custom_cursor_info.hotspot.y = ui_cursor.custom_hotspot().y();
|
|
custom_cursor_info.image_scale_factor = ui_cursor.image_scale_factor();
|
|
custom_cursor_info.buffer = ui_cursor.custom_bitmap().getPixels();
|
|
custom_cursor_info.size.width = ui_cursor.custom_bitmap().width();
|
|
custom_cursor_info.size.height = ui_cursor.custom_bitmap().height();
|
|
}
|
|
|
|
bool handled = false;
|
|
|
|
#if defined(USE_AURA)
|
|
CefCursorHandle platform_cursor;
|
|
scoped_refptr<ui::PlatformCursor> image_cursor;
|
|
|
|
if (ui_cursor.type() == ui::mojom::CursorType::kCustom) {
|
|
image_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());
|
|
}
|
|
|
|
handled = handler->OnCursorChange(browser, platform_cursor, cursor_type,
|
|
custom_cursor_info);
|
|
#elif BUILDFLAG(IS_MAC)
|
|
// |web_cursor| owns the resulting |native_cursor|.
|
|
content::WebCursor web_cursor(ui_cursor);
|
|
CefCursorHandle native_cursor = web_cursor.GetNativeCursor();
|
|
handled = handler->OnCursorChange(browser, native_cursor, cursor_type,
|
|
custom_cursor_info);
|
|
#else
|
|
NOTIMPLEMENTED();
|
|
#endif
|
|
|
|
return handled;
|
|
}
|
|
|
|
} // namespace cursor_util
|