182832 2018-02-15 11:05:50 -0800 [RenderTreeBuilder] Move RenderTable::addChild() to RenderTreeBuilder 2018-02-15 12:02:05 -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 1399531 0 zalan 2018-02-15 11:05:50 -0800 ssia 1399534 1 webkit-bug-importer 2018-02-15 11:06:32 -0800 <rdar://problem/37576362> 1399539 2 333919 zalan 2018-02-15 11:13:18 -0800 Created attachment 333919 Patch 1399545 3 333922 zalan 2018-02-15 11:19:24 -0800 Created attachment 333922 Patch 1399564 4 333922 commit-queue 2018-02-15 12:02:03 -0800 Comment on attachment 333922 Patch Clearing flags on attachment: 333922 Committed r228529: <https://trac.webkit.org/changeset/228529> 1399565 5 commit-queue 2018-02-15 12:02:05 -0800 All reviewed patches have been landed. Closing bug. 333919 2018-02-15 11:13:18 -0800 2018-02-15 11:19:22 -0800 Patch bug-182832-20180215111318.patch text/plain 7437 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNhMDA1NWNhZDBlOGY2 NTdiNTU3NjJkMDk1NDhjMjVmYmExNmI1ZC4uYWVmM2ExYjA2NGRhOTY0NDk0MTFmOWZhMzMwZjRj NzUxZWRiMmZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAyLTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclRhYmxlOjphZGRDaGlsZCgpIHRvIFJlbmRlclRyZWVCdWlsZGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI4MzIKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzM3NTc2MzYyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRhYmxlOjp3aWxsSW5zZXJ0VGFibGVDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGFibGU6OndpbGxJbnNlcnRUYWJsZVNlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGFibGU6OmFkZENoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFi bGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKToKKyAg ICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6Omluc2VydENoaWxkKToK KwogMjAxOC0wMi0xNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92ZSBSZW5kZXJJbmxpbmUvUmVuZGVyR3JpZDo6YWRkQ2hp bGQoKSB0byBSZW5kZXJUcmVlQnVpbGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZS5jcHAKaW5kZXggNzgzY2E1YWQ3NTU1Y2IxNzY4ODJiYjdlMWYxMzY1OGZmOWNmN2VmZS4u MDU2YTY0MWZlMTQwNjc1Y2JhMjE0MWMyZTk0OTM0OTkyOTQ2YjA4ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCkBAIC0xMzMsNDMgKzEzMyw0MSBAQCBzdGF0aWMg aW5saW5lIHZvaWQgcmVzZXRTZWN0aW9uUG9pbnRlcklmTm90QmVmb3JlKFdlYWtQdHI8UmVuZGVy VGFibGVTZWN0aW9uPiYgcwogICAgICAgICBzZWN0aW9uLmNsZWFyKCk7CiB9CiAKLXZvaWQgUmVu ZGVyVGFibGU6OmFkZENoaWxkKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVyLCBSZW5kZXJQdHI8 UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKK3ZvaWQgUmVu ZGVyVGFibGU6OndpbGxJbnNlcnRUYWJsZUNvbHVtbihSZW5kZXJUYWJsZUNvbCYsIFJlbmRlck9i amVjdCopCiB7Ci0gICAgaWYgKGlzPFJlbmRlclRhYmxlQ29sPigqY2hpbGQpKSB7Ci0gICAgICAg IG1faGFzQ29sRWxlbWVudHMgPSB0cnVlOwotICAgIH0gZWxzZSBpZiAoaXM8UmVuZGVyVGFibGVT ZWN0aW9uPigqY2hpbGQpKSB7Ci0gICAgICAgIHN3aXRjaCAoY2hpbGQtPnN0eWxlKCkuZGlzcGxh eSgpKSB7Ci0gICAgICAgICAgICBjYXNlIFRBQkxFX0hFQURFUl9HUk9VUDoKLSAgICAgICAgICAg ICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUobV9oZWFkLCBiZWZvcmVDaGlsZCk7 Ci0gICAgICAgICAgICAgICAgaWYgKCFtX2hlYWQpIHsKLSAgICAgICAgICAgICAgICAgICAgbV9o ZWFkID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9uPihjaGlsZC5nZXQo KSkpOwotICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIHJlc2V0 U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9yZShtX2ZpcnN0Qm9keSwgYmVmb3JlQ2hpbGQpOwotICAg ICAgICAgICAgICAgICAgICBpZiAoIW1fZmlyc3RCb2R5KSAKLSAgICAgICAgICAgICAgICAgICAg ICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVyVGFibGVTZWN0aW9u PihjaGlsZC5nZXQoKSkpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgIGNhc2UgVEFCTEVfRk9PVEVSX0dST1VQOgotICAgICAgICAgICAgICAg IHJlc2V0U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9yZShtX2Zvb3QsIGJlZm9yZUNoaWxkKTsKLSAg ICAgICAgICAgICAgICBpZiAoIW1fZm9vdCkgewotICAgICAgICAgICAgICAgICAgICBtX2Zvb3Qg PSBtYWtlV2Vha1B0cihkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KGNoaWxkLmdldCgpKSk7 Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICBGQUxMVEhST1VHSDsKLSAgICAgICAgICAgIGNhc2UgVEFCTEVfUk9XX0dST1VQOgot ICAgICAgICAgICAgICAgIHJlc2V0U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9yZShtX2ZpcnN0Qm9k eSwgYmVmb3JlQ2hpbGQpOwotICAgICAgICAgICAgICAgIGlmICghbV9maXJzdEJvZHkpCi0gICAg ICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVuZGVy VGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSkpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK KyAgICBtX2hhc0NvbEVsZW1lbnRzID0gdHJ1ZTsKK30KKwordm9pZCBSZW5kZXJUYWJsZTo6d2ls bEluc2VydFRhYmxlU2VjdGlvbihSZW5kZXJUYWJsZVNlY3Rpb24mIGNoaWxkLCBSZW5kZXJPYmpl Y3QqIGJlZm9yZUNoaWxkKQoreworICAgIHN3aXRjaCAoY2hpbGQuc3R5bGUoKS5kaXNwbGF5KCkp IHsKKyAgICBjYXNlIFRBQkxFX0hFQURFUl9HUk9VUDoKKyAgICAgICAgcmVzZXRTZWN0aW9uUG9p bnRlcklmTm90QmVmb3JlKG1faGVhZCwgYmVmb3JlQ2hpbGQpOworICAgICAgICBpZiAoIW1faGVh ZCkKKyAgICAgICAgICAgIG1faGVhZCA9IG1ha2VXZWFrUHRyKGNoaWxkKTsKKyAgICAgICAgZWxz ZSB7CisgICAgICAgICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUobV9maXJzdEJv ZHksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgICAgIGlmICghbV9maXJzdEJvZHkpCisgICAgICAg ICAgICAgICAgbV9maXJzdEJvZHkgPSBtYWtlV2Vha1B0cihjaGlsZCk7CisgICAgICAgIH0KKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBUQUJMRV9GT09URVJfR1JPVVA6CisgICAgICAgIHJlc2V0 U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9yZShtX2Zvb3QsIGJlZm9yZUNoaWxkKTsKKyAgICAgICAg aWYgKCFtX2Zvb3QpIHsKKyAgICAgICAgICAgIG1fZm9vdCA9IG1ha2VXZWFrUHRyKGNoaWxkKTsK KyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CisgICAgICAgIEZBTExUSFJPVUdIOworICAg IGNhc2UgVEFCTEVfUk9XX0dST1VQOgorICAgICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RC ZWZvcmUobV9maXJzdEJvZHksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgaWYgKCFtX2ZpcnN0Qm9k eSkKKyAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFrZVdlYWtQdHIoY2hpbGQpOworICAgICAg ICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAg ICB9CiAKLSAgICBpZiAoaXM8UmVuZGVyVGFibGVTZWN0aW9uPigqY2hpbGQpKQotICAgICAgICBz ZXROZWVkc1NlY3Rpb25SZWNhbGMoKTsKLQotICAgIGJ1aWxkZXIuaW5zZXJ0Q2hpbGRUb1JlbmRl clRhYmxlKCp0aGlzLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgIHNldE5lZWRz U2VjdGlvblJlY2FsYygpOwogfQogCiB2b2lkIFJlbmRlclRhYmxlOjphZGRDYXB0aW9uKFJlbmRl clRhYmxlQ2FwdGlvbiYgY2FwdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl LmgKaW5kZXggNDBjNmM4YWQ2MTg2MjFkNzVkNmEyNzUyZjNjMWNiMjBmMmZlNTJiYy4uMWQxZDNk MmZmZjFiNzBhMWFhMTc1ODg1YzMwMGM0NjIzMzIxYzg4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRhYmxlLmgKQEAgLTEyNyw4ICsxMjcsNiBAQCBwdWJsaWM6CiAgICAgTGF5b3V0 VW5pdCBjYWxjQm9yZGVyRW5kKCkgY29uc3Q7CiAgICAgdm9pZCByZWNhbGNCb3JkZXJzSW5Sb3dE aXJlY3Rpb24oKTsKIAotICAgIHZvaWQgYWRkQ2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImLCBSZW5k ZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IDAp IGZpbmFsOwotCiAgICAgc3RydWN0IENvbHVtblN0cnVjdCB7CiAgICAgICAgIGV4cGxpY2l0IENv bHVtblN0cnVjdCh1bnNpZ25lZCBpbml0aWFsU3BhbiA9IDEpCiAgICAgICAgICAgICA6IHNwYW4o aW5pdGlhbFNwYW4pCkBAIC0yNjgsNyArMjY2LDEwIEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0 IG9mZnNldEhlaWdodEZvckNvbHVtbihjb25zdCBSZW5kZXJUYWJsZUNvbCYpIGNvbnN0OwogICAg IAogICAgIHZvaWQgbWFya0ZvclBhZ2luYXRpb25SZWxheW91dElmTmVlZGVkKCkgZmluYWw7Ci0g ICAgCisKKyAgICB2b2lkIHdpbGxJbnNlcnRUYWJsZUNvbHVtbihSZW5kZXJUYWJsZUNvbCYgY2hp bGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpOworICAgIHZvaWQgd2lsbEluc2VydFRhYmxl U2VjdGlvbihSZW5kZXJUYWJsZVNlY3Rpb24mIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNo aWxkKTsKKwogcHJvdGVjdGVkOgogICAgIHZvaWQgc3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJl bmNlLCBjb25zdCBSZW5kZXJTdHlsZSogb2xkU3R5bGUpIGZpbmFsOwogICAgIHZvaWQgc2ltcGxp ZmllZE5vcm1hbEZsb3dMYXlvdXQoKSBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCmluZGV4IDcyMmQ3ZDQw MjA3YmIwYzE5YjUyYmM1NGE3YWY1NzdlOGZhNDBhMmYuLjE1ZTk4ZmQ4OWI2YzNhNzAwZmIzYTNm MGI1YzdlNzYyNWRjMzI3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91 cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcApAQCAtMTY2LDcgKzE2NiwxMiBAQCB2 b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZChSZW5kZXJFbGVtZW50JiBwYXJlbnQs IFJlbmRlclB0cjxSZW5kZXJPYmplYwogICAgIH0KIAogICAgIGlmIChpczxSZW5kZXJUYWJsZT4o cGFyZW50KSkgewotICAgICAgICBpbnNlcnRSZWN1cnNpdmVJZk5lZWRlZCh0YWJsZUJ1aWxkZXIo KS5maW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZChkb3duY2FzdDxSZW5kZXJUYWJsZT4ocGFyZW50 KSwgKmNoaWxkLCBiZWZvcmVDaGlsZCkpOworICAgICAgICBhdXRvJiBwYXJlbnRDYW5kaWRhdGUg PSB0YWJsZUJ1aWxkZXIoKS5maW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZChkb3duY2FzdDxSZW5k ZXJUYWJsZT4ocGFyZW50KSwgKmNoaWxkLCBiZWZvcmVDaGlsZCk7CisgICAgICAgIGlmIChpczxS ZW5kZXJUYWJsZT4ocGFyZW50Q2FuZGlkYXRlKSAmJiAmcGFyZW50Q2FuZGlkYXRlID09ICZwYXJl bnQpIHsKKyAgICAgICAgICAgIHRhYmxlQnVpbGRlcigpLmluc2VydENoaWxkKGRvd25jYXN0PFJl bmRlclRhYmxlPihwYXJlbnRDYW5kaWRhdGUpLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQp OworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGluc2VydFJlY3Vyc2l2 ZUlmTmVlZGVkKHBhcmVudENhbmRpZGF0ZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlclRhYmxlLmNwcAppbmRleCBjZTQ5ZDZiZTM5MWU2YzllYzBhOTVjZjA3MTk5YjY4 MmZmMDBkNjliLi45NjY4NjM4MjJhZjEyNWFmMDkwZjNhZGVlMWQ5ZDJmNjc1NDEwMTUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJUYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyVGFibGUuY3BwCkBAIC0xODQsNiArMTg0LDEyIEBAIHZvaWQgUmVuZGVyVHJl ZUJ1aWxkZXI6OlRhYmxlOjppbnNlcnRDaGlsZChSZW5kZXJUYWJsZSYgcGFyZW50LCBSZW5kZXJQ dHI8UmVuZGVyCiAgICAgaWYgKGJlZm9yZUNoaWxkICYmIGJlZm9yZUNoaWxkLT5wYXJlbnQoKSAh PSAmcGFyZW50KQogICAgICAgICBiZWZvcmVDaGlsZCA9IG1fYnVpbGRlci5zcGxpdEFub255bW91 c0JveGVzQXJvdW5kQ2hpbGQocGFyZW50LCBiZWZvcmVDaGlsZCk7CiAKKyAgICBhdXRvJiBuZXdD aGlsZCA9ICpjaGlsZC5nZXQoKTsKKyAgICBpZiAoaXM8UmVuZGVyVGFibGVTZWN0aW9uPihuZXdD aGlsZCkpCisgICAgICAgIHBhcmVudC53aWxsSW5zZXJ0VGFibGVTZWN0aW9uKGRvd25jYXN0PFJl bmRlclRhYmxlU2VjdGlvbj4obmV3Q2hpbGQpLCBiZWZvcmVDaGlsZCk7CisgICAgZWxzZSBpZiAo aXM8UmVuZGVyVGFibGVDb2w+KG5ld0NoaWxkKSkKKyAgICAgICAgcGFyZW50LndpbGxJbnNlcnRU YWJsZUNvbHVtbihkb3duY2FzdDxSZW5kZXJUYWJsZUNvbD4obmV3Q2hpbGQpLCBiZWZvcmVDaGls ZCk7CisKICAgICBwYXJlbnQuUmVuZGVyQm94OjphZGRDaGlsZChtX2J1aWxkZXIsIFdURk1vdmUo Y2hpbGQpLCBiZWZvcmVDaGlsZCk7CiB9CiAK 333922 2018-02-15 11:19:24 -0800 2018-02-15 12:02:03 -0800 Patch bug-182832-20180215111923.patch text/plain 7411 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMThjNWE5ZmRkYmZmYjUz YjJhZjk2MzJkMDk3NTE3YmFlYTgwYTJhYi4uNTJiZDA3Y2Y0MTU3NTE5N2M2MWJhOWYyN2FhNThk ODgwMzM4OTBkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAyLTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclRhYmxlOjphZGRDaGlsZCgpIHRvIFJlbmRlclRyZWVCdWlsZGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI4MzIKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzM3NTc2MzYyPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRp IEtvaXZpc3RvLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRhYmxlOjp3aWxsSW5zZXJ0VGFibGVDb2x1bW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGFibGU6OndpbGxJbnNlcnRUYWJsZVNlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGFibGU6OmFkZENoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFi bGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKToKKyAg ICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6Omluc2VydENoaWxkKToK KwogMjAxOC0wMi0xNSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAg ICAgICAgSGFyZkJ1enpGYWNlOiByZXdvcmsgY2FjaGUgZW50cnkgcmVmZXJlbmNlIGhvbGRpbmcK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCmluZGV4IDc4M2NhNWFkNzU1 NWNiMTc2ODgyYmI3ZTFmMTM2NThmZjljZjdlZmUuLjA1NmE2NDFmZTE0MDY3NWNiYTIxNDFjMmU5 NDkzNDk5Mjk0NmIwOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUYWJsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNw cApAQCAtMTMzLDQzICsxMzMsNDEgQEAgc3RhdGljIGlubGluZSB2b2lkIHJlc2V0U2VjdGlvblBv aW50ZXJJZk5vdEJlZm9yZShXZWFrUHRyPFJlbmRlclRhYmxlU2VjdGlvbj4mIHMKICAgICAgICAg c2VjdGlvbi5jbGVhcigpOwogfQogCi12b2lkIFJlbmRlclRhYmxlOjphZGRDaGlsZChSZW5kZXJU cmVlQnVpbGRlciYgYnVpbGRlciwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRl ck9iamVjdCogYmVmb3JlQ2hpbGQpCit2b2lkIFJlbmRlclRhYmxlOjp3aWxsSW5zZXJ0VGFibGVD b2x1bW4oUmVuZGVyVGFibGVDb2wmLCBSZW5kZXJPYmplY3QqKQogewotICAgIGlmIChpczxSZW5k ZXJUYWJsZUNvbD4oKmNoaWxkKSkgewotICAgICAgICBtX2hhc0NvbEVsZW1lbnRzID0gdHJ1ZTsK LSAgICB9IGVsc2UgaWYgKGlzPFJlbmRlclRhYmxlU2VjdGlvbj4oKmNoaWxkKSkgewotICAgICAg ICBzd2l0Y2ggKGNoaWxkLT5zdHlsZSgpLmRpc3BsYXkoKSkgewotICAgICAgICAgICAgY2FzZSBU QUJMRV9IRUFERVJfR1JPVVA6Ci0gICAgICAgICAgICAgICAgcmVzZXRTZWN0aW9uUG9pbnRlcklm Tm90QmVmb3JlKG1faGVhZCwgYmVmb3JlQ2hpbGQpOwotICAgICAgICAgICAgICAgIGlmICghbV9o ZWFkKSB7Ci0gICAgICAgICAgICAgICAgICAgIG1faGVhZCA9IG1ha2VXZWFrUHRyKGRvd25jYXN0 PFJlbmRlclRhYmxlU2VjdGlvbj4oY2hpbGQuZ2V0KCkpKTsKLSAgICAgICAgICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgICAgICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUo bV9maXJzdEJvZHksIGJlZm9yZUNoaWxkKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2Zp cnN0Qm9keSkgCi0gICAgICAgICAgICAgICAgICAgICAgICBtX2ZpcnN0Qm9keSA9IG1ha2VXZWFr UHRyKGRvd25jYXN0PFJlbmRlclRhYmxlU2VjdGlvbj4oY2hpbGQuZ2V0KCkpKTsKLSAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFRBQkxF X0ZPT1RFUl9HUk9VUDoKLSAgICAgICAgICAgICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RC ZWZvcmUobV9mb290LCBiZWZvcmVDaGlsZCk7Ci0gICAgICAgICAgICAgICAgaWYgKCFtX2Zvb3Qp IHsKLSAgICAgICAgICAgICAgICAgICAgbV9mb290ID0gbWFrZVdlYWtQdHIoZG93bmNhc3Q8UmVu ZGVyVGFibGVTZWN0aW9uPihjaGlsZC5nZXQoKSkpOwotICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgRkFMTFRIUk9VR0g7Ci0gICAg ICAgICAgICBjYXNlIFRBQkxFX1JPV19HUk9VUDoKLSAgICAgICAgICAgICAgICByZXNldFNlY3Rp b25Qb2ludGVySWZOb3RCZWZvcmUobV9maXJzdEJvZHksIGJlZm9yZUNoaWxkKTsKLSAgICAgICAg ICAgICAgICBpZiAoIW1fZmlyc3RCb2R5KQotICAgICAgICAgICAgICAgICAgICBtX2ZpcnN0Qm9k eSA9IG1ha2VXZWFrUHRyKGRvd25jYXN0PFJlbmRlclRhYmxlU2VjdGlvbj4oY2hpbGQuZ2V0KCkp KTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAg ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgbV9oYXNDb2xFbGVtZW50cyA9IHRy dWU7Cit9CisKK3ZvaWQgUmVuZGVyVGFibGU6OndpbGxJbnNlcnRUYWJsZVNlY3Rpb24oUmVuZGVy VGFibGVTZWN0aW9uJiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKK3sKKyAgICBz d2l0Y2ggKGNoaWxkLnN0eWxlKCkuZGlzcGxheSgpKSB7CisgICAgY2FzZSBUQUJMRV9IRUFERVJf R1JPVVA6CisgICAgICAgIHJlc2V0U2VjdGlvblBvaW50ZXJJZk5vdEJlZm9yZShtX2hlYWQsIGJl Zm9yZUNoaWxkKTsKKyAgICAgICAgaWYgKCFtX2hlYWQpCisgICAgICAgICAgICBtX2hlYWQgPSBt YWtlV2Vha1B0cihjaGlsZCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgcmVzZXRTZWN0 aW9uUG9pbnRlcklmTm90QmVmb3JlKG1fZmlyc3RCb2R5LCBiZWZvcmVDaGlsZCk7CisgICAgICAg ICAgICBpZiAoIW1fZmlyc3RCb2R5KQorICAgICAgICAgICAgICAgIG1fZmlyc3RCb2R5ID0gbWFr ZVdlYWtQdHIoY2hpbGQpOworICAgICAgICB9CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgVEFC TEVfRk9PVEVSX0dST1VQOgorICAgICAgICByZXNldFNlY3Rpb25Qb2ludGVySWZOb3RCZWZvcmUo bV9mb290LCBiZWZvcmVDaGlsZCk7CisgICAgICAgIGlmICghbV9mb290KSB7CisgICAgICAgICAg ICBtX2Zvb3QgPSBtYWtlV2Vha1B0cihjaGlsZCk7CisgICAgICAgICAgICBicmVhazsKICAgICAg ICAgfQorICAgICAgICBGQUxMVEhST1VHSDsKKyAgICBjYXNlIFRBQkxFX1JPV19HUk9VUDoKKyAg ICAgICAgcmVzZXRTZWN0aW9uUG9pbnRlcklmTm90QmVmb3JlKG1fZmlyc3RCb2R5LCBiZWZvcmVD aGlsZCk7CisgICAgICAgIGlmICghbV9maXJzdEJvZHkpCisgICAgICAgICAgICBtX2ZpcnN0Qm9k eSA9IG1ha2VXZWFrUHRyKGNoaWxkKTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoKKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQogCi0gICAgaWYgKGlzPFJlbmRlclRh YmxlU2VjdGlvbj4oKmNoaWxkKSkKLSAgICAgICAgc2V0TmVlZHNTZWN0aW9uUmVjYWxjKCk7Ci0K LSAgICBidWlsZGVyLmluc2VydENoaWxkVG9SZW5kZXJUYWJsZSgqdGhpcywgV1RGTW92ZShjaGls ZCksIGJlZm9yZUNoaWxkKTsKKyAgICBzZXROZWVkc1NlY3Rpb25SZWNhbGMoKTsKIH0KIAogdm9p ZCBSZW5kZXJUYWJsZTo6YWRkQ2FwdGlvbihSZW5kZXJUYWJsZUNhcHRpb24mIGNhcHRpb24pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCmluZGV4IDQwYzZjOGFkNjE4NjIxZDc1 ZDZhMjc1MmYzYzFjYjIwZjJmZTUyYmMuLjFkMWQzZDJmZmYxYjcwYTFhYTE3NTg4NWMzMDBjNDYy MzMyMWM4OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCkBAIC0xMjcs OCArMTI3LDYgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgY2FsY0JvcmRlckVuZCgpIGNvbnN0 OwogICAgIHZvaWQgcmVjYWxjQm9yZGVyc0luUm93RGlyZWN0aW9uKCk7CiAKLSAgICB2b2lkIGFk ZENoaWxkKFJlbmRlclRyZWVCdWlsZGVyJiwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQs IFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSAwKSBmaW5hbDsKLQogICAgIHN0cnVjdCBDb2x1 bW5TdHJ1Y3QgewogICAgICAgICBleHBsaWNpdCBDb2x1bW5TdHJ1Y3QodW5zaWduZWQgaW5pdGlh bFNwYW4gPSAxKQogICAgICAgICAgICAgOiBzcGFuKGluaXRpYWxTcGFuKQpAQCAtMjY4LDcgKzI2 NiwxMCBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBvZmZzZXRIZWlnaHRGb3JDb2x1bW4oY29u c3QgUmVuZGVyVGFibGVDb2wmKSBjb25zdDsKICAgICAKICAgICB2b2lkIG1hcmtGb3JQYWdpbmF0 aW9uUmVsYXlvdXRJZk5lZWRlZCgpIGZpbmFsOwotICAgIAorCisgICAgdm9pZCB3aWxsSW5zZXJ0 VGFibGVDb2x1bW4oUmVuZGVyVGFibGVDb2wmIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNo aWxkKTsKKyAgICB2b2lkIHdpbGxJbnNlcnRUYWJsZVNlY3Rpb24oUmVuZGVyVGFibGVTZWN0aW9u JiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7CisKIHByb3RlY3RlZDoKICAgICB2 b2lkIHN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSwgY29uc3QgUmVuZGVyU3R5bGUqIG9s ZFN0eWxlKSBmaW5hbDsKICAgICB2b2lkIHNpbXBsaWZpZWROb3JtYWxGbG93TGF5b3V0KCkgZmlu YWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVy VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyLmNwcAppbmRleCA3MjJkN2Q0MDIwN2JiMGMxOWI1MmJjNTRhN2FmNTc3ZThm YTQwYTJmLi4xNWU5OGZkODliNmMzYTcwMGZiM2EzZjBiNWM3ZTc2MjVkYzMyNzY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHAKQEAgLTE2Niw3ICsxNjYsMTIgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6aW5z ZXJ0Q2hpbGQoUmVuZGVyRWxlbWVudCYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWMKICAg ICB9CiAKICAgICBpZiAoaXM8UmVuZGVyVGFibGU+KHBhcmVudCkpIHsKLSAgICAgICAgaW5zZXJ0 UmVjdXJzaXZlSWZOZWVkZWQodGFibGVCdWlsZGVyKCkuZmluZE9yQ3JlYXRlUGFyZW50Rm9yQ2hp bGQoZG93bmNhc3Q8UmVuZGVyVGFibGU+KHBhcmVudCksICpjaGlsZCwgYmVmb3JlQ2hpbGQpKTsK KyAgICAgICAgYXV0byYgcGFyZW50Q2FuZGlkYXRlID0gdGFibGVCdWlsZGVyKCkuZmluZE9yQ3Jl YXRlUGFyZW50Rm9yQ2hpbGQoZG93bmNhc3Q8UmVuZGVyVGFibGU+KHBhcmVudCksICpjaGlsZCwg YmVmb3JlQ2hpbGQpOworICAgICAgICBpZiAoaXM8UmVuZGVyVGFibGU+KHBhcmVudENhbmRpZGF0 ZSkgJiYgJnBhcmVudENhbmRpZGF0ZSA9PSAmcGFyZW50KSB7CisgICAgICAgICAgICB0YWJsZUJ1 aWxkZXIoKS5pbnNlcnRDaGlsZChkb3duY2FzdDxSZW5kZXJUYWJsZT4ocGFyZW50Q2FuZGlkYXRl KSwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQorICAgICAgICBpbnNlcnRSZWN1cnNpdmVJZk5lZWRlZChwYXJlbnRDYW5kaWRhdGUp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHAKaW5kZXgg Y2U0OWQ2YmUzOTFlNmM5ZWMwYTk1Y2YwNzE5OWI2ODJmZjAwZDY5Yi4uOTY2ODYzODIyYWYxMjVh ZjA5MGYzYWRlZTFkOWQyZjY3NTQxMDE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyVGFibGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclRhYmxlLmNwcApAQCAt MTg0LDYgKzE4NCwxMiBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpUYWJsZTo6aW5zZXJ0Q2hp bGQoUmVuZGVyVGFibGUmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlcgogICAgIGlmIChiZWZvcmVD aGlsZCAmJiBiZWZvcmVDaGlsZC0+cGFyZW50KCkgIT0gJnBhcmVudCkKICAgICAgICAgYmVmb3Jl Q2hpbGQgPSBtX2J1aWxkZXIuc3BsaXRBbm9ueW1vdXNCb3hlc0Fyb3VuZENoaWxkKHBhcmVudCwg YmVmb3JlQ2hpbGQpOwogCisgICAgYXV0byYgbmV3Q2hpbGQgPSAqY2hpbGQuZ2V0KCk7CisgICAg aWYgKGlzPFJlbmRlclRhYmxlU2VjdGlvbj4obmV3Q2hpbGQpKQorICAgICAgICBwYXJlbnQud2ls bEluc2VydFRhYmxlU2VjdGlvbihkb3duY2FzdDxSZW5kZXJUYWJsZVNlY3Rpb24+KG5ld0NoaWxk KSwgYmVmb3JlQ2hpbGQpOworICAgIGVsc2UgaWYgKGlzPFJlbmRlclRhYmxlQ29sPihuZXdDaGls ZCkpCisgICAgICAgIHBhcmVudC53aWxsSW5zZXJ0VGFibGVDb2x1bW4oZG93bmNhc3Q8UmVuZGVy VGFibGVDb2w+KG5ld0NoaWxkKSwgYmVmb3JlQ2hpbGQpOworCiAgICAgcGFyZW50LlJlbmRlckJv eDo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogfQog Cg==