74007 2011-12-07 10:03:14 -0800 [Qt] Fix non-animated pinch-zoom scale commit. 2011-12-08 07:33:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte kenneth webkit.review.bot zoltan oldest_to_newest 516693 0 jturcotte 2011-12-07 10:03:14 -0800 [Qt] Fix non-animated pinch-zoom scale commit. 516697 1 118225 jturcotte 2011-12-07 10:06:20 -0800 Created attachment 118225 Patch 517403 2 jturcotte 2011-12-08 07:33:09 -0800 Committed r102338: <http://trac.webkit.org/changeset/102338> 118225 2011-12-07 10:06:20 -0800 2011-12-08 00:53:03 -0800 Patch bug-74007-20111207190609.patch text/plain 5531 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjIzNjY2NTc2ZmEwMjkz ZTdjOTlkMTEzNDljNzRiNDQzYzZjMmFhMy4uOGUxZjJlMDY3MzRiNTcyNWJiZjg2MzJkODZlZTNi ZjhmZWYxMDRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTEyLTA3ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XSBGaXggbm9uLWFuaW1hdGVkIHBpbmNoLXpvb20gc2NhbGUgY29tbWl0LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQwMDcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgdXBkYXRlIGRlZmVycmVyIG9i amVjdCB3YXMgb25seSBkZXN0cm95ZWQgYXQgdGhlIGVuZCBvZiB0aGUgYW5pbWF0aW9uCisgICAg ICAgIGFuZCB3b3VsZG4ndCBiZSBpZiB0aGUgcGluY2gtem9vbSB3YXMgZW5kZWQgd2l0aGluIGxl Z2FsIGJvdW5kcy4KKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIG1ha2VzIHN1cmUgdGhhdCB0aGUg ZGVmZXJyZXIgaXNuJ3QgZGVzdHJveWVkIGFuZCByZS1jcmVhdGVkCisgICAgICAgIG9uY2UgdGhl IGFuaW1hdGlvbiBpcyBzdGFydGVkIGlmIGl0IHdhcyBhbHJlYWR5IHRoZXJlLgorCisgICAgICAg ICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZUl0ZW1SZWN0Vmlz aWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2Nh bGVBbmltYXRpb25TdGF0ZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OmVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KToKKyAg ICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVF bmRlZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZS5oOgorCiAyMDExLTEyLTA2ICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBu b2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBGaXggcGFnZSBvdmVybGF5IHJlbmRlcmluZyB3aXRo IEFDLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcAppbmRleCAyOWY0MjVkMzMwNTYyODgxZjMyNjFmNGJi N2JmYzM5OGQzYjIyYzk5Li5hMDMzNjQ0MmRkNmZmNGNiODJmN2ZmZjU1ODgyZmJiOWYzOTU0MmYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcApAQCAtMTgxLDExICsxODEsMTEgQEAgdm9pZCBRdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldEl0ZW1SZWN0VmlzaWJsZShjb25zdCBRUmVjdEYm IGl0ZW1SZWN0KQogICAgIG1fY29udGVudC0+c2V0UG9zKC0gaXRlbVJlY3QudG9wTGVmdCgpICog aXRlbVNjYWxlKTsKIH0KIAotdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1h dGVJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKK2Jvb2wgUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYg aXRlbVJlY3QpCiB7CiAgICAgUVJlY3RGIGN1cnJlbnRJdGVtUmVjdFZpc2libGUgPSBtX2NvbnRl bnQtPm1hcFJlY3RGcm9tSXRlbShtX3ZpZXdwb3J0LCBtX3ZpZXdwb3J0LT5ib3VuZGluZ1JlY3Qo KSk7CiAgICAgaWYgKGl0ZW1SZWN0ID09IGN1cnJlbnRJdGVtUmVjdFZpc2libGUpCi0gICAgICAg IHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+ c2V0RHVyYXRpb24oa1NjYWxlQW5pbWF0aW9uRHVyYXRpb25NaWxsaXMpOwogICAgIG1fc2NhbGVB bmltYXRpb24tPnNldEVhc2luZ0N1cnZlKFFFYXNpbmdDdXJ2ZTo6T3V0Q3ViaWMpOwpAQCAtMTk0 LDEzICsxOTQsMTUgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVJ dGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKICAgICBtX3NjYWxlQW5pbWF0 aW9uLT5zZXRFbmRWYWx1ZShpdGVtUmVjdCk7CiAKICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zdGFy dCgpOworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZTo6c2NhbGVBbmltYXRpb25TdGF0ZUNoYW5nZWQoUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0 ZSBuZXdTdGF0ZSwgUUFic3RyYWN0QW5pbWF0aW9uOjpTdGF0ZSAvKm9sZFN0YXRlKi8pCiB7CiAg ICAgc3dpdGNoIChuZXdTdGF0ZSkgewogICAgIGNhc2UgUUFic3RyYWN0QW5pbWF0aW9uOjpSdW5u aW5nOgotICAgICAgICBtX3NjYWxlVXBkYXRlRGVmZXJyZXIgPSBhZG9wdFB0cihuZXcgVmlld3Bv cnRVcGRhdGVEZWZlcnJlcih0aGlzKSk7CisgICAgICAgIGlmICghbV9zY2FsZVVwZGF0ZURlZmVy cmVyKQorICAgICAgICAgICAgbV9zY2FsZVVwZGF0ZURlZmVycmVyID0gYWRvcHRQdHIobmV3IFZp ZXdwb3J0VXBkYXRlRGVmZXJyZXIodGhpcykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFFB YnN0cmFjdEFuaW1hdGlvbjo6U3RvcHBlZDoKICAgICAgICAgbV9zY2FsZVVwZGF0ZURlZmVycmVy LmNsZWFyKCk7CkBAIC0zOTIsMTIgKzM5NCwxMiBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6em9vbVRvQXJlYUdlc3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3VjaFBvaQog ICAgIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKIH0KIAot dm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3 cG9ydEJvdW5kYXJ5KGJvb2wgaW1tZWRpYXRlKQorYm9vbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6OmVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KGJvb2wgaW1tZWRpYXRl KQogewogICAgIEFTU0VSVChtX3N1c3BlbmRDb3VudCk7CiAKICAgICBpZiAoc2Nyb2xsQW5pbWF0 aW9uQWN0aXZlKCkgfHwgc2NhbGVBbmltYXRpb25BY3RpdmUoKSkKLSAgICAgICAgcmV0dXJuOwor ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBxcmVhbCBjdXJyZW50Q1NTU2NhbGUgPSBjc3NT Y2FsZUZyb21JdGVtKG1fY29udGVudC0+c2NhbGUoKSk7CiAKQEAgLTQxMywxMCArNDE1LDExIEBA IHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjplbnN1cmVDb250ZW50V2l0aGluVmll d3BvcnRCb3VuZGFyeShib29sIGltbWVkCiAKICAgICBRUmVjdEYgZW5kVmlzaWJsZUNvbnRlbnRS ZWN0KGVuZFBvc2l0aW9uIC8gZW5kSXRlbVNjYWxlLCB2aWV3cG9ydFJlY3Quc2l6ZSgpIC8gZW5k SXRlbVNjYWxlKTsKIAotICAgIGlmIChpbW1lZGlhdGUpCisgICAgaWYgKGltbWVkaWF0ZSkgewog ICAgICAgICBzZXRJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KTsKLSAgICBl bHNlCi0gICAgICAgIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoZW5kVmlzaWJsZUNvbnRlbnRSZWN0 KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiAhYW5pbWF0ZUl0ZW1S ZWN0VmlzaWJsZShlbmRWaXNpYmxlQ29udGVudFJlY3QpOwogfQogCiB2b2lkIFF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZTo6cmVzZXQoKQpAQCAtNTU1LDcgKzU1OCw5IEBAIHZvaWQgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVFbmRlZCgpCiAgICAgICAgIHJldHVy bjsKIAogICAgIG1fcGluY2hTdGFydFNjYWxlID0gLTE7Ci0gICAgZW5zdXJlQ29udGVudFdpdGhp blZpZXdwb3J0Qm91bmRhcnkoKTsKKyAgICAvLyBDbGVhciB0aGUgdXBkYXRlIGRlZmVycmVyIG5v dyBpZiB3ZSdyZSBpbiBvdXIgZmluYWwgcG9zaXRpb24gYW5kIHRoZXJlIHdvbid0IGJlIGFueSBh bmltYXRpb24gdG8gY2xlYXIgaXQgbGF0ZXIuCisgICAgaWYgKGVuc3VyZUNvbnRlbnRXaXRoaW5W aWV3cG9ydEJvdW5kYXJ5KCkpCisgICAgICAgIG1fc2NhbGVVcGRhdGVEZWZlcnJlci5jbGVhcigp OwogfQogCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aXRlbVNpemVDaGFuZ2Vk KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCBkMmEwNDYxYzZiZmVjNTM4MTYwNjZlNGRhNzBiOTMw NzRhNDcxM2FkLi4zNjI4OTk3YTM2Y2VmZmNhMWVjYzVjMTY4ZTNmNGI0NTU5OTkwZGQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZS5oCkBAIC02OSw3ICs2OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGFwcGx5 Q29uc3RyYWludHMoY29uc3QgQ29uc3RyYWludHMmKTsKIAogICAgIHZvaWQgc2V0SXRlbVJlY3RW aXNpYmxlKGNvbnN0IFFSZWN0RiYpOwotICAgIHZvaWQgYW5pbWF0ZUl0ZW1SZWN0VmlzaWJsZShj b25zdCBRUmVjdEYmKTsKKyAgICBib29sIGFuaW1hdGVJdGVtUmVjdFZpc2libGUoY29uc3QgUVJl Y3RGJik7CiAKICAgICB2b2lkIHdoZWVsRXZlbnQoUVdoZWVsRXZlbnQqKTsKICAgICB2b2lkIHBh Z2VQb3NpdGlvblJlcXVlc3QoY29uc3QgUVBvaW50JiBwb3MpOwpAQCAtMTIwLDcgKzEyMCw3IEBA IHByaXZhdGU6CiAgICAgcXJlYWwgb3V0ZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwpOwogCiAgICAg UVJlY3RGIGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxlKHFyZWFsIGl0ZW1TY2FsZSkgY29u c3Q7Ci0gICAgdm9pZCBlbnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3VuZGFyeShib29sIGlt bWVkaWF0ZSA9IGZhbHNlKTsKKyAgICBib29sIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJv dW5kYXJ5KGJvb2wgaW1tZWRpYXRlID0gZmFsc2UpOwogCiAgICAgdm9pZCBzY2FsZUNvbnRlbnQo Y29uc3QgUVBvaW50RiYgY2VudGVySW5Db250ZW50Q29vcmRpbmF0ZXMsIHFyZWFsIHNjYWxlKTsK IAo=