diff options
-rw-r--r-- | webkit/tools/test_shell/mac/webwidget_host.mm | 19 | ||||
-rw-r--r-- | webkit/tools/test_shell/webwidget_host.h | 6 | ||||
-rw-r--r-- | webkit/tools/test_shell/webwidget_host_gtk.cc | 3 |
3 files changed, 8 insertions, 20 deletions
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm index 5be3a2a..da34ca7 100644 --- a/webkit/tools/test_shell/mac/webwidget_host.mm +++ b/webkit/tools/test_shell/mac/webwidget_host.mm @@ -141,17 +141,13 @@ WebWidgetHost::WebWidgetHost() : view_(NULL), webwidget_(NULL), scroll_dx_(0), - scroll_dy_(0), - track_mouse_leave_(false) -{ + scroll_dy_(0) { set_painting(false); } WebWidgetHost::~WebWidgetHost() { // win_util::SetWindowUserData(hwnd_, 0); - TrackMouseLeave(false); - webwidget_->close(); } @@ -236,16 +232,6 @@ void WebWidgetHost::Resize(const gfx::Rect& rect) { void WebWidgetHost::MouseEvent(NSEvent *event) { const WebMouseEvent& web_event = WebInputEventFactory::mouseEvent( event, view_); - switch (web_event.type) { - case WebInputEvent::MouseMove: - TrackMouseLeave(true); - break; - case WebInputEvent::MouseLeave: - TrackMouseLeave(false); - break; - default: - break; - } webwidget_->handleInputEvent(web_event); } @@ -273,9 +259,6 @@ void WebWidgetHost::SetFocus(bool enable) { webwidget_->setFocus(enable); } -void WebWidgetHost::TrackMouseLeave(bool track) { -} - void WebWidgetHost::ResetScrollRect() { scroll_rect_ = gfx::Rect(); scroll_dx_ = 0; diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h index cb9dee7..9f4a13c 100644 --- a/webkit/tools/test_shell/webwidget_host.h +++ b/webkit/tools/test_shell/webwidget_host.h @@ -109,7 +109,10 @@ class WebWidgetHost { void Resize(const gfx::Size& size); #endif +#if defined(OS_WIN) void TrackMouseLeave(bool enable); +#endif + void ResetScrollRect(); void PaintRect(const gfx::Rect& rect); @@ -131,7 +134,10 @@ class WebWidgetHost { int scroll_dx_; int scroll_dy_; +#if defined(OS_WIN) bool track_mouse_leave_; +#endif + #if defined(OS_LINUX) // Since GtkWindow resize is asynchronous, we have to stash the dimensions, // so that the backing store doesn't have to wait for sizing to take place. diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc index b471e6d..405dc87 100644 --- a/webkit/tools/test_shell/webwidget_host_gtk.cc +++ b/webkit/tools/test_shell/webwidget_host_gtk.cc @@ -310,8 +310,7 @@ WebWidgetHost::WebWidgetHost() : view_(NULL), webwidget_(NULL), scroll_dx_(0), - scroll_dy_(0), - track_mouse_leave_(false) { + scroll_dy_(0) { set_painting(false); } |