diff options
| author | tdanderson <tdanderson@chromium.org> | 2014-11-07 11:49:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 19:49:28 +0000 |
| commit | f2d6fd8f14b22b4b15e5e8fd3ac2bb8141bef552 (patch) | |
| tree | a89e676aef922d711fafd91f7f21444911533485 /ui/views/view_unittest.cc | |
| parent | 0fef34d4f5b2e5cd138cc9696f5f189c8c8c2384 (diff) | |
| download | chromium_src-f2d6fd8f14b22b4b15e5e8fd3ac2bb8141bef552.zip chromium_src-f2d6fd8f14b22b4b15e5e8fd3ac2bb8141bef552.tar.gz chromium_src-f2d6fd8f14b22b4b15e5e8fd3ac2bb8141bef552.tar.bz2 | |
Revert of Do not interchange MOUSE_MOVED and MOUSE_DRAGGED events in Widget (patchset #8 id:140001 of https://codereview.chromium.org/560053002/)
Reason for revert:
Responsible for the crash reported in crbug.com/430427. Relanding will require addressing crbug.com/431350 first.
Original issue's description:
> Do not interchange MOUSE_MOVED and MOUSE_DRAGGED events in Widget
>
> In Widget::OnMouseEvent(), do not handle MOUSE_MOVED
> events as MOUSE_DRAGGED events, and do not handle
> MOUSE_DRAGGED events as MOUSE_MOVED events; instead
> trust that the mouse event type has been set correctly
> before arriving at Widget. This also allows us to
> remove the member |is_mouse_button_pressed_|
> from Widget.
>
> BUG=412929, 412931
> TEST=WidgetTest.DragIntoView
BUG=412929, 412931
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/703643004
Cr-Commit-Position: refs/heads/master@{#303274}
Diffstat (limited to 'ui/views/view_unittest.cc')
| -rw-r--r-- | ui/views/view_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index aef5632..85c2f48 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -367,7 +367,7 @@ TEST_F(ViewTest, MouseEvent) { v2->Reset(); ui::MouseEvent released(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), 0, 0); - root->OnMouseReleased(released); + root->OnMouseDragged(released); EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_RELEASED); EXPECT_EQ(v2->location_.x(), -100); EXPECT_EQ(v2->location_.y(), -100); |