227994 2021-07-15 11:15:03 -0700 Improve multicol logging in render tree dumps, and cleanup 2021-07-15 13:31:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1777260 0 simon.fraser 2021-07-15 11:15:03 -0700 Improve multicol logging in render tree dumps, and cleanup 1777261 1 433599 simon.fraser 2021-07-15 11:17:11 -0700 Created attachment 433599 Patch 1777315 2 ews-feeder 2021-07-15 13:30:46 -0700 Committed r279958 (239701@main): <https://commits.webkit.org/239701@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433599. 1777316 3 webkit-bug-importer 2021-07-15 13:31:17 -0700 <rdar://problem/80648655> 433599 2021-07-15 11:17:11 -0700 2021-07-15 13:30:47 -0700 Patch bug-227994-20210715111710.patch text/plain 13340 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5ODQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRhOTZjZDFiZjQ5ZmI0 ZTk2ZGU1MDBmOWU1NjA0YzlhNWJiYjEwMS4uYmM2MTEzMzQ1YTJjNzJhYTY3NDdjMzRhOTVlY2I5 ZTA1Njc4ZDRkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA3LTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgbXVs dGljb2wgbG9nZ2luZyBpbiByZW5kZXIgdHJlZSBkdW1wcywgYW5kIGNsZWFudXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzk5NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZvciBhIFJlbmRlckZyYWdt ZW50ZWRGbG93IGR1bXAgdGhlIGxpc3Qgb2YgZnJhZ21lbnQgY29udGFpbmVycywgYW5kIGNsZWFu IHVwIHRoZSBleGlzdGluZworICAgICAgICBkdW1waW5nIG9mIGNvbnRhaW5lcnMgZm9yIGEgcmVu ZGVyZXIgaW5zaWRlIGEgZnJhZ21lbnRlZCBmbG93LiBBbHNvIGR1bXAgY29sdW1uIGluZm9ybWF0 aW9uCisgICAgICAgIGZvciBSZW5kZXJNdWx0aUNvbHVtblNldC4KKworICAgICAgICBVc2UgaW5p dGlhbGl6ZXJzIGZvciBtZW1iZXIgdmFyaWFibGVzIGluIHZhcmlvdXMgZnJhZ21lbnRhdGlvbi1y ZWxhdGVkIHJlbmRlcmVycy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGcmFnbWVudENv bnRhaW5lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGcmFnbWVudENvbnRhaW5lcjo6 UmVuZGVyRnJhZ21lbnRDb250YWluZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGcmFn bWVudENvbnRhaW5lci5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZs b3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5GbG93OjpSZW5kZXJN dWx0aUNvbHVtbkZsb3cpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZs b3cuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OlJlbmRlck11bHRpQ29sdW1uU2V0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaDoKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmVuY2xvc2lu Z0ZyYWdtZW50ZWRGbG93RnJvbVJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9i amVjdDo6b3V0cHV0UmVnaW9uc0luZm9ybWF0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck9iamVjdDo6b3V0cHV0UmVuZGVyT2JqZWN0IGNvbnN0KToKKwogMjAyMS0wNy0xMiAg Q2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHBh cnRpYWwgcmV2ZXJ0IG9mIHIyNzk2NjEgdG8gYWRkcmVzcyBjcmFzaGVzIG9uIGlPUyBEZWJ1Zy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFnbWVudENvbnRh aW5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhZ21lbnRDb250YWlu ZXIuY3BwCmluZGV4IGIzMjM0ZTAxM2M2NzhiNjNhNzg4NzQ0NTgxZGI5MDdmMWQ2OWI4ODcuLjUz ODBlNWZkODMyYjQ5MWVkMDA5MmQ5MjZlYjQ4NjYyNDdiNTlhYjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFnbWVudENvbnRhaW5lci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYWdtZW50Q29udGFpbmVyLmNwcApAQCAtNTIs MTQgKzUyLDEyIEBAIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChSZW5kZXJGcmFnbWVudENv bnRhaW5lcik7CiBSZW5kZXJGcmFnbWVudENvbnRhaW5lcjo6UmVuZGVyRnJhZ21lbnRDb250YWlu ZXIoRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwgUmVuZGVyRnJhZ21lbnRl ZEZsb3cqIGZyYWdtZW50ZWRGbG93KQogICAgIDogUmVuZGVyQmxvY2tGbG93KGVsZW1lbnQsIFdU Rk1vdmUoc3R5bGUpKQogICAgICwgbV9mcmFnbWVudGVkRmxvdyhmcmFnbWVudGVkRmxvdykKLSAg ICAsIG1faXNWYWxpZChmYWxzZSkKIHsKIH0KIAogUmVuZGVyRnJhZ21lbnRDb250YWluZXI6OlJl bmRlckZyYWdtZW50Q29udGFpbmVyKERvY3VtZW50JiBkb2N1bWVudCwgUmVuZGVyU3R5bGUmJiBz dHlsZSwgUmVuZGVyRnJhZ21lbnRlZEZsb3cqIGZyYWdtZW50ZWRGbG93KQogICAgIDogUmVuZGVy QmxvY2tGbG93KGRvY3VtZW50LCBXVEZNb3ZlKHN0eWxlKSkKICAgICAsIG1fZnJhZ21lbnRlZEZs b3coZnJhZ21lbnRlZEZsb3cpCi0gICAgLCBtX2lzVmFsaWQoZmFsc2UpCiB7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFnbWVudENvbnRhaW5lci5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYWdtZW50Q29udGFpbmVyLmgKaW5k ZXggYWY2YWIzZDUxNGQ0ZmM2YjZkNzQyNzZmZmFjZmZkYTA0ZDllZWE5Yy4uM2M5NjYwYTgwNDEx ODVmNWI5Y2EyZDc0ZjdhYTdhOTQwOTBkMWIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZyYWdtZW50Q29udGFpbmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZyYWdtZW50Q29udGFpbmVyLmgKQEAgLTE2NCw3ICsxNjQsNyBAQCBw cml2YXRlOgogICAgIHR5cGVkZWYgSGFzaE1hcDxjb25zdCBSZW5kZXJCb3gqLCBzdGQ6OnVuaXF1 ZV9wdHI8UmVuZGVyQm94RnJhZ21lbnRJbmZvPj4gUmVuZGVyQm94RnJhZ21lbnRJbmZvTWFwOwog ICAgIFJlbmRlckJveEZyYWdtZW50SW5mb01hcCBtX3JlbmRlckJveEZyYWdtZW50SW5mbzsKIAot ICAgIGJvb2wgbV9pc1ZhbGlkIDogMTsKKyAgICBib29sIG1faXNWYWxpZCB7IGZhbHNlIH07CiB9 OwogCiBjbGFzcyBDdXJyZW50UmVuZGVyRnJhZ21lbnRDb250YWluZXJNYWludGFpbmVyIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAK aW5kZXggYmRiZTRhNzE0ZDBjNmM3YTYzZGNjYzgzNTcyYmIxZjg3MDhlNmEwZC4uYjQ4NWM1ZjRk ZDdjNTdjMDE5N2E1NDhkZWE5ZTNiYmZiOTBmZGYzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKQEAgLTQzLDE1ICs0Myw2IEBA IFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChSZW5kZXJNdWx0aUNvbHVtbkZsb3cpOwogUmVu ZGVyTXVsdGlDb2x1bW5GbG93OjpSZW5kZXJNdWx0aUNvbHVtbkZsb3coRG9jdW1lbnQmIGRvY3Vt ZW50LCBSZW5kZXJTdHlsZSYmIHN0eWxlKQogICAgIDogUmVuZGVyRnJhZ21lbnRlZEZsb3coZG9j dW1lbnQsIFdURk1vdmUoc3R5bGUpKQogICAgICwgbV9zcGFubmVyTWFwKG1ha2VVbmlxdWU8U3Bh bm5lck1hcD4oKSkKLSAgICAsIG1fbGFzdFNldFdvcmtlZE9uKG51bGxwdHIpCi0gICAgLCBtX2Nv bHVtbkNvdW50KDEpCi0gICAgLCBtX2NvbHVtbldpZHRoKDApCi0gICAgLCBtX2NvbHVtbkhlaWdo dEF2YWlsYWJsZSgwKQotICAgICwgbV9pbkxheW91dChmYWxzZSkKLSAgICAsIG1faW5CYWxhbmNp bmdQYXNzKGZhbHNlKQotICAgICwgbV9uZWVkc0hlaWdodHNSZWNhbGN1bGF0aW9uKGZhbHNlKQot ICAgICwgbV9wcm9ncmVzc2lvbklzSW5saW5lKGZhbHNlKQotICAgICwgbV9wcm9ncmVzc2lvbklz UmV2ZXJzZWQoZmFsc2UpCiB7CiAgICAgc2V0RnJhZ21lbnRlZEZsb3dTdGF0ZShJbnNpZGVJbkZy YWdtZW50ZWRGbG93KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNdWx0aUNvbHVtbkZsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJN dWx0aUNvbHVtbkZsb3cuaAppbmRleCBlYjZmMDg4Nzk0NTg1ZTgyNTVkYjdjMGM4NTg4ZDAyZGMx YTVlZjk2Li4yYzhiMWYyN2YxZDA5ZDhiYzQ1MjQ3YmM1ODAzOGIwMDNmMTM2ZDY3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5oCkBAIC0x MjAsMTggKzEyMCwxOCBAQCBwcml2YXRlOgogICAgIC8vIFRoZSBsYXN0IHNldCB3ZSB3b3JrZWQg b24uIEl0J3Mgbm90IHRvIGJlIHVzZWQgYXMgdGhlICJjdXJyZW50IHNldCIuIFRoZSBjb25jZXB0 IG9mIGEKICAgICAvLyAiY3VycmVudCBzZXQiIGlzIGRpZmZpY3VsdCwgc2luY2UgbGF5b3V0IG1h eSBqdW1wIGJhY2sgYW5kIGZvcnRoIGluIHRoZSB0cmVlLCBkdWUgdG8gd3JvbmcKICAgICAvLyB0 b3AgbG9jYXRpb24gZXN0aW1hdGVzIChkdWUgdG8gZS5nLiBtYXJnaW4gY29sbGFwc2luZyksIGFu ZCBwb3NzaWJseSBmb3Igb3RoZXIgcmVhc29ucy4KLSAgICBSZW5kZXJNdWx0aUNvbHVtblNldCog bV9sYXN0U2V0V29ya2VkT247CisgICAgUmVuZGVyTXVsdGlDb2x1bW5TZXQqIG1fbGFzdFNldFdv cmtlZE9uIHsgbnVsbHB0ciB9OwogCi0gICAgdW5zaWduZWQgbV9jb2x1bW5Db3VudDsgLy8gVGhl IGRlZmF1bHQgY29sdW1uIGNvdW50L3dpZHRoIHRoYXQgYXJlIGJhc2VkIG9mZiBvdXIgY29udGFp bmluZyBibG9jayB3aWR0aC4gVGhlc2UgdmFsdWVzIHJlcHJlc2VudCBvbmx5IHRoZSBkZWZhdWx0 LAotICAgIExheW91dFVuaXQgbV9jb2x1bW5XaWR0aDsgLy8gQSBtdWx0aS1jb2x1bW4gYmxvY2sg dGhhdCBpcyBzcGxpdCBhY3Jvc3MgdmFyaWFibGUgd2lkdGggcGFnZXMgb3IgZnJhZ21lbnRzIHdp bGwgaGF2ZSBkaWZmZXJlbnQgY29sdW1uIGNvdW50cyBhbmQgd2lkdGhzIGluIGVhY2guIFRoZXNl IHZhbHVlcyB3aWxsIGJlIGNhY2hlZCAoZXZlbnR1YWxseSkgZm9yIG11bHRpLWNvbHVtbiBibG9j a3MuCisgICAgdW5zaWduZWQgbV9jb2x1bW5Db3VudCB7IDEgfTsgLy8gVGhlIGRlZmF1bHQgY29s dW1uIGNvdW50L3dpZHRoIHRoYXQgYXJlIGJhc2VkIG9mZiBvdXIgY29udGFpbmluZyBibG9jayB3 aWR0aC4gVGhlc2UgdmFsdWVzIHJlcHJlc2VudCBvbmx5IHRoZSBkZWZhdWx0LAorICAgIExheW91 dFVuaXQgbV9jb2x1bW5XaWR0aCB7IDAgfTsgLy8gQSBtdWx0aS1jb2x1bW4gYmxvY2sgdGhhdCBp cyBzcGxpdCBhY3Jvc3MgdmFyaWFibGUgd2lkdGggcGFnZXMgb3IgZnJhZ21lbnRzIHdpbGwgaGF2 ZSBkaWZmZXJlbnQgY29sdW1uIGNvdW50cyBhbmQgd2lkdGhzIGluIGVhY2guIFRoZXNlIHZhbHVl cyB3aWxsIGJlIGNhY2hlZCAoZXZlbnR1YWxseSkgZm9yIG11bHRpLWNvbHVtbiBibG9ja3MuCiAK ICAgICBMYXlvdXRVbml0IG1fY29sdW1uSGVpZ2h0QXZhaWxhYmxlOyAvLyBUb3RhbCBoZWlnaHQg YXZhaWxhYmxlIHRvIGNvbHVtbnMsIG9yIDAgaWYgYXV0by4KLSAgICBib29sIG1faW5MYXlvdXQ7 IC8vIFNldCB3aGlsZSB3ZSdyZSBsYXlpbmcgb3V0IHRoZSBmbG93IHRocmVhZCwgZHVyaW5nIHdo aWNoIGNvbHVtIHNldCBoZWlnaHRzIGFyZSB1bmtub3duLgotICAgIGJvb2wgbV9pbkJhbGFuY2lu Z1Bhc3M7IC8vIEd1YXJkIHRvIGF2b2lkIHJlLWVudGVyaW5nIGNvbHVtbiBiYWxhbmNpbmcuCi0g ICAgYm9vbCBtX25lZWRzSGVpZ2h0c1JlY2FsY3VsYXRpb247CisgICAgYm9vbCBtX2luTGF5b3V0 IHsgZmFsc2UgfTsgLy8gU2V0IHdoaWxlIHdlJ3JlIGxheWluZyBvdXQgdGhlIGZsb3cgdGhyZWFk LCBkdXJpbmcgd2hpY2ggY29sdW0gc2V0IGhlaWdodHMgYXJlIHVua25vd24uCisgICAgYm9vbCBt X2luQmFsYW5jaW5nUGFzcyB7IGZhbHNlIH07IC8vIEd1YXJkIHRvIGF2b2lkIHJlLWVudGVyaW5n IGNvbHVtbiBiYWxhbmNpbmcuCisgICAgYm9vbCBtX25lZWRzSGVpZ2h0c1JlY2FsY3VsYXRpb24g eyBmYWxzZSB9OwogICAgIAotICAgIGJvb2wgbV9wcm9ncmVzc2lvbklzSW5saW5lOwotICAgIGJv b2wgbV9wcm9ncmVzc2lvbklzUmV2ZXJzZWQ7CisgICAgYm9vbCBtX3Byb2dyZXNzaW9uSXNJbmxp bmUgeyBmYWxzZSB9OworICAgIGJvb2wgbV9wcm9ncmVzc2lvbklzUmV2ZXJzZWQgeyBmYWxzZSB9 OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAKaW5kZXggZmZjYmEwNGFhMzQ1YzQ4NGE5 OWQ4M2M2NmJiNGJmNGJlMGEwZGY0MC4uOGVkN2UwNTA3NWFhZWU5ODRmNmU3NWZlNjk5NzEwY2E2 NzJhOGMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRp Q29sdW1uU2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlD b2x1bW5TZXQuY3BwCkBAIC00MiwxNSArNDIsOCBAQCBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lN UEwoUmVuZGVyTXVsdGlDb2x1bW5TZXQpOwogCiBSZW5kZXJNdWx0aUNvbHVtblNldDo6UmVuZGVy TXVsdGlDb2x1bW5TZXQoUmVuZGVyRnJhZ21lbnRlZEZsb3cmIGZyYWdtZW50ZWRGbG93LCBSZW5k ZXJTdHlsZSYmIHN0eWxlKQogICAgIDogUmVuZGVyRnJhZ21lbnRDb250YWluZXJTZXQoZnJhZ21l bnRlZEZsb3cuZG9jdW1lbnQoKSwgV1RGTW92ZShzdHlsZSksIGZyYWdtZW50ZWRGbG93KQotICAg ICwgbV9jb21wdXRlZENvbHVtbkNvdW50KDEpCi0gICAgLCBtX2NvbXB1dGVkQ29sdW1uV2lkdGgo MCkKLSAgICAsIG1fY29tcHV0ZWRDb2x1bW5IZWlnaHQoMCkKLSAgICAsIG1fYXZhaWxhYmxlQ29s dW1uSGVpZ2h0KDApCi0gICAgLCBtX2NvbHVtbkhlaWdodENvbXB1dGVkKGZhbHNlKQogICAgICwg bV9tYXhDb2x1bW5IZWlnaHQoUmVuZGVyRnJhZ21lbnRlZEZsb3c6Om1heExvZ2ljYWxIZWlnaHQo KSkKICAgICAsIG1fbWluU3BhY2VTaG9ydGFnZShSZW5kZXJGcmFnbWVudGVkRmxvdzo6bWF4TG9n aWNhbEhlaWdodCgpKQotICAgICwgbV9taW5pbXVtQ29sdW1uSGVpZ2h0KDApCi0gICAgLCBtX3Nw YWNlU2hvcnRhZ2VGb3JTaXplQ29udGFpbm1lbnQoMCkKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaAppbmRleCBjNDhhZTBhNGM3NTg2 NWE1M2ZhNTViZmJlZjcyZDFiYjkyMjczZDc3Li5mYWM1NDUyZTZjMjFlNDQzZGJmZjgzZjBhYTU4 ODRiODhjZmFiNzRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TXVsdGlDb2x1bW5TZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVs dGlDb2x1bW5TZXQuaApAQCAtMTM4LDYgKzEzOCw4IEBAIHB1YmxpYzoKICAgICBMYXlvdXRSZWN0 IGNvbHVtblJlY3RBdCh1bnNpZ25lZCBpbmRleCkgY29uc3Q7CiAgICAgdW5zaWduZWQgY29sdW1u Q291bnQoKSBjb25zdDsKIAorICAgIExheW91dFVuaXQgY29sdW1uR2FwKCkgY29uc3Q7CisKIHBy aXZhdGU6CiAgICAgdm9pZCBhZGRPdmVyZmxvd0Zyb21DaGlsZHJlbigpIG92ZXJyaWRlOwogICAg IApAQCAtMTY4LDcgKzE3MCw2IEBAIHByaXZhdGU6CiAgICAgY29uc3QgY2hhciogcmVuZGVyTmFt ZSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgTGF5b3V0VW5pdCBjYWxjdWxhdGVNYXhDb2x1bW5I ZWlnaHQoKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGNvbHVtbkdhcCgpIGNvbnN0OwogCiAgICAg TGF5b3V0VW5pdCBjb2x1bW5Mb2dpY2FsTGVmdCh1bnNpZ25lZCkgY29uc3Q7CiAgICAgTGF5b3V0 VW5pdCBjb2x1bW5Mb2dpY2FsVG9wKHVuc2lnbmVkKSBjb25zdDsKQEAgLTE5NywxMSArMTk4LDEx IEBAIHByaXZhdGU6CiAKICAgICBMYXlvdXRVbml0IGNhbGN1bGF0ZUJhbGFuY2VkSGVpZ2h0KGJv b2wgaW5pdGlhbCkgY29uc3Q7CiAKLSAgICB1bnNpZ25lZCBtX2NvbXB1dGVkQ29sdW1uQ291bnQ7 IC8vIFVzZWQgY29sdW1uIGNvdW50ICh0aGUgcmVzdWx0aW5nICdOJyBmcm9tIHRoZSBwc2V1ZG8t YWxnb3JpdGhtIGluIHRoZSBtdWx0aWNvbCBzcGVjKQorICAgIHVuc2lnbmVkIG1fY29tcHV0ZWRD b2x1bW5Db3VudCB7IDEgfTsgLy8gVXNlZCBjb2x1bW4gY291bnQgKHRoZSByZXN1bHRpbmcgJ04n IGZyb20gdGhlIHBzZXVkby1hbGdvcml0aG0gaW4gdGhlIG11bHRpY29sIHNwZWMpCiAgICAgTGF5 b3V0VW5pdCBtX2NvbXB1dGVkQ29sdW1uV2lkdGg7IC8vIFVzZWQgY29sdW1uIHdpZHRoICh0aGUg cmVzdWx0aW5nICdXJyBmcm9tIHRoZSBwc2V1ZG8tYWxnb3JpdGhtIGluIHRoZSBtdWx0aWNvbCBz cGVjKQogICAgIExheW91dFVuaXQgbV9jb21wdXRlZENvbHVtbkhlaWdodDsKICAgICBMYXlvdXRV bml0IG1fYXZhaWxhYmxlQ29sdW1uSGVpZ2h0OwotICAgIGJvb2wgbV9jb2x1bW5IZWlnaHRDb21w dXRlZDsKKyAgICBib29sIG1fY29sdW1uSGVpZ2h0Q29tcHV0ZWQgeyBmYWxzZSB9OwogCiAgICAg Ly8gVGhlIGZvbGxvd2luZyB2YXJpYWJsZXMgYXJlIHVzZWQgd2hlbiBiYWxhbmNpbmcgdGhlIGNv bHVtbiBzZXQuCiAgICAgTGF5b3V0VW5pdCBtX21heENvbHVtbkhlaWdodDsgLy8gTWF4aW11bSBj b2x1bW4gaGVpZ2h0IGFsbG93ZWQuCkBAIC0yMjAsNyArMjIxLDcgQEAgcHJpdmF0ZToKICAgICBw dWJsaWM6CiAgICAgICAgIENvbnRlbnRSdW4oTGF5b3V0VW5pdCBicmVha09mZnNldCkKICAgICAg ICAgICAgIDogbV9icmVha09mZnNldChicmVha09mZnNldCkKLSAgICAgICAgICAgICwgbV9hc3N1 bWVkSW1wbGljaXRCcmVha3MoMCkgeyB9CisgICAgICAgIHsgfQogCiAgICAgICAgIHVuc2lnbmVk IGFzc3VtZWRJbXBsaWNpdEJyZWFrcygpIGNvbnN0IHsgcmV0dXJuIG1fYXNzdW1lZEltcGxpY2l0 QnJlYWtzOyB9CiAgICAgICAgIHZvaWQgYXNzdW1lQW5vdGhlckltcGxpY2l0QnJlYWsoKSB7IG1f YXNzdW1lZEltcGxpY2l0QnJlYWtzKys7IH0KQEAgLTIzMiw3ICsyMzMsNyBAQCBwcml2YXRlOgog CiAgICAgcHJpdmF0ZToKICAgICAgICAgTGF5b3V0VW5pdCBtX2JyZWFrT2Zmc2V0OyAvLyBGbG93 IHRocmVhZCBvZmZzZXQgd2hlcmUgdGhpcyBydW4gZW5kcy4KLSAgICAgICAgdW5zaWduZWQgbV9h c3N1bWVkSW1wbGljaXRCcmVha3M7IC8vIE51bWJlciBvZiBpbXBsaWNpdCBicmVha3MgaW4gdGhp cyBydW4gYXNzdW1lZCBzbyBmYXIuCisgICAgICAgIHVuc2lnbmVkIG1fYXNzdW1lZEltcGxpY2l0 QnJlYWtzIHsgMCB9OyAvLyBOdW1iZXIgb2YgaW1wbGljaXQgYnJlYWtzIGluIHRoaXMgcnVuIGFz c3VtZWQgc28gZmFyLgogICAgIH07CiAgICAgVmVjdG9yPENvbnRlbnRSdW4sIDE+IG1fY29udGVu dFJ1bnM7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRl eCAwZGNmYmNmNjAxZDM3OGUyODZjODE4MmM0ZmRjODZhMDJkYTM5OTAwLi5lN2NiMzRjYjY4ZWJi ZTFlZmU1Njc0MmZhYWM5NmI1N2RmYmNkM2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcApAQCAtNTYsNiArNTYsNyBAQAogI2luY2x1ZGUgIlJlbmRlckxheWVy Q29tcG9zaXRvci5oIgogI2luY2x1ZGUgIlJlbmRlckxpbmVCcmVhay5oIgogI2luY2x1ZGUgIlJl bmRlck11bHRpQ29sdW1uRmxvdy5oIgorI2luY2x1ZGUgIlJlbmRlck11bHRpQ29sdW1uU2V0Lmgi CiAjaW5jbHVkZSAiUmVuZGVyUnVieS5oIgogI2luY2x1ZGUgIlJlbmRlclNWR0Jsb2NrLmgiCiAj aW5jbHVkZSAiUmVuZGVyU1ZHSW5saW5lLmgiCkBAIC0xMDY3LDkgKzEwNjgsNiBAQCBzdGF0aWMg Y29uc3QgUmVuZGVyRnJhZ21lbnRlZEZsb3cqIGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93RnJvbVJl bmRlcmVyKGNvbnN0IFJlbgogICAgIGlmIChyZW5kZXJlci0+ZnJhZ21lbnRlZEZsb3dTdGF0ZSgp ID09IFJlbmRlck9iamVjdDo6Tm90SW5zaWRlRnJhZ21lbnRlZEZsb3cpCiAgICAgICAgIHJldHVy biBudWxscHRyOwogCi0gICAgaWYgKGlzPFJlbmRlckZyYWdtZW50ZWRGbG93PigqcmVuZGVyZXIp KQotICAgICAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyRnJhZ21lbnRlZEZsb3c+KHJlbmRlcmVy KTsKLQogICAgIGlmIChpczxSZW5kZXJCbG9jaz4oKnJlbmRlcmVyKSkKICAgICAgICAgcmV0dXJu IGRvd25jYXN0PFJlbmRlckJsb2NrPigqcmVuZGVyZXIpLmNhY2hlZEVuY2xvc2luZ0ZyYWdtZW50 ZWRGbG93KCk7CiAKQEAgLTEwNzgsMjMgKzEwNzYsMzggQEAgc3RhdGljIGNvbnN0IFJlbmRlckZy YWdtZW50ZWRGbG93KiBlbmNsb3NpbmdGcmFnbWVudGVkRmxvd0Zyb21SZW5kZXJlcihjb25zdCBS ZW4KIAogdm9pZCBSZW5kZXJPYmplY3Q6Om91dHB1dFJlZ2lvbnNJbmZvcm1hdGlvbihUZXh0U3Ry ZWFtJiBzdHJlYW0pIGNvbnN0CiB7Ci0gICAgY29uc3QgUmVuZGVyRnJhZ21lbnRlZEZsb3cqIGZ0 Y2IgPSBlbmNsb3NpbmdGcmFnbWVudGVkRmxvd0Zyb21SZW5kZXJlcih0aGlzKTsKKyAgICBpZiAo aXM8UmVuZGVyRnJhZ21lbnRlZEZsb3c+KCp0aGlzKSkgeworICAgICAgICBjb25zdCBhdXRvJiBm cmFnbWVudGVkRmxvdyA9IGRvd25jYXN0PFJlbmRlckZyYWdtZW50ZWRGbG93PigqdGhpcyk7Cisg ICAgICAgIGF1dG8gZnJhZ21lbnRDb250YWluZXJzID0gZnJhZ21lbnRlZEZsb3cucmVuZGVyRnJh Z21lbnRDb250YWluZXJMaXN0KCk7CisKKyAgICAgICAgc3RyZWFtIDw8ICIgW2ZyYWdtZW50IGNv bnRhaW5lcnMgIjsKKyAgICAgICAgYm9vbCBmaXJzdCA9IHRydWU7CisgICAgICAgIGZvciAoY29u c3QgYXV0byogZnJhZ21lbnQgOiBmcmFnbWVudENvbnRhaW5lcnMpIHsKKyAgICAgICAgICAgIGlm ICghZmlyc3QpCisgICAgICAgICAgICAgICAgc3RyZWFtIDw8ICIsICI7CisgICAgICAgICAgICBm aXJzdCA9IGZhbHNlOworICAgICAgICAgICAgc3RyZWFtIDw8IGZyYWdtZW50OworICAgICAgICB9 CisgICAgICAgIHN0cmVhbSA8PCAiXSI7CisgICAgfQorCisgICAgY29uc3QgUmVuZGVyRnJhZ21l bnRlZEZsb3cqIGZyYWdtZW50ZWRGbG93ID0gZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3dGcm9tUmVu ZGVyZXIodGhpcyk7CiAKLSAgICBpZiAoIWZ0Y2IpIHsKKyAgICBpZiAoIWZyYWdtZW50ZWRGbG93 KSB7CiAgICAgICAgIC8vIE9ubHkgdGhlIGJveGVzIGhhdmUgcmVnaW9uIHJhbmdlIGluZm9ybWF0 aW9uLgogICAgICAgICAvLyBUcnkgdG8gZ2V0IHRoZSBmbG93IHRocmVhZCBjb250YWluaW5nIGJs b2NrIGluZm9ybWF0aW9uCiAgICAgICAgIC8vIGZyb20gdGhlIGNvbnRhaW5pbmcgYmxvY2sgb2Yg dGhpcyBib3guCiAgICAgICAgIGlmIChpczxSZW5kZXJCb3g+KCp0aGlzKSkKLSAgICAgICAgICAg IGZ0Y2IgPSBlbmNsb3NpbmdGcmFnbWVudGVkRmxvd0Zyb21SZW5kZXJlcihjb250YWluaW5nQmxv Y2soKSk7CisgICAgICAgICAgICBmcmFnbWVudGVkRmxvdyA9IGVuY2xvc2luZ0ZyYWdtZW50ZWRG bG93RnJvbVJlbmRlcmVyKGNvbnRhaW5pbmdCbG9jaygpKTsKICAgICB9CiAKLSAgICBpZiAoIWZ0 Y2IpCisgICAgaWYgKCFmcmFnbWVudGVkRmxvdyB8fCAhaXM8UmVuZGVyQm94PigqdGhpcykpCiAg ICAgICAgIHJldHVybjsKIAotICAgIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBzdGFydFJlZ2lv biA9IG51bGxwdHI7Ci0gICAgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGVuZFJlZ2lvbiA9IG51 bGxwdHI7Ci0gICAgZnRjYi0+Z2V0RnJhZ21lbnRSYW5nZUZvckJveChkb3duY2FzdDxSZW5kZXJC b3g+KHRoaXMpLCBzdGFydFJlZ2lvbiwgZW5kUmVnaW9uKTsKLSAgICBzdHJlYW0gPDwgIiBbUnM6 IiA8PCBzdGFydFJlZ2lvbiA8PCAiIFJlOiIgPDwgZW5kUmVnaW9uIDw8ICJdIjsKKyAgICBSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogc3RhcnRDb250YWluZXIgPSBudWxscHRyOworICAgIFJlbmRl ckZyYWdtZW50Q29udGFpbmVyKiBlbmRDb250YWluZXIgPSBudWxscHRyOworICAgIGZyYWdtZW50 ZWRGbG93LT5nZXRGcmFnbWVudFJhbmdlRm9yQm94KGRvd25jYXN0PFJlbmRlckJveD4odGhpcyks IHN0YXJ0Q29udGFpbmVyLCBlbmRDb250YWluZXIpOworICAgIHN0cmVhbSA8PCAiIFtzcGFucyBm cmFnbWVudCBjb250YWluZXJzIGluIGZsb3cgIiA8PCBmcmFnbWVudGVkRmxvdyA8PCAiIGZyb20g IiA8PCBzdGFydENvbnRhaW5lciA8PCAiIHRvICIgPDwgZW5kQ29udGFpbmVyIDw8ICJdIjsKIH0K IAogdm9pZCBSZW5kZXJPYmplY3Q6Om91dHB1dFJlbmRlck9iamVjdChUZXh0U3RyZWFtJiBzdHJl YW0sIGJvb2wgbWFyaywgaW50IGRlcHRoKSBjb25zdApAQCAtMTIzNCw3ICsxMjQ3LDEzIEBAIHZv aWQgUmVuZGVyT2JqZWN0OjpvdXRwdXRSZW5kZXJPYmplY3QoVGV4dFN0cmVhbSYgc3RyZWFtLCBi b29sIG1hcmssIGludCBkZXB0aCkKICAgICAgICAgfQogICAgIH0KIAorICAgIGlmIChpczxSZW5k ZXJNdWx0aUNvbHVtblNldD4oKnRoaXMpKSB7CisgICAgICAgIGNvbnN0IGF1dG8mIG11bHRpY29s U2V0ID0gZG93bmNhc3Q8UmVuZGVyTXVsdGlDb2x1bW5TZXQ+KCp0aGlzKTsKKyAgICAgICAgc3Ry ZWFtIDw8ICIgKGNvbHVtbiBjb3VudCAiIDw8IG11bHRpY29sU2V0LmNvbXB1dGVkQ29sdW1uQ291 bnQoKSA8PCAiLCBzaXplICIgPDwgbXVsdGljb2xTZXQuY29tcHV0ZWRDb2x1bW5XaWR0aCgpIDw8 ICJ4IiA8PCBtdWx0aWNvbFNldC5jb21wdXRlZENvbHVtbkhlaWdodCgpIDw8ICIsIGdhcCAiIDw8 IG11bHRpY29sU2V0LmNvbHVtbkdhcCgpIDw8ICIpIjsKKyAgICB9CisKICAgICBvdXRwdXRSZWdp b25zSW5mb3JtYXRpb24oc3RyZWFtKTsKKwogICAgIGlmIChuZWVkc0xheW91dCgpKSB7CiAgICAg ICAgIHN0cmVhbSA8PCAiIGxheW91dC0+IjsKICAgICAgICAgaWYgKHNlbGZOZWVkc0xheW91dCgp KQo=