Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.

Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.

Other notable changes:
* Removed WindowTreeHostFactory as this is no longer necessary.
* Moved RootWindowTransformer to ash/host
* Removed Set/GetInsets which are no longer necessary (a code in SetInsets is now a part of
SetRootWindowTransformer)
* Added TransformerHelper that implements common behavior to transform root window for AshWindowTreeHost
* Added DEPS files
* Updated metro_viewer code to make sure it creates ash::AshRemoteWindowHostTree

A few more simplifications to come:
* Simplify RootWindowTransformer
* Eliminate EnvObserver in AshWindowTreeHostX11

I'll also work on DEPS reorg to make it more explicit under ash/

BUG=355771
TEST=No functional change. ui/aura/window_tree_host_x11_unittests has been moved to ash/host/ash_window_tree_host_x11_unittests

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=263192

[oshima, 2014-03-26 00:56:02]

This is WIP and not for full review.

Ben, can you take a quick look and let me know if this is
the right direction.

Thank you!

https://codereview.chromium.org/201573015/diff/180001/content/browser/rendere...
File content/browser/renderer_host/render_widget_host_view_aura.cc (left):

https://codereview.chromium.org/201573015/diff/180001/content/browser/rendere...
content/browser/renderer_host/render_widget_host_view_aura.cc:2287:
root_window->GetHost()->ConfineCursorToRootWindow();
This was added in https://codereview.chromium.org/49383004
but this makes sense only on Windows. This is no-op and not necessary on
linux_aura and is actually wrong on cros.

[Ben Goodger (Google), 2014-03-26 05:11:07]

This looks like a good direction to me.

LMK when you're done, and I'll unleash the nits.

https://codereview.chromium.org/201573015/diff/180001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host.h (right):

https://codereview.chromium.org/201573015/diff/180001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host.h:5: #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_H_
it would be good to have a DEPS file in this dir to block general including from
src/ash.

https://codereview.chromium.org/201573015/diff/180001/content/browser/rendere...
File content/browser/renderer_host/render_widget_host_view_aura.cc (left):

https://codereview.chromium.org/201573015/diff/180001/content/browser/rendere...
content/browser/renderer_host/render_widget_host_view_aura.cc:2287:
root_window->GetHost()->ConfineCursorToRootWindow();
On 2014/03/26 00:56:03, oshima wrote:
> This was added in https://codereview.chromium.org/49383004
> but this makes sense only on Windows. This is no-op and not necessary on
> linux_aura and is actually wrong on cros.

Maybe peel this out as a separate CL?

[oshima, 2014-03-27 23:24:41]

On 2014/03/26 05:11:07, Ben Goodger (Google) wrote:
> This looks like a good direction to me.
> 
> LMK when you're done, and I'll unleash the nits.
> 
>
https://codereview.chromium.org/201573015/diff/180001/ash/host/ash_window_tre...
> File ash/host/ash_window_tree_host.h (right):
> 
>
https://codereview.chromium.org/201573015/diff/180001/ash/host/ash_window_tre...
> ash/host/ash_window_tree_host.h:5: #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_H_
> it would be good to have a DEPS file in this dir to block general including
from
> src/ash.

How can I do this in ash/host/DEPS? Only way I know is to add "-ash/host", in
ash/DEPS and
explicitly allow this where it uses these files. (include_include_rules)

> 
>
https://codereview.chromium.org/201573015/diff/180001/content/browser/rendere...
> File content/browser/renderer_host/render_widget_host_view_aura.cc (left):
> 
>
https://codereview.chromium.org/201573015/diff/180001/content/browser/rendere...
> content/browser/renderer_host/render_widget_host_view_aura.cc:2287:
> root_window->GetHost()->ConfineCursorToRootWindow();
> On 2014/03/26 00:56:03, oshima wrote:
> > This was added in https://codereview.chromium.org/49383004
> > but this makes sense only on Windows. This is no-op and not necessary on
> > linux_aura and is actually wrong on cros.
> 
> Maybe peel this out as a separate CL?

[beng (no_code_reviews), 2014-03-28 02:48:17]

You can add a DEPS file in ash/host that has "-ash"... see src/ui/DEPS...
it excludes all of ui by default... the reason is that it forces subdirs to
explicitly state their dependencies which is good because it means people
working on modules under src/ui have to think about their dependency
structure more as they add functionality..

