203150 2019-10-18 08:03:59 -0700 Add TextStream dumping for BasicShape types 2019-10-18 11:55:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc ews-watchlist glenn gyuyoung.kim kondapallykalyan macpherson menard pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1581401 0 simon.fraser 2019-10-18 08:03:59 -0700 Add TextStream dumping for BasicShape types 1581402 1 381301 simon.fraser 2019-10-18 08:04:46 -0700 Created attachment 381301 Patch 1581411 2 381301 zalan 2019-10-18 08:30:13 -0700 Comment on attachment 381301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381301&action=review > Source/WebCore/rendering/style/BasicShapes.h:60 > + Inset yay 1581476 3 381301 commit-queue 2019-10-18 11:54:12 -0700 Comment on attachment 381301 Patch Clearing flags on attachment: 381301 Committed r251292: <https://trac.webkit.org/changeset/251292> 1581477 4 commit-queue 2019-10-18 11:54:14 -0700 All reviewed patches have been landed. Closing bug. 1581479 5 webkit-bug-importer 2019-10-18 11:55:15 -0700 <rdar://problem/56414430> 381301 2019-10-18 08:04:46 -0700 2019-10-18 11:54:12 -0700 Patch bug-203150-20191018080445.patch text/plain 15209 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxMjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRiMDcxOWI5YTg5NmM2 YzJjYmE0ZjY1Y2I5YmUwMGIzMjkzYWJkZS4uZDk5MTkyY2EwNWEzNDNkYTI2ZDQ1ZGJiZmVhNmZm MmU2NDY0NmUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTEwLTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBUZXh0U3Ry ZWFtIGR1bXBpbmcgZm9yIEJhc2ljU2hhcGUgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzE1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBkdW1waW5nIGZvciB0aGUgY2xhc3NlcywgYW5k IG1ha2UgdGhlIEJhc2ljU2hhcGUgZW51bSBhbiBlbnVtIGNsYXNzLgorCisgICAgICAgICogY3Nz L0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dmFsdWVGb3JCYXNp Y1NoYXBlKToKKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNoYXBlOjpjcmVhdGVTaGFwZSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L0Jhc2ljU2hhcGVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2hhcGVDaXJjbGU6OmR1 bXAgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUVsbGlwc2U6OmR1bXAgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZVBvbHlnb246OmR1bXAgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZVBhdGg6OmR1bXAgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6QmFzaWNTaGFwZUluc2V0OjpkdW1wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5oOgor ICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUNlbnRlckNvb3JkaW5hdGU6OkJhc2ljU2hhcGVD ZW50ZXJDb29yZGluYXRlKToKKwogMjAxOS0xMC0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IGluY2x1ZGUgImRlZXAgY29sb3IiIGluIGxh eWVyIHRyZWUgZHVtcHMgaWYgYSB0ZXN0cyByZXF1ZXN0cyBpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCmluZGV4IDE1Yzg1NjA2ODkxYjI4ZDk4MmU3ZDk4NTlh MjNlYzFhNzFlNmViYTkuLmMxMjU3ZWQyNzU5ZThlN2Y0NDU1ZWYzYjFiYTZmMTA4Nzc4NDM5MTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKQEAgLTcxLDcg KzcxLDcgQEAgUmVmPENTU1ByaW1pdGl2ZVZhbHVlPiB2YWx1ZUZvckJhc2ljU2hhcGUoY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBCYXNpY1MKIAogICAgIFJlZlB0cjxDU1NCYXNpY1No YXBlPiBiYXNpY1NoYXBlVmFsdWU7CiAgICAgc3dpdGNoIChiYXNpY1NoYXBlLnR5cGUoKSkgewot ICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZUNpcmNsZVR5cGU6IHsKKyAgICBjYXNlIEJh c2ljU2hhcGU6OlR5cGU6OkNpcmNsZTogewogICAgICAgICBhdXRvJiBjaXJjbGUgPSBkb3duY2Fz dDxCYXNpY1NoYXBlQ2lyY2xlPihiYXNpY1NoYXBlKTsKICAgICAgICAgYXV0byBjaXJjbGVWYWx1 ZSA9IENTU0Jhc2ljU2hhcGVDaXJjbGU6OmNyZWF0ZSgpOwogCkBAIC04Miw3ICs4Miw3IEBAIFJl ZjxDU1NQcmltaXRpdmVWYWx1ZT4gdmFsdWVGb3JCYXNpY1NoYXBlKGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSwgY29uc3QgQmFzaWNTCiAgICAgICAgIGJhc2ljU2hhcGVWYWx1ZSA9IFdURk1vdmUo Y2lyY2xlVmFsdWUpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgY2FzZSBCYXNpY1NoYXBl OjpCYXNpY1NoYXBlRWxsaXBzZVR5cGU6IHsKKyAgICBjYXNlIEJhc2ljU2hhcGU6OlR5cGU6OkVs bGlwc2U6IHsKICAgICAgICAgYXV0byYgZWxsaXBzZSA9IGRvd25jYXN0PEJhc2ljU2hhcGVFbGxp cHNlPihiYXNpY1NoYXBlKTsKICAgICAgICAgYXV0byBlbGxpcHNlVmFsdWUgPSBDU1NCYXNpY1No YXBlRWxsaXBzZTo6Y3JlYXRlKCk7CiAKQEAgLTk0LDcgKzk0LDcgQEAgUmVmPENTU1ByaW1pdGl2 ZVZhbHVlPiB2YWx1ZUZvckJhc2ljU2hhcGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25z dCBCYXNpY1MKICAgICAgICAgYmFzaWNTaGFwZVZhbHVlID0gV1RGTW92ZShlbGxpcHNlVmFsdWUp OwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgY2FzZSBCYXNpY1NoYXBlOjpCYXNpY1NoYXBl UG9seWdvblR5cGU6IHsKKyAgICBjYXNlIEJhc2ljU2hhcGU6OlR5cGU6OlBvbHlnb246IHsKICAg ICAgICAgYXV0byYgcG9seWdvbiA9IGRvd25jYXN0PEJhc2ljU2hhcGVQb2x5Z29uPihiYXNpY1No YXBlKTsKICAgICAgICAgYXV0byBwb2x5Z29uVmFsdWUgPSBDU1NCYXNpY1NoYXBlUG9seWdvbjo6 Y3JlYXRlKCk7CiAKQEAgLTEwNiw3ICsxMDYsNyBAQCBSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IHZh bHVlRm9yQmFzaWNTaGFwZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEJhc2ljUwog ICAgICAgICBiYXNpY1NoYXBlVmFsdWUgPSBXVEZNb3ZlKHBvbHlnb25WYWx1ZSk7CiAgICAgICAg IGJyZWFrOwogICAgIH0KLSAgICBjYXNlIEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVQYXRoVHlwZTog eworICAgIGNhc2UgQmFzaWNTaGFwZTo6VHlwZTo6UGF0aDogewogICAgICAgICBhdXRvJiBwYXRo U2hhcGUgPSBkb3duY2FzdDxCYXNpY1NoYXBlUGF0aD4oYmFzaWNTaGFwZSk7CiAgICAgICAgIGF1 dG8gcGF0aFNoYXBlVmFsdWUgPSBDU1NCYXNpY1NoYXBlUGF0aDo6Y3JlYXRlKHBhdGhTaGFwZS5w YXRoRGF0YSgpLT5jb3B5KCkpOwogICAgICAgICBwYXRoU2hhcGVWYWx1ZS0+c2V0V2luZFJ1bGUo cGF0aFNoYXBlLndpbmRSdWxlKCkpOwpAQCAtMTE0LDcgKzExNCw3IEBAIFJlZjxDU1NQcmltaXRp dmVWYWx1ZT4gdmFsdWVGb3JCYXNpY1NoYXBlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29u c3QgQmFzaWNTCiAgICAgICAgIGJhc2ljU2hhcGVWYWx1ZSA9IFdURk1vdmUocGF0aFNoYXBlVmFs dWUpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgY2FzZSBCYXNpY1NoYXBlOjpCYXNpY1No YXBlSW5zZXRUeXBlOiB7CisgICAgY2FzZSBCYXNpY1NoYXBlOjpUeXBlOjpJbnNldDogewogICAg ICAgICBhdXRvJiBpbnNldCA9IGRvd25jYXN0PEJhc2ljU2hhcGVJbnNldD4oYmFzaWNTaGFwZSk7 CiAgICAgICAgIGF1dG8gaW5zZXRWYWx1ZSA9IENTU0Jhc2ljU2hhcGVJbnNldDo6Y3JlYXRlKCk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKaW5kZXggZjVlZmVm ZGQzMmIzMDU0N2FkYmQ4ZWIwOGY1NGU2M2IwMjQwZmQ5Yy4uMTZhYTkwNWJjMjIzZWVmYTk2NTIz ZjRjZWE5ZGM2OTY0ZGU0Yzk4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3NoYXBlcy9TaGFwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9T aGFwZS5jcHAKQEAgLTEwMCw3ICsxMDAsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBl OjpjcmVhdGVTaGFwZShjb25zdCBCYXNpY1NoYXBlJiBiYXNpY1NoYXBlLCBjb25zdCBMYQogCiAg ICAgc3dpdGNoIChiYXNpY1NoYXBlLnR5cGUoKSkgewogCi0gICAgY2FzZSBCYXNpY1NoYXBlOjpC YXNpY1NoYXBlQ2lyY2xlVHlwZTogeworICAgIGNhc2UgQmFzaWNTaGFwZTo6VHlwZTo6Q2lyY2xl OiB7CiAgICAgICAgIGNvbnN0IGF1dG8mIGNpcmNsZSA9IGRvd25jYXN0PEJhc2ljU2hhcGVDaXJj bGU+KGJhc2ljU2hhcGUpOwogICAgICAgICBmbG9hdCBjZW50ZXJYID0gZmxvYXRWYWx1ZUZvckNl bnRlckNvb3JkaW5hdGUoY2lyY2xlLmNlbnRlclgoKSwgYm94V2lkdGgpOwogICAgICAgICBmbG9h dCBjZW50ZXJZID0gZmxvYXRWYWx1ZUZvckNlbnRlckNvb3JkaW5hdGUoY2lyY2xlLmNlbnRlclko KSwgYm94SGVpZ2h0KTsKQEAgLTExMSw3ICsxMTEsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+ IFNoYXBlOjpjcmVhdGVTaGFwZShjb25zdCBCYXNpY1NoYXBlJiBiYXNpY1NoYXBlLCBjb25zdCBM YQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBjYXNlIEJhc2ljU2hhcGU6OkJhc2ljU2hh cGVFbGxpcHNlVHlwZTogeworICAgIGNhc2UgQmFzaWNTaGFwZTo6VHlwZTo6RWxsaXBzZTogewog ICAgICAgICBjb25zdCBhdXRvJiBlbGxpcHNlID0gZG93bmNhc3Q8QmFzaWNTaGFwZUVsbGlwc2U+ KGJhc2ljU2hhcGUpOwogICAgICAgICBmbG9hdCBjZW50ZXJYID0gZmxvYXRWYWx1ZUZvckNlbnRl ckNvb3JkaW5hdGUoZWxsaXBzZS5jZW50ZXJYKCksIGJveFdpZHRoKTsKICAgICAgICAgZmxvYXQg Y2VudGVyWSA9IGZsb2F0VmFsdWVGb3JDZW50ZXJDb29yZGluYXRlKGVsbGlwc2UuY2VudGVyWSgp LCBib3hIZWlnaHQpOwpAQCAtMTIzLDcgKzEyMyw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxTaGFwZT4g U2hhcGU6OmNyZWF0ZVNoYXBlKGNvbnN0IEJhc2ljU2hhcGUmIGJhc2ljU2hhcGUsIGNvbnN0IExh CiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFw ZVBvbHlnb25UeXBlOiB7CisgICAgY2FzZSBCYXNpY1NoYXBlOjpUeXBlOjpQb2x5Z29uOiB7CiAg ICAgICAgIGNvbnN0IGF1dG8mIHBvbHlnb24gPSBkb3duY2FzdDxCYXNpY1NoYXBlUG9seWdvbj4o YmFzaWNTaGFwZSk7CiAgICAgICAgIGNvbnN0IFZlY3RvcjxMZW5ndGg+JiB2YWx1ZXMgPSBwb2x5 Z29uLnZhbHVlcygpOwogICAgICAgICBzaXplX3QgdmFsdWVzU2l6ZSA9IHZhbHVlcy5zaXplKCk7 CkBAIC0xNDAsNyArMTQwLDcgQEAgc3RkOjp1bmlxdWVfcHRyPFNoYXBlPiBTaGFwZTo6Y3JlYXRl U2hhcGUoY29uc3QgQmFzaWNTaGFwZSYgYmFzaWNTaGFwZSwgY29uc3QgTGEKICAgICAgICAgYnJl YWs7CiAgICAgfQogCi0gICAgY2FzZSBCYXNpY1NoYXBlOjpCYXNpY1NoYXBlSW5zZXRUeXBlOiB7 CisgICAgY2FzZSBCYXNpY1NoYXBlOjpUeXBlOjpJbnNldDogewogICAgICAgICBjb25zdCBhdXRv JiBpbnNldCA9IGRvd25jYXN0PEJhc2ljU2hhcGVJbnNldD4oYmFzaWNTaGFwZSk7CiAgICAgICAg IGZsb2F0IGxlZnQgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKGluc2V0LmxlZnQoKSwgYm94V2lkdGgp OwogICAgICAgICBmbG9hdCB0b3AgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKGluc2V0LnRvcCgpLCBi b3hIZWlnaHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jh c2ljU2hhcGVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBl cy5jcHAKaW5kZXggNzQ0YzkwYjhmYjNmNTI3NjhhNTM4ZDIxMzU4MzYyY2E2MzQ4MjdlZS4uY2E2 ODFhZmVhMjE1NTIzMzg4ZmE2ZDhlMTM3MTk3NzIwZDMxYjg4MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAK ICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvVGlueUxSVUNh Y2hlLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvVGV4dFN0cmVhbS5oPgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKQEAgLTIwMSw2ICsyMDIsMTMgQEAgUmVmPEJhc2ljU2hhcGU+IEJhc2ljU2hhcGVD aXJjbGU6OmJsZW5kKGNvbnN0IEJhc2ljU2hhcGUmIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3MKICAg ICByZXR1cm4gcmVzdWx0OwogfQogCit2b2lkIEJhc2ljU2hhcGVDaXJjbGU6OmR1bXAoVGV4dFN0 cmVhbSYgdHMpIGNvbnN0Cit7CisgICAgdHMuZHVtcFByb3BlcnR5KCJjZW50ZXIteCIsIGNlbnRl clgoKSk7CisgICAgdHMuZHVtcFByb3BlcnR5KCJjZW50ZXIteSIsIGNlbnRlclkoKSk7CisgICAg dHMuZHVtcFByb3BlcnR5KCJyYWRpdXMiLCByYWRpdXMoKSk7Cit9CisKIGJvb2wgQmFzaWNTaGFw ZUVsbGlwc2U6Om9wZXJhdG9yPT0oY29uc3QgQmFzaWNTaGFwZSYgb3RoZXIpIGNvbnN0CiB7CiAg ICAgaWYgKHR5cGUoKSAhPSBvdGhlci50eXBlKCkpCkBAIC0yNjcsNiArMjc1LDE0IEBAIFJlZjxC YXNpY1NoYXBlPiBCYXNpY1NoYXBlRWxsaXBzZTo6YmxlbmQoY29uc3QgQmFzaWNTaGFwZSYgb3Ro ZXIsIGRvdWJsZSBwcm9ncmVzCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAordm9pZCBCYXNpY1No YXBlRWxsaXBzZTo6ZHVtcChUZXh0U3RyZWFtJiB0cykgY29uc3QKK3sKKyAgICB0cy5kdW1wUHJv cGVydHkoImNlbnRlci14IiwgY2VudGVyWCgpKTsKKyAgICB0cy5kdW1wUHJvcGVydHkoImNlbnRl ci15IiwgY2VudGVyWSgpKTsKKyAgICB0cy5kdW1wUHJvcGVydHkoInJhZGl1cy14IiwgcmFkaXVz WCgpKTsKKyAgICB0cy5kdW1wUHJvcGVydHkoInJhZGl1cy15IiwgcmFkaXVzWSgpKTsKK30KKwog Ym9vbCBCYXNpY1NoYXBlUG9seWdvbjo6b3BlcmF0b3I9PShjb25zdCBCYXNpY1NoYXBlJiBvdGhl cikgY29uc3QKIHsKICAgICBpZiAodHlwZSgpICE9IG90aGVyLnR5cGUoKSkKQEAgLTMyNCw2ICsz NDAsMTIgQEAgUmVmPEJhc2ljU2hhcGU+IEJhc2ljU2hhcGVQb2x5Z29uOjpibGVuZChjb25zdCBC YXNpY1NoYXBlJiBvdGhlciwgZG91YmxlIHByb2dyZXMKICAgICByZXR1cm4gcmVzdWx0OwogfQog Cit2b2lkIEJhc2ljU2hhcGVQb2x5Z29uOjpkdW1wKFRleHRTdHJlYW0mIHRzKSBjb25zdAorewor ICAgIHRzLmR1bXBQcm9wZXJ0eSgid2luZC1ydWxlIiwgd2luZFJ1bGUoKSk7CisgICAgdHMuZHVt cFByb3BlcnR5KCJwYXRoIiwgdmFsdWVzKCkpOworfQorCiBCYXNpY1NoYXBlUGF0aDo6QmFzaWNT aGFwZVBhdGgoc3RkOjp1bmlxdWVfcHRyPFNWR1BhdGhCeXRlU3RyZWFtPiYmIGJ5dGVTdHJlYW0p CiAgICAgOiBtX2J5dGVTdHJlYW0oV1RGTW92ZShieXRlU3RyZWFtKSkKIHsKQEAgLTM2Niw2ICsz ODgsMTIgQEAgUmVmPEJhc2ljU2hhcGU+IEJhc2ljU2hhcGVQYXRoOjpibGVuZChjb25zdCBCYXNp Y1NoYXBlJiBmcm9tLCBkb3VibGUgcHJvZ3Jlc3MpIGMKICAgICByZXR1cm4gcmVzdWx0OwogfQog Cit2b2lkIEJhc2ljU2hhcGVQYXRoOjpkdW1wKFRleHRTdHJlYW0mIHRzKSBjb25zdAoreworICAg IHRzLmR1bXBQcm9wZXJ0eSgid2luZC1ydWxlIiwgd2luZFJ1bGUoKSk7CisgICAgLy8gRklYTUU6 IHByaW50IHRoZSBieXRlIHN0cmVhbT8KK30KKwogYm9vbCBCYXNpY1NoYXBlSW5zZXQ6Om9wZXJh dG9yPT0oY29uc3QgQmFzaWNTaGFwZSYgb3RoZXIpIGNvbnN0CiB7CiAgICAgaWYgKHR5cGUoKSAh PSBvdGhlci50eXBlKCkpCkBAIC00MjcsNCArNDU1LDQ5IEBAIFJlZjxCYXNpY1NoYXBlPiBCYXNp Y1NoYXBlSW5zZXQ6OmJsZW5kKGNvbnN0IEJhc2ljU2hhcGUmIGZyb20sIGRvdWJsZSBwcm9ncmVz cykKIAogICAgIHJldHVybiByZXN1bHQ7CiB9CisKK3ZvaWQgQmFzaWNTaGFwZUluc2V0OjpkdW1w KFRleHRTdHJlYW0mIHRzKSBjb25zdAoreworICAgIHRzLmR1bXBQcm9wZXJ0eSgidG9wIiwgdG9w KCkpOworICAgIHRzLmR1bXBQcm9wZXJ0eSgicmlnaHQiLCByaWdodCgpKTsKKyAgICB0cy5kdW1w UHJvcGVydHkoImJvdHRvbSIsIGJvdHRvbSgpKTsKKyAgICB0cy5kdW1wUHJvcGVydHkoImxlZnQi LCBsZWZ0KCkpOworCisgICAgdHMuZHVtcFByb3BlcnR5KCJ0b3AtbGVmdC1yYWRpdXMiLCB0b3BM ZWZ0UmFkaXVzKCkpOworICAgIHRzLmR1bXBQcm9wZXJ0eSgidG9wLXJpZ2h0LXJhZGl1cyIsIHRv cFJpZ2h0UmFkaXVzKCkpOworICAgIHRzLmR1bXBQcm9wZXJ0eSgiYm90dG9tLXJpZ2h0LXJhZGl1 cyIsIGJvdHRvbVJpZ2h0UmFkaXVzKCkpOworICAgIHRzLmR1bXBQcm9wZXJ0eSgiYm90dG9tLWxl ZnQtcmFkaXVzIiwgYm90dG9tTGVmdFJhZGl1cygpKTsKIH0KKworc3RhdGljIFRleHRTdHJlYW0m IG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIEJhc2ljU2hhcGVSYWRpdXM6OlR5cGUgcmFkaXVz VHlwZSkKK3sKKyAgICBzd2l0Y2ggKHJhZGl1c1R5cGUpIHsKKyAgICBjYXNlIEJhc2ljU2hhcGVS YWRpdXM6OlZhbHVlOiB0cyA8PCAidmFsdWUiOyBicmVhazsKKyAgICBjYXNlIEJhc2ljU2hhcGVS YWRpdXM6OkNsb3Nlc3RTaWRlOiB0cyA8PCAiY2xvc2VzdC1zaWRlIjsgYnJlYWs7CisgICAgY2Fz ZSBCYXNpY1NoYXBlUmFkaXVzOjpGYXJ0aGVzdFNpZGU6IHRzIDw8ICJmYXJ0aGVzdC1zaWRlIjsg YnJlYWs7CisgICAgfQorICAgIHJldHVybiB0czsKK30KKworVGV4dFN0cmVhbSYgb3BlcmF0b3I8 PChUZXh0U3RyZWFtJiB0cywgY29uc3QgQmFzaWNTaGFwZVJhZGl1cyYgcmFkaXVzKQoreworICAg IHRzLmR1bXBQcm9wZXJ0eSgidmFsdWUiLCByYWRpdXMudmFsdWUoKSk7CisgICAgdHMuZHVtcFBy b3BlcnR5KCJ0eXBlIiwgcmFkaXVzLnR5cGUoKSk7CisgICAgcmV0dXJuIHRzOworfQorCitUZXh0 U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBCYXNpY1NoYXBlQ2VudGVy Q29vcmRpbmF0ZSYgY29vcmRpbmF0ZSkKK3sKKyAgICB0cy5kdW1wUHJvcGVydHkoImRpcmVjdGlv biIsIGNvb3JkaW5hdGUuZGlyZWN0aW9uKCkgPT0gQmFzaWNTaGFwZUNlbnRlckNvb3JkaW5hdGU6 OlRvcExlZnQgPyAidG9wIGxlZnQiIDogImJvdHRvbSByaWdodCIpOworICAgIHRzLmR1bXBQcm9w ZXJ0eSgibGVuZ3RoIiwgY29vcmRpbmF0ZS5sZW5ndGgoKSk7CisgICAgcmV0dXJuIHRzOworfQor CitUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBCYXNpY1NoYXBl JiBzaGFwZSkKK3sKKyAgICBzaGFwZS5kdW1wKHRzKTsKKyAgICByZXR1cm4gdHM7Cit9CisKK30g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv QmFzaWNTaGFwZXMuaAppbmRleCBkMDhmZGY0MDBlZTFlODBkNTMxYzM3ZWU4NDdkNGM4OTgwNmU0 ZjdhLi5iOWRjNGU3YWE2MGE4YjgxODVhODU2YjA2NzdhMmE0M2NiZmJlODkxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaApAQCAtMzcsNiArMzcsMTAg QEAKICNpbmNsdWRlIDx3dGYvVHlwZUNhc3RzLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgog CituYW1lc3BhY2UgV1RGIHsKK2NsYXNzIFRleHRTdHJlYW07Cit9CisKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogY2xhc3MgRmxvYXRSZWN0OwpAQCAtNDgsMTIgKzUyLDEyIEBAIGNsYXNzIEJhc2lj U2hhcGUgOiBwdWJsaWMgUmVmQ291bnRlZDxCYXNpY1NoYXBlPiB7CiBwdWJsaWM6CiAgICAgdmly dHVhbCB+QmFzaWNTaGFwZSgpID0gZGVmYXVsdDsKIAotICAgIGVudW0gVHlwZSB7Ci0gICAgICAg IEJhc2ljU2hhcGVQb2x5Z29uVHlwZSwKLSAgICAgICAgQmFzaWNTaGFwZVBhdGhUeXBlLAotICAg ICAgICBCYXNpY1NoYXBlQ2lyY2xlVHlwZSwKLSAgICAgICAgQmFzaWNTaGFwZUVsbGlwc2VUeXBl LAotICAgICAgICBCYXNpY1NoYXBlSW5zZXRUeXBlCisgICAgZW51bSBjbGFzcyBUeXBlIHsKKyAg ICAgICAgUG9seWdvbiwKKyAgICAgICAgUGF0aCwKKyAgICAgICAgQ2lyY2xlLAorICAgICAgICBF bGxpcHNlLAorICAgICAgICBJbnNldAogICAgIH07CiAKICAgICB2aXJ0dWFsIFR5cGUgdHlwZSgp IGNvbnN0ID0gMDsKQEAgLTY1LDYgKzY5LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgUmVmPEJh c2ljU2hhcGU+IGJsZW5kKGNvbnN0IEJhc2ljU2hhcGUmIGZyb20sIGRvdWJsZSkgY29uc3QgPSAw OwogCiAgICAgdmlydHVhbCBib29sIG9wZXJhdG9yPT0oY29uc3QgQmFzaWNTaGFwZSYpIGNvbnN0 ID0gMDsKKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgZHVtcChUZXh0U3RyZWFtJikgY29uc3QgPSAw OwogfTsKIAogY2xhc3MgQmFzaWNTaGFwZUNlbnRlckNvb3JkaW5hdGUgewpAQCAtNzUsOCArODEs NiBAQCBwdWJsaWM6CiAgICAgfTsKIAogICAgIEJhc2ljU2hhcGVDZW50ZXJDb29yZGluYXRlKCkK LSAgICAgICAgOiBtX2RpcmVjdGlvbihUb3BMZWZ0KQotICAgICAgICAsIG1fbGVuZ3RoKFVuZGVm aW5lZCkKICAgICB7CiAgICAgICAgIHVwZGF0ZUNvbXB1dGVkTGVuZ3RoKCk7CiAgICAgfQpAQCAt MTA3LDggKzExMSw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVDb21wdXRl ZExlbmd0aCgpOwogCi0gICAgRGlyZWN0aW9uIG1fZGlyZWN0aW9uOwotICAgIExlbmd0aCBtX2xl bmd0aDsKKyAgICBEaXJlY3Rpb24gbV9kaXJlY3Rpb24geyBUb3BMZWZ0IH07CisgICAgTGVuZ3Ro IG1fbGVuZ3RoIHsgVW5kZWZpbmVkIH07CiAgICAgTGVuZ3RoIG1fY29tcHV0ZWRMZW5ndGg7CiB9 OwogCkBAIC0xMTksMTAgKzEyMyw4IEBAIHB1YmxpYzoKICAgICAgICAgQ2xvc2VzdFNpZGUsCiAg ICAgICAgIEZhcnRoZXN0U2lkZQogICAgIH07Ci0gICAgQmFzaWNTaGFwZVJhZGl1cygpCi0gICAg ICAgIDogbV92YWx1ZShVbmRlZmluZWQpLAotICAgICAgICBtX3R5cGUoQ2xvc2VzdFNpZGUpCi0g ICAgeyB9CisKKyAgICBCYXNpY1NoYXBlUmFkaXVzKCkgPSBkZWZhdWx0OwogCiAgICAgZXhwbGlj aXQgQmFzaWNTaGFwZVJhZGl1cyhMZW5ndGggdikKICAgICAgICAgOiBtX3ZhbHVlKHYpCkBAIC0x NTYsOSArMTU4LDggQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKLSAgICBMZW5ndGggbV92 YWx1ZTsKLSAgICBUeXBlIG1fdHlwZTsKLQorICAgIExlbmd0aCBtX3ZhbHVlIHsgVW5kZWZpbmVk IH07CisgICAgVHlwZSBtX3R5cGUgeyBDbG9zZXN0U2lkZSB9OwogfTsKIAogY2xhc3MgQmFzaWNT aGFwZUNpcmNsZSBmaW5hbCA6IHB1YmxpYyBCYXNpY1NoYXBlIHsKQEAgLTE3Nyw3ICsxNzgsNyBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIEJhc2ljU2hhcGVDaXJjbGUoKSA9IGRlZmF1bHQ7CiAK LSAgICBUeXBlIHR5cGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBCYXNpY1NoYXBlQ2lyY2xl VHlwZTsgfQorICAgIFR5cGUgdHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIFR5cGU6OkNp cmNsZTsgfQogCiAgICAgY29uc3QgUGF0aCYgcGF0aChjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlk ZTsKIApAQCAtMTg2LDYgKzE4Nyw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG9wZXJhdG9yPT0o Y29uc3QgQmFzaWNTaGFwZSYpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgdm9pZCBkdW1wKFRleHRT dHJlYW0mKSBjb25zdCBmaW5hbDsKKwogICAgIEJhc2ljU2hhcGVDZW50ZXJDb29yZGluYXRlIG1f Y2VudGVyWDsKICAgICBCYXNpY1NoYXBlQ2VudGVyQ29vcmRpbmF0ZSBtX2NlbnRlclk7CiAgICAg QmFzaWNTaGFwZVJhZGl1cyBtX3JhZGl1czsKQEAgLTIwOSw3ICsyMTIsNyBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIEJhc2ljU2hhcGVFbGxpcHNlKCkgPSBkZWZhdWx0OwogCi0gICAgVHlwZSB0 eXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gQmFzaWNTaGFwZUVsbGlwc2VUeXBlOyB9Cisg ICAgVHlwZSB0eXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gVHlwZTo6RWxsaXBzZTsgfQog CiAgICAgY29uc3QgUGF0aCYgcGF0aChjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKIApAQCAt MjE4LDYgKzIyMSw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgQmFz aWNTaGFwZSYpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgdm9pZCBkdW1wKFRleHRTdHJlYW0mKSBj b25zdCBmaW5hbDsKKwogICAgIEJhc2ljU2hhcGVDZW50ZXJDb29yZGluYXRlIG1fY2VudGVyWDsK ICAgICBCYXNpY1NoYXBlQ2VudGVyQ29vcmRpbmF0ZSBtX2NlbnRlclk7CiAgICAgQmFzaWNTaGFw ZVJhZGl1cyBtX3JhZGl1c1g7CkBAIC0yNDAsNyArMjQ1LDcgQEAgcHVibGljOgogcHJpdmF0ZToK ICAgICBCYXNpY1NoYXBlUG9seWdvbigpID0gZGVmYXVsdDsKIAotICAgIFR5cGUgdHlwZSgpIGNv bnN0IG92ZXJyaWRlIHsgcmV0dXJuIEJhc2ljU2hhcGVQb2x5Z29uVHlwZTsgfQorICAgIFR5cGUg dHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIFR5cGU6OlBvbHlnb247IH0KIAogICAgIGNv bnN0IFBhdGgmIHBhdGgoY29uc3QgRmxvYXRSZWN0Jikgb3ZlcnJpZGU7CiAKQEAgLTI0OSw2ICsy NTQsOCBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEJhc2ljU2hhcGUm KSBjb25zdCBvdmVycmlkZTsKIAorICAgIHZvaWQgZHVtcChUZXh0U3RyZWFtJikgY29uc3QgZmlu YWw7CisKICAgICBXaW5kUnVsZSBtX3dpbmRSdWxlIHsgV2luZFJ1bGU6Ok5vblplcm8gfTsKICAg ICBWZWN0b3I8TGVuZ3RoPiBtX3ZhbHVlczsKIH07CkBAIC0yNjgsNyArMjc1LDcgQEAgcHVibGlj OgogcHJpdmF0ZToKICAgICBCYXNpY1NoYXBlUGF0aChzdGQ6OnVuaXF1ZV9wdHI8U1ZHUGF0aEJ5 dGVTdHJlYW0+JiYpOwogCi0gICAgVHlwZSB0eXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4g QmFzaWNTaGFwZVBhdGhUeXBlOyB9CisgICAgVHlwZSB0eXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gVHlwZTo6UGF0aDsgfQogCiAgICAgY29uc3QgUGF0aCYgcGF0aChjb25zdCBGbG9hdFJl Y3QmKSBvdmVycmlkZTsKIApAQCAtMjc3LDYgKzI4NCw4IEBAIHByaXZhdGU6CiAKICAgICBib29s IG9wZXJhdG9yPT0oY29uc3QgQmFzaWNTaGFwZSYpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgdm9p ZCBkdW1wKFRleHRTdHJlYW0mKSBjb25zdCBmaW5hbDsKKwogICAgIHN0ZDo6dW5pcXVlX3B0cjxT VkdQYXRoQnl0ZVN0cmVhbT4gbV9ieXRlU3RyZWFtOwogICAgIFdpbmRSdWxlIG1fd2luZFJ1bGUg eyBXaW5kUnVsZTo6Tm9uWmVybyB9OwogfTsKQEAgLTMwOCw3ICszMTcsNyBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIEJhc2ljU2hhcGVJbnNldCgpID0gZGVmYXVsdDsKIAotICAgIFR5cGUgdHlw ZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIEJhc2ljU2hhcGVJbnNldFR5cGU7IH0KKyAgICBU eXBlIHR5cGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBUeXBlOjpJbnNldDsgfQogCiAgICAg Y29uc3QgUGF0aCYgcGF0aChjb25zdCBGbG9hdFJlY3QmKSBvdmVycmlkZTsKIApAQCAtMzE3LDYg KzMyNiw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgQmFzaWNTaGFw ZSYpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgdm9pZCBkdW1wKFRleHRTdHJlYW0mKSBjb25zdCBm aW5hbDsKKwogICAgIExlbmd0aCBtX3JpZ2h0OwogICAgIExlbmd0aCBtX3RvcDsKICAgICBMZW5n dGggbV9ib3R0b207CkBAIC0zMjgsNiArMzM5LDEwIEBAIHByaXZhdGU6CiAgICAgTGVuZ3RoU2l6 ZSBtX2JvdHRvbUxlZnRSYWRpdXM7CiB9OwogCitXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwo V1RGOjpUZXh0U3RyZWFtJiwgY29uc3QgQmFzaWNTaGFwZVJhZGl1cyYpOworV1RGOjpUZXh0U3Ry ZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIGNvbnN0IEJhc2ljU2hhcGVDZW50ZXJD b29yZGluYXRlJik7CitXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3RyZWFt JiwgY29uc3QgQmFzaWNTaGFwZSYpOworCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNkZWZp bmUgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CQVNJQ19TSEFQRShUb1ZhbHVlVHlwZU5hbWUsIHBy ZWRpY2F0ZSkgXApAQCAtMzM1LDggKzM1MCw4IEBAIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVH SU4oV2ViQ29yZTo6VG9WYWx1ZVR5cGVOYW1lKSBcCiAgICAgc3RhdGljIGJvb2wgaXNUeXBlKGNv bnN0IFdlYkNvcmU6OkJhc2ljU2hhcGUmIGJhc2ljU2hhcGUpIHsgcmV0dXJuIGJhc2ljU2hhcGUu dHlwZSgpID09IFdlYkNvcmU6OnByZWRpY2F0ZTsgfSBcCiBTUEVDSUFMSVpFX1RZUEVfVFJBSVRT X0VORCgpCiAKLVNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkFTSUNfU0hBUEUoQmFzaWNTaGFwZUNp cmNsZSwgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZUNpcmNsZVR5cGUpCi1TUEVDSUFMSVpFX1RZUEVf VFJBSVRTX0JBU0lDX1NIQVBFKEJhc2ljU2hhcGVFbGxpcHNlLCBCYXNpY1NoYXBlOjpCYXNpY1No YXBlRWxsaXBzZVR5cGUpCi1TUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JBU0lDX1NIQVBFKEJhc2lj U2hhcGVQb2x5Z29uLCBCYXNpY1NoYXBlOjpCYXNpY1NoYXBlUG9seWdvblR5cGUpCi1TUEVDSUFM SVpFX1RZUEVfVFJBSVRTX0JBU0lDX1NIQVBFKEJhc2ljU2hhcGVQYXRoLCBCYXNpY1NoYXBlOjpC YXNpY1NoYXBlUGF0aFR5cGUpCi1TUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JBU0lDX1NIQVBFKEJh c2ljU2hhcGVJbnNldCwgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZUluc2V0VHlwZSkKK1NQRUNJQUxJ WkVfVFlQRV9UUkFJVFNfQkFTSUNfU0hBUEUoQmFzaWNTaGFwZUNpcmNsZSwgQmFzaWNTaGFwZTo6 VHlwZTo6Q2lyY2xlKQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CQVNJQ19TSEFQRShCYXNpY1No YXBlRWxsaXBzZSwgQmFzaWNTaGFwZTo6VHlwZTo6RWxsaXBzZSkKK1NQRUNJQUxJWkVfVFlQRV9U UkFJVFNfQkFTSUNfU0hBUEUoQmFzaWNTaGFwZVBvbHlnb24sIEJhc2ljU2hhcGU6OlR5cGU6OlBv bHlnb24pCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0JBU0lDX1NIQVBFKEJhc2ljU2hhcGVQYXRo LCBCYXNpY1NoYXBlOjpUeXBlOjpQYXRoKQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19CQVNJQ19T SEFQRShCYXNpY1NoYXBlSW5zZXQsIEJhc2ljU2hhcGU6OlR5cGU6Okluc2V0KQo=