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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_win.h

Issue 10825233: OnPointerMessage no longer nukes the active focus (Win8/Desktop). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Removed OnPointerEvent entirely. Created 8 years, 3 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
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 MESSAGE_HANDLER(WM_MOUSEHWHEEL, OnWheelEvent) 134 MESSAGE_HANDLER(WM_MOUSEHWHEEL, OnWheelEvent)
135 MESSAGE_HANDLER(WM_HSCROLL, OnWheelEvent) 135 MESSAGE_HANDLER(WM_HSCROLL, OnWheelEvent)
136 MESSAGE_HANDLER(WM_VSCROLL, OnWheelEvent) 136 MESSAGE_HANDLER(WM_VSCROLL, OnWheelEvent)
137 MESSAGE_HANDLER(WM_CHAR, OnKeyEvent) 137 MESSAGE_HANDLER(WM_CHAR, OnKeyEvent)
138 MESSAGE_HANDLER(WM_SYSCHAR, OnKeyEvent) 138 MESSAGE_HANDLER(WM_SYSCHAR, OnKeyEvent)
139 MESSAGE_HANDLER(WM_TOUCH, OnTouchEvent) 139 MESSAGE_HANDLER(WM_TOUCH, OnTouchEvent)
140 MESSAGE_HANDLER(WM_IME_CHAR, OnKeyEvent) 140 MESSAGE_HANDLER(WM_IME_CHAR, OnKeyEvent)
141 MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate) 141 MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate)
142 MESSAGE_HANDLER(WM_GETOBJECT, OnGetObject) 142 MESSAGE_HANDLER(WM_GETOBJECT, OnGetObject)
143 MESSAGE_HANDLER(WM_PARENTNOTIFY, OnParentNotify) 143 MESSAGE_HANDLER(WM_PARENTNOTIFY, OnParentNotify)
144 MESSAGE_HANDLER(WM_POINTERDOWN, OnPointerMessage)
145 MESSAGE_HANDLER(WM_POINTERUP, OnPointerMessage)
146 MESSAGE_HANDLER(WM_GESTURE, OnGestureEvent) 144 MESSAGE_HANDLER(WM_GESTURE, OnGestureEvent)
147 END_MSG_MAP() 145 END_MSG_MAP()
148 146
149 // RenderWidgetHostView implementation. 147 // RenderWidgetHostView implementation.
150 virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE; 148 virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
151 virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE; 149 virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
152 virtual void SetSize(const gfx::Size& size) OVERRIDE; 150 virtual void SetSize(const gfx::Size& size) OVERRIDE;
153 virtual void SetBounds(const gfx::Rect& rect) OVERRIDE; 151 virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
154 virtual gfx::NativeView GetNativeView() const OVERRIDE; 152 virtual gfx::NativeView GetNativeView() const OVERRIDE;
155 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE; 153 virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam, 318 LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam,
321 BOOL& handled); 319 BOOL& handled);
322 // Handle vertical scrolling. 320 // Handle vertical scrolling.
323 LRESULT OnVScroll(int code, short position, HWND scrollbar_control); 321 LRESULT OnVScroll(int code, short position, HWND scrollbar_control);
324 // Handle horizontal scrolling. 322 // Handle horizontal scrolling.
325 LRESULT OnHScroll(int code, short position, HWND scrollbar_control); 323 LRESULT OnHScroll(int code, short position, HWND scrollbar_control);
326 324
327 LRESULT OnParentNotify(UINT message, WPARAM wparam, LPARAM lparam, 325 LRESULT OnParentNotify(UINT message, WPARAM wparam, LPARAM lparam,
328 BOOL& handled); 326 BOOL& handled);
329 327
330 // Handle the new pointer messages
331 LRESULT OnPointerMessage(UINT message, WPARAM wparam, LPARAM lparam,
332 BOOL& handled);
333 // Handle high-level touch events. 328 // Handle high-level touch events.
334 LRESULT OnGestureEvent(UINT message, WPARAM wparam, LPARAM lparam, 329 LRESULT OnGestureEvent(UINT message, WPARAM wparam, LPARAM lparam,
335 BOOL& handled); 330 BOOL& handled);
336 331
337 void OnFinalMessage(HWND window); 332 void OnFinalMessage(HWND window);
338 333
339 private: 334 private:
340 // Updates the display cursor to the current cursor if the cursor is over this 335 // Updates the display cursor to the current cursor if the cursor is over this
341 // render view. 336 // render view.
342 void UpdateCursorIfOverSelf(); 337 void UpdateCursorIfOverSelf();
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 bool touch_events_enabled_; 571 bool touch_events_enabled_;
577 572
578 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 573 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
579 574
580 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); 575 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
581 }; 576 };
582 577
583 } // namespace content 578 } // namespace content
584 579
585 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 580 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698