140168 2015-01-06 19:46:04 -0800 Move 'webkit-mask-image' CSS property to the new StyleBuilder 2015-01-06 22:35:57 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue oldest_to_newest 1059296 0 cdumez 2015-01-06 19:46:04 -0800 Move 'webkit-mask-image' CSS property to the new StyleBuilder 1059302 1 244130 cdumez 2015-01-06 20:12:51 -0800 Created attachment 244130 Patch 1059326 2 244130 commit-queue 2015-01-06 22:35:53 -0800 Comment on attachment 244130 Patch Clearing flags on attachment: 244130 Committed r178020: <http://trac.webkit.org/changeset/178020> 1059327 3 commit-queue 2015-01-06 22:35:57 -0800 All reviewed patches have been landed. Closing bug. 244130 2015-01-06 20:12:51 -0800 2015-01-06 22:35:53 -0800 Patch bug-140168-20150106201255.patch text/plain 11218 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4MDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBlZTRiMGJlNmVmZWVi YTY4ZTk4M2ZiNTJiNzYzY2IwNmI5YzI0NC4uNDYwM2YzMDNkNzE4ZTZiZDdiNjJjZDkwODdiOWFk M2MxMTg2ZTIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDE1LTAxLTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSAnd2Via2l0LW1hc2st aW1hZ2UnIENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMTY4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSAnd2Via2l0LW1hc2staW1h Z2UnIENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlci4KKworICAgICAgICAqIGNz cy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0 ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydE1h c2tJbWFnZU9wZXJhdGlvbnMpOgorICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsV2Via2l0 TWFza0ltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJ bmhlcml0V2Via2l0TWFza0ltYWdlKToKKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KToKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmNyZWF0ZU1hc2tJbWFnZU9wZXJhdGlvbnMpOiBE ZWxldGVkLgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmg6CisKKzIwMTUtMDEtMDYgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAgICAgICBNb3ZlIHRoZSAnYWx0JyBD U1MgcHJvcGVydHkgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDEyOQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cm9wZXJ0eU5hbWVzLmluCmluZGV4IGJmNjM5YTk1YjI2ZGVhNGU3MmFiZDIyNGZhYzdkNjVhMmI3 OTJjZTQuLmYwMGZiYmI5ODliMTAxNmEyNjMyMGY4NzQxOWM0YzYxZmY4ZDJmMWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBAIC00ODIsNyArNDgyLDcgQEAganVzdGlm eS1jb250ZW50CiAtd2Via2l0LW1hc2stYm94LWltYWdlLXdpZHRoIFtDdXN0b209QWxsXQogLXdl YmtpdC1tYXNrLWNsaXAgW0ZpbGxMYXllclByb3BlcnR5LCBUeXBlTmFtZT1FRmlsbEJveCwgTmFt ZUZvck1ldGhvZHM9Q2xpcF0KIC13ZWJraXQtbWFzay1jb21wb3NpdGUgW0ZpbGxMYXllclByb3Bl cnR5LCBUeXBlTmFtZT1Db21wb3NpdGVPcGVyYXRvciwgTmFtZUZvck1ldGhvZHM9Q29tcG9zaXRl XQotLXdlYmtpdC1tYXNrLWltYWdlIFtMZWdhY3lTdHlsZUJ1aWxkZXJdCistd2Via2l0LW1hc2st aW1hZ2UgW0N1c3RvbT1Jbml0aWFsfEluaGVyaXQsIENvbmRpdGlvbmFsQ29udmVydGVyPU1hc2tJ bWFnZU9wZXJhdGlvbnMsIFR5cGVOYW1lPVZlY3RvcjxSZWZQdHI8TWFza0ltYWdlT3BlcmF0aW9u Pj5dCiAtd2Via2l0LW1hc2stb3JpZ2luIFtGaWxsTGF5ZXJQcm9wZXJ0eSwgVHlwZU5hbWU9RUZp bGxCb3gsIE5hbWVGb3JNZXRob2RzPU9yaWdpbl0KIC13ZWJraXQtbWFzay1wb3NpdGlvbiBbTGVn YWN5U3R5bGVCdWlsZGVyXQogLXdlYmtpdC1tYXNrLXBvc2l0aW9uLXggW0ZpbGxMYXllclByb3Bl cnR5LCBUeXBlTmFtZT1MZW5ndGgsIE5hbWVGb3JNZXRob2RzPVhQb3NpdGlvbl0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAppbmRleCAwNzlhMzhkNzczYjAxZjBm N2ZkZmQzNmMzMDYxY2Q4ZDZiZGJjNDQ5Li4xODMyMGYyZmM2MmRhZDFmZDAyNWJkMTUyMmViZjU3 NmVhZmJhZDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29u dmVydGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5o CkBAIC00MiwxMCArNDIsMTIgQEAKICNpbmNsdWRlICJMZW5ndGhSZXBlYXQuaCIKICNpbmNsdWRl ICJQYWlyLmgiCiAjaW5jbHVkZSAiUXVvdGVzRGF0YS5oIgorI2luY2x1ZGUgIlNWR1VSSVJlZmVy ZW5jZS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZlci5o IgogI2luY2x1ZGUgIlN0eWxlU2Nyb2xsU25hcFBvaW50cy5oIgogI2luY2x1ZGUgIlRyYW5zZm9y bUZ1bmN0aW9ucy5oIgorI2luY2x1ZGUgIldlYktpdENTU1Jlc291cmNlVmFsdWUuaCIKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCkBAIC05OCw2ICsxMDAsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGlj IGJvb2wgY29udmVydFBlcnNwZWN0aXZlKFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYsIGZsb2F0 Jik7CiAgICAgc3RhdGljIGJvb2wgY29udmVydE1hcnF1ZWVJbmNyZW1lbnQoU3R5bGVSZXNvbHZl ciYsIENTU1ZhbHVlJiwgTGVuZ3RoJik7CiAgICAgc3RhdGljIGJvb2wgY29udmVydEZpbHRlck9w ZXJhdGlvbnMoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJiwgRmlsdGVyT3BlcmF0aW9ucyYpOwor ICAgIHN0YXRpYyBib29sIGNvbnZlcnRNYXNrSW1hZ2VPcGVyYXRpb25zKFN0eWxlUmVzb2x2ZXIm LCBDU1NWYWx1ZSYsIFZlY3RvcjxSZWZQdHI8TWFza0ltYWdlT3BlcmF0aW9uPj4mKTsKIAogcHJp dmF0ZToKICAgICBmcmllbmQgY2xhc3MgU3R5bGVCdWlsZGVyQ3VzdG9tOwpAQCAtOTkxLDYgKzk5 NCw1OCBAQCBpbmxpbmUgYm9vbCBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRGaWx0ZXJP cGVyYXRpb25zKFN0eWxlUmVzb2x2ZXImIHN0eWxlUgogICAgIHJldHVybiBzdHlsZVJlc29sdmVy LmNyZWF0ZUZpbHRlck9wZXJhdGlvbnModmFsdWUsIG9wZXJhdGlvbnMpOwogfQogCitpbmxpbmUg Ym9vbCBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRNYXNrSW1hZ2VPcGVyYXRpb25zKFN0 eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSwgVmVjdG9yPFJlZlB0 cjxNYXNrSW1hZ2VPcGVyYXRpb24+PiYgb3BlcmF0aW9ucykKK3sKKyAgICBSZWZQdHI8V2ViS2l0 Q1NTUmVzb3VyY2VWYWx1ZT4gbWFza0ltYWdlVmFsdWU7CisgICAgUmVmUHRyPENTU1ZhbHVlTGlz dD4gbWFza0ltYWdlc0xpc3Q7CisgICAgQ1NTVmFsdWVMaXN0OjppdGVyYXRvciBsaXN0SXRlcmF0 b3I7CisgICAgaWYgKGlzPFdlYktpdENTU1Jlc291cmNlVmFsdWU+KHZhbHVlKSkKKyAgICAgICAg bWFza0ltYWdlVmFsdWUgPSAmZG93bmNhc3Q8V2ViS2l0Q1NTUmVzb3VyY2VWYWx1ZT4odmFsdWUp OworICAgIGVsc2UgaWYgKGlzPENTU1ZhbHVlTGlzdD4odmFsdWUpKSB7CisgICAgICAgIG1hc2tJ bWFnZXNMaXN0ID0gJmRvd25jYXN0PENTU1ZhbHVlTGlzdD4odmFsdWUpOworICAgICAgICBsaXN0 SXRlcmF0b3IgPSBtYXNrSW1hZ2VzTGlzdC0+YmVnaW4oKTsKKyAgICAgICAgaWYgKGxpc3RJdGVy YXRvciAhPSBtYXNrSW1hZ2VzTGlzdC0+ZW5kKCkpCisgICAgICAgICAgICBtYXNrSW1hZ2VWYWx1 ZSA9ICZkb3duY2FzdDxXZWJLaXRDU1NSZXNvdXJjZVZhbHVlPihsaXN0SXRlcmF0b3ItPmdldCgp KTsKKyAgICB9CisKKyAgICB3aGlsZSAobWFza0ltYWdlVmFsdWUuZ2V0KCkpIHsKKyAgICAgICAg UmVmUHRyPENTU1ZhbHVlPiBtYXNrSW5uZXJWYWx1ZSA9IG1hc2tJbWFnZVZhbHVlLT5pbm5lclZh bHVlKCk7CisKKyAgICAgICAgUmVmUHRyPE1hc2tJbWFnZU9wZXJhdGlvbj4gbmV3TWFza0ltYWdl OworICAgICAgICBpZiAoaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KG1hc2tJbm5lclZhbHVlLmdldCgp KSkgeworICAgICAgICAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBwcmltaXRpdmVWYWx1 ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihtYXNrSW5uZXJWYWx1ZS5nZXQoKSk7Cisg ICAgICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmlzVmFsdWVJRCgpICYmIHByaW1pdGl2ZVZh bHVlLT5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb25lKQorICAgICAgICAgICAgICAgIG5ld01h c2tJbWFnZSA9IE1hc2tJbWFnZU9wZXJhdGlvbjo6Y3JlYXRlKCk7CisgICAgICAgICAgICBlbHNl IHsKKyAgICAgICAgICAgICAgICBTdHJpbmcgY3NzVXJsID0gcHJpbWl0aXZlVmFsdWUtPmdldFN0 cmluZ1ZhbHVlKCk7CisgICAgICAgICAgICAgICAgVVJMIHVybCA9IHN0eWxlUmVzb2x2ZXIuZG9j dW1lbnQoKS5jb21wbGV0ZVVSTChjc3NVcmwpOworCisgICAgICAgICAgICAgICAgYm9vbCBpc0V4 dGVybmFsRG9jdW1lbnQgPSBTVkdVUklSZWZlcmVuY2U6OmlzRXh0ZXJuYWxVUklSZWZlcmVuY2Uo Y3NzVXJsLCBzdHlsZVJlc29sdmVyLmRvY3VtZW50KCkpOworICAgICAgICAgICAgICAgIG5ld01h c2tJbWFnZSA9IE1hc2tJbWFnZU9wZXJhdGlvbjo6Y3JlYXRlKG1hc2tJbWFnZVZhbHVlLCBjc3NV cmwsIHVybC5mcmFnbWVudElkZW50aWZpZXIoKSwgaXNFeHRlcm5hbERvY3VtZW50LCBzdHlsZVJl c29sdmVyLmRvY3VtZW50KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKSk7CisgICAgICAgICAgICAg ICAgaWYgKGlzRXh0ZXJuYWxEb2N1bWVudCkKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVSZXNv bHZlci5zdGF0ZSgpLm1hc2tJbWFnZXNXaXRoUGVuZGluZ1NWR0RvY3VtZW50cygpLmFwcGVuZChu ZXdNYXNrSW1hZ2UpOworICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgaWYgKFJlZlB0cjxTdHlsZUltYWdlPiBpbWFnZSA9IHN0eWxlUmVzb2x2ZXIuc3R5bGVJbWFn ZShDU1NQcm9wZXJ0eVdlYmtpdE1hc2tJbWFnZSwgKm1hc2tJbm5lclZhbHVlKSkKKyAgICAgICAg ICAgICAgICBuZXdNYXNrSW1hZ2UgPSBNYXNrSW1hZ2VPcGVyYXRpb246OmNyZWF0ZShpbWFnZSk7 CisgICAgICAgIH0KKworICAgICAgICAvLyBJZiB3ZSBkaWRuJ3QgZ2V0IGEgdmFsaWQgdmFsdWUs IHVzZSBOb25lIHNvIHdlIGtlZXAgdGhlIGNvcnJlY3QgbnVtYmVyIGFuZCBvcmRlciBvZiBtYXNr cy4KKyAgICAgICAgaWYgKCFuZXdNYXNrSW1hZ2UpCisgICAgICAgICAgICBuZXdNYXNrSW1hZ2Ug PSBNYXNrSW1hZ2VPcGVyYXRpb246OmNyZWF0ZSgpOworCisgICAgICAgIG9wZXJhdGlvbnMuYXBw ZW5kKG5ld01hc2tJbWFnZSk7CisKKyAgICAgICAgaWYgKG1hc2tJbWFnZXNMaXN0KSB7CisgICAg ICAgICAgICArK2xpc3RJdGVyYXRvcjsKKyAgICAgICAgICAgIG1hc2tJbWFnZVZhbHVlID0gbGlz dEl0ZXJhdG9yICE9IG1hc2tJbWFnZXNMaXN0LT5lbmQoKSA/ICZkb3duY2FzdDxXZWJLaXRDU1NS ZXNvdXJjZVZhbHVlPihsaXN0SXRlcmF0b3ItPmdldCgpKSA6IG51bGxwdHI7CisgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgbWFza0ltYWdlVmFsdWUgPSBudWxscHRyOworICAgIH0KKworICAg IHJldHVybiB0cnVlOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBT dHlsZUJ1aWxkZXJDb252ZXJ0ZXJfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlckN1c3RvbS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3Rv bS5oCmluZGV4IDQ0Nzk4NmI3ODgzNjYyM2NlMzIxZjQwNDcyZjgzMmQwMjU3YzQyMGMuLmU3ZmI3 ZjE0ZDZkZmNlNjJiZmU1ZDRhNjVmNWZkNTIxNGQ2ZWVlM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVCdWlsZGVyQ3VzdG9tLmgKQEAgLTkwLDYgKzkwLDEwIEBAIHB1YmxpYzoKICAgICBERUNM QVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhXZWJraXRUZXh0RW1waGFzaXNTdHlsZSk7CiAg ICAgREVDTEFSRV9QUk9QRVJUWV9DVVNUT01fSEFORExFUlMoWm9vbSk7CiAKKyAgICAvLyBDdXN0 b20gaGFuZGxpbmcgb2YgaW5pdGlhbCArIGluaGVyaXQgdmFsdWUgc2V0dGluZyBvbmx5LgorICAg IHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbFdlYmtpdE1hc2tJbWFnZShTdHlsZVJlc29sdmVyJikg eyB9CisgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0V2Via2l0TWFza0ltYWdlKFN0eWxlUmVz b2x2ZXImKSB7IH0KKwogICAgIC8vIEN1c3RvbSBoYW5kbGluZyBvZiBpbmhlcml0ICsgdmFsdWUg c2V0dGluZyBvbmx5LgogICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdERpc3BsYXkoU3R5bGVS ZXNvbHZlciYpOwogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVEaXNwbGF5KFN0eWxlUmVzb2x2 ZXImLCBDU1NWYWx1ZSYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVz b2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGQ0 ZDg3NmUzYTZjNGY1NjNmMzg2YmEzNmRiM2MyZDU0ZjNiY2E4YzIuLmVhNDZhZjBiYmM2YTBiMGEx OGJlYjcyNjQzZThhYjJlOGZlMTcyOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5j cHAKQEAgLTIzMDgsMTYgKzIzMDgsOSBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVy dHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUqIHZhbHVlKQogICAgICAgICBzZXRGb250RGVz Y3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLQotICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXNrSW1hZ2U6IHsKLSAgICAgICAgVmVjdG9yPFJlZlB0 cjxNYXNrSW1hZ2VPcGVyYXRpb24+PiBvcGVyYXRpb25zOwotICAgICAgICBpZiAoY3JlYXRlTWFz a0ltYWdlT3BlcmF0aW9ucyh2YWx1ZSwgb3BlcmF0aW9ucykpCi0gICAgICAgICAgICBzdGF0ZS5z dHlsZSgpLT5zZXRNYXNrSW1hZ2Uob3BlcmF0aW9ucyk7Ci0KLSAgICAgICAgcmV0dXJuOwotICAg IH0KICAgICAKICAgICAvLyBUaGVzZSBwcm9wZXJ0aWVzIGFyZSBhbGlhc2VkIGFuZCBTdHlsZUJ1 aWxkZXIgYWxyZWFkeSBhcHBsaWVkIHRoZSBwcm9wZXJ0eSBvbiB0aGUgcHJlZml4ZWQgdmVyc2lv bi4KKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0ltYWdlOgogICAgIGNhc2UgQ1NTUHJv cGVydHlBbmltYXRpb25EZWxheToKICAgICBjYXNlIENTU1Byb3BlcnR5QW5pbWF0aW9uRGlyZWN0 aW9uOgogICAgIGNhc2UgQ1NTUHJvcGVydHlBbmltYXRpb25EdXJhdGlvbjoKQEAgLTMwNzMsNjMg KzMwNjYsNiBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OmNyZWF0ZUZpbHRlck9wZXJhdGlvbnMoQ1NT VmFsdWUmIGluVmFsdWUsIEZpbHRlck9wZXJhdGlvbnMmCiAgICAgcmV0dXJuIHRydWU7CiB9CiAK LWJvb2wgU3R5bGVSZXNvbHZlcjo6Y3JlYXRlTWFza0ltYWdlT3BlcmF0aW9ucyhDU1NWYWx1ZSog aW5WYWx1ZSwgVmVjdG9yPFJlZlB0cjxNYXNrSW1hZ2VPcGVyYXRpb24+PiYgb3V0T3BlcmF0aW9u cykKLXsKLSAgICBBU1NFUlQob3V0T3BlcmF0aW9ucy5pc0VtcHR5KCkpOwotICAgIGlmICghaW5W YWx1ZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgUmVmUHRyPFdlYktpdENTU1Jlc291 cmNlVmFsdWU+IG1hc2tJbWFnZVZhbHVlOwotICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IG1hc2tJ bWFnZXNMaXN0OwotICAgIENTU1ZhbHVlTGlzdDo6aXRlcmF0b3IgbGlzdEl0ZXJhdG9yOwotICAg IGlmIChpczxXZWJLaXRDU1NSZXNvdXJjZVZhbHVlPigqaW5WYWx1ZSkpCi0gICAgICAgIG1hc2tJ bWFnZVZhbHVlID0gZG93bmNhc3Q8V2ViS2l0Q1NTUmVzb3VyY2VWYWx1ZT4oaW5WYWx1ZSk7Ci0g ICAgZWxzZSBpZiAoaXM8Q1NTVmFsdWVMaXN0PigqaW5WYWx1ZSkpIHsKLSAgICAgICAgbWFza0lt YWdlc0xpc3QgPSBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KGluVmFsdWUpOwotICAgICAgICBsaXN0 SXRlcmF0b3IgPSBtYXNrSW1hZ2VzTGlzdC0+YmVnaW4oKTsKLSAgICAgICAgaWYgKGxpc3RJdGVy YXRvciAhPSBtYXNrSW1hZ2VzTGlzdC0+ZW5kKCkpCi0gICAgICAgICAgICBtYXNrSW1hZ2VWYWx1 ZSA9ICZkb3duY2FzdDxXZWJLaXRDU1NSZXNvdXJjZVZhbHVlPihsaXN0SXRlcmF0b3ItPmdldCgp KTsKLSAgICB9Ci0KLSAgICB3aGlsZSAobWFza0ltYWdlVmFsdWUuZ2V0KCkpIHsKLSAgICAgICAg UmVmUHRyPENTU1ZhbHVlPiBtYXNrSW5uZXJWYWx1ZSA9IG1hc2tJbWFnZVZhbHVlLT5pbm5lclZh bHVlKCk7Ci0gICAgICAgIFJlZlB0cjxNYXNrSW1hZ2VPcGVyYXRpb24+IG5ld01hc2tJbWFnZTsK LQotICAgICAgICBpZiAoaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KG1hc2tJbm5lclZhbHVlLmdldCgp KSkgewotICAgICAgICAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBwcmltaXRpdmVWYWx1 ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihtYXNrSW5uZXJWYWx1ZS5nZXQoKSk7Ci0g ICAgICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmlzVmFsdWVJRCgpICYmIHByaW1pdGl2ZVZh bHVlLT5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb25lKQotICAgICAgICAgICAgICAgIG5ld01h c2tJbWFnZSA9IE1hc2tJbWFnZU9wZXJhdGlvbjo6Y3JlYXRlKCk7Ci0gICAgICAgICAgICBlbHNl IHsKLSAgICAgICAgICAgICAgICBTdHJpbmcgY3NzVXJsID0gcHJpbWl0aXZlVmFsdWUtPmdldFN0 cmluZ1ZhbHVlKCk7Ci0gICAgICAgICAgICAgICAgVVJMIHVybCA9IG1fc3RhdGUuZG9jdW1lbnQo KS5jb21wbGV0ZVVSTChjc3NVcmwpOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAg IGJvb2wgaXNFeHRlcm5hbERvY3VtZW50ID0gKFNWR1VSSVJlZmVyZW5jZTo6aXNFeHRlcm5hbFVS SVJlZmVyZW5jZShjc3NVcmwsIG1fc3RhdGUuZG9jdW1lbnQoKSkpOwotICAgICAgICAgICAgICAg IG5ld01hc2tJbWFnZSA9IE1hc2tJbWFnZU9wZXJhdGlvbjo6Y3JlYXRlKG1hc2tJbWFnZVZhbHVl LCBjc3NVcmwsIHVybC5mcmFnbWVudElkZW50aWZpZXIoKSwgaXNFeHRlcm5hbERvY3VtZW50LCBt X3N0YXRlLmRvY3VtZW50KCkuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKSk7Ci0gICAgICAgICAgICAg ICAgaWYgKGlzRXh0ZXJuYWxEb2N1bWVudCkKLSAgICAgICAgICAgICAgICAgICAgbV9zdGF0ZS5t YXNrSW1hZ2VzV2l0aFBlbmRpbmdTVkdEb2N1bWVudHMoKS5hcHBlbmQobmV3TWFza0ltYWdlKTsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIFJlZlB0cjxTdHls ZUltYWdlPiBpbWFnZSA9IHN0eWxlSW1hZ2UoQ1NTUHJvcGVydHlXZWJraXRNYXNrSW1hZ2UsICpt YXNrSW5uZXJWYWx1ZSk7Ci0gICAgICAgICAgICBpZiAoaW1hZ2UuZ2V0KCkpCi0gICAgICAgICAg ICAgICAgbmV3TWFza0ltYWdlID0gTWFza0ltYWdlT3BlcmF0aW9uOjpjcmVhdGUoaW1hZ2UpOwot ICAgICAgICB9Ci0KLSAgICAgICAgLy8gSWYgd2UgZGlkbid0IGdldCBhIHZhbGlkIHZhbHVlLCB1 c2UgTm9uZSBzbyB3ZSBrZWVwIHRoZSBjb3JyZWN0IG51bWJlciBhbmQgb3JkZXIgb2YgbWFza3Mu Ci0gICAgICAgIGlmICghbmV3TWFza0ltYWdlLmdldCgpKQotICAgICAgICAgICAgbmV3TWFza0lt YWdlID0gTWFza0ltYWdlT3BlcmF0aW9uOjpjcmVhdGUoKTsKLQotICAgICAgICBvdXRPcGVyYXRp b25zLmFwcGVuZChuZXdNYXNrSW1hZ2UpOwotCi0gICAgICAgIGlmIChtYXNrSW1hZ2VzTGlzdC5n ZXQoKSkgewotICAgICAgICAgICAgbGlzdEl0ZXJhdG9yKys7Ci0gICAgICAgICAgICBtYXNrSW1h Z2VWYWx1ZSA9IChsaXN0SXRlcmF0b3IgIT0gbWFza0ltYWdlc0xpc3QtPmVuZCgpID8gJmRvd25j YXN0PFdlYktpdENTU1Jlc291cmNlVmFsdWU+KGxpc3RJdGVyYXRvci0+Z2V0KCkpIDogbnVsbHB0 cik7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgbWFza0ltYWdlVmFsdWUgPSBudWxscHRy OwotICAgIH0KLQotICAgIHJldHVybiB0cnVlOwotfQotCiBQYXNzUmVmUHRyPFN0eWxlSW1hZ2U+ IFN0eWxlUmVzb2x2ZXI6OmxvYWRQZW5kaW5nSW1hZ2UoY29uc3QgU3R5bGVQZW5kaW5nSW1hZ2Um IHBlbmRpbmdJbWFnZSwgY29uc3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zJiBvcHRpb25zKQogewog ICAgIGlmIChhdXRvIGltYWdlVmFsdWUgPSBwZW5kaW5nSW1hZ2UuY3NzSW1hZ2VWYWx1ZSgpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKaW5kZXggNTI3NmE4ZTgyOTI3NDk1NWEyOTc4YmY4 YzU5NWRmYWJiYTU4N2ZkMy4uOTU3NTZmZjYxMmJjZGYyOGNmNjllYWVmMTM5OWRkY2Q0ZGJhODRk YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCkBAIC0yMzcsNyArMjM3LDYgQEAgcHVi bGljOgogICAgIHZvaWQgY2xlYXJDYWNoZWRQcm9wZXJ0aWVzQWZmZWN0ZWRCeVZpZXdwb3J0VW5p dHMoKTsKIAogICAgIGJvb2wgY3JlYXRlRmlsdGVyT3BlcmF0aW9ucyhDU1NWYWx1ZSYgaW5WYWx1 ZSwgRmlsdGVyT3BlcmF0aW9ucyYgb3V0T3BlcmF0aW9ucyk7Ci0gICAgYm9vbCBjcmVhdGVNYXNr SW1hZ2VPcGVyYXRpb25zKENTU1ZhbHVlKiBpblZhbHVlLCBWZWN0b3I8UmVmUHRyPE1hc2tJbWFn ZU9wZXJhdGlvbj4+JiBvdXRPcGVyYXRpb25zKTsKICAgICB2b2lkIGxvYWRQZW5kaW5nU1ZHRG9j dW1lbnRzKCk7CiAKICAgICB2b2lkIGxvYWRQZW5kaW5nUmVzb3VyY2VzKCk7Cg==