diff options
| author | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 06:51:15 +0000 |
|---|---|---|
| committer | miletus@chromium.org <miletus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 06:51:15 +0000 |
| commit | 66d3381b11504826ebbc562339ef45c58e545e71 (patch) | |
| tree | d0dfccf57219370facb1d9093758e304e26a48dd | |
| parent | 11814f589842d2299f420ecbfa3c1008606009af (diff) | |
| download | chromium_src-66d3381b11504826ebbc562339ef45c58e545e71.zip chromium_src-66d3381b11504826ebbc562339ef45c58e545e71.tar.gz chromium_src-66d3381b11504826ebbc562339ef45c58e545e71.tar.bz2 | |
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
| -rw-r--r-- | ash/touch/touch_transformer_controller.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/touch/touch_transformer_controller.cc b/ash/touch/touch_transformer_controller.cc index 87954a3..117c0a7 100644 --- a/ash/touch/touch_transformer_controller.cc +++ b/ash/touch/touch_transformer_controller.cc @@ -182,6 +182,10 @@ void TouchTransformerController::UpdateTouchTransformer() const { } 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. aura::Window* root1 = display_controller->GetRootWindowForDisplayId(display1_id); |