Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
[ozone] Enable display controller before notifying its users that it'…
Browse files Browse the repository at this point in the history
…s available.

We take away the controller when we suspend, but never successfully
give it back to window_delegate on resume because it's expected to be
in enabled state. The result was mouse cursor not getting reset on
resume.

BUG=446184
NOTRY=true

Review URL: https://codereview.chromium.org/845303004

Cr-Commit-Position: refs/heads/master@{#311581}

Review URL: https://codereview.chromium.org/855673003

Cr-Commit-Position: refs/branch-heads/2272@{#42}
Cr-Branched-From: 827a380-refs/heads/master@{#310958}
  • Loading branch information
mspang committed Jan 16, 2015
1 parent 518bf87 commit 04ec801
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ui/ozone/platform/dri/screen_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,12 @@ bool ScreenManager::ConfigureDisplayController(uint32_t crtc,
return HandleMirrorMode(it, mirror, crtc, connector);
}

// Just re-enable the controller to re-use the current state.
bool enabled = controller->Enable();
FOR_EACH_OBSERVER(DisplayChangeObserver, observers_,
OnDisplayChanged(controller));
// Just re-enable the controller to re-use the current state.
return controller->Enable();

return enabled;
}

// Either the mode or the location of the display changed, so exit mirror
Expand Down

0 comments on commit 04ec801

Please sign in to comment.