125884 2013-12-17 16:37:27 -0800 WebKit2 View Gestures: Fix the shadow layer restore-from-overpinched animation 2013-12-17 17:02:42 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca simon.fraser oldest_to_newest 960725 0 thorton 2013-12-17 16:37:27 -0800 I'm going to take the olliej defense and say I Cmd-Z'd twice too far when writing the patch, because I know it worked at some point :) 960727 1 219470 thorton 2013-12-17 16:39:06 -0800 Created attachment 219470 patch 960747 2 thorton 2013-12-17 17:02:42 -0800 http://trac.webkit.org/changeset/160740 219470 2013-12-17 16:39:06 -0800 2013-12-17 16:41:02 -0800 patch pinch.diff text/plain 3193 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhNDNhMzZkLi4wNjYxNWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMTItMTcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV2ViS2l0MiBWaWV3IEdlc3R1cmVzOiBGaXggdGhlIHNoYWRvdyBsYXllciByZXN0 b3JlLWZyb20tb3ZlcnBpbmNoZWQgYW5pbWF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU4ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhOjpjb21taXRUcmFuc2llbnRab29tKToKKyAgICAgICAgU2V0IHRvLXZh bHVlcyBvbiB0aGUgcmlnaHQgYW5pbWF0aW9ucy4KKworICAgICAgICAoV2ViS2l0OjpUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0VHJhbnNpZW50Wm9vbSk6CisgICAgICAgIChX ZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjphcHBseVRyYW5zaWVudFpvb21U b1BhZ2UpOgorICAgICAgICBXZSBkb24ndCBuZWVkIHRvIGV4cGxpY2l0bHkgc2V0IHRoZSBzaGFk b3cgcGF0aCwgYmVjYXVzZSBQbGF0Zm9ybUNBTGF5ZXI6OnNldEJvdW5kcyBkb2VzIGl0IGZvciB1 cyBub3cuCisKIDIwMTMtMTItMTIgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIFtDTWFrZV0gQnVpbGQgdGhlIHBsdWdpbiBwcm9jZXNzIGFn YWluc3QgR1RLKyAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpp bmRleCBlZmYyYmYzLi5iNDZiNzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEubW0KQEAgLTczMyw3ICs3MzMsNiBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjphZGp1c3RUcmFuc2llbnRab29tKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludAog CiAgICAgc2hhZG93TGF5ZXItPnNldEJvdW5kcyhzaGFkb3dCb3VuZHMpOwogICAgIHNoYWRvd0xh eWVyLT5zZXRQb3NpdGlvbihvcmlnaW4gKyBzaGFkb3dCb3VuZHMuY2VudGVyKCkpOwotICAgIHNo YWRvd0xheWVyLT5wbGF0Zm9ybUxheWVyKCkuc2hhZG93UGF0aCA9IGFkb3B0Q0YoQ0dQYXRoQ3Jl YXRlV2l0aFJlY3Qoc2hhZG93Qm91bmRzLCBOVUxMKSkuZ2V0KCk7CiAKICAgICBtX3RyYW5zaWVu dFpvb21TY2FsZSA9IHNjYWxlOwogfQpAQCAtNzk1LDkgKzc5NCw5IEBAIHZvaWQgVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRyYW5zaWVudFpvb20oZG91YmxlIHNjYWxlLCBG bG9hdFBvaW50CiAgICAgUmV0YWluUHRyPENBQmFzaWNBbmltYXRpb24+IHNoYWRvd0JvdW5kc0Fu aW1hdGlvbiA9IHRyYW5zaWVudFpvb21TbmFwQW5pbWF0aW9uRm9yS2V5UGF0aCgiYm91bmRzIik7 CiAgICAgW3NoYWRvd0JvdW5kc0FuaW1hdGlvbiBzZXRUb1ZhbHVlOltOU1ZhbHVlIHZhbHVlV2l0 aFJlY3Q6c2hhZG93Qm91bmRzXV07CiAgICAgUmV0YWluUHRyPENBQmFzaWNBbmltYXRpb24+IHNo YWRvd1Bvc2l0aW9uQW5pbWF0aW9uID0gdHJhbnNpZW50Wm9vbVNuYXBBbmltYXRpb25Gb3JLZXlQ YXRoKCJwb3NpdGlvbiIpOwotICAgIFtzaGFkb3dCb3VuZHNBbmltYXRpb24gc2V0VG9WYWx1ZTpb TlNWYWx1ZSB2YWx1ZVdpdGhQb2ludDpjb25zdHJhaW5lZE9yaWdpbiArIHNoYWRvd0JvdW5kcy5j ZW50ZXIoKV1dOworICAgIFtzaGFkb3dQb3NpdGlvbkFuaW1hdGlvbiBzZXRUb1ZhbHVlOltOU1Zh bHVlIHZhbHVlV2l0aFBvaW50OmNvbnN0cmFpbmVkT3JpZ2luICsgc2hhZG93Qm91bmRzLmNlbnRl cigpXV07CiAgICAgUmV0YWluUHRyPENBQmFzaWNBbmltYXRpb24+IHNoYWRvd1BhdGhBbmltYXRp b24gPSB0cmFuc2llbnRab29tU25hcEFuaW1hdGlvbkZvcktleVBhdGgoInNoYWRvd1BhdGgiKTsK LSAgICBbc2hhZG93Qm91bmRzQW5pbWF0aW9uIHNldFRvVmFsdWU6KGlkKXNoYWRvd1BhdGguZ2V0 KCldOworICAgIFtzaGFkb3dQYXRoQW5pbWF0aW9uIHNldFRvVmFsdWU6KGlkKXNoYWRvd1BhdGgu Z2V0KCldOwogCiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwogICAgIFtDQVRyYW5zYWN0aW9u IHNldENvbXBsZXRpb25CbG9jazpeKHZvaWQpIHsKQEAgLTgzMCw3ICs4MjksNiBAQCB2b2lkIFRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjphcHBseVRyYW5zaWVudFpvb21Ub1BhZ2UoZG91 YmxlIHNjYWxlLCBGbG9hdAogICAgIEludFJlY3Qgb3ZlcmZsb3dSZWN0ID0gcmVuZGVyVmlldy0+ cGl4ZWxTbmFwcGVkTGF5b3V0T3ZlcmZsb3dSZWN0KCk7CiAgICAgc2hhZG93TGF5ZXItPnNldEJv dW5kcyhJbnRSZWN0KEludFBvaW50KCksIHRvSW50U2l6ZShvdmVyZmxvd1JlY3QubWF4WE1heFlD b3JuZXIoKSkpKTsKICAgICBzaGFkb3dMYXllci0+c2V0UG9zaXRpb24oc2hhZG93TGF5ZXItPmJv dW5kcygpLmNlbnRlcigpKTsKLSAgICBTY3JvbGxiYXJUaGVtZTo6dGhlbWUoKS0+c2V0VXBDb250 ZW50U2hhZG93TGF5ZXIocmVuZGVyVmlldy0+Y29tcG9zaXRvcigpLmxheWVyRm9yQ29udGVudFNo YWRvdygpKTsKIAogICAgIEZsb2F0UG9pbnQgdW5zY3JvbGxlZE9yaWdpbihvcmlnaW4pOwogICAg IEZsb2F0UmVjdCB2aXNpYmxlQ29udGVudFJlY3QgPSBtX3dlYlBhZ2UtPm1haW5GcmFtZVZpZXco KS0+dmlzaWJsZUNvbnRlbnRSZWN0KFNjcm9sbGFibGVBcmVhOjpJbmNsdWRlU2Nyb2xsYmFycyk7 Cg==