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

Unified Diff: ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm

Issue 2924903003: Enable multiple touch in WebView. (Closed)
Patch Set: Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
diff --git a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
index b1049d4f0bc8f247c8fb29fb212aaf18c8a98311..0ed8f1b7d8599c3069181e26a9bb2b887a14f689 100644
--- a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
+++ b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
@@ -479,12 +479,18 @@ NSString* const kOverscrollActionsDidEnd = @"OverscrollActionsDidStop";
#pragma mark - Pan gesture recognizer handling
- (void)panGesture:(UIPanGestureRecognizer*)gesture {
+ if (gesture.state == UIGestureRecognizerStateEnded ||
+ gesture.state == UIGestureRecognizerStateCancelled) {
+ [self setWebViewInteractionEnabled:YES];
+ }
+ if (self.overscrollState == OverscrollState::NO_PULL_STARTED) {
+ return;
+ }
+
if (gesture.state == UIGestureRecognizerStateBegan) {
[self setWebViewInteractionEnabled:NO];
- } else if (gesture.state == UIGestureRecognizerStateEnded ||
- gesture.state == UIGestureRecognizerStateCancelled) {
- [self setWebViewInteractionEnabled:YES];
}
+
const CGPoint panPointScreen = [gesture locationInView:nil];
if (self.overscrollState == OverscrollState::ACTION_READY) {
const CGFloat direction = UseRTLLayout() ? -1 : 1;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698