Commit fd2e0493 authored by Henrique Ferreiro's avatar Henrique Ferreiro Committed by Commit Bot

Add missing initial call to SetDisplay on CursorManager

Before this change, starting Chromium in a HiDPI display would load a
regular cursor (e.g. instead of 2x) until the display settings were
changed.

Bug: 1127962
Change-Id: Ib6f34458a72d551e832387bb4b5c7df0f1dce805
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2443610Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#814245}
parent ee3f3e6f
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "ui/base/ime/input_method.h" #include "ui/base/ime/input_method.h"
#include "ui/base/ui_base_features.h" #include "ui/base/ui_base_features.h"
#include "ui/compositor/layer.h" #include "ui/compositor/layer.h"
#include "ui/display/screen.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/point_conversions.h" #include "ui/gfx/geometry/point_conversions.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
...@@ -522,6 +523,9 @@ void DesktopNativeWidgetAura::InitNativeWidget(Widget::InitParams params) { ...@@ -522,6 +523,9 @@ void DesktopNativeWidgetAura::InitNativeWidget(Widget::InitParams params) {
if (!cursor_manager_) { if (!cursor_manager_) {
cursor_manager_ = new wm::CursorManager( cursor_manager_ = new wm::CursorManager(
std::unique_ptr<wm::NativeCursorManager>(native_cursor_manager_)); std::unique_ptr<wm::NativeCursorManager>(native_cursor_manager_));
cursor_manager_->SetDisplay(
display::Screen::GetScreen()->GetDisplayNearestWindow(
host_->window()));
} }
native_cursor_manager_->AddHost(host()); native_cursor_manager_->AddHost(host());
aura::client::SetCursorClient(host_->window(), cursor_manager_); aura::client::SetCursorClient(host_->window(), cursor_manager_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment