112679 2013-03-19 03:49:19 -0700 [Qt][WK2] Clean up sanity checks related to gesture recognition 2013-03-20 09:51:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111751 1 abecsi abecsi cmarcelo jturcotte menard webkit.review.bot oldest_to_newest 858127 0 abecsi 2013-03-19 03:49:19 -0700 [Qt][WK2] Clean up sanity checks related to gesture recognition 858130 1 193779 abecsi 2013-03-19 03:52:58 -0700 Created attachment 193779 Patch 858787 2 193779 benjamin 2013-03-19 15:12:33 -0700 Comment on attachment 193779 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193779&action=review Signed off by me for WebKit2. > Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp:166 > + // Check for sane event delivery. At this point neither a pan gesture nor a pinch gesture should be active. > + ASSERT(!m_viewportItem->isDragging() && !(m_pinchStartScale > 0)); You can split this into 2 assertions. 859297 3 193779 jturcotte 2013-03-20 06:03:54 -0700 Comment on attachment 193779 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193779&action=review >> Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp:166 >> + ASSERT(!m_viewportItem->isDragging() && !(m_pinchStartScale > 0)); > > You can split this into 2 assertions. r=me if you fix this. 859328 4 abecsi 2013-03-20 06:19:38 -0700 (In reply to comment #3) > (From update of attachment 193779 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=193779&action=review > > >> Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp:166 > >> + ASSERT(!m_viewportItem->isDragging() && !(m_pinchStartScale > 0)); > > > > You can split this into 2 assertions. > > r=me if you fix this. Will do. 859506 5 abecsi 2013-03-20 09:51:53 -0700 Committed r146356: <http://trac.webkit.org/changeset/146356> 193779 2013-03-19 03:52:58 -0700 2013-03-20 06:03:54 -0700 Patch bug-112679-20130319114707.patch text/plain 6312 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmVlYWM5YjJhMTY1ZDRh MjJiNWVmZmQ3NjVkMjAxNTViZDY0OTcyYi4uZmQ1ZDE5ZTNlYzkxZjMxMzA0N2EyYjQxYmRjN2U3 NWQ5ZTI3ZDAzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAzLTE5ICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBD bGVhbiB1cCBzYW5pdHkgY2hlY2tzIHJlbGF0ZWQgdG8gZ2VzdHVyZSByZWNvZ25pdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNjc5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG9ubHkgY2Fs bGVycyBvZiB0aGUgcGFuR2VzdHVyZUFjdGl2ZSBhbmQgcGluY2hHZXN0dXJlQWN0aXZlIG1lbWJl cgorICAgICAgICBmdW5jdGlvbnMgb2YgdGhlIHBhZ2Ugdmlld3BvcnQgY29udHJvbGxlciBjbGll bnQgYXJlIGV2ZW50IGRlbGl2ZXJ5CisgICAgICAgIHJlbGF0ZWQgc2FuaXR5IGNoZWNrIGFzc2Vy cywgdGh1cyB0aGV5IGNhbiBiZSByZXBsYWNlZCBieSBjaGVja2luZworICAgICAgICBmb3IgdGhl IGNvcnJlc3BvbmRpbmcgaW50ZXJuYWwgc3RhdGVzIGFuZCB0aGVyZWZvcmUgdGhlIHN1cGVyZmx1 b3VzCisgICAgICAgIG1lbWJlcnMgY2FuIGJlIHJlbW92ZWQuCisgICAgICAgIEFsc28gdXBkYXRl IG90aGVyIGFzc2VydHMgaW4gdGhlIHBhZ2Ugdmlld3BvcnQgY29udHJvbGxlciBjbGllbnQgdG8K KyAgICAgICAgYmUgbW9yZSBhY2N1cmF0ZSBhYm91dCB0aGUgZXhwZWN0ZWQgc3RhdGVzLgorCisg ICAgICAgICogVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6YW5pbWF0 ZUNvbnRlbnRSZWN0VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnRRdDo6dG91Y2hCZWdpbik6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRRdDo6cGFuR2VzdHVyZVN0YXJ0ZWQpOgorICAgICAgICAoV2ViS2l0 OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnBpbmNoR2VzdHVyZVN0YXJ0ZWQpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQuaDoK KyAgICAgICAgKFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdCk6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0 V2ViUGFnZUV2ZW50SGFuZGxlcjo6aGFuZGxlSW5wdXRFdmVudCk6CisKIDIwMTMtMDMtMTkgIFRp bSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW3drMl0gU2hv dWxkIHN1cHBvcnQgbXVsdGlwbGUgcGFnZSBvdmVybGF5cywgbGlrZSB0aGUgQVBJIHN1Z2dlc3Rz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmll d3BvcnRDb250cm9sbGVyQ2xpZW50UXQuY3BwCmluZGV4IGQ3ZTFjZDExYTZiMjIzNTdkOTE5MDM4 OWVjYjM1NDIxMzZlNGFjNTIuLjNkNWMyMDNiNGI0NjQ4OTJhNTAzNDgwN2NmZDBiYmQyNjQxYWM0 YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRD b250cm9sbGVyQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9Q YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQuY3BwCkBAIC05NSwxMSArOTUsOCBAQCB2b2lk IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6c2V0Q29udGVudFJlY3RWaXNpYmxlUG9z aXRpb25BdFNjYWxlKGNvbnN0CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0 OjphbmltYXRlQ29udGVudFJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgY29udGVudFJlY3QpCiB7 Ci0gICAgQVNTRVJUKG1fc2NhbGVBbmltYXRpb24tPnN0YXRlKCkgPT0gUUFic3RyYWN0QW5pbWF0 aW9uOjpTdG9wcGVkKTsKLQorICAgIEFTU0VSVCghc2NhbGVBbmltYXRpb25BY3RpdmUoKSk7CiAg ICAgQVNTRVJUKCFzY3JvbGxBbmltYXRpb25BY3RpdmUoKSk7Ci0gICAgaWYgKHNjcm9sbEFuaW1h dGlvbkFjdGl2ZSgpKQotICAgICAgICByZXR1cm47CiAKICAgICBRUmVjdEYgdmlld3BvcnRSZWN0 SW5Db250ZW50Q29vcmRzID0gbV92aWV3cG9ydEl0ZW0tPm1hcFJlY3RUb1dlYkNvbnRlbnQobV92 aWV3cG9ydEl0ZW0tPmJvdW5kaW5nUmVjdCgpKTsKICAgICBpZiAoY29udGVudFJlY3QgPT0gdmll d3BvcnRSZWN0SW5Db250ZW50Q29vcmRzKSB7CkBAIC0xNjUsNiArMTYyLDkgQEAgdm9pZCBQYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnNjYWxlQW5pbWF0aW9uU3RhdGVDaGFuZ2VkKFFB YnN0cmFjdEFuaW1hdGkKIAogdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnRv dWNoQmVnaW4oKQogeworICAgIC8vIENoZWNrIGZvciBzYW5lIGV2ZW50IGRlbGl2ZXJ5LiBBdCB0 aGlzIHBvaW50IG5laXRoZXIgYSBwYW4gZ2VzdHVyZSBub3IgYSBwaW5jaCBnZXN0dXJlIHNob3Vs ZCBiZSBhY3RpdmUuCisgICAgQVNTRVJUKCFtX3ZpZXdwb3J0SXRlbS0+aXNEcmFnZ2luZygpICYm ICEobV9waW5jaFN0YXJ0U2NhbGUgPiAwKSk7CisKICAgICBtX2NvbnRyb2xsZXItPnNldEhhZFVz ZXJJbnRlcmFjdGlvbih0cnVlKTsKIAogICAgIC8vIFByZXZlbnRzIHJlc3VtaW5nIHRoZSBwYWdl IGJldHdlZW4gdGhlIHVzZXIncyBmbGlja3Mgb2YgdGhlIHBhZ2UuCkBAIC0zNDUsMTUgKzM0NSwx MCBAQCBib29sIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6c2Nyb2xsQW5pbWF0aW9u QWN0aXZlKCkgY29uc3QKICAgICByZXR1cm4gbV92aWV3cG9ydEl0ZW0tPmlzRmxpY2tpbmcoKTsK IH0KIAotYm9vbCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnBhbkdlc3R1cmVBY3Rp dmUoKSBjb25zdAotewotICAgIHJldHVybiBtX2NvbnRyb2xsZXItPmhhZFVzZXJJbnRlcmFjdGlv bigpICYmIG1fdmlld3BvcnRJdGVtLT5pc0RyYWdnaW5nKCk7Ci19Ci0KIHZvaWQgUGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudFF0OjpwYW5HZXN0dXJlU3RhcnRlZChjb25zdCBRUG9pbnRGJiBw b3NpdGlvbiwgcWludDY0IGV2ZW50VGltZXN0YW1wTWlsbGlzKQogewogICAgIC8vIFRoaXMgY2Fu IG9ubHkgaGFwcGVuIGFzIGEgcmVzdWx0IG9mIGEgdXNlciBpbnRlcmFjdGlvbi4KLSAgICBBU1NF UlQobV9jb250cm9sbGVyLT5oYWRVc2VySW50ZXJhY3Rpb24oKSk7CisgICAgQVNTRVJUKG1fdG91 Y2hJbnRlcmFjdGlvbi5pblByb2dyZXNzKCkpOwogCiAgICAgbV92aWV3cG9ydEl0ZW0tPmhhbmRs ZUZsaWNrYWJsZU1vdXNlUHJlc3MocG9zaXRpb24sIGV2ZW50VGltZXN0YW1wTWlsbGlzKTsKICAg ICBtX2xhc3RQaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlcyA9IHBvc2l0aW9uOwpAQCAt NDA4LDE1ICs0MDMsMTAgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6Omlu dGVycnVwdFNjYWxlQW5pbWF0aW9uKCkKICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zdG9wKCk7CiB9 CiAKLWJvb2wgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVBY3Rp dmUoKSBjb25zdAotewotICAgIHJldHVybiBtX2NvbnRyb2xsZXItPmhhZFVzZXJJbnRlcmFjdGlv bigpICYmIChtX3BpbmNoU3RhcnRTY2FsZSA+IDApOwotfQotCiB2b2lkIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlU3RhcnRlZChjb25zdCBRUG9pbnRGJiBwaW5j aENlbnRlckluVmlld3BvcnRDb29yZGluYXRlcykKIHsKICAgICAvLyBUaGlzIGNhbiBvbmx5IGhh cHBlbiBhcyBhIHJlc3VsdCBvZiBhIHVzZXIgaW50ZXJhY3Rpb24uCi0gICAgQVNTRVJUKG1fY29u dHJvbGxlci0+aGFkVXNlckludGVyYWN0aW9uKCkpOworICAgIEFTU0VSVChtX3RvdWNoSW50ZXJh Y3Rpb24uaW5Qcm9ncmVzcygpKTsKIAogICAgIGlmICghbV9jb250cm9sbGVyLT5hbGxvd3NVc2Vy U2NhbGluZygpKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmgKaW5kZXgg Zjg1ZTliZDAwMzBiZTM5MDk2NGMwMTE5OWFiMzI2MzI4M2M5NTc1Ni4uZDVmZjBjZGY3NjZjZmEx MGIzZmZjMjYxNGM5MWI0MzBiMTUwNTNmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQuaApAQCAt NjMsNyArNjMsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBzY3JvbGxBbmltYXRpb25BY3RpdmUoKSBj b25zdDsKICAgICB2b2lkIGNhbmNlbFNjcm9sbEFuaW1hdGlvbigpOwogCi0gICAgYm9vbCBwYW5H ZXN0dXJlQWN0aXZlKCkgY29uc3Q7CiAgICAgdm9pZCBwYW5HZXN0dXJlU3RhcnRlZChjb25zdCBR UG9pbnRGJiBwb3NpdGlvbiwgcWludDY0IGV2ZW50VGltZXN0YW1wTWlsbGlzKTsKICAgICB2b2lk IHBhbkdlc3R1cmVSZXF1ZXN0VXBkYXRlKGNvbnN0IFFQb2ludEYmIHBvc2l0aW9uLCBxaW50NjQg ZXZlbnRUaW1lc3RhbXBNaWxsaXMpOwogICAgIHZvaWQgcGFuR2VzdHVyZUVuZGVkKGNvbnN0IFFQ b2ludEYmIHBvc2l0aW9uLCBxaW50NjQgZXZlbnRUaW1lc3RhbXBNaWxsaXMpOwpAQCAtNzIsNyAr NzEsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBzY2FsZUFuaW1hdGlvbkFjdGl2ZSgpIGNvbnN0Owog ICAgIHZvaWQgaW50ZXJydXB0U2NhbGVBbmltYXRpb24oKTsKIAotICAgIGJvb2wgcGluY2hHZXN0 dXJlQWN0aXZlKCkgY29uc3Q7CiAgICAgdm9pZCBwaW5jaEdlc3R1cmVTdGFydGVkKGNvbnN0IFFQ b2ludEYmIHBpbmNoQ2VudGVySW5WaWV3cG9ydENvb3JkaW5hdGVzKTsKICAgICB2b2lkIHBpbmNo R2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBvaW50RiYgcGluY2hDZW50ZXJJblZpZXdwb3J0 Q29vcmRpbmF0ZXMsIHFyZWFsIHRvdGFsU2NhbGVGYWN0b3IpOwogICAgIHZvaWQgcGluY2hHZXN0 dXJlRW5kZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdl YlBhZ2VFdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2Vi UGFnZUV2ZW50SGFuZGxlci5jcHAKaW5kZXggYjgwNjEzNDM4YjM1YmY5NmRlNzNiNGE2MDRkZGFj YTE0MzA0OTNkYS4uZDdmZDJhNDhhYzM0NWEzMTE1YzFkNGE0NTcyZWRjNzUzYzkwYzhiMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxl ci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFu ZGxlci5jcHAKQEAgLTQ2MCw4ICs0NjAsNiBAQCB2b2lkIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6 aGFuZGxlSW5wdXRFdmVudChjb25zdCBRSW5wdXRFdmVudCogZXZlbnQpCiAgICAgICAgIHN3aXRj aCAoZXZlbnQtPnR5cGUoKSkgewogICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VCdXR0b25QcmVz czoKICAgICAgICAgY2FzZSBRRXZlbnQ6OlRvdWNoQmVnaW46Ci0gICAgICAgICAgICBBU1NFUlQo IW1fdmlld3BvcnRDb250cm9sbGVyLT5wYW5HZXN0dXJlQWN0aXZlKCkpOwotICAgICAgICAgICAg QVNTRVJUKCFtX3ZpZXdwb3J0Q29udHJvbGxlci0+cGluY2hHZXN0dXJlQWN0aXZlKCkpOwogICAg ICAgICAgICAgbV92aWV3cG9ydENvbnRyb2xsZXItPnRvdWNoQmVnaW4oKTsKIAogICAgICAgICAg ICAgLy8gVGhlIHBhZ2Ugdmlld3BvcnQgY29udHJvbGxlciBtaWdodCBzdGlsbCBiZSBhbmltYXRp bmcga2luZXRpYyBzY3JvbGxpbmcgb3IgYSBzY2FsZSBhbmltYXRpb24K