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

Side by Side Diff: Source/web/WebPluginContainerImpl.cpp

Issue 732483003: Remove GestureScrollUpdateWithoutPropagation event (blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 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
« no previous file with comments | « Source/web/WebInputEventConversion.cpp ('k') | Source/web/WebPopupMenuImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2014 Opera Software ASA. All rights reserved. 3 * Copyright (C) 2014 Opera Software ASA. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 if (webEvent.type == WebInputEvent::Undefined) 909 if (webEvent.type == WebInputEvent::Undefined)
910 return; 910 return;
911 if (event->type() == EventTypeNames::gesturetapdown) 911 if (event->type() == EventTypeNames::gesturetapdown)
912 focusPlugin(); 912 focusPlugin();
913 WebCursorInfo cursorInfo; 913 WebCursorInfo cursorInfo;
914 if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) { 914 if (m_webPlugin->handleInputEvent(webEvent, cursorInfo)) {
915 event->setDefaultHandled(); 915 event->setDefaultHandled();
916 return; 916 return;
917 } 917 }
918 918
919 if (webEvent.type == WebInputEvent::GestureScrollUpdate || webEvent.type == WebInputEvent::GestureScrollUpdateWithoutPropagation) { 919 if (webEvent.type == WebInputEvent::GestureScrollUpdate) {
920 if (!m_scrollbarGroup) 920 if (!m_scrollbarGroup)
921 return; 921 return;
922 if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollLeft, ScrollRight, webEvent.data.scrollUpdate.deltaX)) 922 if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollLeft, ScrollRight, webEvent.data.scrollUpdate.deltaX))
923 event->setDefaultHandled(); 923 event->setDefaultHandled();
924 if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollUp, ScrollDown, we bEvent.data.scrollUpdate.deltaY)) 924 if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollUp, ScrollDown, we bEvent.data.scrollUpdate.deltaY))
925 event->setDefaultHandled(); 925 event->setDefaultHandled();
926 } 926 }
927 // FIXME: Can a plugin change the cursor from a touch-event callback? 927 // FIXME: Can a plugin change the cursor from a touch-event callback?
928 } 928 }
929 929
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 982
983 return clipRect; 983 return clipRect;
984 } 984 }
985 985
986 bool WebPluginContainerImpl::pluginShouldPersist() const 986 bool WebPluginContainerImpl::pluginShouldPersist() const
987 { 987 {
988 return m_webPlugin->shouldPersist(); 988 return m_webPlugin->shouldPersist();
989 } 989 }
990 990
991 } // namespace blink 991 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebInputEventConversion.cpp ('k') | Source/web/WebPopupMenuImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698