Commit 66d3381b authored by miletus@chromium.org's avatar miletus@chromium.org

Early return in UpdateTouchTransformer for software mirroring mode

Software mirroring mode is special that display_state is marked as
DUAL_EXTENDED but it is doing mirroring. There is only one root
window as supposed 2 root windows in the extended mode. Early return
in UpdateTouchTransformer() for the software mirroring mode for now
so as not to crash chrome.

BUG=376459
TEST=arm devices don't crash while switching from extended to mirror
mode.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272414 0039d316-1c4b-4281-b951-d872f2087c98
parent 11814f58
...@@ -182,6 +182,10 @@ void TouchTransformerController::UpdateTouchTransformer() const { ...@@ -182,6 +182,10 @@ void TouchTransformerController::UpdateTouchTransformer() const {
} }
if (display_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED) { if (display_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED) {
// TODO(miletus) : Handle the case the state is DUAL_EXTENDED but it
// is actually doing software mirroring.
if (GetDisplayManager()->software_mirroring_enabled())
return;
// In extended mode, each display is associated with one root window. // In extended mode, each display is associated with one root window.
aura::Window* root1 = aura::Window* root1 =
display_controller->GetRootWindowForDisplayId(display1_id); display_controller->GetRootWindowForDisplayId(display1_id);
......
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