125749 2013-12-14 20:09:52 -0800 WebKit2 View Gestures: Can't pinch in past the maximum scale 2013-12-15 22:36:08 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca commit-queue mitz sam simon.fraser oldest_to_newest 959894 0 thorton 2013-12-14 20:09:52 -0800 You should still be able to pinch in (with great resistance) once you get past the maximum scale, just like you can at the minimum. 959925 1 219275 thorton 2013-12-15 04:41:17 -0800 Created attachment 219275 patch 960002 2 219275 commit-queue 2013-12-15 22:36:06 -0800 Comment on attachment 219275 patch Clearing flags on attachment: 219275 Committed r160630: <http://trac.webkit.org/changeset/160630> 960003 3 commit-queue 2013-12-15 22:36:08 -0800 All reviewed patches have been landed. Closing bug. 219275 2013-12-15 04:41:17 -0800 2013-12-15 22:36:06 -0800 patch pinchin.diff text/plain 5400 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiM2YyMjg5Li5mYzAzNTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMTItMTUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV2ViS2l0MiBWaWV3IEdlc3R1cmVzOiBDYW4ndCBwaW5jaCBpbiBwYXN0IHRoZSBt YXhpbXVtIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMjU3NDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBQaW5jaGluZyBpbiBwYXN0IHRoZSBtYXhpbXVtIHNjYWxlIHNob3VsZCByZXN1bHQgaW4g dGhlIHpvb20gcmVzaXN0aW5nLCBidXQgY29udGludWluZy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6cmVzaXN0 YW5jZUZvckRlbHRhKToKKyAgICAgICAgQ2xlYW4gdXAgdGhlIGxvZ2ljIGFuZCBhcHBseSByZXNp c3RhbmNlIHRvIHBpbmNoaW5nIGluIHBhc3QgdGhlIG1heGltdW0uCisKKyAgICAgICAgKFdlYktp dDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpoYW5kbGVNYWduaWZpY2F0aW9uR2VzdHVyZSk6Cisg ICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kTWFnbmlmaWNhdGlvbkdl c3R1cmUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpjb21taXRUcmFuc2llbnRab29tKToKKwogMjAxMy0xMi0xNCAgRGFuIEJlcm5z dGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEltcGxlbWVudCBOZXR3b3Jr UHJvY2Vzczo6YWxsb3dTcGVjaWZpY0hUVFBTQ2VydGlmaWNhdGVGb3JIb3N0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHAK aW5kZXggY2RhOTRkZS4uOWRiMGJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcApAQCAtMzIsOSArMzIsMTIgQEAK IAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLXN0YXRpYyBjb25zdCBkb3VibGUgbWluTWFn bmlmaWNhdGlvbiA9IDAuNzU7CitzdGF0aWMgY29uc3QgZG91YmxlIG1pbk1hZ25pZmljYXRpb24g PSAxOwogc3RhdGljIGNvbnN0IGRvdWJsZSBtYXhNYWduaWZpY2F0aW9uID0gMzsKIAorc3RhdGlj IGNvbnN0IGRvdWJsZSBtaW5FbGFzdGljTWFnbmlmaWNhdGlvbiA9IDAuNzU7CitzdGF0aWMgY29u c3QgZG91YmxlIG1heEVsYXN0aWNNYWduaWZpY2F0aW9uID0gNDsKKwogc3RhdGljIGNvbnN0IGRv dWJsZSB6b29tT3V0Qm9vc3QgPSAxLjY7CiBzdGF0aWMgY29uc3QgZG91YmxlIHpvb21PdXRSZXNp c3RhbmNlID0gMC4xMDsKIApAQCAtNTUsMTggKzU4LDE4IEBAIFZpZXdHZXN0dXJlQ29udHJvbGxl cjo6flZpZXdHZXN0dXJlQ29udHJvbGxlcigpCiAKIHN0YXRpYyBkb3VibGUgcmVzaXN0YW5jZUZv ckRlbHRhKGRvdWJsZSBkZWx0YVNjYWxlLCBkb3VibGUgY3VycmVudFNjYWxlKQogewotICAgIC8v IFpvb20gaW4gd2l0aCBubyBhY2NlbGVyYXRpb24uCi0gICAgLy8gRklYTUU6IFNob3VsZCBoYXZl IHJlc2lzdGFuY2Ugd2hlbiB6b29taW5nIGluIHBhc3QgdGhlIGxpbWl0LgotICAgIGlmIChkZWx0 YVNjYWxlID4gMCkKLSAgICAgICAgcmV0dXJuIDE7Ci0KLSAgICAvLyBab29tIG91dCB3aXRoIHNs aWdodCBhY2NlbGVyYXRpb24sIHVudGlsIHdlIHJlYWNoIHVuaXQgc2NhbGUuCi0gICAgaWYgKGN1 cnJlbnRTY2FsZSA+IDEpCisgICAgLy8gWm9vbSBvdXQgd2l0aCBzbGlnaHQgYWNjZWxlcmF0aW9u LCB1bnRpbCB3ZSByZWFjaCBtaW5pbXVtIHNjYWxlLgorICAgIGlmIChkZWx0YVNjYWxlIDwgMCAm JiBjdXJyZW50U2NhbGUgPiBtaW5NYWduaWZpY2F0aW9uKQogICAgICAgICByZXR1cm4gem9vbU91 dEJvb3N0OwogCi0gICAgLy8gQmV5b25kIHNjYWxlPTEsIHJlc2lzdCB6b29taW5nIG91dC4KLSAg ICBkb3VibGUgc2NhbGVEaXN0YW5jZSA9IG1pbk1hZ25pZmljYXRpb24gLSBjdXJyZW50U2NhbGU7 Ci0gICAgZG91YmxlIHNjYWxlUGVyY2VudCA9IHN0ZDo6bWluKHN0ZDo6bWF4KHNjYWxlRGlzdGFu Y2UgLyBtaW5NYWduaWZpY2F0aW9uLCAwLiksIDEuKTsKKyAgICAvLyBab29tIGluIHdpdGggbm8g YWNjZWxlcmF0aW9uLCB1bnRpbCB3ZSByZWFjaCBtYXhpbXVtIHNjYWxlLgorICAgIGlmIChkZWx0 YVNjYWxlID4gMCAmJiBjdXJyZW50U2NhbGUgPCBtYXhNYWduaWZpY2F0aW9uKQorICAgICAgICBy ZXR1cm4gMTsKKworICAgIC8vIE91dHNpZGUgb2YgdGhlIGV4dHJlbWVzLCByZXNpc3QgZnVydGhl ciBzY2FsaW5nLgorICAgIGRvdWJsZSBsaW1pdCA9IGN1cnJlbnRTY2FsZSA8IG1pbk1hZ25pZmlj YXRpb24gPyBtaW5NYWduaWZpY2F0aW9uIDogbWF4TWFnbmlmaWNhdGlvbjsKKyAgICBkb3VibGUg c2NhbGVEaXN0YW5jZSA9IGFicyhsaW1pdCAtIGN1cnJlbnRTY2FsZSk7CisgICAgZG91YmxlIHNj YWxlUGVyY2VudCA9IHN0ZDo6bWluKHN0ZDo6bWF4KHNjYWxlRGlzdGFuY2UgLyBsaW1pdCwgMC4p LCAxLik7CiAgICAgZG91YmxlIHJlc2lzdGFuY2UgPSB6b29tT3V0UmVzaXN0YW5jZSArIHNjYWxl UGVyY2VudCAqICgwLjAxIC0gem9vbU91dFJlc2lzdGFuY2UpOwogCiAgICAgcmV0dXJuIHJlc2lz dGFuY2U7CkBAIC0xMDYsNyArMTA5LDcgQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6Omhh bmRsZU1hZ25pZmljYXRpb25HZXN0dXJlKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludAogICAgIGRv dWJsZSBzY2FsZVdpdGhSZXNpc3RhbmNlID0gcmVzaXN0YW5jZUZvckRlbHRhKHNjYWxlLCBtX21h Z25pZmljYXRpb24pICogc2NhbGU7CiAKICAgICBtX21hZ25pZmljYXRpb24gKz0gbV9tYWduaWZp Y2F0aW9uICogc2NhbGVXaXRoUmVzaXN0YW5jZTsKLSAgICBtX21hZ25pZmljYXRpb24gPSBzdGQ6 Om1pbihzdGQ6Om1heChtX21hZ25pZmljYXRpb24sIG1pbk1hZ25pZmljYXRpb24pLCBtYXhNYWdu aWZpY2F0aW9uKTsKKyAgICBtX21hZ25pZmljYXRpb24gPSBzdGQ6Om1pbihzdGQ6Om1heChtX21h Z25pZmljYXRpb24sIG1pbkVsYXN0aWNNYWduaWZpY2F0aW9uKSwgbWF4RWxhc3RpY01hZ25pZmlj YXRpb24pOwogCiAgICAgbV9tYWduaWZpY2F0aW9uT3JpZ2luID0gb3JpZ2luOwogCkBAIC0xMjAs NyArMTIzLDcgQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZE1hZ25pZmljYXRpb25H ZXN0dXJlKCkKICAgICBBU1NFUlQobV9hY3RpdmVHZXN0dXJlVHlwZSA9PSBWaWV3R2VzdHVyZVR5 cGU6Ok1hZ25pZmljYXRpb24pOwogCiAgICAgLy8gRklYTUU6IFNob3VsZCBydWJiZXItYmFuZCBi YWNrIHdoZW4gem9vbWVkIGluIG9yIG91dCBwYXN0IHRoZSBsaW1pdC4KLSAgICBkb3VibGUgbmV3 TWFnbmlmaWNhdGlvbiA9IHN0ZDo6bWF4KG1fbWFnbmlmaWNhdGlvbiwgMS4pOworICAgIGRvdWJs ZSBuZXdNYWduaWZpY2F0aW9uID0gc3RkOjptaW4oc3RkOjptYXgobV9tYWduaWZpY2F0aW9uLCBt aW5NYWduaWZpY2F0aW9uKSwgbWF4TWFnbmlmaWNhdGlvbik7CiAKICAgICBGbG9hdFBvaW50IHNj YWxlZE9yaWdpbiA9IHNjYWxlZE1hZ25pZmljYXRpb25PcmlnaW4obV9tYWduaWZpY2F0aW9uT3Jp Z2luLCBuZXdNYWduaWZpY2F0aW9uKTsKICAgICBzY2FsZWRPcmlnaW4ubW92ZUJ5KC1tX3Zpc2li bGVDb250ZW50UmVjdC5sb2NhdGlvbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhLm1tCmluZGV4IDQ2NGIyOWIuLmE3MjQxZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtNzM4LDkgKzczOCwxMCBAQCB2b2lkIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpjb21taXRUcmFuc2llbnRab29tKGRvdWJsZSBzY2Fs ZSwgRmxvYXRQb2ludAogICAgIFJlbmRlclZpZXcqIHJlbmRlclZpZXcgPSBtX3dlYlBhZ2UtPmNv cmVQYWdlKCktPm1haW5GcmFtZSgpLnZpZXcoKS0+cmVuZGVyVmlldygpOwogCiAgICAgLy8gSWYg dGhlIHBhZ2Ugc2NhbGUgaXMgYWxyZWFkeSB0aGUgdGFyZ2V0IHNjYWxlLCBzY2FsZVBhZ2UoKSB3 aWxsIHNob3J0LWNpcmN1aXQKLSAgICAvLyBhbmQgbm90IGFwcGx5IHRoZSB0cmFuc2Zvcm0sIHNv IHdlIGNhbid0IGNsZWFyIGl0LgotICAgIGlmIChtX3RyYW5zaWVudFpvb21TY2FsZSAhPSBtX3dl YlBhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpKQotICAgICAgIHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5 ZXJDQSo+KHJlbmRlclZpZXctPmxheWVyKCktPmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpKS0+ cGxhdGZvcm1DQUxheWVyKCktPnNldFRyYW5zZm9ybShUcmFuc2Zvcm1hdGlvbk1hdHJpeCgpKTsK KyAgICAvLyBhbmQgbm90IGFwcGx5IHRoZSB0cmFuc2Zvcm0sIHNvIHdlIGNhbid0IGRlcGVuZCBv biBpdCB0byBkbyBzby4KKyAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCB0cmFuc2Zvcm07CisgICAg dHJhbnNmb3JtLnNjYWxlKHNjYWxlKTsKKyAgICBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ0Eq PihyZW5kZXJWaWV3LT5sYXllcigpLT5iYWNraW5nKCktPmdyYXBoaWNzTGF5ZXIoKSktPnBsYXRm b3JtQ0FMYXllcigpLT5zZXRUcmFuc2Zvcm0odHJhbnNmb3JtKTsKIAogICAgIFBsYXRmb3JtQ0FM YXllciogc2hhZG93TGF5ZXIgPSBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ0EqPihyZW5kZXJW aWV3LT5jb21wb3NpdG9yKCkubGF5ZXJGb3JDb250ZW50U2hhZG93KCkpLT5wbGF0Zm9ybUNBTGF5 ZXIoKTsKICAgICBzaGFkb3dMYXllci0+c2V0SGlkZGVuKGZhbHNlKTsK