182811 2018-02-14 14:51:00 -0800 [RenderTreeBuilder] Move RenderSVG*::addChild() to RenderTreeBuilder 2018-02-14 15:42:02 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1399267 0 zalan 2018-02-14 14:51:00 -0800 ssia 1399269 1 webkit-bug-importer 2018-02-14 14:51:44 -0800 <rdar://problem/37549714> 1399276 2 333848 zalan 2018-02-14 14:55:37 -0800 Created attachment 333848 Patch 1399292 3 333848 commit-queue 2018-02-14 15:42:00 -0800 Comment on attachment 333848 Patch Clearing flags on attachment: 333848 Committed r228492: <https://trac.webkit.org/changeset/228492> 1399293 4 commit-queue 2018-02-14 15:42:02 -0800 All reviewed patches have been landed. Closing bug. 333848 2018-02-14 14:55:37 -0800 2018-02-14 15:42:00 -0800 Patch bug-182811-20180214145536.patch text/plain 11669 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzlhMmFlY2E5YWFjODU5 NjNiZjY4YTVkZTdjODdmNjk4MGM0NTY5Zi4uYTYwMDc3ZDliM2FiMmY2YWY4N2M2ODNiNGRiZjY3 Y2M3ZjAyMThmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE4LTAyLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclNWRyo6OmFkZENoaWxkKCkgdG8gUmVuZGVyVHJlZUJ1aWxkZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjgxMQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMzc1NDk3MTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTVkdDb250YWluZXI6OmFkZENoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5oOgorICAgICAgICAqIHJlbmRlcmluZy9z dmcvUmVuZGVyU1ZHSW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR0lubGlu ZTo6YWRkQ2hpbGQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZH SW5saW5lLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclNWR1Jvb3Q6OmFkZENoaWxkKTogRGVsZXRlZC4KKyAgICAg ICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv c3ZnL1JlbmRlclNWR1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU1ZHVGV4dDo6 YWRkQ2hpbGQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHVGV4 dC5oOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkVG9TVkdDb250YWlu ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Omluc2Vy dENoaWxkVG9TVkdJbmxpbmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJl ZUJ1aWxkZXI6Omluc2VydENoaWxkVG9TVkdSb290KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvU1ZHVGV4dCk6IERlbGV0ZWQuCisg ICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmg6CisKIDIwMTgt MDItMTQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQ29u ZmlybSBwcm9wZXIgdGhyZWFkIGluIFVzZXJHZXN0dXJlSW5kaWNhdG9yIGNvbnN0cnVjdG9yCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5l ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5j cHAKaW5kZXggMDIxN2ZlNWJlZWY1ZDk2Njc5ZmYxOGRmNTBiZWM3ZjMyNmM4NjBkMC4uOWUwYzgy YzczNDdhODlmODNjZDFkYmZiZThmMDg4ODQ4ZDFiZGUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWluZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29udGFpbmVyLmNwcApAQCAtOTAsMTEgKzkw LDYgQEAgdm9pZCBSZW5kZXJTVkdDb250YWluZXI6OmxheW91dCgpCiAgICAgY2xlYXJOZWVkc0xh eW91dCgpOwogfQogCi12b2lkIFJlbmRlclNWR0NvbnRhaW5lcjo6YWRkQ2hpbGQoUmVuZGVyVHJl ZUJ1aWxkZXImIGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5k ZXJPYmplY3QqIGJlZm9yZUNoaWxkKQotewotICAgIGJ1aWxkZXIuaW5zZXJ0Q2hpbGRUb1NWR0Nv bnRhaW5lcigqdGhpcywgV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNoaWxkKTsKLX0KLQogYm9v bCBSZW5kZXJTVkdDb250YWluZXI6OnNlbGZXaWxsUGFpbnQoKQogewogICAgIGF1dG8qIHJlc291 cmNlcyA9IFNWR1Jlc291cmNlc0NhY2hlOjpjYWNoZWRSZXNvdXJjZXNGb3JSZW5kZXJlcigqdGhp cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0Nv bnRhaW5lci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWlu ZXIuaAppbmRleCBiMDFkMmMyYjlhNWExYjhlZmIzNGUxZWM3MmY4NWQxZDViZTY4NjRhLi4zZWQz NDgzMDc5MmM4NzdhM2RjZWJjZDJjZWFkM2RiM2MzMDRiZGJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29udGFpbmVyLmgKQEAgLTQ4LDcgKzQ4LDYg QEAgcHJvdGVjdGVkOgogCiAgICAgdm9pZCBsYXlvdXQoKSBvdmVycmlkZTsKIAotICAgIHZvaWQg YWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGls ZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApIGZpbmFsOwogICAgIHZvaWQgYWRkRm9j dXNSaW5nUmVjdHMoVmVjdG9yPExheW91dFJlY3Q+JiwgY29uc3QgTGF5b3V0UG9pbnQmIGFkZGl0 aW9uYWxPZmZzZXQsIGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHBhaW50Q29udGFpbmVy ID0gMCkgZmluYWw7CiAKICAgICBGbG9hdFJlY3Qgb2JqZWN0Qm91bmRpbmdCb3goKSBjb25zdCBm aW5hbCB7IHJldHVybiBtX29iamVjdEJvdW5kaW5nQm94OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0lubGluZS5jcHAKaW5kZXggZjQxZjVlMGUyYmRkNzJh YzgzOWRiNWUzYzMzZGJmODhiZWE2OWY0Yi4uYTYyZjRkNzAwZGQyMGFhNjlkNjFkZTRiNmNkYWIx Zjc3OTc4OWU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHSW5saW5lLmNwcApAQCAtMTIzLDkgKzEyMyw0IEBAIHZvaWQgUmVuZGVyU1ZHSW5saW5lOjp1 cGRhdGVGcm9tU3R5bGUoKQogICAgIHNldElubGluZSh0cnVlKTsKIH0KIAotdm9pZCBSZW5kZXJT VkdJbmxpbmU6OmFkZENoaWxkKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVyLCBSZW5kZXJQdHI8 UmVuZGVyT2JqZWN0PiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKLXsKLSAg ICBidWlsZGVyLmluc2VydENoaWxkVG9TVkdJbmxpbmUoKnRoaXMsIFdURk1vdmUobmV3Q2hpbGQp LCBiZWZvcmVDaGlsZCk7Ci19Ci0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR0lubGluZS5oCmluZGV4IDk0NDYxNDRlYzcxY2VkOGM2MGJiZDdiYTFlZjQ4MTFm YzFmMzZmNmMuLjRlODA5NDVjMjM2ODUyOTI1YjUzNmExNDUwYTViZDRmYjAzNWI1MTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHSW5saW5lLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdJbmxpbmUuaApAQCAtNjAs OCArNjAsNiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB3aWxsQmVEZXN0cm95ZWQoUmVuZGVyVHJl ZUJ1aWxkZXImKSBmaW5hbDsKICAgICB2b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5j ZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0eWxlKSBmaW5hbDsKLQotICAgIHZvaWQgYWRkQ2hp bGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVu ZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpIGZpbmFsOwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSb290LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH Um9vdC5jcHAKaW5kZXggMGIwYTRlYTZkODc2MGM4OTc5ZjI3YTM4NWZmNTg4ZDIyNTJjMDVlMy4u OWJmMzRjYzFhZDFkYTk5MjZlMWM0ZDMzYTc4NjAyZTIyMjI1Zjg3NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwCkBAIC0zMDMsMTEgKzMwMyw2 IEBAIHZvaWQgUmVuZGVyU1ZHUm9vdDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRp ZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTCiAgICAgU1ZHUmVzb3VyY2VzQ2FjaGU6OmNsaWVu dFN0eWxlQ2hhbmdlZCgqdGhpcywgZGlmZiwgc3R5bGUoKSk7CiB9CiAKLXZvaWQgUmVuZGVyU1ZH Um9vdDo6YWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5k ZXJPYmplY3Q+IG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQotewotICAgIGJ1 aWxkZXIuaW5zZXJ0Q2hpbGRUb1NWR1Jvb3QoKnRoaXMsIFdURk1vdmUobmV3Q2hpbGQpLCBiZWZv cmVDaGlsZCk7Ci19Ci0KIC8vIFJlbmRlckJveCBtZXRob2RzIHdpbGwgZXhwZWN0IGNvb3JkaW5h dGVzIHcvbyBhbnkgdHJhbnNmb3JtcyBpbiBjb29yZGluYXRlcwogLy8gcmVsYXRpdmUgdG8gb3Vy IGJvcmRlckJveCBvcmlnaW4uICBUaGlzIG1ldGhvZCBnaXZlcyB1cyBleGFjdGx5IHRoYXQuCiB2 b2lkIFJlbmRlclNWR1Jvb3Q6OmJ1aWxkTG9jYWxUb0JvcmRlckJveFRyYW5zZm9ybSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUm9vdC5oCmluZGV4IDlkZTk1NTNk M2U3MWMwYzU2MWYyMTU4ZTlmMGZjZmY0M2M3ODY3MTQuLjM5Njk4MTQzYjJkZjNmNDBmNDcxZGIx NTZlZjA0OTM1Y2M3MjdjMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUm9vdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUm9vdC5oCkBAIC04Miw3ICs4Miw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCB3aWxsQmVS ZW1vdmVkRnJvbVRyZWUoKSBvdmVycmlkZTsKIAogICAgIHZvaWQgc3R5bGVEaWRDaGFuZ2UoU3R5 bGVEaWZmZXJlbmNlLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpIG92ZXJyaWRlOwotICAg IHZvaWQgYWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0 PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDApIG92ZXJyaWRlOwogCiAgICAg Y29uc3QgQWZmaW5lVHJhbnNmb3JtJiBsb2NhbFRvUGFyZW50VHJhbnNmb3JtKCkgY29uc3Qgb3Zl cnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1RleHQu Y3BwCmluZGV4IGY2ZTc0MmJkOTlhM2RkMjU0NTllZDJiOWZjNThhYzQzYmYxN2NmOTcuLjQ4ZWQ3 MTFlNTliMDg1ZDdkMTc1MzllOWQyNDNiM2ZiODA1MmZjYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdUZXh0LmNwcApAQCAtNTIwLDExICs1MjAsNiBAQCBG bG9hdFJlY3QgUmVuZGVyU1ZHVGV4dDo6cmVwYWludFJlY3RJbkxvY2FsQ29vcmRpbmF0ZXMoKSBj b25zdAogICAgIHJldHVybiByZXBhaW50UmVjdDsKIH0KIAotdm9pZCBSZW5kZXJTVkdUZXh0Ojph ZGRDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYgYnVpbGRlciwgUmVuZGVyUHRyPFJlbmRlck9iamVj dD4gbmV3Q2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCi17Ci0gICAgYnVpbGRlci5p bnNlcnRDaGlsZFRvU1ZHVGV4dCgqdGhpcywgV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNoaWxk KTsKLX0KLQogLy8gRml4IGZvciA8cmRhcjovL3Byb2JsZW0vODA0ODg3NT4uIFdlIHNob3VsZCBu b3QgcmVuZGVyIDpmaXJzdC1saW5lIENTUyBTdHlsZQogLy8gaW4gYSBTVkcgdGV4dCBlbGVtZW50 IGNvbnRleHQuCiBSZW5kZXJCbG9jayogUmVuZGVyU1ZHVGV4dDo6Zmlyc3RMaW5lQmxvY2soKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdU ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1RleHQuaAppbmRl eCA5NGQyZTE0OTQ0YTkwMjk3MWM4M2I0NjU1ZTVmNTMxMDQ3ZWJlMWY2Li5kY2JkMzhmODJiOWE3 MWE4OThkMmE1MzA4ODE0OGJmZmI2MDFlYmFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1RleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1RleHQuaApAQCAtODMsNyArODMsNiBAQCBwcml2YXRlOgogCiAgICAg dm9pZCBtYXBMb2NhbFRvQ29udGFpbmVyKGNvbnN0IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHJl cGFpbnRDb250YWluZXIsIFRyYW5zZm9ybVN0YXRlJiwgTWFwQ29vcmRpbmF0ZXNGbGFncywgYm9v bCogd2FzRml4ZWQpIGNvbnN0IG92ZXJyaWRlOwogICAgIGNvbnN0IFJlbmRlck9iamVjdCogcHVz aE1hcHBpbmdUb0NvbnRhaW5lcihjb25zdCBSZW5kZXJMYXllck1vZGVsT2JqZWN0KiBhbmNlc3Rv clRvU3RvcEF0LCBSZW5kZXJHZW9tZXRyeU1hcCYpIGNvbnN0IG92ZXJyaWRlOwotICAgIHZvaWQg YWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGls ZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpIG92ZXJyaWRlOwogICAgIHZv aWQgd2lsbEJlRGVzdHJveWVkKFJlbmRlclRyZWVCdWlsZGVyJikgb3ZlcnJpZGU7CiAKICAgICBj b25zdCBBZmZpbmVUcmFuc2Zvcm0mIGxvY2FsVG9QYXJlbnRUcmFuc2Zvcm0oKSBjb25zdCBvdmVy cmlkZSB7IHJldHVybiBtX2xvY2FsVHJhbnNmb3JtOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCAzYjBh N2JlYzk4NzE1MmY0MDdjMGY4Y2QwOWIwZWUyNjdmZGMxMDc1Li5hNDdiZDgyNzBmNWE3OTRlMjg4 YTIzMGU5NmViZWUwMTlkMzFkZDNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTE5NCw2ICsxOTQsMjYg QEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGQoUmVuZGVyRWxlbWVudCYgcGFy ZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAg IGlmIChpczxSZW5kZXJTVkdDb250YWluZXI+KHBhcmVudCkpIHsKKyAgICAgICAgc3ZnQnVpbGRl cigpLmluc2VydENoaWxkKGRvd25jYXN0PFJlbmRlclNWR0NvbnRhaW5lcj4ocGFyZW50KSwgV1RG TW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IGlmIChpczxSZW5kZXJTVkdJbmxpbmU+KHBhcmVudCkpIHsKKyAgICAgICAgc3ZnQnVpbGRlcigp Lmluc2VydENoaWxkKGRvd25jYXN0PFJlbmRlclNWR0lubGluZT4ocGFyZW50KSwgV1RGTW92ZShj aGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChp czxSZW5kZXJTVkdSb290PihwYXJlbnQpKSB7CisgICAgICAgIHN2Z0J1aWxkZXIoKS5pbnNlcnRD aGlsZChkb3duY2FzdDxSZW5kZXJTVkdSb290PihwYXJlbnQpLCBXVEZNb3ZlKGNoaWxkKSwgYmVm b3JlQ2hpbGQpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGlzPFJlbmRlclNW R1RleHQ+KHBhcmVudCkpIHsKKyAgICAgICAgc3ZnQnVpbGRlcigpLmluc2VydENoaWxkKGRvd25j YXN0PFJlbmRlclNWR1RleHQ+KHBhcmVudCksIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBwYXJlbnQuYWRkQ2hpbGQoKnRoaXMsIFdU Rk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CiB9CiAKQEAgLTQ2NywyNiArNDg3LDYgQEAgdm9p ZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1JlbmRlcklubGluZUlnbm9yaW5nQ29u dGludWF0aW9uKFJlbmRlcklubGkKICAgICBpbmxpbmVCdWlsZGVyKCkuaW5zZXJ0Q2hpbGRJZ25v cmluZ0NvbnRpbnVhdGlvbihwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CiB9 CiAKLXZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkVG9TVkdDb250YWluZXIoUmVu ZGVyU1ZHQ29udGFpbmVyJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQotewotICAgIHN2Z0J1aWxkZXIoKS5pbnNlcnRDaGls ZChwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7Ci19Ci0KLXZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6Omluc2VydENoaWxkVG9TVkdJbmxpbmUoUmVuZGVyU1ZHSW5saW5lJiBwYXJl bnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNo aWxkKQotewotICAgIHN2Z0J1aWxkZXIoKS5pbnNlcnRDaGlsZChwYXJlbnQsIFdURk1vdmUoY2hp bGQpLCBiZWZvcmVDaGlsZCk7Ci19Ci0KLXZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENo aWxkVG9TVkdSb290KFJlbmRlclNWR1Jvb3QmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVj dD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCi17Ci0gICAgc3ZnQnVpbGRlcigp Lmluc2VydENoaWxkKHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKLX0KLQot dm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1NWR1RleHQoUmVuZGVyU1ZHVGV4 dCYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBi ZWZvcmVDaGlsZCkKLXsKLSAgICBzdmdCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50LCBXVEZN b3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwotfQotCiB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpp bnNlcnRDaGlsZFRvUmVuZGVyVGFibGUoUmVuZGVyVGFibGUmIHBhcmVudCwgUmVuZGVyUHRyPFJl bmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCiB7CiAgICAgdGFi bGVCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hp bGQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVy VHJlZUJ1aWxkZXIuaAppbmRleCBiMGYxYTA5MmIxMGM3ZmM5ZjA5OTE5ODBjODEyMWYwM2I5Nzk2 Y2YwLi5lMDk2MjgxNzM1YTFiYWQwMTI0NzcyMmE5MWZmNjQyNjQxMzBjMDM0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu aApAQCAtNjksMTAgKzY5LDYgQEAgcHVibGljOgogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRl ckJsb2NrRmxvdyhSZW5kZXJCbG9ja0Zsb3cmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVj dD4sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGluc2Vy dENoaWxkVG9SZW5kZXJJbmxpbmUoUmVuZGVySW5saW5lJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5k ZXJPYmplY3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAgICAgdm9p ZCBpbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lSWdub3JpbmdDb250aW51YXRpb24oUmVuZGVySW5s aW5lJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9y ZUNoaWxkID0gbnVsbHB0cik7Ci0gICAgdm9pZCBpbnNlcnRDaGlsZFRvU1ZHQ29udGFpbmVyKFJl bmRlclNWR0NvbnRhaW5lciYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOwotICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1NW R0lubGluZShSZW5kZXJTVkdJbmxpbmUmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4s IFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKLSAgICB2b2lkIGluc2VydENo aWxkVG9TVkdSb290KFJlbmRlclNWR1Jvb3QmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVj dD4sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKLSAgICB2b2lkIGluc2Vy dENoaWxkVG9TVkdUZXh0KFJlbmRlclNWR1RleHQmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9i amVjdD4sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGlu c2VydENoaWxkVG9SZW5kZXJUYWJsZShSZW5kZXJUYWJsZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVu ZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOwog ICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlclRhYmxlU2VjdGlvbihSZW5kZXJUYWJsZVNlY3Rp b24mIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCog YmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJUYWJs ZVJvdyhSZW5kZXJUYWJsZVJvdyYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGls ZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOwo=