diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/gpu/gpu_view_win.cc | 27 | ||||
| -rw-r--r-- | chrome/gpu/gpu_view_win.h | 39 |
2 files changed, 4 insertions, 62 deletions
diff --git a/chrome/gpu/gpu_view_win.cc b/chrome/gpu/gpu_view_win.cc index e94c695..e6233a6 100644 --- a/chrome/gpu/gpu_view_win.cc +++ b/chrome/gpu/gpu_view_win.cc @@ -129,30 +129,3 @@ void GpuViewWin::OnPaint(HDC unused_dc) { DrawBackground(paint_dc.m_ps.rcPaint, &paint_dc); } } - -LRESULT GpuViewWin::OnMouseEvent(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled) { - handled = true; - ::PostMessage(GetParent(), message, wparam, lparam); - return 0; -} - -LRESULT GpuViewWin::OnKeyEvent(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled) { - handled = true; - ::PostMessage(GetParent(), message, wparam, lparam); - return 0; -} - -LRESULT GpuViewWin::OnWheelEvent(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled) { - handled = true; - ::PostMessage(GetParent(), message, wparam, lparam); - return 0; -} diff --git a/chrome/gpu/gpu_view_win.h b/chrome/gpu/gpu_view_win.h index 30efeac8..87d8f5d 100644 --- a/chrome/gpu/gpu_view_win.h +++ b/chrome/gpu/gpu_view_win.h @@ -23,7 +23,10 @@ class Rect; class Size; } -typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0> +// WS_DISABLED means that input events will be delivered to the parent, which is +// what we want for our overlay window. +typedef CWinTraits< + WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | WS_DISABLED, 0> GpuRenderWidgetHostViewWinTraits; class GpuViewWin @@ -46,28 +49,6 @@ class GpuViewWin BEGIN_MSG_MAP(GpuViewWin) MSG_WM_PAINT(OnPaint) - MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseEvent) - MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseEvent) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnMouseEvent) - MESSAGE_HANDLER(WM_MBUTTONDOWN, OnMouseEvent) - MESSAGE_HANDLER(WM_RBUTTONDOWN, OnMouseEvent) - MESSAGE_HANDLER(WM_LBUTTONUP, OnMouseEvent) - MESSAGE_HANDLER(WM_MBUTTONUP, OnMouseEvent) - MESSAGE_HANDLER(WM_RBUTTONUP, OnMouseEvent) - MESSAGE_HANDLER(WM_LBUTTONDBLCLK, OnMouseEvent) - MESSAGE_HANDLER(WM_MBUTTONDBLCLK, OnMouseEvent) - MESSAGE_HANDLER(WM_RBUTTONDBLCLK, OnMouseEvent) - MESSAGE_HANDLER(WM_SYSKEYDOWN, OnKeyEvent) - MESSAGE_HANDLER(WM_SYSKEYUP, OnKeyEvent) - MESSAGE_HANDLER(WM_KEYDOWN, OnKeyEvent) - MESSAGE_HANDLER(WM_KEYUP, OnKeyEvent) - MESSAGE_HANDLER(WM_MOUSEWHEEL, OnWheelEvent) - MESSAGE_HANDLER(WM_MOUSEHWHEEL, OnWheelEvent) - MESSAGE_HANDLER(WM_HSCROLL, OnWheelEvent) - MESSAGE_HANDLER(WM_VSCROLL, OnWheelEvent) - MESSAGE_HANDLER(WM_CHAR, OnKeyEvent) - MESSAGE_HANDLER(WM_SYSCHAR, OnKeyEvent) - MESSAGE_HANDLER(WM_IME_CHAR, OnKeyEvent) END_MSG_MAP() private: @@ -76,18 +57,6 @@ class GpuViewWin // Windows message handlers. void OnPaint(HDC unused_dc); - LRESULT OnMouseEvent(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled); - LRESULT OnKeyEvent(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled); - LRESULT OnWheelEvent(UINT message, - WPARAM wparam, - LPARAM lparam, - BOOL& handled); GpuThread* gpu_thread_; int32 routing_id_; |