Fix software mirror mode on Ozone part 2/2

ui/ozone/platform/dri/dri_window.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 "ui/ozone/platform/dri/dri_window.h"
 
 #include "base/bind.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ skipping 107 matching lines @@
   // If there is a grab, capture events here.
   gfx::AcceleratedWidget grabber = window_manager_->event_grabber();
   if (grabber != gfx::kNullAcceleratedWidget)
     return grabber == widget_;
 
   if (event->IsTouchEvent()) {
     // Dispatch the event if it is from the touchscreen associated with the
     // DriWindow. We cannot check the event's location because if the
     // touchscreen has a bezel, touches in the bezel have a location outside of
     // |bounds_|.
-    int64_t display_id =
+    gfx::Display display =
         DeviceDataManager::GetInstance()->GetDisplayForTouchDevice(
             event->source_device_id());
 
-    if (display_id == gfx::Display::kInvalidDisplayID)
+    if (display.id() == gfx::Display::kInvalidDisplayID)
       return false;
 
-    DisplaySnapshot* snapshot = display_manager_->GetDisplay(display_id);
+    // If |display| is mirroring another display's content, touches should be
+    // dispatched to that display.
+    int64_t touch_display_id =
+        display.mirrored_display_id() == gfx::Display::kInvalidDisplayID
+        ? display.id()
+        : display.mirrored_display_id();
+
+    DisplaySnapshot* snapshot = display_manager_->GetDisplay(touch_display_id);
     if (!snapshot || !snapshot->current_mode())
       return false;
 
-    gfx::Rect display_bounds(snapshot->origin(),
-                             snapshot->current_mode()->size());
-    return display_bounds == bounds_;
+    gfx::Rect touch_display_bounds(snapshot->origin(),
+                                   snapshot->current_mode()->size());
+    return touch_display_bounds == bounds_;
   } else if (event->IsLocatedEvent()) {
     LocatedEvent* located_event = static_cast<LocatedEvent*>(event);
     return bounds_.Contains(gfx::ToFlooredPoint(located_event->location()));
   }
 
   // TODO(spang): For non-ash builds we would need smarter keyboard focus.
   return true;
 }
 
 uint32_t DriWindow::DispatchEvent(const PlatformEvent& native_event) {
@@ skipping 23 matching lines @@
 void DriWindow::OnChannelDestroyed() {
 }
 
 void DriWindow::SendBoundsChange() {
   cursor_->PrepareForBoundsChange(widget_);
   sender_->Send(new OzoneGpuMsg_WindowBoundsChanged(widget_, bounds_));
   cursor_->CommitBoundsChange(widget_, bounds_, GetCursorConfinedBounds());
 }
 
 }  // namespace ui