diff options
author | dbeam <dbeam@chromium.org> | 2014-09-17 14:49:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 21:49:23 +0000 |
commit | 8c2ece8a0b3ebda1ceebd8fda2939d23b85848f9 (patch) | |
tree | 6e7f928c686313cc8b7cd98858aaaffd0046d826 | |
parent | 486410ba144ea2811ad98d615e40bb6ef291a69d (diff) | |
download | chromium_src-8c2ece8a0b3ebda1ceebd8fda2939d23b85848f9.zip chromium_src-8c2ece8a0b3ebda1ceebd8fda2939d23b85848f9.tar.gz chromium_src-8c2ece8a0b3ebda1ceebd8fda2939d23b85848f9.tar.bz2 |
Revert of Clean up GestureEventDetails constructors and fix unit tests (patchset #3 id:60001 of https://codereview.chromium.org/573963005/)
Reason for revert:
this may have broken wm_unittests on XP Tests (3):
https://build.chromium.org/p/chromium.win/builders/XP%20Tests%20(3)/builds/28989
WindowAnimationsTest.HideAnimationDetachLayers (run #1):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B9D8 vs 0017B9D8
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (141 ms)
WindowAnimationsTest.HideAnimationDetachLayers (run #2):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B318 vs 0017B318
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slaveWindowAnimationsTest.HideAnimationDetachLayers (run #1):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B9D8 vs 0017B9D8
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (141 ms)
WindowAnimationsTest.HideAnimationDetachLayers (run #2):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B318 vs 0017B318
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (94 ms)
WindowAnimationsTest.HideAnimationDetachLayers (run #3):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B318 vs 0017B318
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (47 ms)
WindowAnimationsTest.HideAnimationDetachLayers (run #4):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B318 vs 0017B318
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (47 ms)\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (94 ms)
WindowAnimationsTest.HideAnimationDetachLayers (run #3):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B318 vs 0017B318
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (47 ms)
WindowAnimationsTest.HideAnimationDetachLayers (run #4):
[ RUN ] WindowAnimationsTest.HideAnimationDetachLayers
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(149): error: Value of: AnimateOnChildWindowVisibilityChanged( animating_window.get(), false)
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(150): error: Value of: animating_layer->GetAnimator()->is_animating()
Actual: false
Expected: true
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(151): error: Value of: animating_layer->delegate()
Actual: true
Expected: false
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(155): error: Expected: (animating_window->layer()) != (animating_layer), actual: 0017B318 vs 0017B318
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(171): error: Value of: GetLayerZPosition(animating_layer)
Actual: 1
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(180): error: Value of: GetLayerZPosition(animating_layer)
Actual: 0
Expected: 2
c:\b\build\slave\win_builder\build\src\ui\wm\core\window_animations_unittest.cc(188): error: Value of: std::find(parent->layer()->children().begin(), parent->layer()->children().end(), animating_layer) == parent->layer()->children().end()
Actual: false
Expected: true
[ FAILED ] WindowAnimationsTest.HideAnimationDetachLayers (47 ms)
Original issue's description:
> Clean up GestureEventDetails constructors and fix unit tests.
>
> A new version of Issue 565583005: Clean up GestureEventDetails
> constructors
> https://codereview.chromium.org/565583005/
>
> BUG=350942
>
> TBR=tdresser@chromium.org, jdduke@chromium.org, sadrul@chromium.org
>
> Committed: https://crrev.com/874611d5ab5b879648682c1ea41062bebc9c95e5
> Cr-Commit-Position: refs/heads/master@{#295144}
>
> Committed: https://crrev.com/66e0c057b87824c6e6928f359fa56a8ee45ae6e2
> Cr-Commit-Position: refs/heads/master@{#295296}
>
> Committed: https://crrev.com/9ec877c2d256a538b1c9af2fbed736aad8406e66
> Cr-Commit-Position: refs/heads/master@{#295329}
TBR=sky@chromium.org,lanwei@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=350942
Review URL: https://codereview.chromium.org/580973002
Cr-Commit-Position: refs/heads/master@{#295353}
-rw-r--r-- | content/browser/web_contents/touch_editable_impl_aura_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc index c159d5f..f97f6df 100644 --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc @@ -340,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, 10, 0, ui::EventTimeForNow(), - ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS)); + ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0)); touch_editable->Reset(); rwhva->OnGestureEvent(&long_press); touch_editable->WaitForSelectionChangeCallback(); |