179603 2017-11-13 00:23:11 -0800 [Cairo] Move focus ring drawing operations from GraphicsContextCairo to CairoOperations 2017-11-15 09:33:29 -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 1370858 0 zan 2017-11-13 00:23:11 -0800 [Cairo] Move focus ring drawing operations from GraphicsContextCairo to CairoOperations 1370859 1 326750 zan 2017-11-13 00:27:23 -0800 Created attachment 326750 Patch 1370864 2 326750 zan 2017-11-13 01:19:21 -0800 Comment on attachment 326750 Patch Clearing flags on attachment: 326750 Committed r224749: <https://trac.webkit.org/changeset/224749> 1370865 3 zan 2017-11-13 01:19:26 -0800 All reviewed patches have been landed. Closing bug. 1371885 4 webkit-bug-importer 2017-11-15 09:33:29 -0800 <rdar://problem/35561946> 326750 2017-11-13 00:27:23 -0800 2017-11-13 01:19:21 -0800 Patch bug-179603-20171113092722.patch text/plain 11936 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU0ZTBmZTgzNTVhNDNm ZDRiNWQ4NDBmODA5YTQyOWM4M2EzNDNjYS4uZTA3MWFkYTU2ODhlY2Q5MjE2MGJlNTY2OGZiN2Ji ODhlZTk4ZTRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE3LTExLTEzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ2Fpcm9dIE1vdmUg Zm9jdXMgcmluZyBkcmF3aW5nIG9wZXJhdGlvbnMgZnJvbSBHcmFwaGljc0NvbnRleHRDYWlybyB0 byBDYWlyb09wZXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3OTYwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1vdmUgb3BlcmF0aW9ucyB0aGF0IHBlcmZvcm0gZm9jdXMgcmluZyBkcmF3aW5n IHRvIHRoZSBDYWlyb09wZXJhdGlvbnMKKyAgICAgICAgZmlsZS4gVGhpcyBsaW1pdHMgb3BlcmF0 aW9ucyB0byBvbmx5IHdvcmsgd2l0aCBhIFBsYXRmb3JtQ29udGV4dENhaXJvCisgICAgICAgIG9i amVjdCwgYWxvbmcgd2l0aCBvdGhlciByZXF1aXJlZCBwYXJhbWV0ZXJzLCBhbmQgd2lsbCBoZWxw IHdpdGggZnV0dXJlCisgICAgICAgIHdvcmsgaW4gdGhpcyBhcmVhLgorCisgICAgICAgIFRoZSBD YWlybzo6U3RhdGUgbmFtZXNwYWNlIGlzIGludHJvZHVjZWQsIHdpdGggdGhlIHNldFN0cm9rZVN0 eWxlKCkKKyAgICAgICAgZnVuY3Rpb24gcGxhY2VkIHRoZXJlLiBUaGUgbmFtZXNwYWNlIHdpbGwg YmUgdXNlZCBmb3Igb3BlcmF0aW9ucyB0aGF0CisgICAgICAgIG9ubHkgY2hhbmdlIGFuIGFzcGVj dCBvZiB0aGUgQ2Fpcm8gc3RhdGUuIE1vcmUgZnVuY3Rpb25zIHdpbGwgYmUgYWRkZWQKKyAgICAg ICAgc29vbiwgYW5kIGV4aXN0aW5nIGxpbmUgYW5kIG1pdGVyIG9wZXJhdGlvbnMgd2lsbCBsaWtl bHkgbW92ZSB0aGVyZSBhcworICAgICAgICB3ZWxsLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAt LSBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9DYWlyb09wZXJhdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmFkanVz dEZvY3VzUmluZ0NvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNhaXJvOjphZGp1c3RGb2N1c1Jp bmdMaW5lV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmZvY3VzUmluZ1N0cm9rZVN0 eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhaXJvOjpTdGF0ZTo6c2V0U3Ryb2tlU3R5bGUpOgor ICAgICAgICAoV2ViQ29yZTo6Q2Fpcm86OmRyYXdGb2N1c1JpbmcpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyk6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtU3Ryb2tlU3R5bGUpOgorICAgICAgICAoV2ViQ29y ZTo6YWRqdXN0Rm9jdXNSaW5nQ29sb3IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6YWRq dXN0Rm9jdXNSaW5nTGluZVdpZHRoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmZvY3Vz UmluZ1N0cm9rZVN0eWxlKTogRGVsZXRlZC4KKwogMjAxNy0xMS0xMiAgWmFuIERvYmVyc2VrICA8 emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NhaXJvXSBNb3ZlIHJlY3RhbmdsZSBh bmQgcGF0aCBmaWxsaW5nLCBzdHJva2luZywgY2xlYXJpbmcgb3BlcmF0aW9ucyBpbiBHcmFwaGlj c0NvbnRleHRDYWlybyB0byBDYWlyb09wZXJhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuY3BwCmluZGV4 IGMyYjY3OTRmZWNiZTljYmQwYWM5NTdjMDVhYTc5Y2JmYjY1ZGM4M2UuLmFmOTkzMGZjNTU4OWFi NWQzMDQ4ZDBhNzc0MGYyYTVlNThlZjBkZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9PcGVyYXRpb25zLmNwcApAQCAtMTMz LDYgKzEzMyw2NCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZmlsbEN1cnJlbnRDYWlyb1BhdGgoUGxh dGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRmb3JtQ29udGV4dCwgYwogICAgIGNhaXJvX3Jlc3RvcmUo Y3IpOwogfQogCitzdGF0aWMgaW5saW5lIHZvaWQgYWRqdXN0Rm9jdXNSaW5nQ29sb3IoQ29sb3Im IGNvbG9yKQoreworI2lmICFQTEFURk9STShHVEspCisgICAgLy8gRm9yY2UgdGhlIGFscGhhIHRv IDUwJS4gVGhpcyBtYXRjaGVzIHdoYXQgdGhlIE1hYyBkb2VzIHdpdGggb3V0bGluZSByaW5ncy4K KyAgICBjb2xvciA9IENvbG9yKG1ha2VSR0JBKGNvbG9yLnJlZCgpLCBjb2xvci5ncmVlbigpLCBj b2xvci5ibHVlKCksIDEyNykpOworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0oY29sb3IpOworI2Vu ZGlmCit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCBhZGp1c3RGb2N1c1JpbmdMaW5lV2lkdGgoZmxv YXQmIHdpZHRoKQoreworI2lmIFBMQVRGT1JNKEdUSykKKyAgICB3aWR0aCA9IDI7CisjZWxzZQor ICAgIFVOVVNFRF9QQVJBTSh3aWR0aCk7CisjZW5kaWYKK30KKworc3RhdGljIGlubGluZSBTdHJv a2VTdHlsZSBmb2N1c1JpbmdTdHJva2VTdHlsZSgpCit7CisjaWYgUExBVEZPUk0oR1RLKQorICAg IHJldHVybiBEb3R0ZWRTdHJva2U7CisjZWxzZQorICAgIHJldHVybiBTb2xpZFN0cm9rZTsKKyNl bmRpZgorfQorCituYW1lc3BhY2UgU3RhdGUgeworCit2b2lkIHNldFN0cm9rZVN0eWxlKFBsYXRm b3JtQ29udGV4dENhaXJvJiBwbGF0Zm9ybUNvbnRleHQsIFN0cm9rZVN0eWxlIHN0cm9rZVN0eWxl KQoreworICAgIHN0YXRpYyBjb25zdCBkb3VibGUgZGFzaFBhdHRlcm5bXSA9IHsgNS4wLCA1LjAg fTsKKyAgICBzdGF0aWMgY29uc3QgZG91YmxlIGRvdFBhdHRlcm5bXSA9IHsgMS4wLCAxLjAgfTsK KworICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1Db250ZXh0LmNyKCk7CisgICAgc3dpdGNoIChz dHJva2VTdHlsZSkgeworICAgIGNhc2UgTm9TdHJva2U6CisgICAgICAgIC8vIEZJWE1FOiBpcyBp dCB0aGUgcmlnaHQgd2F5IHRvIGVtdWxhdGUgTm9TdHJva2U/CisgICAgICAgIGNhaXJvX3NldF9s aW5lX3dpZHRoKGNyLCAwKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBTb2xpZFN0cm9rZToK KyAgICBjYXNlIERvdWJsZVN0cm9rZToKKyAgICBjYXNlIFdhdnlTdHJva2U6CisgICAgICAgIC8v IEZJWE1FOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQxMTAgLSBO ZWVkcyBwbGF0Zm9ybSBzdXBwb3J0LgorICAgICAgICBjYWlyb19zZXRfZGFzaChjciwgMCwgMCwg MCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRG90dGVkU3Ryb2tlOgorICAgICAgICBjYWly b19zZXRfZGFzaChjciwgZG90UGF0dGVybiwgMiwgMCk7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgRGFzaGVkU3Ryb2tlOgorICAgICAgICBjYWlyb19zZXRfZGFzaChjciwgZGFzaFBhdHRlcm4s IDIsIDApOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK30gLy8gbmFtZXNwYWNlIFN0YXRl CisKIHZvaWQgc2V0TGluZUNhcChQbGF0Zm9ybUNvbnRleHRDYWlybyYgcGxhdGZvcm1Db250ZXh0 LCBMaW5lQ2FwIGxpbmVDYXApCiB7CiAgICAgY2Fpcm9fbGluZV9jYXBfdCBjYWlyb0NhcDsKQEAg LTI4OSw2ICszNDcsNTcgQEAgdm9pZCBjbGVhclJlY3QoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBs YXRmb3JtQ29udGV4dCwgY29uc3QgRmxvYXRSZWN0JiByZWN0KQogICAgIGNhaXJvX3Jlc3RvcmUo Y3IpOwogfQogCit2b2lkIGRyYXdGb2N1c1JpbmcoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRm b3JtQ29udGV4dCwgY29uc3QgUGF0aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGNvbnN0IENvbG9yJiBj b2xvcikKK3sKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGRyYXcgcGF0aHMgdGhhdCBkZXNjcmli ZSBhIHJlY3RhbmdsZSB3aXRoIHJvdW5kZWQgY29ybmVycworICAgIC8vIHNvIGFzIHRvIGJlIGNv bnNpc3RlbnQgd2l0aCBob3cgd2UgZHJhdyByZWN0YW5ndWxhciBmb2N1cyByaW5ncy4KKyAgICBD b2xvciByaW5nQ29sb3IgPSBjb2xvcjsKKyAgICBhZGp1c3RGb2N1c1JpbmdDb2xvcihyaW5nQ29s b3IpOworICAgIGFkanVzdEZvY3VzUmluZ0xpbmVXaWR0aCh3aWR0aCk7CisKKyAgICBjYWlyb190 KiBjciA9IHBsYXRmb3JtQ29udGV4dC5jcigpOworICAgIGNhaXJvX3NhdmUoY3IpOworCisgICAg Y2Fpcm9fcHVzaF9ncm91cChjcik7CisgICAgYXBwZW5kV2ViQ29yZVBhdGhUb0NhaXJvQ29udGV4 dChjciwgcGF0aCk7CisgICAgc2V0U291cmNlUkdCQUZyb21Db2xvcihjciwgcmluZ0NvbG9yKTsK KyAgICBjYWlyb19zZXRfbGluZV93aWR0aChjciwgd2lkdGgpOworICAgIENhaXJvOjpTdGF0ZTo6 c2V0U3Ryb2tlU3R5bGUocGxhdGZvcm1Db250ZXh0LCBmb2N1c1JpbmdTdHJva2VTdHlsZSgpKTsK KyAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IsIENBSVJPX09QRVJBVE9SX09WRVIpOworICAgIGNh aXJvX3N0cm9rZV9wcmVzZXJ2ZShjcik7CisKKyAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IsIENB SVJPX09QRVJBVE9SX0NMRUFSKTsKKyAgICBjYWlyb19zZXRfZmlsbF9ydWxlKGNyLCBDQUlST19G SUxMX1JVTEVfV0lORElORyk7CisgICAgY2Fpcm9fZmlsbChjcik7CisKKyAgICBjYWlyb19wb3Bf Z3JvdXBfdG9fc291cmNlKGNyKTsKKyAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IsIENBSVJPX09Q RVJBVE9SX09WRVIpOworICAgIGNhaXJvX3BhaW50KGNyKTsKKworICAgIGNhaXJvX3Jlc3RvcmUo Y3IpOworfQorCit2b2lkIGRyYXdGb2N1c1JpbmcoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mIHBsYXRm b3JtQ29udGV4dCwgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHJlY3RzLCBmbG9hdCB3aWR0aCwg Y29uc3QgQ29sb3ImIGNvbG9yKQoreworICAgIFBhdGggcGF0aDsKKyNpZiBQTEFURk9STShHVEsp CisgICAgZm9yIChjb25zdCBhdXRvJiByZWN0IDogcmVjdHMpCisgICAgICAgIHBhdGguYWRkUmVj dChyZWN0KTsKKyNlbHNlCisgICAgdW5zaWduZWQgcmVjdENvdW50ID0gcmVjdHMuc2l6ZSgpOwor ICAgIGludCByYWRpdXMgPSAod2lkdGggLSAxKSAvIDI7CisgICAgUGF0aCBzdWJQYXRoOworICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCByZWN0Q291bnQ7ICsraSkgeworICAgICAgICBpZiAo aSA+IDApCisgICAgICAgICAgICBzdWJQYXRoLmNsZWFyKCk7CisgICAgICAgIHN1YlBhdGguYWRk Um91bmRlZFJlY3QocmVjdHNbaV0sIEZsb2F0U2l6ZShyYWRpdXMsIHJhZGl1cykpOworICAgICAg ICBwYXRoLmFkZFBhdGgoc3ViUGF0aCwgQWZmaW5lVHJhbnNmb3JtKCkpOworICAgIH0KKyNlbmRp ZgorCisgICAgZHJhd0ZvY3VzUmluZyhwbGF0Zm9ybUNvbnRleHQsIHBhdGgsIHdpZHRoLCBjb2xv cik7Cit9CisKIHZvaWQgc2F2ZShQbGF0Zm9ybUNvbnRleHRDYWlybyYgcGxhdGZvcm1Db250ZXh0 KQogewogICAgIHBsYXRmb3JtQ29udGV4dC5zYXZlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9DYWlyb09wZXJhdGlvbnMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCmluZGV4IGFj NDE3MTUwYjYzMjU0YTkyNjI5ZDk0ZDI3YzEwMjA2N2RkMTcxNTcuLjRkZGY4MTdmNmE5Y2UyNjU3 YTkwYmEzMWUxYTdlNzczYTJkZDBkZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvT3BlcmF0aW9ucy5oCkBAIC0zNSw2ICszNSw3 IEBACiAjaWYgVVNFKENBSVJPKQogCiAjaW5jbHVkZSAiRGFzaEFycmF5LmgiCisjaW5jbHVkZSAi R3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NUeXBlcy5oIgogCiB0eXBlZGVm IHN0cnVjdCBfY2Fpcm9fcGF0dGVybiBjYWlyb19wYXR0ZXJuX3Q7CkBAIC01NCw2ICs1NSwxMCBA QCBjbGFzcyBQbGF0Zm9ybUNvbnRleHRDYWlybzsKIAogbmFtZXNwYWNlIENhaXJvIHsKIAorbmFt ZXNwYWNlIFN0YXRlIHsKK3ZvaWQgc2V0U3Ryb2tlU3R5bGUoUGxhdGZvcm1Db250ZXh0Q2Fpcm8m LCBTdHJva2VTdHlsZSk7Cit9CisKIHZvaWQgc2V0TGluZUNhcChQbGF0Zm9ybUNvbnRleHRDYWly byYsIExpbmVDYXApOwogdm9pZCBzZXRMaW5lRGFzaChQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNv bnN0IERhc2hBcnJheSYsIGZsb2F0KTsKIHZvaWQgc2V0TGluZUpvaW4oUGxhdGZvcm1Db250ZXh0 Q2Fpcm8mLCBMaW5lSm9pbik7CkBAIC02OSw2ICs3NCw5IEBAIHZvaWQgc3Ryb2tlUmVjdChQbGF0 Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IEZsb2F0UmVjdCYsIGZsb2F0LCBjb25zdCBHcmFwaGlj c0NvCiB2b2lkIHN0cm9rZVBhdGgoUGxhdGZvcm1Db250ZXh0Q2Fpcm8mLCBjb25zdCBQYXRoJiwg Y29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmLCBHcmFwaGljc0NvbnRleHQmKTsKIHZvaWQgY2xl YXJSZWN0KFBsYXRmb3JtQ29udGV4dENhaXJvJiwgY29uc3QgRmxvYXRSZWN0Jik7CiAKK3ZvaWQg ZHJhd0ZvY3VzUmluZyhQbGF0Zm9ybUNvbnRleHRDYWlybyYsIGNvbnN0IFBhdGgmLCBmbG9hdCwg Y29uc3QgQ29sb3ImKTsKK3ZvaWQgZHJhd0ZvY3VzUmluZyhQbGF0Zm9ybUNvbnRleHRDYWlybyYs IGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiwgZmxvYXQsIGNvbnN0IENvbG9yJik7CisKIHZvaWQg c2F2ZShQbGF0Zm9ybUNvbnRleHRDYWlybyYpOwogdm9pZCByZXN0b3JlKFBsYXRmb3JtQ29udGV4 dENhaXJvJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAppbmRleCA5NTAyYzI4YmYy ODg5MjkyZmI5NDcwNTdjY2EzNzliNDE0MDQ1MWEwLi4xZmE0ZWU5ZTA5MjNjYTkxNGM4N2ZiNDAy ZGE5YjVjNGU2NTM2N2NjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCkBAIC01MTMs ODYgKzUxMywzMiBAQCBJbnRSZWN0IEdyYXBoaWNzQ29udGV4dDo6Y2xpcEJvdW5kcygpIGNvbnN0 CiAgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3QoRmxvYXRSZWN0KHgxLCB5MSwgeDIgLSB4MSwg eTIgLSB5MSkpOwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQgYWRqdXN0Rm9jdXNSaW5nQ29sb3Io Q29sb3ImIGNvbG9yKQotewotI2lmICFQTEFURk9STShHVEspCi0gICAgLy8gRm9yY2UgdGhlIGFs cGhhIHRvIDUwJS4gIFRoaXMgbWF0Y2hlcyB3aGF0IHRoZSBNYWMgZG9lcyB3aXRoIG91dGxpbmUg cmluZ3MuCi0gICAgY29sb3IgPSBDb2xvcihtYWtlUkdCQShjb2xvci5yZWQoKSwgY29sb3IuZ3Jl ZW4oKSwgY29sb3IuYmx1ZSgpLCAxMjcpKTsKLSNlbHNlCi0gICAgVU5VU0VEX1BBUkFNKGNvbG9y KTsKLSNlbmRpZgotfQotCi1zdGF0aWMgaW5saW5lIHZvaWQgYWRqdXN0Rm9jdXNSaW5nTGluZVdp ZHRoKGZsb2F0JiB3aWR0aCkKLXsKLSNpZiBQTEFURk9STShHVEspCi0gICAgd2lkdGggPSAyOwot I2Vsc2UKLSAgICBVTlVTRURfUEFSQU0od2lkdGgpOwotI2VuZGlmCi19Ci0KLXN0YXRpYyBpbmxp bmUgU3Ryb2tlU3R5bGUgZm9jdXNSaW5nU3Ryb2tlU3R5bGUoKQotewotI2lmIFBMQVRGT1JNKEdU SykKLSAgICByZXR1cm4gRG90dGVkU3Ryb2tlOwotI2Vsc2UKLSAgICByZXR1cm4gU29saWRTdHJv a2U7Ci0jZW5kaWYKLX0KLQotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29u c3QgUGF0aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGZsb2F0IC8qIG9mZnNldCAqLywgY29uc3QgQ29s b3ImIGNvbG9yKQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgUGF0 aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNldCwgY29uc3QgQ29sb3ImIGNvbG9yKQog ewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgZHJhdyBwYXRocyB0aGF0IGRlc2NyaWJlIGEgcmVjdGFuZ2xlIHdp dGggcm91bmRlZCBjb3JuZXJzCi0gICAgLy8gc28gYXMgdG8gYmUgY29uc2lzdGVudCB3aXRoIGhv dyB3ZSBkcmF3IHJlY3Rhbmd1bGFyIGZvY3VzIHJpbmdzLgotICAgIENvbG9yIHJpbmdDb2xvciA9 IGNvbG9yOwotICAgIGFkanVzdEZvY3VzUmluZ0NvbG9yKHJpbmdDb2xvcik7Ci0gICAgYWRqdXN0 Rm9jdXNSaW5nTGluZVdpZHRoKHdpZHRoKTsKLQotICAgIGNhaXJvX3QqIGNyID0gcGxhdGZvcm1D b250ZXh0KCktPmNyKCk7Ci0gICAgY2Fpcm9fc2F2ZShjcik7Ci0gICAgY2Fpcm9fcHVzaF9ncm91 cChjcik7Ci0gICAgYXBwZW5kV2ViQ29yZVBhdGhUb0NhaXJvQ29udGV4dChjciwgcGF0aCk7Ci0g ICAgc2V0U291cmNlUkdCQUZyb21Db2xvcihjciwgcmluZ0NvbG9yKTsKLSAgICBjYWlyb19zZXRf bGluZV93aWR0aChjciwgd2lkdGgpOwotICAgIHNldFBsYXRmb3JtU3Ryb2tlU3R5bGUoZm9jdXNS aW5nU3Ryb2tlU3R5bGUoKSk7Ci0gICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNyLCBDQUlST19PUEVS QVRPUl9PVkVSKTsKLSAgICBjYWlyb19zdHJva2VfcHJlc2VydmUoY3IpOwotCi0gICAgY2Fpcm9f c2V0X29wZXJhdG9yKGNyLCBDQUlST19PUEVSQVRPUl9DTEVBUik7Ci0gICAgY2Fpcm9fc2V0X2Zp bGxfcnVsZShjciwgQ0FJUk9fRklMTF9SVUxFX1dJTkRJTkcpOwotICAgIGNhaXJvX2ZpbGwoY3Ip OworICAgIGlmIChtX2ltcGwpIHsKKyAgICAgICAgbV9pbXBsLT5kcmF3Rm9jdXNSaW5nKHBhdGgs IHdpZHRoLCBvZmZzZXQsIGNvbG9yKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAgIGNh aXJvX3BvcF9ncm91cF90b19zb3VyY2UoY3IpOwotICAgIGNhaXJvX3NldF9vcGVyYXRvcihjciwg Q0FJUk9fT1BFUkFUT1JfT1ZFUik7Ci0gICAgY2Fpcm9fcGFpbnQoY3IpOwotICAgIGNhaXJvX3Jl c3RvcmUoY3IpOworICAgIEFTU0VSVChoYXNQbGF0Zm9ybUNvbnRleHQoKSk7CisgICAgQ2Fpcm86 OmRyYXdGb2N1c1JpbmcoKnBsYXRmb3JtQ29udGV4dCgpLCBwYXRoLCB3aWR0aCwgY29sb3IpOwog fQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8Rmxv YXRSZWN0PiYgcmVjdHMsIGZsb2F0IHdpZHRoLCBmbG9hdCAvKiBvZmZzZXQgKi8sIGNvbnN0IENv bG9yJiBjb2xvcikKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZl Y3RvcjxGbG9hdFJlY3Q+JiByZWN0cywgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNldCwgY29uc3Qg Q29sb3ImIGNvbG9yKQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFBhdGggcGF0aDsKLSNpZiBQTEFURk9STShHVEspCi0gICAgZm9yIChjb25z dCBhdXRvJiByZWN0IDogcmVjdHMpCi0gICAgICAgIHBhdGguYWRkUmVjdChyZWN0KTsKLSNlbHNl Ci0gICAgdW5zaWduZWQgcmVjdENvdW50ID0gcmVjdHMuc2l6ZSgpOwotICAgIGludCByYWRpdXMg PSAod2lkdGggLSAxKSAvIDI7Ci0gICAgUGF0aCBzdWJQYXRoOwotICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCByZWN0Q291bnQ7ICsraSkgewotICAgICAgICBpZiAoaSA+IDApCi0gICAgICAg ICAgICBzdWJQYXRoLmNsZWFyKCk7Ci0gICAgICAgIHN1YlBhdGguYWRkUm91bmRlZFJlY3QocmVj dHNbaV0sIEZsb2F0U2l6ZShyYWRpdXMsIHJhZGl1cykpOwotICAgICAgICBwYXRoLmFkZFBhdGgo c3ViUGF0aCwgQWZmaW5lVHJhbnNmb3JtKCkpOworICAgIGlmIChtX2ltcGwpIHsKKyAgICAgICAg bV9pbXBsLT5kcmF3Rm9jdXNSaW5nKHJlY3RzLCB3aWR0aCwgb2Zmc2V0LCBjb2xvcik7CisgICAg ICAgIHJldHVybjsKICAgICB9Ci0jZW5kaWYKLSAgICBkcmF3Rm9jdXNSaW5nKHBhdGgsIHdpZHRo LCAwLCBjb2xvcik7CisKKyAgICBBU1NFUlQoaGFzUGxhdGZvcm1Db250ZXh0KCkpOworICAgIENh aXJvOjpkcmF3Rm9jdXNSaW5nKCpwbGF0Zm9ybUNvbnRleHQoKSwgcmVjdHMsIHdpZHRoLCBjb2xv cik7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxv YXRQb2ludCYgb3JpZ2luLCBmbG9hdCB3aWR0aCwgYm9vbCBwcmludGluZywgYm9vbCBkb3VibGVV bmRlcmxpbmVzLCBTdHJva2VTdHlsZSkKQEAgLTc1NSwzMSArNzAxLDExIEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpzZXRQbGF0Zm9ybVN0cm9rZVRoaWNrbmVzcyhmbG9hdCBzdHJva2VUaGlja25l c3MpCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVN0cm9rZVN0eWxlKFN0cm9r ZVN0eWxlIHN0cm9rZVN0eWxlKQogewotICAgIHN0YXRpYyBjb25zdCBkb3VibGUgZGFzaFBhdHRl cm5bXSA9IHsgNS4wLCA1LjAgfTsKLSAgICBzdGF0aWMgY29uc3QgZG91YmxlIGRvdFBhdHRlcm5b XSA9IHsgMS4wLCAxLjAgfTsKLQogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAg IHJldHVybjsKIAogICAgIEFTU0VSVChoYXNQbGF0Zm9ybUNvbnRleHQoKSk7Ci0KLSAgICBzd2l0 Y2ggKHN0cm9rZVN0eWxlKSB7Ci0gICAgY2FzZSBOb1N0cm9rZToKLSAgICAgICAgLy8gRklYTUU6 IGlzIGl0IHRoZSByaWdodCB3YXkgdG8gZW11bGF0ZSBOb1N0cm9rZT8KLSAgICAgICAgY2Fpcm9f c2V0X2xpbmVfd2lkdGgocGxhdGZvcm1Db250ZXh0KCktPmNyKCksIDApOwotICAgICAgICBicmVh azsKLSAgICBjYXNlIFNvbGlkU3Ryb2tlOgotICAgIGNhc2UgRG91YmxlU3Ryb2tlOgotICAgIGNh c2UgV2F2eVN0cm9rZTogLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NDExMCAtIE5lZWRzIHBsYXRmb3JtIHN1cHBvcnQuCi0gICAgICAgIGNhaXJvX3Nl dF9kYXNoKHBsYXRmb3JtQ29udGV4dCgpLT5jcigpLCAwLCAwLCAwKTsKLSAgICAgICAgYnJlYWs7 Ci0gICAgY2FzZSBEb3R0ZWRTdHJva2U6Ci0gICAgICAgIGNhaXJvX3NldF9kYXNoKHBsYXRmb3Jt Q29udGV4dCgpLT5jcigpLCBkb3RQYXR0ZXJuLCAyLCAwKTsKLSAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBEYXNoZWRTdHJva2U6Ci0gICAgICAgIGNhaXJvX3NldF9kYXNoKHBsYXRmb3JtQ29udGV4 dCgpLT5jcigpLCBkYXNoUGF0dGVybiwgMiwgMCk7Ci0gICAgICAgIGJyZWFrOwotICAgIH0KKyAg ICBDYWlybzo6U3RhdGU6OnNldFN0cm9rZVN0eWxlKCpwbGF0Zm9ybUNvbnRleHQoKSwgc3Ryb2tl U3R5bGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0VVJMRm9yUmVjdChjb25zdCBV UkwmLCBjb25zdCBGbG9hdFJlY3QmKQo=