diff options
| author | rjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 00:01:31 +0000 |
|---|---|---|
| committer | rjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 00:01:31 +0000 |
| commit | caea2f6a988c14c6f923662fd9fe556d158b6037 (patch) | |
| tree | 878a84149d6f78affeef2fb4dc1ef732a29a8bee | |
| parent | cc0bbb3c421e2e33855a9462f6d3e9815adf1a26 (diff) | |
| download | chromium_src-caea2f6a988c14c6f923662fd9fe556d158b6037.zip chromium_src-caea2f6a988c14c6f923662fd9fe556d158b6037.tar.gz chromium_src-caea2f6a988c14c6f923662fd9fe556d158b6037.tar.bz2 | |
Fix the aura unit tests for ozone=1
Implemented NativeEvent copying for ozone events to
fix crash in unit tests and suppressed cursor tests
that cannot yet function.
BUG=252320
Review URL: https://chromiumcodereview.appspot.com/17274016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207646 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/aura/window_unittest.cc | 11 | ||||
| -rw-r--r-- | ui/base/events/event.cc | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 8106c66..320d1a61 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -386,7 +386,12 @@ TEST_F(WindowTest, ContainsMouse) { } // Test Window::ConvertPointToWindow() with transform to root_window. +#if defined(USE_OZONE) +// TODO(rjkroege): Add cursor support in ozone: http://crbug.com/252315. +TEST_F(WindowTest, DISABLED_MoveCursorToWithTransformRootWindow) { +#else TEST_F(WindowTest, MoveCursorToWithTransformRootWindow) { +#endif RootWindow* root = root_window(); gfx::Transform transform; transform.Translate(100.0, 100.0); @@ -443,7 +448,13 @@ TEST_F(WindowTest, MoveCursorToWithTransformWindow) { // Test Window::ConvertPointToWindow() with complex transforms to both root and // non-root windows. +// Test Window::ConvertPointToWindow() with transform to root_window. +#if defined(USE_OZONE) +// TODO(rjkroege): Add cursor support in ozone: http://crbug.com/252315. +TEST_F(WindowTest, DISABLED_MoveCursorToWithComplexTransform) { +#else TEST_F(WindowTest, MoveCursorToWithComplexTransform) { +#endif scoped_ptr<Window> w1( CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 10, 500, 500), root_window())); diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc index b69780c..1ade950 100644 --- a/ui/base/events/event.cc +++ b/ui/base/events/event.cc @@ -35,6 +35,8 @@ base::NativeEvent CopyNativeEvent(const base::NativeEvent& event) { return copy; #elif defined(OS_WIN) return event; +#elif defined(USE_OZONE) + return event; #else NOTREACHED() << "Don't know how to copy base::NativeEvent for this platform"; |