Aura/ash split: Don't use X11 window borders.

ui/aura/event.cc

 // Copyright (c) 2012 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/aura/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
@@ skipping 82 matching lines @@
 }
 
 LocatedEvent::~LocatedEvent() {
 }
 
 LocatedEvent::LocatedEvent(const base::NativeEvent& native_event)
     : Event(native_event,
             ui::EventTypeFromNative(native_event),
             ui::EventFlagsFromNative(native_event)),
       location_(ui::EventLocationFromNative(native_event)),
-      root_location_(location_) {
+      root_location_(ui::EventRootLocationFromNative(native_event)) {
 }
 
 LocatedEvent::LocatedEvent(const LocatedEvent& model,
                            Window* source,
                            Window* target)
     : Event(model),
       location_(model.location_),
       root_location_(model.root_location_) {
   if (target && target != source)
     Window::ConvertPointToWindow(source, target, &location_);
 }
 
 LocatedEvent::LocatedEvent(ui::EventType type,
                            const gfx::Point& location,
                            const gfx::Point& root_location,
                            int flags)
     : Event(type, flags),
       location_(location),
       root_location_(location) {
 }
 
 void LocatedEvent::UpdateForRootTransform(const ui::Transform& root_transform) {
   // Transform has to be done at root level.
-  DCHECK_EQ(root_location_.x(), location_.x());
-  DCHECK_EQ(root_location_.y(), location_.y());
-  gfx::Point3f p(location_);
-  root_transform.TransformPointReverse(p);
-  root_location_ = location_ = p.AsPoint();
+  if (!root_transform.matrix().isIdentity()) {
+    // TODO(oshima): This isn't correct with more than two RootWindows.

[Daniel Erat, 2012/05/09 20:58:27]

Not sure I understand this.  Should it be "two or more RootWindows", or is there
something else going on here that I'm not seeing?

+    DCHECK_EQ(root_location_.x(), location_.x());
+    DCHECK_EQ(root_location_.y(), location_.y());
+    gfx::Point3f p(location_);
+    root_transform.TransformPointReverse(p);
+    root_location_ = location_ = p.AsPoint();
+  }
 }
 
 MouseEvent::MouseEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event) {
   if (type() == ui::ET_MOUSE_PRESSED)
     SetClickCount(GetRepeatCount(*this));
 }
 
 MouseEvent::MouseEvent(const MouseEvent& model, Window* source, Window* target)
     : LocatedEvent(model, source, target) {
@@ skipping 321 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace aura