Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 6685069: Disambiguate OnMouseCaptureLost from OnMouseReleased, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refinements, etc. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 654
655 GetRenderWidgetHost()->ForwardMouseEvent(e); 655 GetRenderWidgetHost()->ForwardMouseEvent(e);
656 return true; 656 return true;
657 } 657 }
658 658
659 bool RenderWidgetHostViewViews::OnMouseDragged(const views::MouseEvent& event) { 659 bool RenderWidgetHostViewViews::OnMouseDragged(const views::MouseEvent& event) {
660 OnMouseMoved(event); 660 OnMouseMoved(event);
661 return true; 661 return true;
662 } 662 }
663 663
664 void RenderWidgetHostViewViews::OnMouseReleased(const views::MouseEvent& event, 664 void RenderWidgetHostViewViews::OnMouseReleased(
665 bool canceled) { 665 const views::MouseEvent& event) {
666 WebKit::WebMouseEvent e = WebMouseEventFromViewsEvent(event); 666 WebKit::WebMouseEvent e = WebMouseEventFromViewsEvent(event);
667 667
668 e.type = WebKit::WebInputEvent::MouseUp; 668 e.type = WebKit::WebInputEvent::MouseUp;
669 e.clickCount = 1; 669 e.clickCount = 1;
670 670
671 GetRenderWidgetHost()->ForwardMouseEvent(e); 671 GetRenderWidgetHost()->ForwardMouseEvent(e);
672 } 672 }
673 673
674 void RenderWidgetHostViewViews::OnMouseCaptureLost() {
675 // TODO(msw): Replicate behavior of OnMouseReleased with synthesized event?
msw 2011/03/17 23:28:51 Need guidance / deeper investigation.
676 }
677
674 void RenderWidgetHostViewViews::OnMouseMoved(const views::MouseEvent& event) { 678 void RenderWidgetHostViewViews::OnMouseMoved(const views::MouseEvent& event) {
675 WebKit::WebMouseEvent e = WebMouseEventFromViewsEvent(event); 679 WebKit::WebMouseEvent e = WebMouseEventFromViewsEvent(event);
676 680
677 e.type = WebKit::WebInputEvent::MouseMove; 681 e.type = WebKit::WebInputEvent::MouseMove;
678 682
679 GetRenderWidgetHost()->ForwardMouseEvent(e); 683 GetRenderWidgetHost()->ForwardMouseEvent(e);
680 } 684 }
681 685
682 void RenderWidgetHostViewViews::OnMouseEntered(const views::MouseEvent& event) { 686 void RenderWidgetHostViewViews::OnMouseEntered(const views::MouseEvent& event) {
683 // Already generated synthetically by webkit. 687 // Already generated synthetically by webkit.
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 } 977 }
974 978
975 // static 979 // static
976 RenderWidgetHostView* 980 RenderWidgetHostView*
977 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( 981 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
978 gfx::NativeView widget) { 982 gfx::NativeView widget) {
979 gpointer user_data = g_object_get_data(G_OBJECT(widget), 983 gpointer user_data = g_object_get_data(G_OBJECT(widget),
980 kRenderWidgetHostViewKey); 984 kRenderWidgetHostViewKey);
981 return reinterpret_cast<RenderWidgetHostView*>(user_data); 985 return reinterpret_cast<RenderWidgetHostView*>(user_data);
982 } 986 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698