159587 2016-07-08 16:45:57 -0700 Cleanup: Remove use of PassRefPtr from class HTMLTableElement 2016-07-08 19:15:29 -0700 1 1 1 Unclassified WebKit Tables WebKit Local Build All All RESOLVED FIXED P2 Normal --- 1 dbates dbates cdumez commit-queue darin esprehn+autocc gyuyoung.kim oldest_to_newest 1209328 0 dbates 2016-07-08 16:45:57 -0700 Towards removing class PassRefPtr we should remove use of it from class HTMLTableElement. Currently HTMLTableElement::set{Caption, THead}() take a PassRefPtr argument. We should modify these functions to take a rvalue reference to a RefPtr. 1209330 1 283224 dbates 2016-07-08 16:48:26 -0700 Created attachment 283224 Patch 1209332 2 283224 cdumez 2016-07-08 16:51:08 -0700 Comment on attachment 283224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283224&action=review > Source/WebCore/html/HTMLTableElement.cpp:147 > return head; You're returning head after moving it :S > Source/WebCore/html/HTMLTableElement.cpp:185 > return caption; ditto. 1209339 3 dbates 2016-07-08 17:07:11 -0700 (In reply to comment #2) > > Source/WebCore/html/HTMLTableElement.cpp:147 > > return head; > > You're returning head after moving it :S > I'm blind. 1209354 4 283230 dbates 2016-07-08 17:23:45 -0700 Created attachment 283230 Patch 1209378 5 283230 cdumez 2016-07-08 18:24:14 -0700 Comment on attachment 283230 Patch r=me 1209389 6 283230 dbates 2016-07-08 19:15:23 -0700 Comment on attachment 283230 Patch Clearing flags on attachment: 283230 Committed r203016: <http://trac.webkit.org/changeset/203016> 1209391 7 dbates 2016-07-08 19:15:29 -0700 All reviewed patches have been landed. Closing bug. 283224 2016-07-08 16:48:26 -0700 2016-07-08 17:23:42 -0700 Patch bug-159587-20160708164750.patch text/plain 4522 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyOTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU0OTE3OGE4YWZmNmQx MTJkZTUyN2YwYWNjYjVjNTllNjA4ZjI0YS4uZWEwODE5NzhlOGViMjFjNDVkZjkxY2RkNmY4ZDky MWEwMTM4MTc4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE2LTA3LTA4ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbnVwOiBSZW1vdmUg dXNlIG9mIFBhc3NSZWZQdHIgZnJvbSBjbGFzcyBIVE1MVGFibGVFbGVtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk1ODcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvSFRNTFRhYmxlRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50OjpzZXRDYXB0aW9u KTogVGFrZSBhIHJ2YWx1ZSByZWZlcmVuY2UgdG8gYSBSZWZQdHIgaW5zdGVhZCBvZiBhIFBhc3NS ZWZQdHIuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50OjpzZXRUSGVhZCk6IFRh a2UgYSBydmFsdWUgcmVmZXJlbmNlIHRvIGEgUmVmUHRyIGluc3RlYWQgb2YgYSBQYXNzUmVmUHRy LiBBbHNvCisgICAgICAgIGZpeCBhIHN0eWxlIG5pdDsgYWRkIGN1cmx5IGJyYWNlcyBhcm91bmQg dGhlIGZvci1sb29wIGJvZHkgc2luY2UgaXRzIGJvZHkgaXMgbW9yZSB0aGFuIGEgc2luZ2xlIGxp bmUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50OjpjcmVhdGVUSGVhZCk6IFVz ZSBXVEZNb3ZlKCkgaW5zdGVhZCBvZiBSZWY6OnB0cigpIHRvIHBhc3MgdGhlIGluc3RhbnRpYXRl ZAorICAgICAgICB0YWJsZSBzZWN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRhYmxlRWxl bWVudDo6Y3JlYXRlQ2FwdGlvbik6IERpdHRvLgorICAgICAgICAqIGh0bWwvSFRNTFRhYmxlRWxl bWVudC5oOgorCisyMDE2LTA3LTA4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4K KwogICAgICAgICBTZXR0aW5nIHRhYmxlLnRGb290IG9yIGNhbGxpbmcgdGFibGUuY3JlYXRlVEZv b3QoKSBzaG91bGQgYXBwZW5kIEhUTUwgdGZvbnQgZWxlbWVudCB0byB0aGUgZW5kIG9mIHRoZSB0 YWJsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5 NTgzCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzI1NTI5Mj4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxUYWJsZUVsZW1lbnQuY3BwCmluZGV4IDA4NTFiY2EwNTBiNzZiYTFmYWQxZWQ3M2Q3NDY1 Mzk0MDU5NTQyYWIuLjM4NjE0Y2ZlYzIzYjQ0MTNlNWJlM2E3MjIxMGFkZjFjMTUwMTJhOGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVFbGVtZW50LmNwcApAQCAtNzcsNyArNzcsNyBA QCBIVE1MVGFibGVDYXB0aW9uRWxlbWVudCogSFRNTFRhYmxlRWxlbWVudDo6Y2FwdGlvbigpIGNv bnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLXZvaWQgSFRNTFRhYmxlRWxlbWVudDo6c2V0 Q2FwdGlvbihQYXNzUmVmUHRyPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiBuZXdDYXB0aW9uLCBF eGNlcHRpb25Db2RlJiBlYykKK3ZvaWQgSFRNTFRhYmxlRWxlbWVudDo6c2V0Q2FwdGlvbihSZWZQ dHI8SFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQ+JiYgbmV3Q2FwdGlvbiwgRXhjZXB0aW9uQ29kZSYg ZWMpCiB7CiAgICAgZGVsZXRlQ2FwdGlvbigpOwogICAgIGlmIChuZXdDYXB0aW9uKQpAQCAtOTMs NyArOTMsNyBAQCBIVE1MVGFibGVTZWN0aW9uRWxlbWVudCogSFRNTFRhYmxlRWxlbWVudDo6dEhl YWQoKSBjb25zdAogICAgIHJldHVybiBudWxscHRyOwogfQogCi12b2lkIEhUTUxUYWJsZUVsZW1l bnQ6OnNldFRIZWFkKFBhc3NSZWZQdHI8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+IG5ld0hlYWQs IEV4Y2VwdGlvbkNvZGUmIGVjKQordm9pZCBIVE1MVGFibGVFbGVtZW50OjpzZXRUSGVhZChSZWZQ dHI8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+JiYgbmV3SGVhZCwgRXhjZXB0aW9uQ29kZSYgZWMp CiB7CiAgICAgaWYgKFVOTElLRUxZKG5ld0hlYWQgJiYgIW5ld0hlYWQtPmhhc1RhZ05hbWUodGhl YWRUYWcpKSkgewogICAgICAgICBlYyA9IEhJRVJBUkNIWV9SRVFVRVNUX0VSUjsKQEAgLTEwNiw5 ICsxMDYsMTAgQEAgdm9pZCBIVE1MVGFibGVFbGVtZW50OjpzZXRUSGVhZChQYXNzUmVmUHRyPEhU TUxUYWJsZVNlY3Rpb25FbGVtZW50PiBuZXdIZWFkLCBFeGMKICAgICAgICAgcmV0dXJuOwogCiAg ICAgTm9kZSogY2hpbGQ7Ci0gICAgZm9yIChjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpCisgICAgZm9yIChjaGlsZCA9IGZpcnN0Q2hpbGQo KTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgaWYgKGNo aWxkLT5pc0VsZW1lbnROb2RlKCkgJiYgIWNoaWxkLT5oYXNUYWdOYW1lKGNhcHRpb25UYWcpICYm ICFjaGlsZC0+aGFzVGFnTmFtZShjb2xncm91cFRhZykpCiAgICAgICAgICAgICBicmVhazsKKyAg ICB9CiAKICAgICBpbnNlcnRCZWZvcmUoKm5ld0hlYWQsIGNoaWxkLCBlYyk7CiB9CkBAIC0xNDIs NyArMTQzLDcgQEAgUmVmPEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50PiBIVE1MVGFibGVFbGVtZW50 OjpjcmVhdGVUSGVhZCgpCiAgICAgaWYgKEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50KiBleGlzdGlu Z0hlYWQgPSB0SGVhZCgpKQogICAgICAgICByZXR1cm4gKmV4aXN0aW5nSGVhZDsKICAgICBSZWY8 SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+IGhlYWQgPSBIVE1MVGFibGVTZWN0aW9uRWxlbWVudDo6 Y3JlYXRlKHRoZWFkVGFnLCBkb2N1bWVudCgpKTsKLSAgICBzZXRUSGVhZChoZWFkLnB0cigpLCBJ R05PUkVfRVhDRVBUSU9OKTsKKyAgICBzZXRUSGVhZChXVEZNb3ZlKGhlYWQpLCBJR05PUkVfRVhD RVBUSU9OKTsKICAgICByZXR1cm4gaGVhZDsKIH0KIApAQCAtMTgwLDcgKzE4MSw3IEBAIFJlZjxI VE1MVGFibGVDYXB0aW9uRWxlbWVudD4gSFRNTFRhYmxlRWxlbWVudDo6Y3JlYXRlQ2FwdGlvbigp CiAgICAgaWYgKEhUTUxUYWJsZUNhcHRpb25FbGVtZW50KiBleGlzdGluZ0NhcHRpb24gPSBjYXB0 aW9uKCkpCiAgICAgICAgIHJldHVybiAqZXhpc3RpbmdDYXB0aW9uOwogICAgIFJlZjxIVE1MVGFi bGVDYXB0aW9uRWxlbWVudD4gY2FwdGlvbiA9IEhUTUxUYWJsZUNhcHRpb25FbGVtZW50OjpjcmVh dGUoY2FwdGlvblRhZywgZG9jdW1lbnQoKSk7Ci0gICAgc2V0Q2FwdGlvbihjYXB0aW9uLnB0cigp LCBJR05PUkVfRVhDRVBUSU9OKTsKKyAgICBzZXRDYXB0aW9uKFdURk1vdmUoY2FwdGlvbiksIElH Tk9SRV9FWENFUFRJT04pOwogICAgIHJldHVybiBjYXB0aW9uOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlRWxlbWVudC5oCmluZGV4IGU0MmFiZTMyMmFmOThjZjg1ZGIyYzQ3ZDIzMzY4 MGM4YWRjODkwOTQuLjEyYjc2MDFiZmZmN2JmZDkzMzVlNDJlNjY0NDM1ZTVkOGUzY2Q1YzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5oCkBAIC00MSwxMCArNDEsMTAgQEAg cHVibGljOgogICAgIHN0YXRpYyBSZWY8SFRNTFRhYmxlRWxlbWVudD4gY3JlYXRlKGNvbnN0IFF1 YWxpZmllZE5hbWUmLCBEb2N1bWVudCYpOwogCiAgICAgSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQq IGNhcHRpb24oKSBjb25zdDsKLSAgICB2b2lkIHNldENhcHRpb24oUGFzc1JlZlB0cjxIVE1MVGFi bGVDYXB0aW9uRWxlbWVudD4sIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICB2b2lkIHNldENhcHRpb24o UmVmUHRyPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiYmLCBFeGNlcHRpb25Db2RlJik7CiAKICAg ICBIVE1MVGFibGVTZWN0aW9uRWxlbWVudCogdEhlYWQoKSBjb25zdDsKLSAgICB2b2lkIHNldFRI ZWFkKFBhc3NSZWZQdHI8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+LCBFeGNlcHRpb25Db2RlJik7 CisgICAgdm9pZCBzZXRUSGVhZChSZWZQdHI8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+JiYsIEV4 Y2VwdGlvbkNvZGUmKTsKIAogICAgIEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50KiB0Rm9vdCgpIGNv bnN0OwogICAgIHZvaWQgc2V0VEZvb3QoUmVmUHRyPEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50PiYm LCBFeGNlcHRpb25Db2RlJik7Cg== 283230 2016-07-08 17:23:45 -0700 2016-07-08 19:15:23 -0700 Patch bug-159587-20160708172309.patch text/plain 4594 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyOTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU0OTE3OGE4YWZmNmQx MTJkZTUyN2YwYWNjYjVjNTllNjA4ZjI0YS4uNmNkOGQxOTU3OGViMDBjMzE0YjFhZDVmMDM4OTI0 Y2QwNGE3NzQzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE2LTA3LTA4ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbnVwOiBSZW1vdmUg dXNlIG9mIFBhc3NSZWZQdHIgZnJvbSBjbGFzcyBIVE1MVGFibGVFbGVtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk1ODcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvSFRNTFRhYmxlRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50OjpzZXRDYXB0aW9u KTogVGFrZSBhIHJ2YWx1ZSByZWZlcmVuY2UgdG8gYSBSZWZQdHIgaW5zdGVhZCBvZiBhIFBhc3NS ZWZQdHIuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50OjpzZXRUSGVhZCk6IFRh a2UgYSBydmFsdWUgcmVmZXJlbmNlIHRvIGEgUmVmUHRyIGluc3RlYWQgb2YgYSBQYXNzUmVmUHRy LiBBbHNvCisgICAgICAgIGZpeCBhIHN0eWxlIG5pdDsgYWRkIGN1cmx5IGJyYWNlcyBhcm91bmQg dGhlIGZvci1sb29wIGJvZHkgc2luY2UgaXRzIGJvZHkgaXMgbW9yZSB0aGFuIGEgc2luZ2xlIGxp bmUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MVGFibGVFbGVtZW50OjpjcmVhdGVUSGVhZCk6IFVz ZSBSZWY6OmNvcHlSZWYoKSBpbnN0ZWFkIG9mIFJlZjo6cHRyKCkgdG8gcGFzcyB0aGUgaW5zdGFu dGlhdGVkCisgICAgICAgIHRhYmxlIHNlY3Rpb24gdG8gYmV0dGVyIGNvbnZleSB0aGF0IHdlIGFy ZSBwYXNzaW5nIGEgY29weSBvZiB0aGUgdGFibGUgc2VjdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxUYWJsZUVsZW1lbnQ6OmNyZWF0ZUNhcHRpb24pOiBEaXR0by4KKyAgICAgICAgKiBodG1s L0hUTUxUYWJsZUVsZW1lbnQuaDoKKworMjAxNi0wNy0wOCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRl c0BhcHBsZS5jb20+CisKICAgICAgICAgU2V0dGluZyB0YWJsZS50Rm9vdCBvciBjYWxsaW5nIHRh YmxlLmNyZWF0ZVRGb290KCkgc2hvdWxkIGFwcGVuZCBIVE1MIHRmb250IGVsZW1lbnQgdG8gdGhl IGVuZCBvZiB0aGUgdGFibGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1OTU4MwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjcyNTUyOTI+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MVGFibGVFbGVtZW50LmNwcAppbmRleCAwODUxYmNhMDUwYjc2YmEx ZmFkMWVkNzNkNzQ2NTM5NDA1OTU0MmFiLi5jMTg1ZDU0N2FmZjQxNjM5Mjg3NzZhYWRmYTY4OTU3 NWE1MGExZGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAKQEAg LTc3LDcgKzc3LDcgQEAgSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQqIEhUTUxUYWJsZUVsZW1lbnQ6 OmNhcHRpb24oKSBjb25zdAogICAgIHJldHVybiBudWxscHRyOwogfQogCi12b2lkIEhUTUxUYWJs ZUVsZW1lbnQ6OnNldENhcHRpb24oUGFzc1JlZlB0cjxIVE1MVGFibGVDYXB0aW9uRWxlbWVudD4g bmV3Q2FwdGlvbiwgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lkIEhUTUxUYWJsZUVsZW1lbnQ6OnNl dENhcHRpb24oUmVmUHRyPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiYmIG5ld0NhcHRpb24sIEV4 Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGRlbGV0ZUNhcHRpb24oKTsKICAgICBpZiAobmV3Q2Fw dGlvbikKQEAgLTkzLDcgKzkzLDcgQEAgSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQqIEhUTUxUYWJs ZUVsZW1lbnQ6OnRIZWFkKCkgY29uc3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotdm9pZCBI VE1MVGFibGVFbGVtZW50OjpzZXRUSGVhZChQYXNzUmVmUHRyPEhUTUxUYWJsZVNlY3Rpb25FbGVt ZW50PiBuZXdIZWFkLCBFeGNlcHRpb25Db2RlJiBlYykKK3ZvaWQgSFRNTFRhYmxlRWxlbWVudDo6 c2V0VEhlYWQoUmVmUHRyPEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50PiYmIG5ld0hlYWQsIEV4Y2Vw dGlvbkNvZGUmIGVjKQogewogICAgIGlmIChVTkxJS0VMWShuZXdIZWFkICYmICFuZXdIZWFkLT5o YXNUYWdOYW1lKHRoZWFkVGFnKSkpIHsKICAgICAgICAgZWMgPSBISUVSQVJDSFlfUkVRVUVTVF9F UlI7CkBAIC0xMDYsOSArMTA2LDEwIEBAIHZvaWQgSFRNTFRhYmxlRWxlbWVudDo6c2V0VEhlYWQo UGFzc1JlZlB0cjxIVE1MVGFibGVTZWN0aW9uRWxlbWVudD4gbmV3SGVhZCwgRXhjCiAgICAgICAg IHJldHVybjsKIAogICAgIE5vZGUqIGNoaWxkOwotICAgIGZvciAoY2hpbGQgPSBmaXJzdENoaWxk KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKQorICAgIGZvciAoY2hpbGQg PSBmaXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7CiAg ICAgICAgIGlmIChjaGlsZC0+aXNFbGVtZW50Tm9kZSgpICYmICFjaGlsZC0+aGFzVGFnTmFtZShj YXB0aW9uVGFnKSAmJiAhY2hpbGQtPmhhc1RhZ05hbWUoY29sZ3JvdXBUYWcpKQogICAgICAgICAg ICAgYnJlYWs7CisgICAgfQogCiAgICAgaW5zZXJ0QmVmb3JlKCpuZXdIZWFkLCBjaGlsZCwgZWMp OwogfQpAQCAtMTQyLDcgKzE0Myw3IEBAIFJlZjxIVE1MVGFibGVTZWN0aW9uRWxlbWVudD4gSFRN TFRhYmxlRWxlbWVudDo6Y3JlYXRlVEhlYWQoKQogICAgIGlmIChIVE1MVGFibGVTZWN0aW9uRWxl bWVudCogZXhpc3RpbmdIZWFkID0gdEhlYWQoKSkKICAgICAgICAgcmV0dXJuICpleGlzdGluZ0hl YWQ7CiAgICAgUmVmPEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50PiBoZWFkID0gSFRNTFRhYmxlU2Vj dGlvbkVsZW1lbnQ6OmNyZWF0ZSh0aGVhZFRhZywgZG9jdW1lbnQoKSk7Ci0gICAgc2V0VEhlYWQo aGVhZC5wdHIoKSwgSUdOT1JFX0VYQ0VQVElPTik7CisgICAgc2V0VEhlYWQoaGVhZC5jb3B5UmVm KCksIElHTk9SRV9FWENFUFRJT04pOwogICAgIHJldHVybiBoZWFkOwogfQogCkBAIC0xODAsNyAr MTgxLDcgQEAgUmVmPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiBIVE1MVGFibGVFbGVtZW50Ojpj cmVhdGVDYXB0aW9uKCkKICAgICBpZiAoSFRNTFRhYmxlQ2FwdGlvbkVsZW1lbnQqIGV4aXN0aW5n Q2FwdGlvbiA9IGNhcHRpb24oKSkKICAgICAgICAgcmV0dXJuICpleGlzdGluZ0NhcHRpb247CiAg ICAgUmVmPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiBjYXB0aW9uID0gSFRNTFRhYmxlQ2FwdGlv bkVsZW1lbnQ6OmNyZWF0ZShjYXB0aW9uVGFnLCBkb2N1bWVudCgpKTsKLSAgICBzZXRDYXB0aW9u KGNhcHRpb24ucHRyKCksIElHTk9SRV9FWENFUFRJT04pOworICAgIHNldENhcHRpb24oY2FwdGlv bi5jb3B5UmVmKCksIElHTk9SRV9FWENFUFRJT04pOwogICAgIHJldHVybiBjYXB0aW9uOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuaCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5oCmluZGV4IGU0MmFiZTMyMmFmOThj Zjg1ZGIyYzQ3ZDIzMzY4MGM4YWRjODkwOTQuLjEyYjc2MDFiZmZmN2JmZDkzMzVlNDJlNjY0NDM1 ZTVkOGUzY2Q1YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxl bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5oCkBAIC00 MSwxMCArNDEsMTAgQEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8SFRNTFRhYmxlRWxlbWVudD4g Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCYpOwogCiAgICAgSFRNTFRhYmxl Q2FwdGlvbkVsZW1lbnQqIGNhcHRpb24oKSBjb25zdDsKLSAgICB2b2lkIHNldENhcHRpb24oUGFz c1JlZlB0cjxIVE1MVGFibGVDYXB0aW9uRWxlbWVudD4sIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICB2 b2lkIHNldENhcHRpb24oUmVmUHRyPEhUTUxUYWJsZUNhcHRpb25FbGVtZW50PiYmLCBFeGNlcHRp b25Db2RlJik7CiAKICAgICBIVE1MVGFibGVTZWN0aW9uRWxlbWVudCogdEhlYWQoKSBjb25zdDsK LSAgICB2b2lkIHNldFRIZWFkKFBhc3NSZWZQdHI8SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQ+LCBF eGNlcHRpb25Db2RlJik7CisgICAgdm9pZCBzZXRUSGVhZChSZWZQdHI8SFRNTFRhYmxlU2VjdGlv bkVsZW1lbnQ+JiYsIEV4Y2VwdGlvbkNvZGUmKTsKIAogICAgIEhUTUxUYWJsZVNlY3Rpb25FbGVt ZW50KiB0Rm9vdCgpIGNvbnN0OwogICAgIHZvaWQgc2V0VEZvb3QoUmVmUHRyPEhUTUxUYWJsZVNl Y3Rpb25FbGVtZW50PiYmLCBFeGNlcHRpb25Db2RlJik7Cg==