126661 2014-01-08 13:31:27 -0800 Clean up confusing names and calculations in image-dragging functions 2014-01-08 18:17:53 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 125375 1 bburg bburg commit-queue oldest_to_newest 965617 0 bburg 2014-01-08 13:31:27 -0800 Several functions used to implement image dragging have unhelpful variable names and scale-related calculations that could be simpler. This led to mistakes where the wrong scale was applied. 965624 1 220661 bburg 2014-01-08 13:41:23 -0800 Created attachment 220661 patch 965728 2 220661 commit-queue 2014-01-08 18:17:51 -0800 Comment on attachment 220661 patch Clearing flags on attachment: 220661 Committed r161537: <http://trac.webkit.org/changeset/161537> 965729 3 commit-queue 2014-01-08 18:17:53 -0800 All reviewed patches have been landed. Closing bug. 220661 2014-01-08 13:41:23 -0800 2014-01-08 18:17:51 -0800 patch bug-126661-20140108134123.patch text/plain 6807 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjliNWY4MWQ4ZmEyODA2 OTJlYjNlNmFhNTdhMjA5MzM0ODFlZjkxNy4uYzQzODRjNjFjMDIxMjM3Y2RlY2JmMTUwNzJkYTVk Njk1MDRkNzViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTAxLTA4ICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNvbmZ1c2luZyBu YW1lcyBhbmQgY2FsY3VsYXRpb25zIGluIGltYWdlLWRyYWdnaW5nIGZ1bmN0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NjYxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgor CisgICAgICAgICogcGFnZS9EcmFnQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE cmFnQ29udHJvbGxlcjo6ZG9JbWFnZURyYWcpOiByZW5hbWUgdmFyaWFibGVzIGFuZAorICAgICAg ICBzaW1wbGlmeSB0aGUgY2FsY3VsYXRpb24gb2YgdGhlIGltYWdlJ3Mgc2NhbGVkIG9yaWdpbi4K KworICAgICAgICAqIHBsYXRmb3JtL0RyYWdJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpm aXREcmFnSW1hZ2VUb01heFNpemUpOiByZW5hbWUgdmFyaWFibGVzLgorCiAyMDE0LTAxLTA3ICBK ZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFBsYXRmb3JtTGF5ZXIg Y29udGFpbmluZyBzY3JvbGxiYXJzIGRvZXMgbm90IGRpc2FwcGVhciB3aGVuIHNldHRpbmcgb3Zl cmZsb3c6aGlkZGVuIG9uIHBhZ2Ugcm9vdCwgdW50aWwgcmVzaXplLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RyYWdDb250cm9sbGVyLmNwcAppbmRleCA4OWViOGZkZWY0ODhmYTYxNzUyNGJlNThkOTU5OTkw N2Q5YThmZGRkLi5iZDMxYzc1Yjg1MGNiNGRkZGQ1NWU4OGE5YTQ0ZmNlYmI4ZjllYjkxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcApAQCAtODQ4LDExICs4NDgsMTEgQEAg Ym9vbCBEcmFnQ29udHJvbGxlcjo6c3RhcnREcmFnKEZyYW1lJiBzcmMsIGNvbnN0IERyYWdTdGF0 ZSYgc3RhdGUsIERyYWdPcGVyYXRpb24KICAgICByZXR1cm4gc3RhcnRlZERyYWc7CiB9CiAKLXZv aWQgRHJhZ0NvbnRyb2xsZXI6OmRvSW1hZ2VEcmFnKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IElu dFBvaW50JiBkcmFnT3JpZ2luLCBjb25zdCBJbnRSZWN0JiByZWN0LCBDbGlwYm9hcmQmIGNsaXBi b2FyZCwgRnJhbWUmIGZyYW1lLCBJbnRQb2ludCYgZHJhZ0ltYWdlT2Zmc2V0KQordm9pZCBEcmFn Q29udHJvbGxlcjo6ZG9JbWFnZURyYWcoRWxlbWVudCYgZWxlbWVudCwgY29uc3QgSW50UG9pbnQm IGRyYWdPcmlnaW4sIGNvbnN0IEludFJlY3QmIGxheW91dFJlY3QsIENsaXBib2FyZCYgY2xpcGJv YXJkLCBGcmFtZSYgZnJhbWUsIEludFBvaW50JiBkcmFnSW1hZ2VPZmZzZXQpCiB7CiAgICAgSW50 UG9pbnQgbW91c2VEb3duUG9pbnQgPSBkcmFnT3JpZ2luOwotICAgIERyYWdJbWFnZVJlZiBkcmFn SW1hZ2UgPSAwOwotICAgIEludFBvaW50IG9yaWdpbjsKKyAgICBEcmFnSW1hZ2VSZWYgZHJhZ0lt YWdlID0gbnVsbHB0cjsKKyAgICBJbnRQb2ludCBzY2FsZWRPcmlnaW47CiAKICAgICBpZiAoIWVs ZW1lbnQucmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtODY1LDM0ICs4NjUsMzEgQEAg dm9pZCBEcmFnQ29udHJvbGxlcjo6ZG9JbWFnZURyYWcoRWxlbWVudCYgZWxlbWVudCwgY29uc3Qg SW50UG9pbnQmIGRyYWdPcmlnaW4sIGMKICAgICBJbWFnZSogaW1hZ2UgPSBnZXRJbWFnZShlbGVt ZW50KTsKICAgICBpZiAoaW1hZ2UgJiYgaW1hZ2UtPnNpemUoKS5oZWlnaHQoKSAqIGltYWdlLT5z aXplKCkud2lkdGgoKSA8PSBNYXhPcmlnaW5hbEltYWdlQXJlYQogICAgICAgICAmJiAoZHJhZ0lt YWdlID0gY3JlYXRlRHJhZ0ltYWdlRnJvbUltYWdlKGltYWdlLCBlbGVtZW50LnJlbmRlcmVyKCkg PyBvcmllbnRhdGlvbkRlc2NyaXB0aW9uIDogSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkp KSkgewotICAgICAgICBJbnRTaXplIG9yaWdpbmFsU2l6ZSA9IHJlY3Quc2l6ZSgpOwotICAgICAg ICBvcmlnaW4gPSByZWN0LmxvY2F0aW9uKCk7CiAKLSAgICAgICAgZHJhZ0ltYWdlID0gZml0RHJh Z0ltYWdlVG9NYXhTaXplKGRyYWdJbWFnZSwgcmVjdC5zaXplKCksIG1heERyYWdJbWFnZVNpemUo KSk7CisgICAgICAgIGRyYWdJbWFnZSA9IGZpdERyYWdJbWFnZVRvTWF4U2l6ZShkcmFnSW1hZ2Us IGxheW91dFJlY3Quc2l6ZSgpLCBtYXhEcmFnSW1hZ2VTaXplKCkpOworICAgICAgICBJbnRTaXpl IGZpdHRlZFNpemUgPSBkcmFnSW1hZ2VTaXplKGRyYWdJbWFnZSk7CisKICAgICAgICAgZHJhZ0lt YWdlID0gZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uKGRyYWdJbWFnZSwgRHJhZ0ltYWdlQWxw aGEpOwotICAgICAgICBJbnRTaXplIG5ld1NpemUgPSBkcmFnSW1hZ2VTaXplKGRyYWdJbWFnZSk7 CiAKLSAgICAgICAgLy8gUHJvcGVybHkgb3JpZW50IHRoZSBkcmFnIGltYWdlIGFuZCBvcmllbnQg aXQgZGlmZmVyZW50bHkgaWYgaXQncyBzbWFsbGVyIHRoYW4gdGhlIG9yaWdpbmFsCi0gICAgICAg IGZsb2F0IHNjYWxlID0gbmV3U2l6ZS53aWR0aCgpIC8gKGZsb2F0KW9yaWdpbmFsU2l6ZS53aWR0 aCgpOwotICAgICAgICBmbG9hdCBkeCA9IG9yaWdpbi54KCkgLSBtb3VzZURvd25Qb2ludC54KCk7 Ci0gICAgICAgIGR4ICo9IHNjYWxlOwotICAgICAgICBvcmlnaW4uc2V0WCgoaW50KShkeCArIDAu NSkpOworICAgICAgICAvLyBQcm9wZXJseSBvcmllbnQgdGhlIGRyYWcgaW1hZ2UgYW5kIG9yaWVu dCBpdCBkaWZmZXJlbnRseSBpZiBpdCdzIHNtYWxsZXIgdGhhbiB0aGUgb3JpZ2luYWwuCisgICAg ICAgIGZsb2F0IHNjYWxlID0gZml0dGVkU2l6ZS53aWR0aCgpIC8gKGZsb2F0KWxheW91dFJlY3Qu d2lkdGgoKTsKKyAgICAgICAgZmxvYXQgZHggPSBzY2FsZSAqIChsYXlvdXRSZWN0LngoKSAtIG1v dXNlRG93blBvaW50LngoKSk7CisgICAgICAgIGZsb2F0IG9yaWdpblkgPSBsYXlvdXRSZWN0Lnko KTsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIC8vQ29tcGVuc2F0ZSBmb3IgYWNjdXJzZWQg ZmxpcHBlZCBjb29yZGluYXRlcyBpbiBjb2NvYQotICAgICAgICBvcmlnaW4uc2V0WShvcmlnaW4u eSgpICsgb3JpZ2luYWxTaXplLmhlaWdodCgpKTsKKyAgICAgICAgLy8gQ29tcGVuc2F0ZSBmb3Ig YWNjdXJzZWQgZmxpcHBlZCBjb29yZGluYXRlcyBpbiBDb2NvYS4KKyAgICAgICAgb3JpZ2luWSAr PSBsYXlvdXRSZWN0LmhlaWdodCgpOwogI2VuZGlmCi0gICAgICAgIGZsb2F0IGR5ID0gb3JpZ2lu LnkoKSAtIG1vdXNlRG93blBvaW50LnkoKTsKLSAgICAgICAgZHkgKj0gc2NhbGU7Ci0gICAgICAg IG9yaWdpbi5zZXRZKChpbnQpKGR5ICsgMC41KSk7CisgICAgICAgIGZsb2F0IGR5ID0gc2NhbGUg KiAob3JpZ2luWSAtIG1vdXNlRG93blBvaW50LnkoKSk7CisgICAgICAgIHNjYWxlZE9yaWdpbiA9 IEludFBvaW50KChpbnQpKGR4ICsgMC41KSwgKGludCkoZHkgKyAwLjUpKTsKICAgICB9IGVsc2Ug ewogICAgICAgICBpZiAoQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gZ2V0Q2FjaGVkSW1hZ2Uo ZWxlbWVudCkpIHsKICAgICAgICAgICAgIGRyYWdJbWFnZSA9IGNyZWF0ZURyYWdJbWFnZUljb25G b3JDYWNoZWRJbWFnZUZpbGVuYW1lKGNhY2hlZEltYWdlLT5yZXNwb25zZSgpLnN1Z2dlc3RlZEZp bGVuYW1lKCkpOwogICAgICAgICAgICAgaWYgKGRyYWdJbWFnZSkKLSAgICAgICAgICAgICAgICBv cmlnaW4gPSBJbnRQb2ludChEcmFnSWNvblJpZ2h0SW5zZXQgLSBkcmFnSW1hZ2VTaXplKGRyYWdJ bWFnZSkud2lkdGgoKSwgRHJhZ0ljb25Cb3R0b21JbnNldCk7CisgICAgICAgICAgICAgICAgc2Nh bGVkT3JpZ2luID0gSW50UG9pbnQoRHJhZ0ljb25SaWdodEluc2V0IC0gZHJhZ0ltYWdlU2l6ZShk cmFnSW1hZ2UpLndpZHRoKCksIERyYWdJY29uQm90dG9tSW5zZXQpOwogICAgICAgICB9CiAgICAg fQogCi0gICAgZHJhZ0ltYWdlT2Zmc2V0ID0gbW91c2VEb3duUG9pbnQgKyBvcmlnaW47CisgICAg ZHJhZ0ltYWdlT2Zmc2V0ID0gbW91c2VEb3duUG9pbnQgKyBzY2FsZWRPcmlnaW47CiAgICAgZG9T eXN0ZW1EcmFnKGRyYWdJbWFnZSwgZHJhZ0ltYWdlT2Zmc2V0LCBkcmFnT3JpZ2luLCBjbGlwYm9h cmQsIGZyYW1lLCBmYWxzZSk7CiAKICAgICBkZWxldGVEcmFnSW1hZ2UoZHJhZ0ltYWdlKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9EcmFnSW1hZ2UuY3BwCmluZGV4IDA2NTJlOWYzMjFhMTZiNTYyYzEx NzUzNWZiYzhlNTliOTFhZGQwNjcuLmY0NzAxODEyYjQyNDU5NjZmMTcxY2M3OGNiYTRhODM0MjJl YjEwYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRHJhZ0ltYWdlLmNwcApAQCAtMzgsMzYgKzM4 LDM2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotRHJhZ0ltYWdlUmVmIGZpdERyYWdJbWFn ZVRvTWF4U2l6ZShEcmFnSW1hZ2VSZWYgaW1hZ2UsIGNvbnN0IEludFNpemUmIHNyY1NpemUsIGNv bnN0IEludFNpemUmIHNpemUpCitEcmFnSW1hZ2VSZWYgZml0RHJhZ0ltYWdlVG9NYXhTaXplKERy YWdJbWFnZVJlZiBpbWFnZSwgY29uc3QgSW50U2l6ZSYgbGF5b3V0U2l6ZSwgY29uc3QgSW50U2l6 ZSYgbWF4U2l6ZSkKIHsKICAgICBmbG9hdCBoZWlnaHRSZXNpemVSYXRpbyA9IDAuMGY7CiAgICAg ZmxvYXQgd2lkdGhSZXNpemVSYXRpbyA9IDAuMGY7CiAgICAgZmxvYXQgcmVzaXplUmF0aW8gPSAt MS4wZjsKICAgICBJbnRTaXplIG9yaWdpbmFsU2l6ZSA9IGRyYWdJbWFnZVNpemUoaW1hZ2UpOwog Ci0gICAgaWYgKHNyY1NpemUud2lkdGgoKSA+IHNpemUud2lkdGgoKSkgewotICAgICAgICB3aWR0 aFJlc2l6ZVJhdGlvID0gc2l6ZS53aWR0aCgpIC8gKGZsb2F0KXNyY1NpemUud2lkdGgoKTsKKyAg ICBpZiAobGF5b3V0U2l6ZS53aWR0aCgpID4gbWF4U2l6ZS53aWR0aCgpKSB7CisgICAgICAgIHdp ZHRoUmVzaXplUmF0aW8gPSBtYXhTaXplLndpZHRoKCkgLyAoZmxvYXQpbGF5b3V0U2l6ZS53aWR0 aCgpOwogICAgICAgICByZXNpemVSYXRpbyA9IHdpZHRoUmVzaXplUmF0aW87CiAgICAgfQogCi0g ICAgaWYgKHNyY1NpemUuaGVpZ2h0KCkgPiBzaXplLmhlaWdodCgpKSB7Ci0gICAgICAgIGhlaWdo dFJlc2l6ZVJhdGlvID0gc2l6ZS5oZWlnaHQoKSAvIChmbG9hdClzcmNTaXplLmhlaWdodCgpOwor ICAgIGlmIChsYXlvdXRTaXplLmhlaWdodCgpID4gbWF4U2l6ZS5oZWlnaHQoKSkgeworICAgICAg ICBoZWlnaHRSZXNpemVSYXRpbyA9IG1heFNpemUuaGVpZ2h0KCkgLyAoZmxvYXQpbGF5b3V0U2l6 ZS5oZWlnaHQoKTsKICAgICAgICAgaWYgKChyZXNpemVSYXRpbyA8IDAuMGYpIHx8IChyZXNpemVS YXRpbyA+IGhlaWdodFJlc2l6ZVJhdGlvKSkKICAgICAgICAgICAgIHJlc2l6ZVJhdGlvID0gaGVp Z2h0UmVzaXplUmF0aW87CiAgICAgfQogCi0gICAgaWYgKHNyY1NpemUgPT0gb3JpZ2luYWxTaXpl KQorICAgIGlmIChsYXlvdXRTaXplID09IG9yaWdpbmFsU2l6ZSkKICAgICAgICAgcmV0dXJuIHJl c2l6ZVJhdGlvID4gMC4wZiA/IHNjYWxlRHJhZ0ltYWdlKGltYWdlLCBGbG9hdFNpemUocmVzaXpl UmF0aW8sIHJlc2l6ZVJhdGlvKSkgOiBpbWFnZTsKIAotICAgIC8vIFRoZSBpbWFnZSB3YXMgc2Nh bGVkIGluIHRoZSB3ZWJwYWdlIHNvIGF0IG1pbmltdW0gd2UgbXVzdCBhY2NvdW50IGZvciB0aGF0 IHNjYWxpbmcKLSAgICBmbG9hdCBzY2FsZXggPSBzcmNTaXplLndpZHRoKCkgLyAoZmxvYXQpb3Jp Z2luYWxTaXplLndpZHRoKCk7Ci0gICAgZmxvYXQgc2NhbGV5ID0gc3JjU2l6ZS5oZWlnaHQoKSAv IChmbG9hdClvcmlnaW5hbFNpemUuaGVpZ2h0KCk7CisgICAgLy8gVGhlIGltYWdlIHdhcyBzY2Fs ZWQgaW4gdGhlIHdlYnBhZ2Ugc28gYXQgbWluaW11bSB3ZSBtdXN0IGFjY291bnQgZm9yIHRoYXQg c2NhbGluZy4KKyAgICBmbG9hdCBzY2FsZVggPSBsYXlvdXRTaXplLndpZHRoKCkgLyAoZmxvYXQp b3JpZ2luYWxTaXplLndpZHRoKCk7CisgICAgZmxvYXQgc2NhbGVZID0gbGF5b3V0U2l6ZS5oZWln aHQoKSAvIChmbG9hdClvcmlnaW5hbFNpemUuaGVpZ2h0KCk7CiAgICAgaWYgKHJlc2l6ZVJhdGlv ID4gMC4wZikgewotICAgICAgICBzY2FsZXggKj0gcmVzaXplUmF0aW87Ci0gICAgICAgIHNjYWxl eSAqPSByZXNpemVSYXRpbzsKKyAgICAgICAgc2NhbGVYICo9IHJlc2l6ZVJhdGlvOworICAgICAg ICBzY2FsZVkgKj0gcmVzaXplUmF0aW87CiAgICAgfQogCi0gICAgcmV0dXJuIHNjYWxlRHJhZ0lt YWdlKGltYWdlLCBGbG9hdFNpemUoc2NhbGV4LCBzY2FsZXkpKTsKKyAgICByZXR1cm4gc2NhbGVE cmFnSW1hZ2UoaW1hZ2UsIEZsb2F0U2l6ZShzY2FsZVgsIHNjYWxlWSkpOwogfQogCiBzdHJ1Y3Qg U2NvcGVkTm9kZURyYWdFbmFibGVyIHsK