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

Side by Side Diff: Source/web/WebViewImpl.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/WebPopupMenuImpl.cpp ('k') | public/web/WebInputEvent.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 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 // GestureDoubleTap is currently only used by Android for zooming. For W ebCore, 686 // GestureDoubleTap is currently only used by Android for zooming. For W ebCore,
687 // GestureTap with tap count = 2 is used instead. So we drop GestureDoub leTap here. 687 // GestureTap with tap count = 2 is used instead. So we drop GestureDoub leTap here.
688 eventSwallowed = true; 688 eventSwallowed = true;
689 m_client->didHandleGestureEvent(event, eventCancelled); 689 m_client->didHandleGestureEvent(event, eventCancelled);
690 return eventSwallowed; 690 return eventSwallowed;
691 case WebInputEvent::GestureScrollBegin: 691 case WebInputEvent::GestureScrollBegin:
692 case WebInputEvent::GesturePinchBegin: 692 case WebInputEvent::GesturePinchBegin:
693 m_client->cancelScheduledContentIntents(); 693 m_client->cancelScheduledContentIntents();
694 case WebInputEvent::GestureScrollEnd: 694 case WebInputEvent::GestureScrollEnd:
695 case WebInputEvent::GestureScrollUpdate: 695 case WebInputEvent::GestureScrollUpdate:
696 case WebInputEvent::GestureScrollUpdateWithoutPropagation:
697 case WebInputEvent::GesturePinchEnd: 696 case WebInputEvent::GesturePinchEnd:
698 case WebInputEvent::GesturePinchUpdate: 697 case WebInputEvent::GesturePinchUpdate:
699 case WebInputEvent::GestureFlingStart: 698 case WebInputEvent::GestureFlingStart:
700 // Scrolling-related gesture events invoke EventHandler recursively for each frame down 699 // Scrolling-related gesture events invoke EventHandler recursively for each frame down
701 // the chain, doing a single-frame hit-test per frame. This matches hand leWheelEvent. 700 // the chain, doing a single-frame hit-test per frame. This matches hand leWheelEvent.
702 // Perhaps we could simplify things by rewriting scroll handling to work inner frame 701 // Perhaps we could simplify things by rewriting scroll handling to work inner frame
703 // out, and then unify with other gesture events. 702 // out, and then unify with other gesture events.
704 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureS crollEvent(platformEvent); 703 eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureS crollEvent(platformEvent);
705 m_client->didHandleGestureEvent(event, eventCancelled); 704 m_client->didHandleGestureEvent(event, eventCancelled);
706 return eventSwallowed; 705 return eventSwallowed;
(...skipping 3818 matching lines...) Expand 10 before | Expand all | Expand 10 after
4525 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4524 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4526 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4525 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4527 } 4526 }
4528 4527
4529 void WebViewImpl::forceNextWebGLContextCreationToFail() 4528 void WebViewImpl::forceNextWebGLContextCreationToFail()
4530 { 4529 {
4531 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); 4530 WebGLRenderingContext::forceNextWebGLContextCreationToFail();
4532 } 4531 }
4533 4532
4534 } // namespace blink 4533 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebPopupMenuImpl.cpp ('k') | public/web/WebInputEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698