-Ben


On Thu, Mar 27, 2014 at 4:24 PM, <oshima@chromium.org> wrote:

> On 2014/03/26 05:11:07, Ben Goodger (Google) wrote:
>
>> This looks like a good direction to me.
>>
>
>  LMK when you're done, and I'll unleash the nits.
>>
>
>
> https://codereview.chromium.org/201573015/diff/180001/ash/
> host/ash_window_tree_host.h
>
>> File ash/host/ash_window_tree_host.h (right):
>>
>
>
> https://codereview.chromium.org/201573015/diff/180001/ash/
> host/ash_window_tree_host.h#newcode5
>
>> ash/host/ash_window_tree_host.h:5: #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_
>> H_
>> it would be good to have a DEPS file in this dir to block general
>> including
>>
> from
>
>> src/ash.
>>
>
> How can I do this in ash/host/DEPS? Only way I know is to add "-ash/host",
> in
> ash/DEPS and
> explicitly allow this where it uses these files. (include_include_rules)
>
>
>
>
> https://codereview.chromium.org/201573015/diff/180001/
> content/browser/renderer_host/render_widget_host_view_aura.cc
>
>> File content/browser/renderer_host/render_widget_host_view_aura.cc
>> (left):
>>
>
>
> https://codereview.chromium.org/201573015/diff/180001/
> content/browser/renderer_host/render_widget_host_view_aura.cc#oldcode2287
>
>> content/browser/renderer_host/render_widget_host_view_aura.cc:2287:
>> root_window->GetHost()->ConfineCursorToRootWindow();
>> On 2014/03/26 00:56:03, oshima wrote:
>> > This was added in https://codereview.chromium.org/49383004
>> > but this makes sense only on Windows. This is no-op and not necessary on
>> > linux_aura and is actually wrong on cros.
>>
>
>  Maybe peel this out as a separate CL?
>>
>
>
>
> https://codereview.chromium.org/201573015/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[oshima, 2014-04-01 14:45:56]

I uploaded latest patch and updated the description.
PTAL.

[oshima, 2014-04-01 22:05:38]

On 2014/04/01 14:45:56, oshima wrote:
> I uploaded latest patch and updated the description.
> PTAL.


I also run "git cl format". (and this isn't super urgent, so I'll just wait
until you're back.)

[Yufeng Shen (Slow to review), 2014-04-09 21:35:51]

https://codereview.chromium.org/201573015/diff/930001/ui/aura/window_tree_hos...
File ui/aura/window_tree_host_x11.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ui/aura/window_tree_hos...
ui/aura/window_tree_host_x11.cc:548: return;
Can we have a
virtual bool WindowTreeHostX11::IsTouchEventTargetingThisRootWindow() {
   return true;
}

which gets called here
 
and have
bool AshWindowTreeHostX11::IsTouchEventTargetingThisRootWindow() {
#if defined(OS_CHROMEOS)
if (base::SysInfo::IsRunningOnChromeOS() &&
!bounds().Contains(ui::EventLocationFromNative(xev)))
return false;
}
#endif
return true;
}

This way we move all the chromeos specific code into AshWTHX11. Does this make
sense ?

[Ben Goodger (Google), 2014-04-09 22:41:49]

This is a great change. Just nits.

LGTM

https://codereview.chromium.org/201573015/diff/930001/ash/display/cursor_wind...
File ash/display/cursor_window_controller.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ash/display/cursor_wind...
ash/display/cursor_window_controller.cc:121: ->display_controller()
nit: I think you're supposed to put the -> on the prev line.

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host_ozone.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host_ozone.cc:23: virtual void ToggleFullScreen()
OVERRIDE { NOTIMPLEMENTED(); }
since you never refer to this type directly, these methods can all be private.

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host_win.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host_win.cc:32: // AshWindowTreeHost:
since you never refer to this type directly, these methods can all be private.

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host_x11.h (right):

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host_x11.h:25: // AshWindowTreeHost:
since you never refer to this type directly, these methods can all be private.

[oshima, 2014-04-09 23:52:14]

