mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 96.0.4664.0 (#929512)
This commit is contained in:
@ -17,7 +17,7 @@
|
||||
#include "ui/accessibility/ax_enums.mojom.h"
|
||||
#include "ui/accessibility/ax_text_utils.h"
|
||||
#include "ui/accessibility/ax_tree_update.h"
|
||||
#include "ui/gfx/transform.h"
|
||||
#include "ui/gfx/geometry/transform.h"
|
||||
|
||||
namespace {
|
||||
using ui::ToString;
|
||||
|
@ -723,6 +723,12 @@ void CefRenderWidgetHostViewOSR::GetScreenInfo(display::ScreenInfo* results) {
|
||||
*results = ScreenInfoFrom(screen_info);
|
||||
}
|
||||
|
||||
display::ScreenInfos CefRenderWidgetHostViewOSR::GetScreenInfos() {
|
||||
display::ScreenInfo screen_info;
|
||||
GetScreenInfo(&screen_info);
|
||||
return display::ScreenInfos(screen_info);
|
||||
}
|
||||
|
||||
void CefRenderWidgetHostViewOSR::TransformPointToRootSurface(
|
||||
gfx::PointF* point) {}
|
||||
|
||||
@ -1516,14 +1522,11 @@ bool CefRenderWidgetHostViewOSR::SetDeviceScaleFactor() {
|
||||
|
||||
void CefRenderWidgetHostViewOSR::SetCurrentDeviceScaleFactor(float scale) {
|
||||
// Initialize a display struct as needed, to cache the scale factor.
|
||||
if (display_list_.displays().empty()) {
|
||||
display_list_ = display::DisplayList(
|
||||
{display::Display(display::kDefaultDisplayId)},
|
||||
display::kDefaultDisplayId, display::kDefaultDisplayId);
|
||||
if (screen_infos_.screen_infos.empty()) {
|
||||
screen_infos_ = display::ScreenInfos(display::ScreenInfo());
|
||||
}
|
||||
display::Display current_display = display_list_.GetCurrentDisplay();
|
||||
current_display.set_device_scale_factor(scale);
|
||||
display_list_.UpdateDisplay(current_display);
|
||||
screen_infos_.mutable_current().device_scale_factor = scale;
|
||||
UpdateScreenInfo();
|
||||
}
|
||||
|
||||
bool CefRenderWidgetHostViewOSR::SetViewBounds() {
|
||||
|
@ -159,6 +159,7 @@ class CefRenderWidgetHostViewOSR
|
||||
const gfx::Size& output_size,
|
||||
base::OnceCallback<void(const SkBitmap&)> callback) override;
|
||||
void GetScreenInfo(display::ScreenInfo* results) override;
|
||||
display::ScreenInfos GetScreenInfos() override;
|
||||
void TransformPointToRootSurface(gfx::PointF* point) override;
|
||||
gfx::Rect GetBoundsInRootWindow() override;
|
||||
|
||||
|
Reference in New Issue
Block a user