TouchTransformer for software mirroring mode

ash/touch/touch_transformer_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/touch/touch_transformer_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/root_window_controller.h"
@@ skipping 179 matching lines @@
 
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   ui::MultipleDisplayState display_state =
       Shell::GetInstance()->display_configurator()->display_state();
   if (display_state == ui::MULTIPLE_DISPLAY_STATE_INVALID ||
       display_state == ui::MULTIPLE_DISPLAY_STATE_HEADLESS) {
     return;
   } else if (display_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR ||
              display_state == ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED) {
-    // TODO(miletus) : Handle DUAL_EXTENDED with software mirroring.
     DisplayIdPair id_pair = GetDisplayManager()->GetCurrentDisplayIdPair();
     display1_id = id_pair.first;
     display2_id = id_pair.second;
     DCHECK(display1_id != gfx::Display::kInvalidDisplayID &&
            display2_id != gfx::Display::kInvalidDisplayID);
     display1 = GetDisplayManager()->GetDisplayInfo(display1_id);
     display2 = GetDisplayManager()->GetDisplayInfo(display2_id);
     device_manager->UpdateTouchRadiusScale(display1.touch_device_id(),
                                            GetTouchResolutionScale(display1));
     device_manager->UpdateTouchRadiusScale(display2.touch_device_id(),
@@ skipping 18 matching lines @@
         display1.touch_device_id(),
         GetMirrorModeTouchTransformer(display1));
     device_manager->UpdateTouchInfoForDisplay(
         display2_id,
         display2.touch_device_id(),
         GetMirrorModeTouchTransformer(display2));
     return;
   }
 
   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);
-    aura::Window* root2 =
-        display_controller->GetRootWindowForDisplayId(display2_id);
-    RootWindowController::ForWindow(root1)->ash_host()->UpdateDisplayID(
-        display1_id, gfx::Display::kInvalidDisplayID);
-    RootWindowController::ForWindow(root2)->ash_host()->UpdateDisplayID(
-        display2_id, gfx::Display::kInvalidDisplayID);
+    // In extended but software mirroring mode, ther is only one X root window
+    // that associates with both displays.
+    if (GetDisplayManager()->software_mirroring_enabled())  {
+      aura::Window* root = display_controller->GetPrimaryRootWindow();
+      RootWindowController::ForWindow(root)->ash_host()->UpdateDisplayID(
+          display1_id, display2_id);

[oshima, 2014/09/10 22:34:56]

Does this work even if the touch screen is on external display side?
If so, how events on the external display mapped to the root window?

[Yufeng Shen (Slow to review), 2014/09/11 01:14:31]

right, in the external touch display case, the event should be mapped from
framebuffer to the source display (internal display)'s size, not the external
display's size. This is different than the true extended mode.

Fixed it in the new patchset. Tested on Big with external touchscreen.

+    } else {
+      // In actual extended mode, each display is associated with one root
+      // window.
+      aura::Window* root1 =
+          display_controller->GetRootWindowForDisplayId(display1_id);
+      aura::Window* root2 =
+          display_controller->GetRootWindowForDisplayId(display2_id);
+      RootWindowController::ForWindow(root1)->ash_host()->UpdateDisplayID(
+          display1_id, gfx::Display::kInvalidDisplayID);
+      RootWindowController::ForWindow(root2)->ash_host()->UpdateDisplayID(
+          display2_id, gfx::Display::kInvalidDisplayID);
+    }
     gfx::Size fb_size =
         Shell::GetInstance()->display_configurator()->framebuffer_size();
     device_manager->UpdateTouchInfoForDisplay(
         display1_id,
         display1.touch_device_id(),
         GetExtendedModeTouchTransformer(display1, fb_size));
     device_manager->UpdateTouchInfoForDisplay(
         display2_id,
         display2.touch_device_id(),
         GetExtendedModeTouchTransformer(display2, fb_size));
@@ skipping 12 matching lines @@
 
 void TouchTransformerController::OnDisplaysInitialized() {
   UpdateTouchTransformer();
 }
 
 void TouchTransformerController::OnDisplayConfigurationChanged() {
   UpdateTouchTransformer();
 }
 
 }  // namespace ash