https://codereview.chromium.org/201573015/diff/930001/ash/display/cursor_wind...
File ash/display/cursor_window_controller.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ash/display/cursor_wind...
ash/display/cursor_window_controller.cc:121: ->display_controller()
On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
> nit: I think you're supposed to put the -> on the prev line.

Done. 

FYI: This is what "git cl format" does.

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host_ozone.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host_ozone.cc:23: virtual void ToggleFullScreen()
OVERRIDE { NOTIMPLEMENTED(); }
On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
> since you never refer to this type directly, these methods can all be private.

Done.

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host_win.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host_win.cc:32: // AshWindowTreeHost:
On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
> since you never refer to this type directly, these methods can all be private.

Done.

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
File ash/host/ash_window_tree_host_x11.h (right):

https://codereview.chromium.org/201573015/diff/930001/ash/host/ash_window_tre...
ash/host/ash_window_tree_host_x11.h:25: // AshWindowTreeHost:
On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
> since you never refer to this type directly, these methods can all be private.

Done.

https://codereview.chromium.org/201573015/diff/930001/ui/aura/window_tree_hos...
File ui/aura/window_tree_host_x11.cc (right):

https://codereview.chromium.org/201573015/diff/930001/ui/aura/window_tree_hos...
ui/aura/window_tree_host_x11.cc:548: return;
On 2014/04/09 21:35:51, Yufeng Shen wrote:
> Can we have a
> virtual bool WindowTreeHostX11::IsTouchEventTargetingThisRootWindow() {
>    return true;
> }
> 
> which gets called here
>  
> and have
> bool AshWindowTreeHostX11::IsTouchEventTargetingThisRootWindow() {
> #if defined(OS_CHROMEOS)
> if (base::SysInfo::IsRunningOnChromeOS() &&
> !bounds().Contains(ui::EventLocationFromNative(xev)))
> return false;
> }
> #endif
> return true;
> }
> 
> This way we move all the chromeos specific code into AshWTHX11. Does this make
> sense ?

I was actually wondering why this needs to be cros specific, and if we can
simply remove ifdef and IsRunningOnChromeOS. Do you know why?

In any case, let me land this change first (becuase CL is big) and
address this in separate CL if necessary.

[miletus1, 2014-04-10 00:10:44]

On Wed, Apr 9, 2014 at 7:52 PM, <oshima@chromium.org> wrote:

>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> display/cursor_window_controller.cc
> File ash/display/cursor_window_controller.cc (right):
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> display/cursor_window_controller.cc#newcode121
> ash/display/cursor_window_controller.cc:121: ->display_controller()
> On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
>
>> nit: I think you're supposed to put the -> on the prev line.
>>
>
> Done.
>
> FYI: This is what "git cl format" does.
>
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> host/ash_window_tree_host_ozone.cc
> File ash/host/ash_window_tree_host_ozone.cc (right):
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> host/ash_window_tree_host_ozone.cc#newcode23
> ash/host/ash_window_tree_host_ozone.cc:23: virtual void
> ToggleFullScreen() OVERRIDE { NOTIMPLEMENTED(); }
> On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
>
>> since you never refer to this type directly, these methods can all be
>>
> private.
>
> Done.
>
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> host/ash_window_tree_host_win.cc
> File ash/host/ash_window_tree_host_win.cc (right):
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> host/ash_window_tree_host_win.cc#newcode32
> ash/host/ash_window_tree_host_win.cc:32: // AshWindowTreeHost:
> On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
>
>> since you never refer to this type directly, these methods can all be
>>
> private.
>
> Done.
>
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> host/ash_window_tree_host_x11.h
> File ash/host/ash_window_tree_host_x11.h (right):
>
> https://codereview.chromium.org/201573015/diff/930001/ash/
> host/ash_window_tree_host_x11.h#newcode25
> ash/host/ash_window_tree_host_x11.h:25: // AshWindowTreeHost:
> On 2014/04/09 22:41:49, Ben Goodger (Google) wrote:
>
>> since you never refer to this type directly, these methods can all be
>>
> private.
>
> Done.
>
>
> https://codereview.chromium.org/201573015/diff/930001/ui/
> aura/window_tree_host_x11.cc
> File ui/aura/window_tree_host_x11.cc (right):
>
> https://codereview.chromium.org/201573015/diff/930001/ui/
> aura/window_tree_host_x11.cc#newcode548
> ui/aura/window_tree_host_x11.cc:548: return;
> On 2014/04/09 21:35:51, Yufeng Shen wrote:
>
>> Can we have a
>> virtual bool WindowTreeHostX11::IsTouchEventTargetingThisRootWindow()
>>
> {
>
>>     return true;
>> }
>>
>
>  which gets called here
>>
>
>  and have
>> bool AshWindowTreeHostX11::IsTouchEventTargetingThisRootWindow() {
>> #if defined(OS_CHROMEOS)
>> if (base::SysInfo::IsRunningOnChromeOS() &&
>> !bounds().Contains(ui::EventLocationFromNative(xev)))
>> return false;
>> }
>> #endif
>> return true;
>> }
>>
>
>  This way we move all the chromeos specific code into AshWTHX11. Does
>>
> this make
>
>> sense ?
>>
>
> I was actually wondering why this needs to be cros specific, and if we
> can simply remove ifdef and IsRunningOnChromeOS. Do you know why?
>
In any case, let me land this change first (becuase CL is big) and
> address this in separate CL if necessary.
>

