179669 2017-11-14 07:37:59 -0800 [Cairo] Move drawLine operation from GraphicsContextCairo to CairoOperations 2017-11-15 09:31:58 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply cgarcia webkit-bug-importer oldest_to_newest 1371375 0 zan 2017-11-14 07:37:59 -0800 [Cairo] Move drawLine operation from GraphicsContextCairo to CairoOperations 1371377 1 326878 zan 2017-11-14 07:48:30 -0800 Created attachment 326878 Patch 1371416 2 326878 zan 2017-11-14 10:02:43 -0800 Comment on attachment 326878 Patch Clearing flags on attachment: 326878 Committed r224820: <https://trac.webkit.org/changeset/224820> 1371417 3 zan 2017-11-14 10:02:48 -0800 All reviewed patches have been landed. Closing bug. 1371867 4 webkit-bug-importer 2017-11-15 09:31:58 -0800 <rdar://problem/35561876> 326878 2017-11-14 07:48:30 -0800 2017-11-14 10:02:43 -0800 Patch bug-179669-20171114164828.patch text/plain 13056 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0ODE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZmNDFhMTJjNDUxNWVi MzZlYjM1OTdiMjVkNjg1MGY4MmRiNTA0ZS4uMjg4NDEyZTZmOGQ3NDU3ZDFmNjBiMGIxNjA5YzQ1 MjZlYmQyZGEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE3LTExLTE0ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ2Fpcm9dIE1vdmUg ZHJhd0xpbmUgb3BlcmF0aW9uIGZyb20gR3JhcGhpY3NDb250ZXh0Q2Fpcm8gdG8gQ2Fpcm9PcGVy YXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Nzk2NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN b3ZlIHRoZSBkcmF3TGluZSBvcGVyYXRpb24gaW1wbGVtZW50YXRpb24gaW50byB0aGUgQ2Fpcm9P cGVyYXRpb25zCisgICAgICAgIGltcGxlbWVudGF0aW9uIGZpbGUsIHdpdGggdGhlIENhaXJvOjpk cmF3TGluZSgpIGZ1bmN0aW9uIG9ubHkgZXhwZWN0aW5nCisgICAgICAgIGEgUGxhdGZvcm1Db250 ZXh0Q2Fpcm8gb2JqZWN0LCB0d28gRmxvYXRpbmdQb2ludHMsIGFuZCBhIGNvbnN0IHJlZmVyZW5j ZQorICAgICAgICB0byBhIEdyYXBoaWNzQ29udGV4dFN0YXRlIG9iamVjdC4KKworICAgICAgICBB cyB3aXRoIGRyYXdMaW5lc0ZvclRleHQoKSwgdGhlIGRyYXdMaW5lKCkgaW1wbGVtZW50YXRpb24g dXRpbGl6ZWQgYSBmZXcKKyAgICAgICAgcHJpdmF0ZSBHcmFwaGljc0NvbnRleHQgbWV0aG9kcyB0 aGF0IHdlIGZvciBub3cgcmVpbXBsZW1lbnQgaW4gdGhlCisgICAgICAgIENhaXJvIG5hbWVzcGFj ZSBhcyBzdGF0aWMgZnVuY3Rpb25zLCBwcm92aWRpbmcgbmVjZXNzYXJ5IHN0YXRlIHZhbHVlcyB0 bworICAgICAgICBwZXJmb3JtIHRoZSBjb21wdXRhdGlvbnMuIFRoZSBHcmFwaGljc0NvbnRleHQg bWV0aG9kcyBzaG91bGQgYmUgY2hhbmdlZAorICAgICAgICB0byBiZWNvbWUgc3RhdGljIHB1Ymxp YyBmdW5jdGlvbnMgLS0gYWZ0ZXIgdGhhdCB3ZSdsbCBiZSBhYmxlIHRvIHJlbW92ZQorICAgICAg ICB0aGUgbmV3IGR1cGxpY2F0ZWQgaGVscGVyIGZ1bmN0aW9ucy4KKworICAgICAgICBObyBuZXcg dGVzdHMgLS0gbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhaXJv OjpkYXNoZWRMaW5lQ29ybmVyV2lkdGhGb3JTdHJva2VXaWR0aCk6CisgICAgICAgIChXZWJDb3Jl OjpDYWlybzo6ZGFzaGVkTGluZVBhdHRlcm5XaWR0aEZvclN0cm9rZVdpZHRoKToKKyAgICAgICAg KFdlYkNvcmU6OkNhaXJvOjpkYXNoZWRMaW5lUGF0dGVybk9mZnNldEZvclBhdHRlcm5BbmRTdHJv a2VXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpDYWlybzo6Y2VudGVyTGluZUFuZEN1dE9mZkNv cm5lcnMpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmRyYXdMaW5lKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lKToKKworMjAxNy0xMS0xNCAgWmFuIERv YmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKICAgICAgICAgW0NhaXJvXSBNb3ZlIGRy YXdMaW5lc0ZvclRleHQgb3BlcmF0aW9uIGZyb20gR3JhcGhpY3NDb250ZXh0Q2Fpcm8gdG8gQ2Fp cm9PcGVyYXRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzk2NjEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKaW5kZXggNDRhMGI1OGZjZTk5NzhiNDg5 MWVmMDkzNGMyY2UwYTdmNDk0ZTdkYS4uYjgyYTNkMTlmZmQ2NDEzYzQ1MWVlMDA4ZjUxNDljODUz MDhiNWIwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vQ2Fpcm9PcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCkBAIC0yNjYsNiArMjY2LDY1IEBAIEZsb2F0 UmVjdCBjb21wdXRlTGluZUJvdW5kc0FuZEFudGlhbGlhc2luZ01vZGVGb3JUZXh0KFBsYXRmb3Jt Q29udGV4dENhaXJvJiBwbGF0CiAgICAgcmV0dXJuIEZsb2F0UmVjdChvcmlnaW4sIEZsb2F0U2l6 ZSh3aWR0aCwgdGhpY2tuZXNzKSk7CiB9OwogCisvLyBGSVhNRTogUmVwbGFjZSBvbmNlIEdyYXBo aWNzQ29udGV4dDo6ZGFzaGVkTGluZUNvcm5lcldpZHRoRm9yU3Ryb2tlV2lkdGgoKQorLy8gaXMg cmVmYWN0b3JlZCBhcyBhIHN0YXRpYyBwdWJsaWMgZnVuY3Rpb24uCitzdGF0aWMgZmxvYXQgZGFz aGVkTGluZUNvcm5lcldpZHRoRm9yU3Ryb2tlV2lkdGgoZmxvYXQgc3Ryb2tlV2lkdGgsIGNvbnN0 IEdyYXBoaWNzQ29udGV4dFN0YXRlJiBzdGF0ZSkKK3sKKyAgICBmbG9hdCB0aGlja25lc3MgPSBz dGF0ZS5zdHJva2VUaGlja25lc3M7CisgICAgcmV0dXJuIHN0YXRlLnN0cm9rZVN0eWxlID09IERv dHRlZFN0cm9rZSA/IHRoaWNrbmVzcyA6IHN0ZDo6bWluKDIuMGYgKiB0aGlja25lc3MsIHN0ZDo6 bWF4KHRoaWNrbmVzcywgc3Ryb2tlV2lkdGggLyAzLjBmKSk7Cit9CisKKy8vIEZJWE1FOiBSZXBs YWNlIG9uY2UgR3JhcGhpY3NDb250ZXh0OjpkYXNoZWRMaW5lUGF0dGVybldpZHRoRm9yU3Ryb2tl V2lkdGgoKQorLy8gaXMgcmVmYWN0b3JlZCBhcyBhIHN0YXRpYyBwdWJsaWMgZnVuY3Rpb24uCitz dGF0aWMgZmxvYXQgZGFzaGVkTGluZVBhdHRlcm5XaWR0aEZvclN0cm9rZVdpZHRoKGZsb2F0IHN0 cm9rZVdpZHRoLCBjb25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYgc3RhdGUpCit7CisgICAgZmxv YXQgdGhpY2tuZXNzID0gc3RhdGUuc3Ryb2tlVGhpY2tuZXNzOworICAgIHJldHVybiBzdGF0ZS5z dHJva2VTdHlsZSA9PSBEb3R0ZWRTdHJva2UgPyB0aGlja25lc3MgOiBzdGQ6Om1pbigzLjBmICog dGhpY2tuZXNzLCBzdGQ6Om1heCh0aGlja25lc3MsIHN0cm9rZVdpZHRoIC8gMy4wZikpOworfQor CisvLyBGSVhNRTogUmVwbGFjZSBvbmNlIEdyYXBoaWNzQ29udGV4dDo6ZGFzaGVkTGluZVBhdHRl cm5PZmZzZXRGb3JQYXR0ZXJuQW5kU3Ryb2tlV2lkdGgoKQorLy8gaXMgcmVmYWN0b3JlZCBhcyBh IHN0YXRpYyBwdWJsaWMgZnVuY3Rpb24uCitzdGF0aWMgZmxvYXQgZGFzaGVkTGluZVBhdHRlcm5P ZmZzZXRGb3JQYXR0ZXJuQW5kU3Ryb2tlV2lkdGgoZmxvYXQgcGF0dGVybldpZHRoLCBmbG9hdCBz dHJva2VXaWR0aCkKK3sKKyAgICAvLyBQYXR0ZXJuIHN0YXJ0cyB3aXRoIGZ1bGwgZmlsbCBhbmQg ZW5kcyB3aXRoIHRoZSBlbXB0eSBmaWxsLgorICAgIC8vIDEuIExldCdzIHN0YXJ0IHdpdGggdGhl IGVtcHR5IHBoYXNlIGFmdGVyIHRoZSBjb3JuZXIuCisgICAgLy8gMi4gQ2hlY2sgaWYgd2UndmUg Z290IG9kZCBvciBldmVuIG51bWJlciBvZiBwYXR0ZXJucyBhbmQgd2hldGhlciB0aGV5IGZ1bGx5 IGNvdmVyIHRoZSBsaW5lLgorICAgIC8vIDMuIEluIGNhc2Ugb2YgZXZlbiBudW1iZXIgb2YgcGF0 dGVybnMgYW5kL29yIHJlbWFpbmRlciwgbW92ZSB0aGUgcGF0dGVybiBzdGFydCBwb3NpdGlvbgor ICAgIC8vIHNvIHRoYXQgdGhlIHBhdHRlcm4gaXMgYmFsYW5jZWQgYmV0d2VlbiB0aGUgY29ybmVy cy4KKyAgICBmbG9hdCBwYXR0ZXJuT2Zmc2V0ID0gcGF0dGVybldpZHRoOworICAgIGludCBudW1i ZXJPZlNlZ21lbnRzID0gc3RkOjpmbG9vcihzdHJva2VXaWR0aCAvIHBhdHRlcm5XaWR0aCk7Cisg ICAgYm9vbCBvZGROdW1iZXJPZlNlZ21lbnRzID0gbnVtYmVyT2ZTZWdtZW50cyAlIDI7CisgICAg ZmxvYXQgcmVtYWluZGVyID0gc3Ryb2tlV2lkdGggLSAobnVtYmVyT2ZTZWdtZW50cyAqIHBhdHRl cm5XaWR0aCk7CisgICAgaWYgKG9kZE51bWJlck9mU2VnbWVudHMgJiYgcmVtYWluZGVyKQorICAg ICAgICBwYXR0ZXJuT2Zmc2V0IC09IHJlbWFpbmRlciAvIDIuMGY7CisgICAgZWxzZSBpZiAoIW9k ZE51bWJlck9mU2VnbWVudHMpIHsKKyAgICAgICAgaWYgKHJlbWFpbmRlcikKKyAgICAgICAgICAg IHBhdHRlcm5PZmZzZXQgKz0gcGF0dGVybk9mZnNldCAtIChwYXR0ZXJuV2lkdGggKyByZW1haW5k ZXIpIC8gMi4wZjsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgcGF0dGVybk9mZnNldCArPSBw YXR0ZXJuV2lkdGggLyAyLjBmOworICAgIH0KKworICAgIHJldHVybiBwYXR0ZXJuT2Zmc2V0Owor fQorCisvLyBGSVhNRTogUmVwbGFjZSBvbmNlIEdyYXBoaWNzQ29udGV4dDo6Y2VudGVyTGluZUFu ZEN1dE9mZkNvcm5lcnMoKQorLy8gaXMgcmVmYWN0b3JlZCBhcyBhIHN0YXRpYyBwdWJsaWMgZnVu Y3Rpb24uCitzdGF0aWMgVmVjdG9yPEZsb2F0UG9pbnQ+IGNlbnRlckxpbmVBbmRDdXRPZmZDb3Ju ZXJzKGJvb2wgaXNWZXJ0aWNhbExpbmUsIGZsb2F0IGNvcm5lcldpZHRoLCBGbG9hdFBvaW50IHBv aW50MSwgRmxvYXRQb2ludCBwb2ludDIpCit7CisgICAgLy8gQ2VudGVyIGxpbmUgYW5kIGN1dCBv ZmYgY29ybmVycyBmb3IgcGF0dGVybiBwYWludGluZy4KKyAgICBpZiAoaXNWZXJ0aWNhbExpbmUp IHsKKyAgICAgICAgZmxvYXQgY2VudGVyT2Zmc2V0ID0gKHBvaW50Mi54KCkgLSBwb2ludDEueCgp KSAvIDIuMGY7CisgICAgICAgIHBvaW50MS5tb3ZlKGNlbnRlck9mZnNldCwgY29ybmVyV2lkdGgp OworICAgICAgICBwb2ludDIubW92ZSgtY2VudGVyT2Zmc2V0LCAtY29ybmVyV2lkdGgpOworICAg IH0gZWxzZSB7CisgICAgICAgIGZsb2F0IGNlbnRlck9mZnNldCA9IChwb2ludDIueSgpIC0gcG9p bnQxLnkoKSkgLyAyLjBmOworICAgICAgICBwb2ludDEubW92ZShjb3JuZXJXaWR0aCwgY2VudGVy T2Zmc2V0KTsKKyAgICAgICAgcG9pbnQyLm1vdmUoLWNvcm5lcldpZHRoLCAtY2VudGVyT2Zmc2V0 KTsKKyAgICB9CisKKyAgICByZXR1cm4geyBwb2ludDEsIHBvaW50MiB9OworfQorCiBuYW1lc3Bh Y2UgU3RhdGUgewogCiB2b2lkIHNldFN0cm9rZVRoaWNrbmVzcyhQbGF0Zm9ybUNvbnRleHRDYWly byYgcGxhdGZvcm1Db250ZXh0LCBmbG9hdCBzdHJva2VUaGlja25lc3MpCkBAIC02NTYsNiArNzE1 LDY0IEBAIHZvaWQgZHJhd1JlY3QoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4 dCwgY29uc3QgRmxvYXRSZWN0JiByZWN0LCBmbG9hCiAgICAgY2Fpcm9fcmVzdG9yZShjcik7CiB9 CiAKK3ZvaWQgZHJhd0xpbmUoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwg Y29uc3QgRmxvYXRQb2ludCYgcG9pbnQxLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludDIsIGNvbnN0 IEdyYXBoaWNzQ29udGV4dFN0YXRlJiBzdGF0ZSkKK3sKKyAgICBib29sIGlzVmVydGljYWxMaW5l ID0gKHBvaW50MS54KCkgKyBzdGF0ZS5zdHJva2VUaGlja25lc3MgPT0gcG9pbnQyLngoKSk7Cisg ICAgZmxvYXQgc3Ryb2tlV2lkdGggPSBpc1ZlcnRpY2FsTGluZSA/IHBvaW50Mi55KCkgLSBwb2lu dDEueSgpIDogcG9pbnQyLngoKSAtIHBvaW50MS54KCk7CisgICAgaWYgKCFzdGF0ZS5zdHJva2VU aGlja25lc3MgfHwgIXN0cm9rZVdpZHRoKQorICAgICAgICByZXR1cm47CisKKyAgICBjYWlyb190 KiBjYWlyb0NvbnRleHQgPSBwbGF0Zm9ybUNvbnRleHQuY3IoKTsKKyAgICBmbG9hdCBjb3JuZXJX aWR0aCA9IDA7CisgICAgYm9vbCBkcmF3c0Rhc2hlZExpbmUgPSBzdGF0ZS5zdHJva2VTdHlsZSA9 PSBEb3R0ZWRTdHJva2UgfHwgc3RhdGUuc3Ryb2tlU3R5bGUgPT0gRGFzaGVkU3Ryb2tlOworCisg ICAgaWYgKGRyYXdzRGFzaGVkTGluZSkgeworICAgICAgICBjYWlyb19zYXZlKGNhaXJvQ29udGV4 dCk7CisgICAgICAgIC8vIEZpZ3VyZSBvdXQgZW5kIHBvaW50cyB0byBlbnN1cmUgd2UgYWx3YXlz IHBhaW50IGNvcm5lcnMuCisgICAgICAgIGNvcm5lcldpZHRoID0gZGFzaGVkTGluZUNvcm5lcldp ZHRoRm9yU3Ryb2tlV2lkdGgoc3Ryb2tlV2lkdGgsIHN0YXRlKTsKKyAgICAgICAgaWYgKGlzVmVy dGljYWxMaW5lKSB7CisgICAgICAgICAgICBmaWxsUmVjdFdpdGhDb2xvcihjYWlyb0NvbnRleHQs IEZsb2F0UmVjdChwb2ludDEueCgpLCBwb2ludDEueSgpLCBzdGF0ZS5zdHJva2VUaGlja25lc3Ms IGNvcm5lcldpZHRoKSwgc3RhdGUuc3Ryb2tlQ29sb3IpOworICAgICAgICAgICAgZmlsbFJlY3RX aXRoQ29sb3IoY2Fpcm9Db250ZXh0LCBGbG9hdFJlY3QocG9pbnQxLngoKSwgcG9pbnQyLnkoKSAt IGNvcm5lcldpZHRoLCBzdGF0ZS5zdHJva2VUaGlja25lc3MsIGNvcm5lcldpZHRoKSwgc3RhdGUu c3Ryb2tlQ29sb3IpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgZmlsbFJlY3RXaXRo Q29sb3IoY2Fpcm9Db250ZXh0LCBGbG9hdFJlY3QocG9pbnQxLngoKSwgcG9pbnQxLnkoKSwgY29y bmVyV2lkdGgsIHN0YXRlLnN0cm9rZVRoaWNrbmVzcyksIHN0YXRlLnN0cm9rZUNvbG9yKTsKKyAg ICAgICAgICAgIGZpbGxSZWN0V2l0aENvbG9yKGNhaXJvQ29udGV4dCwgRmxvYXRSZWN0KHBvaW50 Mi54KCkgLSBjb3JuZXJXaWR0aCwgcG9pbnQxLnkoKSwgY29ybmVyV2lkdGgsIHN0YXRlLnN0cm9r ZVRoaWNrbmVzcyksIHN0YXRlLnN0cm9rZUNvbG9yKTsKKyAgICAgICAgfQorICAgICAgICBzdHJv a2VXaWR0aCAtPSAyICogY29ybmVyV2lkdGg7CisgICAgICAgIGZsb2F0IHBhdHRlcm5XaWR0aCA9 IGRhc2hlZExpbmVQYXR0ZXJuV2lkdGhGb3JTdHJva2VXaWR0aChzdHJva2VXaWR0aCwgc3RhdGUp OworICAgICAgICAvLyBDaGVjayBpZiBjb3JuZXIgZHJhd2luZyBzdWZmaWNpZW50bHkgY292ZXJz IHRoZSBsaW5lLgorICAgICAgICBpZiAoc3Ryb2tlV2lkdGggPD0gcGF0dGVybldpZHRoICsgMSkg eworICAgICAgICAgICAgY2Fpcm9fcmVzdG9yZShjYWlyb0NvbnRleHQpOworICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgZmxvYXQgcGF0dGVybk9mZnNldCA9IGRhc2hl ZExpbmVQYXR0ZXJuT2Zmc2V0Rm9yUGF0dGVybkFuZFN0cm9rZVdpZHRoKHBhdHRlcm5XaWR0aCwg c3Ryb2tlV2lkdGgpOworICAgICAgICBjb25zdCBkb3VibGUgZGFzaGVkTGluZVsyXSA9IHsgc3Rh dGljX2Nhc3Q8ZG91YmxlPihwYXR0ZXJuV2lkdGgpLCBzdGF0aWNfY2FzdDxkb3VibGU+KHBhdHRl cm5XaWR0aCkgfTsKKyAgICAgICAgY2Fpcm9fc2V0X2Rhc2goY2Fpcm9Db250ZXh0LCBkYXNoZWRM aW5lLCAyLCBwYXR0ZXJuT2Zmc2V0KTsKKyAgICB9IGVsc2UgeworICAgICAgICBzZXRTb3VyY2VS R0JBRnJvbUNvbG9yKGNhaXJvQ29udGV4dCwgc3RhdGUuc3Ryb2tlQ29sb3IpOworICAgICAgICBp ZiAoc3RhdGUuc3Ryb2tlVGhpY2tuZXNzIDwgMSkKKyAgICAgICAgICAgIGNhaXJvX3NldF9saW5l X3dpZHRoKGNhaXJvQ29udGV4dCwgMSk7CisgICAgfQorCisKKyAgICBhdXRvIGNlbnRlcmVkUG9p bnRzID0gY2VudGVyTGluZUFuZEN1dE9mZkNvcm5lcnMoaXNWZXJ0aWNhbExpbmUsIGNvcm5lcldp ZHRoLCBwb2ludDEsIHBvaW50Mik7CisgICAgYXV0byBwMSA9IGNlbnRlcmVkUG9pbnRzWzBdOwor ICAgIGF1dG8gcDIgPSBjZW50ZXJlZFBvaW50c1sxXTsKKworICAgIGlmIChzdGF0ZS5zaG91bGRB bnRpYWxpYXMpCisgICAgICAgIGNhaXJvX3NldF9hbnRpYWxpYXMoY2Fpcm9Db250ZXh0LCBDQUlS T19BTlRJQUxJQVNfTk9ORSk7CisKKyAgICBjYWlyb19uZXdfcGF0aChjYWlyb0NvbnRleHQpOwor ICAgIGNhaXJvX21vdmVfdG8oY2Fpcm9Db250ZXh0LCBwMS54KCksIHAxLnkoKSk7CisgICAgY2Fp cm9fbGluZV90byhjYWlyb0NvbnRleHQsIHAyLngoKSwgcDIueSgpKTsKKyAgICBjYWlyb19zdHJv a2UoY2Fpcm9Db250ZXh0KTsKKyAgICBpZiAoZHJhd3NEYXNoZWRMaW5lKQorICAgICAgICBjYWly b19yZXN0b3JlKGNhaXJvQ29udGV4dCk7CisKKyAgICBpZiAoc3RhdGUuc2hvdWxkQW50aWFsaWFz KQorICAgICAgICBjYWlyb19zZXRfYW50aWFsaWFzKGNhaXJvQ29udGV4dCwgQ0FJUk9fQU5USUFM SUFTX0RFRkFVTFQpOworfQorCiB2b2lkIGRyYXdMaW5lc0ZvclRleHQoUGxhdGZvcm1Db250ZXh0 Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIGNvbnN0IERh c2hBcnJheSYgd2lkdGhzLCBib29sIHByaW50aW5nLCBib29sIGRvdWJsZVVuZGVybGluZXMsIGNv bnN0IENvbG9yJiBjb2xvciwgZmxvYXQgc3Ryb2tlVGhpY2tuZXNzKQogewogICAgIENvbG9yIG1v ZGlmaWVkQ29sb3IgPSBjb2xvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmgKaW5kZXggOGUxNTZiNzk3YzRmMGUx NWYwMGViYWYzZGU2YTNlOTkzNjNjNWY5OS4uN2M4ZDA3N2MyNDBmMWYyYzk4MzgzYzk0YjMzMDk2 Y2E2MTEwMDU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmgKQEAgLTk5LDYgKzk5LDcgQEAgdm9pZCBkcmF3 TmF0aXZlSW1hZ2UoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mLCBjb25zdCBOYXRpdmVJbWFnZVB0ciYs IGNvbnN0IEZsb2F0UmUKIHZvaWQgZHJhd1BhdHRlcm4oUGxhdGZvcm1Db250ZXh0Q2Fpcm8mLCBJ bWFnZSYsIGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEFmZmluZVRy YW5zZm9ybSYsIGNvbnN0IEZsb2F0UG9pbnQmLCBDb21wb3NpdGVPcGVyYXRvciwgQmxlbmRNb2Rl KTsKIAogdm9pZCBkcmF3UmVjdChQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UmVj dCYsIGZsb2F0LCBjb25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYpOwordm9pZCBkcmF3TGluZShQ bGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBGbG9hdFBvaW50 JiwgY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmKTsKIHZvaWQgZHJhd0xpbmVzRm9yVGV4dChQ bGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBjb25zdCBEYXNoQXJyYXkm LCBib29sLCBib29sLCBjb25zdCBDb2xvciYsIGZsb2F0KTsKIHZvaWQgZHJhd0xpbmVGb3JEb2N1 bWVudE1hcmtlcihQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UG9pbnQmLCBmbG9h dCwgR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1hcmtlckxpbmVTdHlsZSk7CiB2b2lkIGRyYXdF bGxpcHNlKFBsYXRmb3JtQ29udGV4dENhaXJvJiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgR3Jh cGhpY3NDb250ZXh0U3RhdGUmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAppbmRleCAx ZDNiZmY3NjAxMzllOWI5NjdkMzk0ZGYxNDNjMDcwZjZlODdlYTlhLi4zNjViNWViMWQzNzM3ZDNh NmM0MmZkZjQzYzlmMzQwYTM2MDk5NDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3Bw CkBAIC0yNzIsNjIgKzI3Miw4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZShjb25z dCBGbG9hdFBvaW50JiBwb2ludDEsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICBjb25zdCBDb2xvciYgc3Ryb2tlQ29sb3IgPSB0aGlzLT5zdHJv a2VDb2xvcigpOwotICAgIGZsb2F0IHRoaWNrbmVzcyA9IHN0cm9rZVRoaWNrbmVzcygpOwotICAg IGJvb2wgaXNWZXJ0aWNhbExpbmUgPSAocG9pbnQxLngoKSArIHRoaWNrbmVzcyA9PSBwb2ludDIu eCgpKTsKLSAgICBmbG9hdCBzdHJva2VXaWR0aCA9IGlzVmVydGljYWxMaW5lID8gcG9pbnQyLnko KSAtIHBvaW50MS55KCkgOiBwb2ludDIueCgpIC0gcG9pbnQxLngoKTsKLSAgICBpZiAoIXRoaWNr bmVzcyB8fCAhc3Ryb2tlV2lkdGgpCi0gICAgICAgIHJldHVybjsKLQotICAgIGNhaXJvX3QqIGNh aXJvQ29udGV4dCA9IHBsYXRmb3JtQ29udGV4dCgpLT5jcigpOwotICAgIFN0cm9rZVN0eWxlIHN0 cm9rZVN0eWxlID0gdGhpcy0+c3Ryb2tlU3R5bGUoKTsKLSAgICBmbG9hdCBjb3JuZXJXaWR0aCA9 IDA7Ci0gICAgYm9vbCBkcmF3c0Rhc2hlZExpbmUgPSBzdHJva2VTdHlsZSA9PSBEb3R0ZWRTdHJv a2UgfHwgc3Ryb2tlU3R5bGUgPT0gRGFzaGVkU3Ryb2tlOwotCi0gICAgaWYgKGRyYXdzRGFzaGVk TGluZSkgewotICAgICAgICBjYWlyb19zYXZlKGNhaXJvQ29udGV4dCk7Ci0gICAgICAgIC8vIEZp Z3VyZSBvdXQgZW5kIHBvaW50cyB0byBlbnN1cmUgd2UgYWx3YXlzIHBhaW50IGNvcm5lcnMuCi0g ICAgICAgIGNvcm5lcldpZHRoID0gZGFzaGVkTGluZUNvcm5lcldpZHRoRm9yU3Ryb2tlV2lkdGgo c3Ryb2tlV2lkdGgpOwotICAgICAgICBpZiAoaXNWZXJ0aWNhbExpbmUpIHsKLSAgICAgICAgICAg IGZpbGxSZWN0V2l0aENvbG9yKGNhaXJvQ29udGV4dCwgRmxvYXRSZWN0KHBvaW50MS54KCksIHBv aW50MS55KCksIHRoaWNrbmVzcywgY29ybmVyV2lkdGgpLCBzdHJva2VDb2xvcik7Ci0gICAgICAg ICAgICBmaWxsUmVjdFdpdGhDb2xvcihjYWlyb0NvbnRleHQsIEZsb2F0UmVjdChwb2ludDEueCgp LCBwb2ludDIueSgpIC0gY29ybmVyV2lkdGgsIHRoaWNrbmVzcywgY29ybmVyV2lkdGgpLCBzdHJv a2VDb2xvcik7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBmaWxsUmVjdFdpdGhDb2xv cihjYWlyb0NvbnRleHQsIEZsb2F0UmVjdChwb2ludDEueCgpLCBwb2ludDEueSgpLCBjb3JuZXJX aWR0aCwgdGhpY2tuZXNzKSwgc3Ryb2tlQ29sb3IpOwotICAgICAgICAgICAgZmlsbFJlY3RXaXRo Q29sb3IoY2Fpcm9Db250ZXh0LCBGbG9hdFJlY3QocG9pbnQyLngoKSAtIGNvcm5lcldpZHRoLCBw b2ludDEueSgpLCBjb3JuZXJXaWR0aCwgdGhpY2tuZXNzKSwgc3Ryb2tlQ29sb3IpOwotICAgICAg ICB9Ci0gICAgICAgIHN0cm9rZVdpZHRoIC09IDIgKiBjb3JuZXJXaWR0aDsKLSAgICAgICAgZmxv YXQgcGF0dGVybldpZHRoID0gZGFzaGVkTGluZVBhdHRlcm5XaWR0aEZvclN0cm9rZVdpZHRoKHN0 cm9rZVdpZHRoKTsKLSAgICAgICAgLy8gQ2hlY2sgaWYgY29ybmVyIGRyYXdpbmcgc3VmZmljaWVu dGx5IGNvdmVycyB0aGUgbGluZS4KLSAgICAgICAgaWYgKHN0cm9rZVdpZHRoIDw9IHBhdHRlcm5X aWR0aCArIDEpIHsKLSAgICAgICAgICAgIGNhaXJvX3Jlc3RvcmUoY2Fpcm9Db250ZXh0KTsKLSAg ICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGZsb2F0IHBhdHRlcm5PZmZz ZXQgPSBkYXNoZWRMaW5lUGF0dGVybk9mZnNldEZvclBhdHRlcm5BbmRTdHJva2VXaWR0aChwYXR0 ZXJuV2lkdGgsIHN0cm9rZVdpZHRoKTsKLSAgICAgICAgY29uc3QgZG91YmxlIGRhc2hlZExpbmVb Ml0gPSB7IHN0YXRpY19jYXN0PGRvdWJsZT4ocGF0dGVybldpZHRoKSwgc3RhdGljX2Nhc3Q8ZG91 YmxlPihwYXR0ZXJuV2lkdGgpIH07Ci0gICAgICAgIGNhaXJvX3NldF9kYXNoKGNhaXJvQ29udGV4 dCwgZGFzaGVkTGluZSwgMiwgcGF0dGVybk9mZnNldCk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAg c2V0U291cmNlUkdCQUZyb21Db2xvcihjYWlyb0NvbnRleHQsIHN0cm9rZUNvbG9yKTsKLSAgICAg ICAgaWYgKHRoaWNrbmVzcyA8IDEpCi0gICAgICAgICAgICBjYWlyb19zZXRfbGluZV93aWR0aChj YWlyb0NvbnRleHQsIDEpOwotICAgIH0KLQotCi0gICAgYXV0byBjZW50ZXJlZFBvaW50cyA9IGNl bnRlckxpbmVBbmRDdXRPZmZDb3JuZXJzKGlzVmVydGljYWxMaW5lLCBjb3JuZXJXaWR0aCwgcG9p bnQxLCBwb2ludDIpOwotICAgIGF1dG8gcDEgPSBjZW50ZXJlZFBvaW50c1swXTsKLSAgICBhdXRv IHAyID0gY2VudGVyZWRQb2ludHNbMV07Ci0KLSAgICBpZiAoc2hvdWxkQW50aWFsaWFzKCkpCi0g ICAgICAgIGNhaXJvX3NldF9hbnRpYWxpYXMoY2Fpcm9Db250ZXh0LCBDQUlST19BTlRJQUxJQVNf Tk9ORSk7Ci0KLSAgICBjYWlyb19uZXdfcGF0aChjYWlyb0NvbnRleHQpOwotICAgIGNhaXJvX21v dmVfdG8oY2Fpcm9Db250ZXh0LCBwMS54KCksIHAxLnkoKSk7Ci0gICAgY2Fpcm9fbGluZV90byhj YWlyb0NvbnRleHQsIHAyLngoKSwgcDIueSgpKTsKLSAgICBjYWlyb19zdHJva2UoY2Fpcm9Db250 ZXh0KTsKLSAgICBpZiAoZHJhd3NEYXNoZWRMaW5lKQotICAgICAgICBjYWlyb19yZXN0b3JlKGNh aXJvQ29udGV4dCk7Ci0gICAgaWYgKHNob3VsZEFudGlhbGlhcygpKQotICAgICAgICBjYWlyb19z ZXRfYW50aWFsaWFzKGNhaXJvQ29udGV4dCwgQ0FJUk9fQU5USUFMSUFTX0RFRkFVTFQpOworICAg IEFTU0VSVChoYXNQbGF0Zm9ybUNvbnRleHQoKSk7CisgICAgQ2Fpcm86OmRyYXdMaW5lKCpwbGF0 Zm9ybUNvbnRleHQoKSwgcG9pbnQxLCBwb2ludDIsIHN0YXRlKCkpOwogfQogCiAvLyBUaGlzIG1l dGhvZCBpcyBvbmx5IHVzZWQgdG8gZHJhdyB0aGUgbGl0dGxlIGNpcmNsZXMgdXNlZCBpbiBsaXN0 cy4K