124232 2013-11-12 14:10:58 -0800 Remove most uses of MutableArray 2022-09-10 16:46:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca ahmad.saleem792 oldest_to_newest 949871 0 andersca 2013-11-12 14:10:58 -0800 Remove most uses of MutableArray 949872 1 216722 andersca 2013-11-12 14:12:51 -0800 Created attachment 216722 Patch 1897654 2 ahmad.saleem792 2022-09-10 16:46:39 -0700 It landed and didn't backed out: https://github.com/WebKit/WebKit/commit/2ac5e5865c65a8360ebccc412efe288860cf994a Marking this as "RESOLVED FIXED". Thanks! 216722 2013-11-12 14:12:51 -0800 2013-11-12 14:14:55 -0800 Patch bug-124232-20131112141251.patch text/plain 12226 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5MTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2FmZjQxMjhmOGJhOGMw ZTEyYzkyN2Y1OGVjMjY2ODYwYjg2N2VhYi4uZThhNWQ3YTU0OTI1MzFiOGI2YzJlNzNmNzRjYzk3 MzQzMjAwMjExZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEzLTExLTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIG1vc3Qg dXNlcyBvZiBNdXRhYmxlQXJyYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNDIzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLTXV0YWJsZUFycmF5LmNwcDoKKyAgICAgICAg KFdLTXV0YWJsZUFycmF5Q3JlYXRlKToKKyAgICAgICAgKiBTaGFyZWQvVXNlck1lc3NhZ2VDb2Rl cnMuaDoKKyAgICAgICAgKFdlYktpdDo6VXNlck1lc3NhZ2VEZWNvZGVyOjpiYXNlRGVjb2RlKToK KyAgICAgICAgKiBTaGFyZWQvV2ViUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UmVuZGVyTGF5ZXI6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlbmRlckxheWVyOjpX ZWJSZW5kZXJMYXllcik6CisgICAgICAgICogU2hhcmVkL1dlYlJlbmRlck9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlJlbmRlck9iamVjdDo6V2ViUmVuZGVyT2JqZWN0KToKKyAgICAg ICAgKiBTaGFyZWQvV2ViUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlJlbmRl ck9iamVjdDo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVuZGVyT2JqZWN0OjpXZWJS ZW5kZXJPYmplY3QpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0 ZWRCdW5kbGVQYWdlQ29udGV4dE1lbnVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbmpl Y3RlZEJ1bmRsZVBhZ2VDb250ZXh0TWVudUNsaWVudDo6Z2V0Q3VzdG9tTWVudUZyb21EZWZhdWx0 SXRlbXMpOgorCisyMDEzLTExLTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CisKICAgICAgICAgVXNlIFZlY3RvciArIEltbXV0YWJsZUFycmF5IGluc3RlYWQgb2YgTXV0 YWJsZUFycmF5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjQyMjEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLTXV0 YWJsZUFycmF5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS011dGFibGVBcnJh eS5jcHAKaW5kZXggMmQ4YzExZDI1ZWMyNTdlZGFmNzFjNjBkMDYyNjI1YTUwNDhkMWIwYy4uZWI2 M2M5ZWMxOGY0M2EwZjNhMmNmYzc2MWI1YWNmMDExYTdkZmQ3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLTXV0YWJsZUFycmF5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvQVBJL2MvV0tNdXRhYmxlQXJyYXkuY3BwCkBAIC0zMyw4ICszMyw3IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLTXV0YWJsZUFycmF5UmVmIFdLTXV0YWJsZUFycmF5 Q3JlYXRlKCkKIHsKLSAgICBSZWZQdHI8TXV0YWJsZUFycmF5PiBhcnJheSA9IE11dGFibGVBcnJh eTo6Y3JlYXRlKCk7Ci0gICAgcmV0dXJuIHRvQVBJKGFycmF5LnJlbGVhc2UoKS5sZWFrUmVmKCkp OworICAgIHJldHVybiB0b0FQSShNdXRhYmxlQXJyYXk6OmNyZWF0ZSgpLmxlYWtSZWYoKSk7CiB9 CiAKIGJvb2wgV0tBcnJheUlzTXV0YWJsZShXS0FycmF5UmVmIGFycmF5UmVmKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1VzZXJNZXNzYWdlQ29kZXJzLmggYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaAppbmRleCBiNTY4ZjA3MjZjNTk5MDA5NjJh ODk5MDA3MzI2NTAzZGQ0ZDIyZTNlLi5hNjUxOTQ1NGM4ZTQxN2QyNWI4OTY1ZjFlYzQ0YjA1ODIy MzM2N2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2Rl cnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvVXNlck1lc3NhZ2VDb2RlcnMuaApAQCAt NDE5LDggKzQxOSw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUo cG9zaXRpdmVaT3JkZXJMaXN0Q29kZXIpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgICAgIGNvZGVyLm1fcm9vdCA9IFdlYlJlbmRlckxheWVyOjpjcmVhdGUoc3RhdGlj X3BvaW50ZXJfY2FzdDxXZWJSZW5kZXJPYmplY3Q+KHJlbmRlcmVyKSwgaXNSZWZsZWN0aW9uLCBp c0NsaXBwaW5nLCBpc0NsaXBwZWQsIHN0YXRpY19jYXN0PFdlYlJlbmRlckxheWVyOjpDb21wb3Np dGluZ0xheWVyVHlwZT4oY29tcG9zaXRpbmdMYXllclR5cGVBc1VJbnQzMiksCi0gICAgICAgICAg ICAgICAgYWJzb2x1dGVCb3VuZGluZ0JveCwgc3RhdGljX3BvaW50ZXJfY2FzdDxNdXRhYmxlQXJy YXk+KG5lZ2F0aXZlWk9yZGVyTGlzdCksIHN0YXRpY19wb2ludGVyX2Nhc3Q8TXV0YWJsZUFycmF5 Pihub3JtYWxGbG93TGlzdCksCi0gICAgICAgICAgICAgICAgc3RhdGljX3BvaW50ZXJfY2FzdDxN dXRhYmxlQXJyYXk+KHBvc2l0aXZlWk9yZGVyTGlzdCkpOworICAgICAgICAgICAgICAgIGFic29s dXRlQm91bmRpbmdCb3gsIHN0YXRpY19wb2ludGVyX2Nhc3Q8SW1tdXRhYmxlQXJyYXk+KG5lZ2F0 aXZlWk9yZGVyTGlzdCksIHN0YXRpY19wb2ludGVyX2Nhc3Q8SW1tdXRhYmxlQXJyYXk+KG5vcm1h bEZsb3dMaXN0KSwKKyAgICAgICAgICAgICAgICBzdGF0aWNfcG9pbnRlcl9jYXN0PEltbXV0YWJs ZUFycmF5Pihwb3NpdGl2ZVpPcmRlckxpc3QpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICB9CiAgICAgICAgIGNhc2UgQVBJT2JqZWN0OjpUeXBlUmVuZGVyT2JqZWN0OiB7CkBAIC00NTAs NyArNDUwLDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgICAgIGlmIChjaGlsZHJlbiAmJiBjaGlsZHJlbi0+dHlwZSgpICE9IEFQSU9iamVjdDo6VHlw ZUFycmF5KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIGNvZGVy Lm1fcm9vdCA9IFdlYlJlbmRlck9iamVjdDo6Y3JlYXRlKG5hbWUsIGVsZW1lbnRUYWdOYW1lLCBl bGVtZW50SUQsIFdURjo6c3RhdGljX3BvaW50ZXJfY2FzdDxNdXRhYmxlQXJyYXk+KGVsZW1lbnRD bGFzc05hbWVzKSwgYWJzb2x1dGVQb3NpdGlvbiwgZnJhbWVSZWN0LCBXVEY6OnN0YXRpY19wb2lu dGVyX2Nhc3Q8TXV0YWJsZUFycmF5PihjaGlsZHJlbikpOworICAgICAgICAgICAgY29kZXIubV9y b290ID0gV2ViUmVuZGVyT2JqZWN0OjpjcmVhdGUobmFtZSwgZWxlbWVudFRhZ05hbWUsIGVsZW1l bnRJRCwgc3RhdGljX3BvaW50ZXJfY2FzdDxJbW11dGFibGVBcnJheT4oZWxlbWVudENsYXNzTmFt ZXMpLCBhYnNvbHV0ZVBvc2l0aW9uLCBmcmFtZVJlY3QsIHN0YXRpY19wb2ludGVyX2Nhc3Q8SW1t dXRhYmxlQXJyYXk+KGNoaWxkcmVuKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog ICAgICAgICBjYXNlIEFQSU9iamVjdDo6VHlwZVVSTDogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvU2hhcmVkL1dlYlJlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi UmVuZGVyTGF5ZXIuaAppbmRleCAzOWJmYTBkM2NjMjI2OWExNDZlMGFjMzdhZjk3NThkODZiNDUw NTA3Li45NTgzZDg2MTAzNTNmZmFkOWZmNTc4M2QwZjRiOWU1NjJhZTYxNDFiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViUmVuZGVyTGF5ZXIuaApAQCAtNDIsNyArNDIsNyBAQCBwdWJsaWM6CiAK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJSZW5kZXJMYXllcj4gY3JlYXRlKFdlYlBhZ2UqKTsK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJSZW5kZXJMYXllcj4gY3JlYXRlKFBhc3NSZWZQdHI8 V2ViUmVuZGVyT2JqZWN0PiByZW5kZXJlciwgYm9vbCBpc1JlZmxlY3Rpb24sIGJvb2wgaXNDbGlw cGluZywgYm9vbCBpc0NsaXBwZWQsIENvbXBvc2l0aW5nTGF5ZXJUeXBlIHR5cGUsCi0gICAgICAg IFdlYkNvcmU6OkludFJlY3QgYWJzb2x1dGVCb3VuZGluZ0JveCwgUGFzc1JlZlB0cjxNdXRhYmxl QXJyYXk+IG5lZ2F0aXZlWk9yZGVyTGlzdCwgUGFzc1JlZlB0cjxNdXRhYmxlQXJyYXk+IG5vcm1h bEZsb3dMaXN0LCBQYXNzUmVmUHRyPE11dGFibGVBcnJheT4gcG9zaXRpdmVaT3JkZXJMaXN0KQor ICAgICAgICBXZWJDb3JlOjpJbnRSZWN0IGFic29sdXRlQm91bmRpbmdCb3gsIFBhc3NSZWZQdHI8 SW1tdXRhYmxlQXJyYXk+IG5lZ2F0aXZlWk9yZGVyTGlzdCwgUGFzc1JlZlB0cjxJbW11dGFibGVB cnJheT4gbm9ybWFsRmxvd0xpc3QsIFBhc3NSZWZQdHI8SW1tdXRhYmxlQXJyYXk+IHBvc2l0aXZl Wk9yZGVyTGlzdCkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViUmVuZGVy TGF5ZXIocmVuZGVyZXIsIGlzUmVmbGVjdGlvbiwgaXNDbGlwcGluZywgaXNDbGlwcGVkLCB0eXBl LCBhYnNvbHV0ZUJvdW5kaW5nQm94LCBuZWdhdGl2ZVpPcmRlckxpc3QsIG5vcm1hbEZsb3dMaXN0 LCBwb3NpdGl2ZVpPcmRlckxpc3QpKTsKICAgICB9CkBAIC02MSw3ICs2MSw3IEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgV2ViUmVuZGVyTGF5ZXIoV2ViQ29yZTo6UmVuZGVyTGF5ZXIqKTsKICAg ICBXZWJSZW5kZXJMYXllcihQYXNzUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gcmVuZGVyZXIsIGJv b2wgaXNSZWZsZWN0aW9uLCBib29sIGlzQ2xpcHBpbmcsIGJvb2wgaXNDbGlwcGVkLCBDb21wb3Np dGluZ0xheWVyVHlwZSB0eXBlLCBXZWJDb3JlOjpJbnRSZWN0IGFic29sdXRlQm91bmRpbmdCb3gs Ci0gICAgICAgIFBhc3NSZWZQdHI8TXV0YWJsZUFycmF5PiBuZWdhdGl2ZVpPcmRlckxpc3QsIFBh c3NSZWZQdHI8TXV0YWJsZUFycmF5PiBub3JtYWxGbG93TGlzdCwgUGFzc1JlZlB0cjxNdXRhYmxl QXJyYXk+IHBvc2l0aXZlWk9yZGVyTGlzdCkKKyAgICAgICAgUGFzc1JlZlB0cjxJbW11dGFibGVB cnJheT4gbmVnYXRpdmVaT3JkZXJMaXN0LCBQYXNzUmVmUHRyPEltbXV0YWJsZUFycmF5PiBub3Jt YWxGbG93TGlzdCwgUGFzc1JlZlB0cjxJbW11dGFibGVBcnJheT4gcG9zaXRpdmVaT3JkZXJMaXN0 KQogICAgICAgICA6IG1fcmVuZGVyZXIocmVuZGVyZXIpCiAgICAgICAgICwgbV9pc1JlZmxlY3Rp b24oaXNSZWZsZWN0aW9uKQogICAgICAgICAsIG1faXNDbGlwcGluZyhpc0NsaXBwaW5nKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJlbmRlck9iamVjdC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVyT2JqZWN0LmNwcAppbmRleCA4NjExODhhNzZiYWEw MTZkOTE5ZGY1NDNhMjFlNWFlZGZlYzg2MTNkLi5iNDIwOTU0ZDkzNDMzZGRmMTFiMjY4ZTY1ZDVk MmU3MThiMTNiOTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVy T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVyT2JqZWN0LmNw cApAQCAtNjQsMTIgKzY0LDE1IEBAIFdlYlJlbmRlck9iamVjdDo6V2ViUmVuZGVyT2JqZWN0KFJl bmRlck9iamVjdCogcmVuZGVyZXIsIGJvb2wgc2hvdWxkSW5jbHVkZURlc2NlCiAgICAgICAgICAg ICBFbGVtZW50KiBlbGVtZW50ID0gdG9FbGVtZW50KG5vZGUpOwogICAgICAgICAgICAgbV9lbGVt ZW50VGFnTmFtZSA9IGVsZW1lbnQtPnRhZ05hbWUoKTsKICAgICAgICAgICAgIG1fZWxlbWVudElE ID0gZWxlbWVudC0+Z2V0SWRBdHRyaWJ1dGUoKTsKKyAgICAgICAgICAgIAogICAgICAgICAgICAg aWYgKGVsZW1lbnQtPmlzU3R5bGVkRWxlbWVudCgpICYmIGVsZW1lbnQtPmhhc0NsYXNzKCkpIHsK LSAgICAgICAgICAgICAgICBpZiAoc2l6ZV90IGNsYXNzTmFtZUNvdW50ID0gZWxlbWVudC0+Y2xh c3NOYW1lcygpLnNpemUoKSkgewotICAgICAgICAgICAgICAgICAgICBtX2VsZW1lbnRDbGFzc05h bWVzID0gTXV0YWJsZUFycmF5OjpjcmVhdGUoKTsKLSAgICAgICAgICAgICAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBjbGFzc05hbWVDb3VudDsgKytpKQotICAgICAgICAgICAgICAgICAg ICAgICAgbV9lbGVtZW50Q2xhc3NOYW1lcy0+YXBwZW5kKFdlYlN0cmluZzo6Y3JlYXRlKGVsZW1l bnQtPmNsYXNzTmFtZXMoKVtpXSkuZ2V0KCkpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICBWZWN0b3I8UmVmUHRyPEFQSU9iamVjdD4+IGNsYXNzTmFtZXM7CisgICAgICAgICAg ICAgICAgY2xhc3NOYW1lcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGVsZW1lbnQtPmNsYXNzTmFt ZXMoKS5zaXplKCkpOworCisgICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDAsIHNpemUg PSBlbGVtZW50LT5jbGFzc05hbWVzKCkuc2l6ZSgpOyBpIDwgc2l6ZTsgKytpKQorICAgICAgICAg ICAgICAgICAgICBjbGFzc05hbWVzLmFwcGVuZChXZWJTdHJpbmc6OmNyZWF0ZShlbGVtZW50LT5j bGFzc05hbWVzKClbaV0pKTsKKworICAgICAgICAgICAgICAgIG1fZWxlbWVudENsYXNzTmFtZXMg PSBJbW11dGFibGVBcnJheTo6Y3JlYXRlKHN0ZDo6bW92ZShjbGFzc05hbWVzKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC04OSwyNCArOTIsMjcgQEAgV2ViUmVuZGVyT2Jq ZWN0OjpXZWJSZW5kZXJPYmplY3QoUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgYm9vbCBzaG91bGRJ bmNsdWRlRGVzY2UKICAgICBpZiAoIXNob3VsZEluY2x1ZGVEZXNjZW5kYW50cykKICAgICAgICAg cmV0dXJuOwogCi0gICAgbV9jaGlsZHJlbiA9IE11dGFibGVBcnJheTo6Y3JlYXRlKCk7CisgICAg VmVjdG9yPFJlZlB0cjxBUElPYmplY3Q+PiBjaGlsZHJlbjsKKwogICAgIGZvciAoUmVuZGVyT2Jq ZWN0KiBjb3JlQ2hpbGQgPSByZW5kZXJlci0+Zmlyc3RDaGlsZFNsb3coKTsgY29yZUNoaWxkOyBj b3JlQ2hpbGQgPSBjb3JlQ2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgUmVmUHRyPFdl YlJlbmRlck9iamVjdD4gY2hpbGQgPSBhZG9wdFJlZihuZXcgV2ViUmVuZGVyT2JqZWN0KGNvcmVD aGlsZCwgc2hvdWxkSW5jbHVkZURlc2NlbmRhbnRzKSk7Ci0gICAgICAgIG1fY2hpbGRyZW4tPmFw cGVuZChjaGlsZC5nZXQoKSk7CisgICAgICAgIGNoaWxkcmVuLmFwcGVuZChzdGQ6Om1vdmUoY2hp bGQpKTsKICAgICB9CiAKLSAgICBpZiAoIXJlbmRlcmVyLT5pc1dpZGdldCgpKQotICAgICAgICBy ZXR1cm47CisgICAgaWYgKHJlbmRlcmVyLT5pc1dpZGdldCgpKSB7CisgICAgICAgIGlmIChXaWRn ZXQqIHdpZGdldCA9IHRvUmVuZGVyV2lkZ2V0KHJlbmRlcmVyKS0+d2lkZ2V0KCkpIHsKKyAgICAg ICAgICAgIGlmICh3aWRnZXQtPmlzRnJhbWVWaWV3KCkpIHsKKyAgICAgICAgICAgICAgICBGcmFt ZVZpZXcqIGZyYW1lVmlldyA9IHRvRnJhbWVWaWV3KHdpZGdldCk7CisgICAgICAgICAgICAgICAg aWYgKFJlbmRlclZpZXcqIGNvcmVDb250ZW50UmVuZGVyZXIgPSBmcmFtZVZpZXctPmZyYW1lKCku Y29udGVudFJlbmRlcmVyKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgUmVmUHRyPFdlYlJlbmRl ck9iamVjdD4gY29udGVudFJlbmRlcmVyID0gYWRvcHRSZWYobmV3IFdlYlJlbmRlck9iamVjdChj b3JlQ29udGVudFJlbmRlcmVyLCBzaG91bGRJbmNsdWRlRGVzY2VuZGFudHMpKTsKIAotICAgIFdp ZGdldCogd2lkZ2V0ID0gdG9SZW5kZXJXaWRnZXQocmVuZGVyZXIpLT53aWRnZXQoKTsKLSAgICBp ZiAoIXdpZGdldCB8fCAhd2lkZ2V0LT5pc0ZyYW1lVmlldygpKQotICAgICAgICByZXR1cm47Ci0K LSAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IHRvRnJhbWVWaWV3KHdpZGdldCk7Ci0gICAgaWYg KFJlbmRlclZpZXcqIGNvcmVDb250ZW50UmVuZGVyZXIgPSBmcmFtZVZpZXctPmZyYW1lKCkuY29u dGVudFJlbmRlcmVyKCkpIHsKLSAgICAgICAgUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gY29udGVu dFJlbmRlcmVyID0gYWRvcHRSZWYobmV3IFdlYlJlbmRlck9iamVjdChjb3JlQ29udGVudFJlbmRl cmVyLCBzaG91bGRJbmNsdWRlRGVzY2VuZGFudHMpKTsKLSAgICAgICAgbV9jaGlsZHJlbi0+YXBw ZW5kKGNvbnRlbnRSZW5kZXJlci5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIGNoaWxkcmVu LmFwcGVuZChzdGQ6Om1vdmUoY29udGVudFJlbmRlcmVyKSk7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQorCisgICAgbV9jaGlsZHJlbiA9IEltbXV0 YWJsZUFycmF5OjpjcmVhdGUoc3RkOjptb3ZlKGNoaWxkcmVuKSk7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJlbmRlck9i amVjdC5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlJlbmRlck9iamVjdC5oCmluZGV4IDdk YWQyOGU3YTg1ZTU5ZmQ2ZTFiZjAyMTNlZjE1YWI0MTQ4ODQ1NTMuLmUzZWY0ODY1MTFhMGM1MGE4 ZjdmYTZiN2JlZDIyODE4N2JiMjU4YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJSZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUmVuZGVy T2JqZWN0LmgKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogICAgIH0KIAogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFdlYlJlbmRlck9iamVjdD4gY3JlYXRlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29u c3QgU3RyaW5nJiBlbGVtZW50VGFnTmFtZSwgY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsCi0gICAg ICAgIFBhc3NSZWZQdHI8TXV0YWJsZUFycmF5PiBlbGVtZW50Q2xhc3NOYW1lcywgV2ViQ29yZTo6 SW50UG9pbnQgYWJzb2x1dGVQb3NpdGlvbiwgV2ViQ29yZTo6SW50UmVjdCBmcmFtZVJlY3QsIFBh c3NSZWZQdHI8TXV0YWJsZUFycmF5PiBjaGlsZHJlbikKKyAgICAgICAgUGFzc1JlZlB0cjxJbW11 dGFibGVBcnJheT4gZWxlbWVudENsYXNzTmFtZXMsIFdlYkNvcmU6OkludFBvaW50IGFic29sdXRl UG9zaXRpb24sIFdlYkNvcmU6OkludFJlY3QgZnJhbWVSZWN0LCBQYXNzUmVmUHRyPEltbXV0YWJs ZUFycmF5PiBjaGlsZHJlbikKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2Vi UmVuZGVyT2JqZWN0KG5hbWUsIGVsZW1lbnRUYWdOYW1lLCBlbGVtZW50SUQsIGVsZW1lbnRDbGFz c05hbWVzLCBhYnNvbHV0ZVBvc2l0aW9uLCBmcmFtZVJlY3QsIGNoaWxkcmVuKSk7CiAgICAgfQpA QCAtNjUsOCArNjUsOCBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgV2ViUmVuZGVyT2JqZWN0 KFdlYkNvcmU6OlJlbmRlck9iamVjdCosIGJvb2wgc2hvdWxkSW5jbHVkZURlc2NlbmRhbnRzKTsK LSAgICBXZWJSZW5kZXJPYmplY3QoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGVs ZW1lbnRUYWdOYW1lLCBjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgUGFzc1JlZlB0cjxNdXRhYmxl QXJyYXk+IGVsZW1lbnRDbGFzc05hbWVzLAotICAgICAgICBXZWJDb3JlOjpJbnRQb2ludCBhYnNv bHV0ZVBvc2l0aW9uLCBXZWJDb3JlOjpJbnRSZWN0IGZyYW1lUmVjdCwgUGFzc1JlZlB0cjxNdXRh YmxlQXJyYXk+IGNoaWxkcmVuKQorICAgIFdlYlJlbmRlck9iamVjdChjb25zdCBTdHJpbmcmIG5h bWUsIGNvbnN0IFN0cmluZyYgZWxlbWVudFRhZ05hbWUsIGNvbnN0IFN0cmluZyYgZWxlbWVudElE LCBQYXNzUmVmUHRyPEltbXV0YWJsZUFycmF5PiBlbGVtZW50Q2xhc3NOYW1lcywKKyAgICAgICAg V2ViQ29yZTo6SW50UG9pbnQgYWJzb2x1dGVQb3NpdGlvbiwgV2ViQ29yZTo6SW50UmVjdCBmcmFt ZVJlY3QsIFBhc3NSZWZQdHI8SW1tdXRhYmxlQXJyYXk+IGNoaWxkcmVuKQogICAgICAgICA6IG1f Y2hpbGRyZW4oY2hpbGRyZW4pCiAgICAgICAgICwgbV9uYW1lKG5hbWUpCiAgICAgICAgICwgbV9l bGVtZW50VGFnTmFtZShlbGVtZW50VGFnTmFtZSkKQEAgLTc3LDEyICs3NywxMiBAQCBwcml2YXRl OgogICAgIHsKICAgICB9CiAKLSAgICBSZWZQdHI8TXV0YWJsZUFycmF5PiBtX2NoaWxkcmVuOwor ICAgIFJlZlB0cjxJbW11dGFibGVBcnJheT4gbV9jaGlsZHJlbjsKIAogICAgIFN0cmluZyBtX25h bWU7CiAgICAgU3RyaW5nIG1fZWxlbWVudFRhZ05hbWU7CiAgICAgU3RyaW5nIG1fZWxlbWVudElE OwotICAgIFJlZlB0cjxNdXRhYmxlQXJyYXk+IG1fZWxlbWVudENsYXNzTmFtZXM7CisgICAgUmVm UHRyPEltbXV0YWJsZUFycmF5PiBtX2VsZW1lbnRDbGFzc05hbWVzOwogICAgIFdlYkNvcmU6Oklu dFBvaW50IG1fYWJzb2x1dGVQb3NpdGlvbjsKICAgICBXZWJDb3JlOjpJbnRSZWN0IG1fZnJhbWVS ZWN0OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlQ29udGV4dE1lbnVDbGllbnQuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VDb250ZXh0 TWVudUNsaWVudC5jcHAKaW5kZXggM2NkOGRmYWVjYTE3MmExNTQxODkyN2JlMTJlNTA0NThkNDA2 MjEyMi4uNzNjMjM1ZDMwMGNiOWYyNDhkNDhiNTk3ZmI4ZWY1MTM3NzUzODc3MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZVBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAK QEAgLTQ3LDE0ICs0NywxNCBAQCBib29sIEluamVjdGVkQnVuZGxlUGFnZUNvbnRleHRNZW51Q2xp ZW50OjpnZXRDdXN0b21NZW51RnJvbURlZmF1bHRJdGVtcyhXZWJQYWdlKgogICAgIGlmICghbV9j bGllbnQuZ2V0Q29udGV4dE1lbnVGcm9tRGVmYXVsdE1lbnUpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIFJlZlB0cjxNdXRhYmxlQXJyYXk+IGRlZmF1bHRNZW51QXJyYXkgPSBNdXRhYmxl QXJyYXk6OmNyZWF0ZSgpOwotICAgIGRlZmF1bHRNZW51QXJyYXktPnJlc2VydmVDYXBhY2l0eShk ZWZhdWx0TWVudS5zaXplKCkpOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBkZWZhdWx0 TWVudS5zaXplKCk7ICsraSkKLSAgICAgICAgZGVmYXVsdE1lbnVBcnJheS0+YXBwZW5kKFdlYkNv bnRleHRNZW51SXRlbTo6Y3JlYXRlKGRlZmF1bHRNZW51W2ldKS5nZXQoKSk7CisgICAgVmVjdG9y PFJlZlB0cjxBUElPYmplY3Q+PiBkZWZhdWx0TWVudUl0ZW1zOworICAgIGRlZmF1bHRNZW51SXRl bXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShkZWZhdWx0TWVudS5zaXplKCkpOworICAgIGZvciAo Y29uc3QgYXV0byYgaXRlbSA6IGRlZmF1bHRNZW51KQorICAgICAgICBkZWZhdWx0TWVudUl0ZW1z LnVuY2hlY2tlZEFwcGVuZChXZWJDb250ZXh0TWVudUl0ZW06OmNyZWF0ZShpdGVtKSk7CiAKICAg ICBXS0FycmF5UmVmIG5ld01lbnVXSyA9IDA7CiAgICAgV0tUeXBlUmVmIHVzZXJEYXRhVG9QYXNz ID0gMDsKLSAgICBtX2NsaWVudC5nZXRDb250ZXh0TWVudUZyb21EZWZhdWx0TWVudSh0b0FQSShw YWdlKSwgdG9BUEkoaGl0VGVzdFJlc3VsdCksIHRvQVBJKGRlZmF1bHRNZW51QXJyYXkuZ2V0KCkp LCAmbmV3TWVudVdLLCAmdXNlckRhdGFUb1Bhc3MsIG1fY2xpZW50LmNsaWVudEluZm8pOworICAg IG1fY2xpZW50LmdldENvbnRleHRNZW51RnJvbURlZmF1bHRNZW51KHRvQVBJKHBhZ2UpLCB0b0FQ SShoaXRUZXN0UmVzdWx0KSwgdG9BUEkoSW1tdXRhYmxlQXJyYXk6OmNyZWF0ZShzdGQ6Om1vdmUo ZGVmYXVsdE1lbnVJdGVtcykpLmdldCgpKSwgJm5ld01lbnVXSywgJnVzZXJEYXRhVG9QYXNzLCBt X2NsaWVudC5jbGllbnRJbmZvKTsKICAgICBSZWZQdHI8SW1tdXRhYmxlQXJyYXk+IGFycmF5ID0g YWRvcHRSZWYodG9JbXBsKG5ld01lbnVXSykpOwogICAgIHVzZXJEYXRhID0gYWRvcHRSZWYodG9J bXBsKHVzZXJEYXRhVG9QYXNzKSk7CiAgICAgCg==