no worry, I will address this in my touch CTM patch, removing the
ifdef/isRunningOnChromeOS
if they prove to be not needed.


>
> https://codereview.chromium.org/201573015/
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[oshima, 2014-04-10 03:31:13]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-04-10 03:31:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/201573015/950001

[commit-bot: I haz the power, 2014-04-10 05:21:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-10 05:21:42]

Retried try job too often on win_rel for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[oshima, 2014-04-11 03:19:47]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-04-11 03:20:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/201573015/990001

[commit-bot: I haz the power, 2014-04-11 03:20:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-11 03:20:56]

Failed to apply patch for ui/aura/window_tree_host_x11.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/aura/window_tree_host_x11.cc
  Hunk #2 succeeded at 25 (offset -1 lines).
  Hunk #3 FAILED at 107.
  Hunk #4 succeeded at 248 (offset 1 line).
  Hunk #5 succeeded at 306 (offset 1 line).
  Hunk #6 succeeded at 345 (offset 1 line).
  Hunk #7 succeeded at 374 (offset 1 line).
  Hunk #8 succeeded at 406 (offset 1 line).
  Hunk #9 succeeded at 467 (offset 1 line).
  Hunk #10 succeeded at 509 (offset 1 line).
  Hunk #11 succeeded at 544 (offset 1 line).
  Hunk #12 succeeded at 553 (offset 1 line).
  Hunk #13 succeeded at 589 (offset 1 line).
  Hunk #14 succeeded at 640 (offset 1 line).
  Hunk #15 succeeded at 675 (offset 1 line).
  Hunk #16 succeeded at 696 (offset 1 line).
  Hunk #17 succeeded at 735 (offset 1 line).
  1 out of 17 hunks FAILED -- saving rejects to file
ui/aura/window_tree_host_x11.cc.rej

Patch:       ui/aura/window_tree_host_x11.cc
Index: ui/aura/window_tree_host_x11.cc
diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc
index
525694b793aca1993f6fcc5efd95f0461c0c769e..94a5c4eb06e66fc40e3c243ba5af9cb963ce4a3d
100644
--- a/ui/aura/window_tree_host_x11.cc
+++ b/ui/aura/window_tree_host_x11.cc
@@ -6,7 +6,6 @@
 
 #include <strings.h>
 #include <X11/cursorfont.h>
-#include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
@@ -27,8 +26,8 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "ui/aura/client/cursor_client.h"
-#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/ui_base_switches.h"
@@ -108,136 +107,6 @@ bool default_override_redirect = false;
 
 }  // namespace
 
