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 132.0.6834.0

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-11-14 17:07:03 -05:00
parent c166b4abc9
commit 34dbad30db
91 changed files with 832 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libcef/browser/osr/touch_selection_controller_client_osr.cc
View File

@@ -17,9 +17,10 @@
#include "content/public/browser/render_view_host.h"
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
#include "ui/base/pointer/touch_editing_controller.h"
#include "ui/base/mojom/menu_source_type.mojom-forward.h"
#include "ui/gfx/geometry/point_conversions.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/touch_selection/touch_editing_controller.h"
namespace {
@@ -146,8 +147,8 @@ void CefTouchSelectionControllerClientOSR::OnScrollCompleted() {
bool CefTouchSelectionControllerClientOSR::HandleContextMenu(
const content::ContextMenuParams& params) {
if ((params.source_type == ui::MENU_SOURCE_LONG_PRESS ||
params.source_type == ui::MENU_SOURCE_LONG_TAP) &&
if ((params.source_type == ui::mojom::MenuSourceType::kLongPress ||
params.source_type == ui::mojom::MenuSourceType::kLongTap) &&
params.is_editable && params.selection_text.empty() &&
IsQuickMenuAvailable()) {
quick_menu_requested_ = true;
@@ -155,9 +156,10 @@ bool CefTouchSelectionControllerClientOSR::HandleContextMenu(
return true;
}
const bool from_touch = params.source_type == ui::MENU_SOURCE_LONG_PRESS ||
params.source_type == ui::MENU_SOURCE_LONG_TAP ||
params.source_type == ui::MENU_SOURCE_TOUCH;
const bool from_touch =
params.source_type == ui::mojom::MenuSourceType::kLongPress ||
params.source_type == ui::mojom::MenuSourceType::kLongTap ||
params.source_type == ui::mojom::MenuSourceType::kTouch;
if (from_touch && !params.selection_text.empty()) {
return true;
}
@@ -530,8 +532,9 @@ void CefTouchSelectionControllerClientOSR::RunContextMenu() {
rwhv_->selection_controller()->GetVisibleRectBetweenBounds();
const gfx::PointF anchor_point =
gfx::PointF(anchor_rect.CenterPoint().x(), anchor_rect.y());
rwhv_->host()->ShowContextMenuAtPoint(gfx::ToRoundedPoint(anchor_point),
ui::MENU_SOURCE_TOUCH_EDIT_MENU);
rwhv_->host()->ShowContextMenuAtPoint(
gfx::ToRoundedPoint(anchor_point),
ui::mojom::MenuSourceType::kTouchEditMenu);
// Hide selection handles after getting rect-between-bounds from touch
// selection controller; otherwise, rect would be empty and the above