| Index: ui/aura/shared/compound_event_filter.cc
|
| diff --git a/ui/aura/shared/compound_event_filter.cc b/ui/aura/shared/compound_event_filter.cc
|
| index b9f0716174218c55da9135bc75d63499fc4bc23a..b14712ec93ef52f6eab934489db0a79c50245e39 100644
|
| --- a/ui/aura/shared/compound_event_filter.cc
|
| +++ b/ui/aura/shared/compound_event_filter.cc
|
| @@ -86,8 +86,9 @@ size_t CompoundEventFilter::GetFilterCount() const {
|
| // CompoundEventFilter, private:
|
|
|
| void CompoundEventFilter::UpdateCursor(Window* target, ui::MouseEvent* event) {
|
| + aura::RootWindow* root_window = target->GetRootWindow();
|
| client::CursorClient* client =
|
| - client::GetCursorClient(target->GetRootWindow());
|
| + client::GetCursorClient(root_window);
|
| if (client) {
|
| gfx::NativeCursor cursor = target->GetCursor(event->location());
|
| if (event->flags() & ui::EF_IS_NON_CLIENT) {
|
| @@ -97,6 +98,8 @@ void CompoundEventFilter::UpdateCursor(Window* target, ui::MouseEvent* event) {
|
| }
|
|
|
| client->SetCursor(cursor);
|
| + client->SetDeviceScaleFactor(
|
| + root_window->AsRootWindowHostDelegate()->GetDeviceScaleFactor());
|
| }
|
| }
|
|
|
|
|