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

Side by Side Diff: ui/views/widget/native_widget_win.cc

Issue 23619025: Fix use after free when handling async touch events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/widget/native_widget_win.h ('k') | ui/views/win/hwnd_message_handler_delegate.h » ('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 #include "ui/views/widget/native_widget_win.h" 5 #include "ui/views/widget/native_widget_win.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 return event.handled(); 777 return event.handled();
778 } 778 }
779 779
780 bool NativeWidgetWin::HandleUntranslatedKeyEvent(const ui::KeyEvent& event) { 780 bool NativeWidgetWin::HandleUntranslatedKeyEvent(const ui::KeyEvent& event) {
781 InputMethod* input_method = GetInputMethod(); 781 InputMethod* input_method = GetInputMethod();
782 if (input_method) 782 if (input_method)
783 input_method->DispatchKeyEvent(event); 783 input_method->DispatchKeyEvent(event);
784 return !!input_method; 784 return !!input_method;
785 } 785 }
786 786
787 bool NativeWidgetWin::HandleTouchEvent(const ui::TouchEvent& event) { 787 void NativeWidgetWin::HandleTouchEvent(const ui::TouchEvent& event) {
788 NOTREACHED() << "Touch events are not supported"; 788 NOTREACHED() << "Touch events are not supported";
789 return false;
790 } 789 }
791 790
792 bool NativeWidgetWin::HandleIMEMessage(UINT message, 791 bool NativeWidgetWin::HandleIMEMessage(UINT message,
793 WPARAM w_param, 792 WPARAM w_param,
794 LPARAM l_param, 793 LPARAM l_param,
795 LRESULT* result) { 794 LRESULT* result) {
796 InputMethod* input_method = GetInputMethod(); 795 InputMethod* input_method = GetInputMethod();
797 if (!input_method || input_method->IsMock()) { 796 if (!input_method || input_method->IsMock()) {
798 *result = 0; 797 *result = 0;
799 return false; 798 return false;
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 // static 1032 // static
1034 bool NativeWidgetPrivate::IsTouchDown() { 1033 bool NativeWidgetPrivate::IsTouchDown() {
1035 // This currently isn't necessary because we're not generating touch events on 1034 // This currently isn't necessary because we're not generating touch events on
1036 // windows. When we do, this will need to be updated. 1035 // windows. When we do, this will need to be updated.
1037 return false; 1036 return false;
1038 } 1037 }
1039 1038
1040 } // namespace internal 1039 } // namespace internal
1041 1040
1042 } // namespace views 1041 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_win.h ('k') | ui/views/win/hwnd_message_handler_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698