Fix software mirror mode on Ozone part 2/2

ash/host/ash_window_tree_host_x11.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/host/ash_window_tree_host_x11.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
@@ skipping 15 matching lines @@
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/null_event_targeter.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds)
-    : WindowTreeHostX11(initial_bounds),
-      transformer_helper_(this),
-      display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID,
-                                  gfx::Display::kInvalidDisplayID)) {
+    : WindowTreeHostX11(initial_bounds), transformer_helper_(this) {
   aura::Env::GetInstance()->AddObserver(this);
 }
 
 AshWindowTreeHostX11::~AshWindowTreeHostX11() {
   aura::Env::GetInstance()->RemoveObserver(this);
   UnConfineCursor();
 }
 
 void AshWindowTreeHostX11::ToggleFullScreen() { NOTIMPLEMENTED(); }
 
@@ skipping 69 matching lines @@
     ConfineCursorToRootWindow();
   }
 }
 
 gfx::Insets AshWindowTreeHostX11::GetHostInsets() const {
   return transformer_helper_.GetHostInsets();
 }
 
 aura::WindowTreeHost* AshWindowTreeHostX11::AsWindowTreeHost() { return this; }
 
-void AshWindowTreeHostX11::UpdateDisplayID(int64 id1, int64 id2) {
-  display_ids_.first = id1;
-  display_ids_.second = id2;
-}
-
 void AshWindowTreeHostX11::PrepareForShutdown() {
   // Block the root window from dispatching events because it is weird for a
   // ScreenPositionClient not to be attached to the root window and for
   // ui::EventHandlers to be unable to convert the event's location to screen
   // coordinates.
   window()->SetEventTargeter(
       scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter));
 
   if (ui::PlatformEventSource::GetInstance()) {
     // Block X events which are not turned into ui::Events from getting
@@ skipping 62 matching lines @@
   // For touch event, check if the root window is residing on the according
   // touch display.
   switch (type) {
     case ui::ET_TOUCH_MOVED:
     case ui::ET_TOUCH_PRESSED:
     case ui::ET_TOUCH_CANCELLED:
     case ui::ET_TOUCH_RELEASED: {
 #if defined(OS_CHROMEOS)
       XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
       int64 touch_display_id =
-          ui::DeviceDataManager::GetInstance()->GetDisplayForTouchDevice(
+          ui::DeviceDataManager::GetInstance()->GetTargetDisplayForTouchDevice(
               xiev->deviceid);
       // If we don't have record of display id for this touch device, check
       // that if the event is within the bound of the root window. Note
       // that in multi-monitor case, the event position is in framebuffer
       // space so the bounds check will not work so well.
       if (touch_display_id == gfx::Display::kInvalidDisplayID) {
         if (base::SysInfo::IsRunningOnChromeOS() &&
             !bounds().Contains(ui::EventLocationFromNative(xev)))
           return false;
-      } else if (touch_display_id != display_ids_.first &&
-                 touch_display_id != display_ids_.second) {
-        return false;
+      } else {
+        gfx::Screen* screen = gfx::Screen::GetScreenFor(window());
+        gfx::Display display = screen->GetDisplayNearestWindow(window());
+        return touch_display_id == display.id();
       }
 #endif  // defined(OS_CHROMEOS)
       return true;
     }
     default:
       return true;
   }
 }
 void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
     ui::LocatedEvent* event) {
@@ skipping 45 matching lines @@
   }
 }
 #endif
 
 AshWindowTreeHost* AshWindowTreeHost::Create(
     const AshWindowTreeHostInitParams& init_params) {
   return new AshWindowTreeHostX11(init_params.initial_bounds);
 }
 
 }  // namespace ash