-namespace internal {
-
-// Accomplishes 2 tasks concerning touch event calibration:
-// 1. Being a message-pump observer,
-//    routes all the touch events to the X root window,
-//    where they can be calibrated later.
-// 2. Has the Calibrate method that does the actual bezel calibration,
-//    when invoked from X root window's event dispatcher.
-class TouchEventCalibrate : public base::MessagePumpObserver {
- public:
-  TouchEventCalibrate()
-    : left_(0),
-      right_(0),
-      top_(0),
-      bottom_(0) {
-    base::MessageLoopForUI::current()->AddObserver(this);
-#if defined(USE_XI2_MT)
-    std::vector<std::string> parts;
-    if (Tokenize(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-        switches::kTouchCalibration), ",", &parts) >= 4) {
-      if (!base::StringToInt(parts[0], &left_))
-        DLOG(ERROR) << "Incorrect left border calibration value passed.";
-      if (!base::StringToInt(parts[1], &right_))
-        DLOG(ERROR) << "Incorrect right border calibration value passed.";
-      if (!base::StringToInt(parts[2], &top_))
-        DLOG(ERROR) << "Incorrect top border calibration value passed.";
-      if (!base::StringToInt(parts[3], &bottom_))
-        DLOG(ERROR) << "Incorrect bottom border calibration value passed.";
-    }
-#endif  // defined(USE_XI2_MT)
-  }
-
-  virtual ~TouchEventCalibrate() {
-    base::MessageLoopForUI::current()->RemoveObserver(this);
-  }
-
-  // Modify the location of the |event|,
-  // expanding it from |bounds| to (|bounds| + bezels).
-  // Required when touchscreen is bigger than screen (i.e. has bezels),
-  // because we receive events in touchscreen coordinates,
-  // which need to be expanded when converting to screen coordinates,
-  // so that location on bezels will be outside of screen area.
-  void Calibrate(ui::TouchEvent* event, const gfx::Rect& bounds) {
-#if defined(USE_XI2_MT)
-    int x = event->x();
-    int y = event->y();
-
-    if (!left_ && !right_ && !top_ && !bottom_)
-      return;
-
-    const int resolution_x = bounds.width();
-    const int resolution_y = bounds.height();
-    // The "grace area" (10% in this case) is to make it easier for the user to
-    // navigate to the corner.
-    const double kGraceAreaFraction = 0.1;
-    if (left_ || right_) {
-      // Offset the x position to the real
-      x -= left_;
-      // Check if we are in the grace area of the left side.
-      // Note: We might not want to do this when the gesture is locked?
-      if (x < 0 && x > -left_ * kGraceAreaFraction)
-        x = 0;
-      // Check if we are in the grace area of the right side.
-      // Note: We might not want to do this when the gesture is locked?
-      if (x > resolution_x - left_ &&
-          x < resolution_x - left_ + right_ * kGraceAreaFraction)
-        x = resolution_x - left_;
-      // Scale the screen area back to the full resolution of the screen.
-      x = (x * resolution_x) / (resolution_x - (right_ + left_));
-    }
-    if (top_ || bottom_) {
-      // When there is a top bezel we add our border,
-      y -= top_;
-
-      // Check if we are in the grace area of the top side.
-      // Note: We might not want to do this when the gesture is locked?
-      if (y < 0 && y > -top_ * kGraceAreaFraction)
-        y = 0;
-
-      // Check if we are in the grace area of the bottom side.
-      // Note: We might not want to do this when the gesture is locked?
-      if (y > resolution_y - top_ &&
-          y < resolution_y - top_ + bottom_ * kGraceAreaFraction)
-        y = resolution_y - top_;
-      // Scale the screen area back to the full resolution of the screen.
-      y = (y * resolution_y) / (resolution_y - (bottom_ + top_));
-    }
-
-    // Set the modified coordinate back to the event.
-    if (event->root_location() == event->location()) {
-      // Usually those will be equal,
-      // if not, I am not sure what the correct value should be.
-      event->set_root_location(gfx::Point(x, y));
-    }
-    event->set_location(gfx::Point(x, y));
-#endif  // defined(USE_XI2_MT)
-  }
-
- private:
-  // Overridden from base::MessagePumpObserver:
-  virtual void WillProcessEvent(const base::NativeEvent& event) OVERRIDE {
-#if defined(USE_XI2_MT)
-    if (event->type == GenericEvent &&
-        (event->xgeneric.evtype == XI_TouchBegin ||
-         event->xgeneric.evtype == XI_TouchUpdate ||
-         event->xgeneric.evtype == XI_TouchEnd)) {
-      XIDeviceEvent* xievent =
static_cast<XIDeviceEvent*>(event->xcookie.data);
-      xievent->event = xievent->root;
-      xievent->event_x = xievent->root_x;
-      xievent->event_y = xievent->root_y;
-    }
-#endif  // defined(USE_XI2_MT)
-  }
-
-  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
-  }
-
-  // The difference in screen's native resolution pixels between
-  // the border of the touchscreen and the border of the screen,
-  // aka bezel sizes.
-  int left_;
-  int right_;
-  int top_;
-  int bottom_;
-
-  DISALLOW_COPY_AND_ASSIGN(TouchEventCalibrate);
-};
-
-}  // namespace internal
-

