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

Side by Side Diff: public/web/WebInputEvent.h

Issue 1127013002: Make Mac pinch thresholding apply only to zoom (Blink side) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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
« Source/web/WebViewImpl.cpp ('K') | « Source/web/WebViewImpl.cpp ('k') | no next file » | 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 * 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 float velocityY; 491 float velocityY;
492 } flingStart; 492 } flingStart;
493 493
494 struct { 494 struct {
495 // If set to true, don't treat flingCancel 495 // If set to true, don't treat flingCancel
496 // as a part of fling boost events sequence. 496 // as a part of fling boost events sequence.
497 bool preventBoosting; 497 bool preventBoosting;
498 } flingCancel; 498 } flingCancel;
499 499
500 struct { 500 struct {
501 bool zoomDisabled;
Rick Byers 2015/05/06 21:53:04 nit: can we call this canZoom since it almost exac
ccameron 2015/05/06 22:10:14 I went with zoomDisabled so that the default value
501 float scale; 502 float scale;
502 } pinchUpdate; 503 } pinchUpdate;
503 } data; 504 } data;
504 505
505 WebGestureEvent() 506 WebGestureEvent()
506 : WebInputEvent(sizeof(WebGestureEvent)) 507 : WebInputEvent(sizeof(WebGestureEvent))
507 , x(0) 508 , x(0)
508 , y(0) 509 , y(0)
509 , globalX(0) 510 , globalX(0)
510 , globalY(0) 511 , globalY(0)
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 , uniqueTouchEventId(0) 548 , uniqueTouchEventId(0)
548 { 549 {
549 } 550 }
550 }; 551 };
551 552
552 #pragma pack(pop) 553 #pragma pack(pop)
553 554
554 } // namespace blink 555 } // namespace blink
555 556
556 #endif 557 #endif
OLDNEW
« Source/web/WebViewImpl.cpp ('K') | « Source/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698