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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2539283002: Remove PlatformGestureEvent in favour of using WebGestureEvent (Closed)
Patch Set: Add missing copyright on new file Created 4 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 case WebInputEvent::GestureLongTap: 856 case WebInputEvent::GestureLongTap:
857 break; 857 break;
858 case WebInputEvent::GestureFlingStart: 858 case WebInputEvent::GestureFlingStart:
859 case WebInputEvent::GestureFlingCancel: 859 case WebInputEvent::GestureFlingCancel:
860 m_client->didHandleGestureEvent(event, eventCancelled); 860 m_client->didHandleGestureEvent(event, eventCancelled);
861 return WebInputEventResult::NotHandled; 861 return WebInputEventResult::NotHandled;
862 default: 862 default:
863 NOTREACHED(); 863 NOTREACHED();
864 } 864 }
865 LocalFrame* frame = m_localRoot->frame(); 865 LocalFrame* frame = m_localRoot->frame();
866 eventResult = frame->eventHandler().handleGestureEvent( 866 WebGestureEvent scaledEvent = TransformWebGestureEvent(frame->view(), event);
867 PlatformGestureEventBuilder(frame->view(), event)); 867 eventResult = frame->eventHandler().handleGestureEvent(scaledEvent);
868 m_client->didHandleGestureEvent(event, eventCancelled); 868 m_client->didHandleGestureEvent(event, eventCancelled);
869 return eventResult; 869 return eventResult;
870 } 870 }
871 871
872 WebInputEventResult WebFrameWidgetImpl::handleKeyEvent( 872 WebInputEventResult WebFrameWidgetImpl::handleKeyEvent(
873 const WebKeyboardEvent& event) { 873 const WebKeyboardEvent& event) {
874 DCHECK((event.type == WebInputEvent::RawKeyDown) || 874 DCHECK((event.type == WebInputEvent::RawKeyDown) ||
875 (event.type == WebInputEvent::KeyDown) || 875 (event.type == WebInputEvent::KeyDown) ||
876 (event.type == WebInputEvent::KeyUp)); 876 (event.type == WebInputEvent::KeyUp));
877 877
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 return nullptr; 1150 return nullptr;
1151 } 1151 }
1152 1152
1153 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { 1153 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
1154 if (!m_imeAcceptEvents) 1154 if (!m_imeAcceptEvents)
1155 return nullptr; 1155 return nullptr;
1156 return focusedLocalFrameInWidget(); 1156 return focusedLocalFrameInWidget();
1157 } 1157 }
1158 1158
1159 } // namespace blink 1159 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/LinkHighlightImplTest.cpp ('k') | third_party/WebKit/Source/web/WebInputEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698