diff options
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_win.cc | 6 | ||||
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_win.cc | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 2a81d33..4cb6cfe 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -278,10 +278,9 @@ LRESULT CALLBACK PluginWrapperWindowProc(HWND window, unsigned int message, switch (LOWORD(wparam)) { case WM_LBUTTONDOWN: case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: { + case WM_MBUTTONDOWN: ::SendMessage(GetParent(window), message, wparam, lparam); return 0; - } default: break; } @@ -1735,10 +1734,9 @@ LRESULT RenderWidgetHostViewWin::OnParentNotify(UINT message, WPARAM wparam, switch (LOWORD(wparam)) { case WM_LBUTTONDOWN: case WM_RBUTTONDOWN: - case WM_MBUTTONDOWN: { + case WM_MBUTTONDOWN: render_widget_host_->StartUserGesture(); break; - } default: break; } diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index 1e82cad..5bfc994 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -1404,19 +1404,15 @@ void WebPluginDelegateImpl::HandleCaptureForMessage(HWND window, switch (message) { case WM_LBUTTONDOWN: case WM_MBUTTONDOWN: - case WM_RBUTTONDOWN: { + case WM_RBUTTONDOWN: ::SetCapture(window); // As per documentation the WM_PARENTNOTIFY message is sent to the parent // window chain if mouse input is received by the child window. However // the parent receives the WM_PARENTNOTIFY message only if we doubleclick // on the window. We send the WM_PARENTNOTIFY message for mouse input // messages to the parent to indicate that user action is expected. - HWND parent = GetParent(window); - if (IsWindow(parent)) { - ::SendMessage(parent, WM_PARENTNOTIFY, message, 0); - } + ::SendMessage(::GetParent(window), WM_PARENTNOTIFY, message, 0); break; - } case WM_LBUTTONUP: case WM_MBUTTONUP: |