diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 17:20:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 09:28:09 +0000 |
| commit | bb09965444b5bb20b096a291445170876225268d (patch) | |
| tree | b5f6596f7e6e941b1d7d72f0ce5181500c261529 /chromium/components/exo/pointer.cc | |
| parent | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (diff) | |
| download | qtwebengine-chromium-bb09965444b5bb20b096a291445170876225268d.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.98
Change-Id: Ib913750d687f29e036959c62a0cabf2412a8faa7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/exo/pointer.cc')
| -rw-r--r-- | chromium/components/exo/pointer.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/components/exo/pointer.cc b/chromium/components/exo/pointer.cc index 61442ed0608..1697f5c34dc 100644 --- a/chromium/components/exo/pointer.cc +++ b/chromium/components/exo/pointer.cc @@ -380,8 +380,12 @@ void Pointer::OnCursorCaptured(const gfx::Point& hotspot, void Pointer::UpdateCursor() { DCHECK(focus_); + aura::Window* root_window = focus_->window()->GetRootWindow(); + if (!root_window) + return; + aura::client::CursorClient* cursor_client = - aura::client::GetCursorClient(focus_->window()->GetRootWindow()); + aura::client::GetCursorClient(root_window); if (cursor_client) cursor_client->SetCursor(cursor_); } |