////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostX11
 
@@ -248,8 +117,6 @@ WindowTreeHostX11::WindowTreeHostX11(const gfx::Rect&
bounds)
       current_cursor_(ui::kCursorNull),
       window_mapped_(false),
       bounds_(bounds),
-      is_internal_display_(false),
-      touch_calibrate_(new internal::TouchEventCalibrate),
       atom_cache_(xdisplay_, kAtomsToCache) {
   XSetWindowAttributes swa;
   memset(&swa, 0, sizeof(swa));
@@ -308,17 +175,13 @@ WindowTreeHostX11::WindowTreeHostX11(const gfx::Rect&
bounds)
 
   XRRSelectInput(xdisplay_, x_root_window_,
                  RRScreenChangeNotifyMask | RROutputChangeNotifyMask);
-  Env::GetInstance()->AddObserver(this);
   CreateCompositor(GetAcceleratedWidget());
 }
 
 WindowTreeHostX11::~WindowTreeHostX11() {
-  Env::GetInstance()->RemoveObserver(this);
   if (ui::PlatformEventSource::GetInstance())
    
ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 
-  UnConfineCursor();
-
   DestroyCompositor();
   DestroyDispatcher();
   XDestroyWindow(xdisplay_, xwindow_);
@@ -351,12 +214,12 @@ uint32_t WindowTreeHostX11::DispatchEvent(const
ui::PlatformEvent& event) {
       // EnterNotify creates ET_MOUSE_MOVE. Mark as synthesized as this is not
       // real mouse move event.
       mouse_event.set_flags(mouse_event.flags() | ui::EF_IS_SYNTHESIZED);
-      TranslateAndDispatchMouseEvent(&mouse_event);
+      TranslateAndDispatchLocatedEvent(&mouse_event);
       break;
     }
     case LeaveNotify: {
       ui::MouseEvent mouse_event(xev);
-      TranslateAndDispatchMouseEvent(&mouse_event);
+      TranslateAndDispatchLocatedEvent(&mouse_event);
       break;
     }
     case Expose: {
@@ -380,13 +243,13 @@ uint32_t WindowTreeHostX11::DispatchEvent(const
ui::PlatformEvent& event) {
       switch (ui::EventTypeFromNative(xev)) {
         case ui::ET_MOUSEWHEEL: {
           ui::MouseWheelEvent mouseev(xev);
-          TranslateAndDispatchMouseEvent(&mouseev);
+          TranslateAndDispatchLocatedEvent(&mouseev);
           break;
         }
         case ui::ET_MOUSE_PRESSED:
         case ui::ET_MOUSE_RELEASED: {
           ui::MouseEvent mouseev(xev);
-          TranslateAndDispatchMouseEvent(&mouseev);
+          TranslateAndDispatchLocatedEvent(&mouseev);
           break;
         }
         case ui::ET_UNKNOWN:
@@ -412,13 +275,7 @@ uint32_t WindowTreeHostX11::DispatchEvent(const
ui::PlatformEvent& event) {
       bool size_changed = bounds_.size() != bounds.size();
       bool origin_changed = bounds_.origin() != bounds.origin();
       bounds_ = bounds;
-      UpdateIsInternalDisplay();
-      // Always update barrier and mouse location because |bounds_| might
-      // have already been updated in |SetBounds|.
-      if (pointer_barriers_) {
-        UnConfineCursor();
-        ConfineCursorToRootWindow();
-      }
+      OnConfigureNotify();
       if (size_changed)
         OnHostResized…
(message too large)

[oshima, 2014-04-11 05:30:07]

The CQ bit was checked by oshima@chromium.org

[commit-bot: I haz the power, 2014-04-11 05:30:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/201573015/1030001

[commit-bot: I haz the power, 2014-04-11 08:13:49]

Change committed as 263192