233099 2021-11-14 09:42:40 -0800 Modal dialogs should make the root element unfocusable 2021-11-14 10:48:21 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 84635 1 ntim ntim cdumez clopez esprehn+autocc ews-watchlist kangil.han simon.fraser webkit-bug-importer youennf oldest_to_newest 1814858 0 ntim 2021-11-14 09:42:40 -0800 From https://html.spec.whatwg.org/multipage/interaction.html#inert, > A Document document is blocked by a modal dialog subject if subject is > the topmost dialog element in document's top layer. While document is > so blocked, every node that is connected to document, with the > exception of the subject element and its shadow-including descendants, > must be marked inert. RenderStyle::effectiveInert() already matches this definition, Node::deprecatedIsInert() does not. Main reason for the removed check was to prevent the whole document from being inert to hit-testing, but with the RenderStyle approach, we instead override effectiveInert to false for the modal dialog. Removing this check for focus is absolutely fine however, since focusability isn't inherited. Tests added by this Chromium WPT: https://github.com/web-platform-tests/wpt/commit/0457111e7109ec3d9e575aa421b96d8c36ce2ae8 1814859 1 444178 ntim 2021-11-14 09:57:01 -0800 Created attachment 444178 Patch 1814860 2 ews-watchlist 2021-11-14 09:57:56 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1814861 3 444179 ntim 2021-11-14 09:58:26 -0800 Created attachment 444179 Patch 1814870 4 ews-feeder 2021-11-14 10:47:39 -0800 Committed r285791 (244235@main): <https://commits.webkit.org/244235@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444179. 1814871 5 webkit-bug-importer 2021-11-14 10:48:21 -0800 <rdar://problem/85391533> 444178 2021-11-14 09:57:01 -0800 2021-11-14 09:58:22 -0800 Patch bug-233099-20211114185659.patch text/plain 8673 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1Nzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWUzOWFmZjM3NDQ4ODM4 OTBmMDUxMDhiMTEwNWUyZjJmYTk1NWQzNi4uNWY5OWE4NjQ3NjBlYTUzY2YxOTVlMzViZWFiMGMy MWYwMzU5N2M3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTExLTE0ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kYWwgZGlhbG9ncyBzaG91bGQg bWFrZSB0aGUgcm9vdCBlbGVtZW50IHVuZm9jdXNhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMwOTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcm9tIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5v cmcvbXVsdGlwYWdlL2ludGVyYWN0aW9uLmh0bWwjaW5lcnQsCisKKyAgICAgICAgPiBBIERvY3Vt ZW50IGRvY3VtZW50IGlzIGJsb2NrZWQgYnkgYSBtb2RhbCBkaWFsb2cgc3ViamVjdCBpZiBzdWJq ZWN0IGlzCisgICAgICAgID4gdGhlIHRvcG1vc3QgZGlhbG9nIGVsZW1lbnQgaW4gZG9jdW1lbnQn cyB0b3AgbGF5ZXIuIFdoaWxlIGRvY3VtZW50IGlzCisgICAgICAgID4gc28gYmxvY2tlZCwgZXZl cnkgbm9kZSB0aGF0IGlzIGNvbm5lY3RlZCB0byBkb2N1bWVudCwgd2l0aCB0aGUKKyAgICAgICAg PiBleGNlcHRpb24gb2YgdGhlIHN1YmplY3QgZWxlbWVudCBhbmQgaXRzIHNoYWRvdy1pbmNsdWRp bmcgZGVzY2VuZGFudHMsCisgICAgICAgID4gbXVzdCBiZSBtYXJrZWQgaW5lcnQuCisKKyAgICAg ICAgUmVuZGVyU3R5bGU6OmVmZmVjdGl2ZUluZXJ0KCkgYWxyZWFkeSBtYXRjaGVzIHRoaXMgZGVm aW5pdGlvbiwgTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQoKSBkb2VzIG5vdC4KKworICAgICAgICBN YWluIHJlYXNvbiB0aGUgcmVtb3ZlZCBjaGVjayB3YXMgdGhlcmUgaXMgdG8gcHJldmVudCB0aGUg d2hvbGUgZG9jdW1lbnQgZnJvbSBiZWluZyBpbmVydCB0byBoaXQtdGVzdGluZywgYnV0IHdpdGgg dGhlIFJlbmRlclN0eWxlCisgICAgICAgIGFwcHJvYWNoLCB3ZSBpbnN0ZWFkIG92ZXJyaWRlIGVm ZmVjdGl2ZUluZXJ0IHRvIGZhbHNlIGZvciB0aGUgbW9kYWwgZGlhbG9nLiBSZW1vdmluZyB0aGlz IGNoZWNrIGZvciBmb2N1cyBpcyBhYnNvbHV0ZWx5IGZpbmUKKyAgICAgICAgaG93ZXZlciwgc2lu Y2UgZm9jdXNhYmlsaXR5IGlzbid0IGluaGVyaXRlZCAoTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQg aXMgb25seSB1c2VkIGZvciBmb2N1cykuCisKKyAgICAgICAgVGVzdHMgYWRkZWQgYnkgdGhpcyBD aHJvbWl1bSBXUFQ6IGh0dHBzOi8vZ2l0aHViLmNvbS93ZWItcGxhdGZvcm0tdGVzdHMvd3B0L2Nv bW1pdC8wNDU3MTExZTcxMDllYzNkOWU1NzVhYTQyMWI5NmQ4YzM2Y2UyYWU4CisKKyAgICAgICAg KiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpkZXByZWNhdGVkSXNJbmVy dCBjb25zdCk6CisKIDIwMjEtMTEtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CiAKICAgICAgICAgUnVuIGEgU2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0gZm9yIHRoZSBt b21lbnR1bSBwaGFzZSBvZiBhIHNjcm9sbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDJiMTUxNjdhNjRm NzQ0Y2QxZGU2MzFkYjRlODNmZDFkMTgzMDA2YzAuLjhkZjk2MDcxYzZiMjY4ZjliYjNmYzdlNTRj YTVmODJiNTc1NWVmMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTI2MjgsNyArMjYyOCw3IEBAIGJv b2wgTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQoKSBjb25zdAogICAgIGlmICghaXNDb25uZWN0ZWQo KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAodGhpcyAhPSAmZG9jdW1lbnQoKSAm JiB0aGlzICE9IGRvY3VtZW50KCkuZG9jdW1lbnRFbGVtZW50KCkpIHsKKyAgICBpZiAodGhpcyAh PSAmZG9jdW1lbnQoKSkgewogICAgICAgICBOb2RlKiBhY3RpdmVNb2RhbERpYWxvZyA9IGRvY3Vt ZW50KCkuYWN0aXZlTW9kYWxEaWFsb2coKTsKICAgICAgICAgaWYgKGFjdGl2ZU1vZGFsRGlhbG9n ICYmICFhY3RpdmVNb2RhbERpYWxvZy0+Y29udGFpbnNJbmNsdWRpbmdTaGFkb3dET00odGhpcykp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmlu ZGV4IGIxZGQxZDViMjRlNGU1ODU2ZWE5YTRmNjY2MzdlYzFjYTU2YTMzM2EuLjgyZDA2OTQ3ZGMw YjdkMTgzNjZhY2UzMmRmMmJiZDcxYjc2MGY5ZWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTExLTE0ICBUaW0gTmd1eWVuICA8bnRpbUBhcHBs ZS5jb20+CisKKyAgICAgICAgTW9kYWwgZGlhbG9ncyBzaG91bGQgbWFrZSB0aGUgcm9vdCBlbGVt ZW50IHVuZm9jdXNhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzMwOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBGcm9tIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2ludGVy YWN0aW9uLmh0bWwjaW5lcnQsCisKKyAgICAgICAgPiBBIERvY3VtZW50IGRvY3VtZW50IGlzIGJs b2NrZWQgYnkgYSBtb2RhbCBkaWFsb2cgc3ViamVjdCBpZiBzdWJqZWN0IGlzCisgICAgICAgID4g dGhlIHRvcG1vc3QgZGlhbG9nIGVsZW1lbnQgaW4gZG9jdW1lbnQncyB0b3AgbGF5ZXIuIFdoaWxl IGRvY3VtZW50IGlzCisgICAgICAgID4gc28gYmxvY2tlZCwgZXZlcnkgbm9kZSB0aGF0IGlzIGNv bm5lY3RlZCB0byBkb2N1bWVudCwgd2l0aCB0aGUKKyAgICAgICAgPiBleGNlcHRpb24gb2YgdGhl IHN1YmplY3QgZWxlbWVudCBhbmQgaXRzIHNoYWRvdy1pbmNsdWRpbmcgZGVzY2VuZGFudHMsCisg ICAgICAgID4gbXVzdCBiZSBtYXJrZWQgaW5lcnQuCisKKyAgICAgICAgUmVuZGVyU3R5bGU6OmVm ZmVjdGl2ZUluZXJ0KCkgYWxyZWFkeSBtYXRjaGVzIHRoaXMgZGVmaW5pdGlvbiwgTm9kZTo6ZGVw cmVjYXRlZElzSW5lcnQoKSBkb2VzIG5vdC4KKworICAgICAgICBNYWluIHJlYXNvbiB0aGUgcmVt b3ZlZCBjaGVjayB3YXMgdGhlcmUgaXMgdG8gcHJldmVudCB0aGUgd2hvbGUgZG9jdW1lbnQgZnJv bSBiZWluZyBpbmVydCB0byBoaXQtdGVzdGluZywgYnV0IHdpdGggdGhlIFJlbmRlclN0eWxlCisg ICAgICAgIGFwcHJvYWNoLCB3ZSBpbnN0ZWFkIG92ZXJyaWRlIGVmZmVjdGl2ZUluZXJ0IHRvIGZh bHNlIGZvciB0aGUgbW9kYWwgZGlhbG9nLiBSZW1vdmluZyB0aGlzIGNoZWNrIGZvciBmb2N1cyBp cyBhYnNvbHV0ZWx5IGZpbmUKKyAgICAgICAgaG93ZXZlciwgc2luY2UgZm9jdXNhYmlsaXR5IGlz bid0IGluaGVyaXRlZCAoTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQgaXMgb25seSB1c2VkIGZvciBm b2N1cykuCisKKyAgICAgICAgVGVzdHMgYWRkZWQgYnkgdGhpcyBDaHJvbWl1bSBXUFQ6IGh0dHBz Oi8vZ2l0aHViLmNvbS93ZWItcGxhdGZvcm0tdGVzdHMvd3B0L2NvbW1pdC8wNDU3MTExZTcxMDll YzNkOWU1NzVhYTQyMWI5NmQ4YzM2Y2UyYWU4CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz dHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50 L2luZXJ0LW5vZGUtaXMtdW5mb2N1c2FibGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1w bGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlh bG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy11bmZvY3VzYWJsZS5odG1sOgorCiAyMDIxLTExLTEy ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJldmVydGluZyByMjg1NTgzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50 cy90aGUtZGlhbG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy11bmZvY3VzYWJsZS1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2Vt YW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9pbmVydC1ub2Rl LWlzLXVuZm9jdXNhYmxlLWV4cGVjdGVkLnR4dAppbmRleCBmZTJjNDIyMjBiYmM0M2YyNTEzNzUz M2I0M2I4MmNjMTJkNDgzMDk2Li42MTFlY2FjYmM1ZTQzYzgyZTNjZTJmZTk2NzQyMmM5OTI5Zjli NjBiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVu dC9pbmVydC1ub2RlLWlzLXVuZm9jdXNhYmxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0 aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9pbmVydC1ub2RlLWlzLXVuZm9jdXNhYmxl LWV4cGVjdGVkLnR4dApAQCAtMSw4ICsxLDIyIEBACi1JIGdldCBmb2N1c0kgZG9uJ3QgZ2V0IGZv Y3VzLgogCiBJJ20gZWRpdGFibGUKIEknbSB0YWJpbmRleGVkLgogIExpbmsKIAotUEFTUyBUZXN0 IHRoYXQgaW5lcnQgbm9kZXMgYXJlIG5vdCBmb2N1c2FibGUuCitGQUlMICNodG1sIGlzIG5vdCAg Zm9jdXNhYmxlIGFzc2VydF9ub3RfZXF1YWxzOiBnb3QgZGlzYWxsb3dlZCB2YWx1ZSBFbGVtZW50 IG5vZGUgPGh0bWwgaWQ9Imh0bWwiIHRhYmluZGV4PSIxIj48aGVhZD4KKzxsaW5rIHJlbD0iaGVs cCIgaHJlZi4uLgorUEFTUyAjYm9keSBpcyBub3QgIGZvY3VzYWJsZQorUEFTUyAjdG9wLWRpYWxv ZyBpcyAgZm9jdXNhYmxlCitQQVNTICN0b3AtZGlhbG9nLWJ1dHRvbiBpcyAgZm9jdXNhYmxlCitQ QVNTICNib3R0b20tZGlhbG9nIGlzIG5vdCAgZm9jdXNhYmxlCitQQVNTICNib3R0b20tZGlhbG9n LWJ1dHRvbiBpcyBub3QgIGZvY3VzYWJsZQorUEFTUyAjY29udGFpbmVyIGlzIG5vdCAgZm9jdXNh YmxlCitQQVNTICN0ZXh0IGlzIG5vdCAgZm9jdXNhYmxlCitQQVNTICNkYXRldGltZSBpcyBub3Qg IGZvY3VzYWJsZQorUEFTUyAjY29sb3IgaXMgbm90ICBmb2N1c2FibGUKK1BBU1MgI3NlbGVjdCBp cyBub3QgIGZvY3VzYWJsZQorUEFTUyAjb3B0Z3JvdXAgaXMgbm90ICBmb2N1c2FibGUKK1BBU1Mg I29wdGlvbiBpcyBub3QgIGZvY3VzYWJsZQorUEFTUyAjY29udGVudGVkaXRhYmxlLWRpdiBpcyBu b3QgIGZvY3VzYWJsZQorUEFTUyAjdGFiaW5kZXgtc3BhbiBpcyBub3QgIGZvY3VzYWJsZQogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0 bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9pbmVy dC1ub2RlLWlzLXVuZm9jdXNhYmxlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1k aWFsb2ctZWxlbWVudC9pbmVydC1ub2RlLWlzLXVuZm9jdXNhYmxlLmh0bWwKaW5kZXggNDlkNjY5 MGQ2NzM2ZmMxOTRiMTMwYjdiNmRiMmM3YzI4ZWRiNTMyYi4uNTZmMzFmMzU5MjQ5NzRmMzFiM2Nh ZTk4MjU4NDZlYzAxZTFhMDE3MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90 aGUtZGlhbG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy11bmZvY3VzYWJsZS5odG1sCisrKyBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3Mv aW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L2luZXJ0LW5vZGUtaXMtdW5m b2N1c2FibGUuaHRtbApAQCAtMSw2ICsxLDggQEAKIDwhRE9DVFlQRSBodG1sPgotPGh0bWw+Cis8 aHRtbCBpZD0iaHRtbCIgdGFiaW5kZXg9IjEiPgogPGhlYWQ+Cis8bGluayByZWw9ImhlbHAiIGhy ZWY9Imh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2ludGVyYWN0aW9uLmh0 bWwjYmxvY2tlZC1ieS1hLW1vZGFsLWRpYWxvZyI+Cis8bWV0YSBuYW1lPSJhc3NlcnQiIGNvbnRl bnQ9IkNoZWNrcyB0aGF0LCB3aGVuIG9wZW5pbmcgbW9kYWwgZGlhbG9ncywgaW5lcnQgbm9kZXMg YXJlIG5vdCBmb2N1c2FibGUuIj4KIDxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNz LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0 LmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KQEAgLTI2LDExICsyOCwxNyBAQAogLy8gVGhlIHRlc3Qg cGFzc3NlcyBpZiBvbmx5IHRoZSB0b3Btb3N0IGRpYWxvZyBhbmQgaXRzIGJ1dHRvbiBhcmUgZm9j dXNhYmxlLgogCiBmdW5jdGlvbiB0ZXN0Rm9jdXMoZWxlbWVudCwgZXhwZWN0Rm9jdXMpIHsKLSAg ICB2YXIgZm9jdXNlZEVsZW1lbnQgPSBudWxsOwotICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cignZm9jdXMnLCBmdW5jdGlvbigpIHsgZm9jdXNlZEVsZW1lbnQgPSBlbGVtZW50OyB9LCBmYWxz ZSk7Ci0gICAgZWxlbWVudC5mb2N1cygpOwotICAgIHZhciB0aGVFbGVtZW50ID0gZWxlbWVudDsK LSAgICBhc3NlcnRfZXF1YWxzKGZvY3VzZWRFbGVtZW50ID09PSB0aGVFbGVtZW50LCBleHBlY3RG b2N1cywgZWxlbWVudC5pZCk7CisgICAgdGVzdChmdW5jdGlvbigpIHsKKyAgICAgICAgdmFyIGZv Y3VzZWRFbGVtZW50ID0gbnVsbDsKKyAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCdm b2N1cycsIGZ1bmN0aW9uKCkgeyBmb2N1c2VkRWxlbWVudCA9IGVsZW1lbnQ7IH0sIGZhbHNlKTsK KyAgICAgICAgZWxlbWVudC5mb2N1cygpOworICAgICAgICB2YXIgdGhlRWxlbWVudCA9IGVsZW1l bnQ7CisgICAgICAgIGlmIChleHBlY3RGb2N1cykgeworICAgICAgICAgICAgYXNzZXJ0X2VxdWFs cyhmb2N1c2VkRWxlbWVudCwgdGhlRWxlbWVudCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICBhc3NlcnRfbm90X2VxdWFscyhmb2N1c2VkRWxlbWVudCwgdGhlRWxlbWVudCk7CisgICAg ICAgIH0KKyAgICB9LCBgIyR7Q1NTLmVzY2FwZShlbGVtZW50LmlkKX0gaXMgJHtleHBlY3RGb2N1 cyA/ICIiIDogIm5vdCAifSBmb2N1c2FibGVgKTsKIH0KIAogZnVuY3Rpb24gdGVzdFRyZWUoZWxl bWVudCwgZXhwZWN0Rm9jdXMpIHsKQEAgLTQxLDE4ICs0OSwyMiBAQCBmdW5jdGlvbiB0ZXN0VHJl ZShlbGVtZW50LCBleHBlY3RGb2N1cykgewogICAgICAgICB0ZXN0VHJlZShjaGlsZE5vZGVzW2ld LCBleHBlY3RGb2N1cyk7CiB9CiAKLXRlc3QoZnVuY3Rpb24oKSB7Ci0gICAgdmFyIGJvdHRvbURp YWxvZyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdib3R0b20tZGlhbG9nJyk7Cit2YXIgYm90 dG9tRGlhbG9nID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2JvdHRvbS1kaWFsb2cnKTsKK3Zh ciB0b3BEaWFsb2cgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndG9wLWRpYWxvZycpOworc2V0 dXAoZnVuY3Rpb24oKSB7CiAgICAgYm90dG9tRGlhbG9nLnNob3dNb2RhbCgpOwotCi0gICAgdmFy IHRvcERpYWxvZyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0b3AtZGlhbG9nJyk7CiAgICAg dG9wRGlhbG9nLnNob3dNb2RhbCgpOworICAgIGFkZF9jb21wbGV0aW9uX2NhbGxiYWNrKGZ1bmN0 aW9uKCkgeworICAgICAgICB0b3BEaWFsb2cuY2xvc2UoKTsKKyAgICAgICAgYm90dG9tRGlhbG9n LmNsb3NlKCk7CisgICAgfSk7Cit9KTsKIAotICAgIHRlc3RGb2N1cyhkb2N1bWVudC5ib2R5LCBm YWxzZSk7Ci0gICAgdGVzdFRyZWUodG9wRGlhbG9nLCB0cnVlKTsKLSAgICB0ZXN0VHJlZShib3R0 b21EaWFsb2csIGZhbHNlKTsKLSAgICB0ZXN0VHJlZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn Y29udGFpbmVyJyksIGZhbHNlKTsKLX0sICJUZXN0IHRoYXQgaW5lcnQgbm9kZXMgYXJlIG5vdCBm b2N1c2FibGUuIik7Cit0ZXN0Rm9jdXMoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LCBmYWxzZSk7 Cit0ZXN0Rm9jdXMoZG9jdW1lbnQuYm9keSwgZmFsc2UpOwordGVzdFRyZWUodG9wRGlhbG9nLCB0 cnVlKTsKK3Rlc3RUcmVlKGJvdHRvbURpYWxvZywgZmFsc2UpOwordGVzdFRyZWUoZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpLCBmYWxzZSk7CiA8L3NjcmlwdD4KIDwvYm9keT4K IDwvaHRtbD4K 444179 2021-11-14 09:58:26 -0800 2021-11-14 10:47:41 -0800 Patch bug-233099-20211114185825.patch text/plain 8558 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1Nzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWUzOWFmZjM3NDQ4ODM4 OTBmMDUxMDhiMTEwNWUyZjJmYTk1NWQzNi4uNWY5OWE4NjQ3NjBlYTUzY2YxOTVlMzViZWFiMGMy MWYwMzU5N2M3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTExLTE0ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kYWwgZGlhbG9ncyBzaG91bGQg bWFrZSB0aGUgcm9vdCBlbGVtZW50IHVuZm9jdXNhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMwOTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcm9tIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5v cmcvbXVsdGlwYWdlL2ludGVyYWN0aW9uLmh0bWwjaW5lcnQsCisKKyAgICAgICAgPiBBIERvY3Vt ZW50IGRvY3VtZW50IGlzIGJsb2NrZWQgYnkgYSBtb2RhbCBkaWFsb2cgc3ViamVjdCBpZiBzdWJq ZWN0IGlzCisgICAgICAgID4gdGhlIHRvcG1vc3QgZGlhbG9nIGVsZW1lbnQgaW4gZG9jdW1lbnQn cyB0b3AgbGF5ZXIuIFdoaWxlIGRvY3VtZW50IGlzCisgICAgICAgID4gc28gYmxvY2tlZCwgZXZl cnkgbm9kZSB0aGF0IGlzIGNvbm5lY3RlZCB0byBkb2N1bWVudCwgd2l0aCB0aGUKKyAgICAgICAg PiBleGNlcHRpb24gb2YgdGhlIHN1YmplY3QgZWxlbWVudCBhbmQgaXRzIHNoYWRvdy1pbmNsdWRp bmcgZGVzY2VuZGFudHMsCisgICAgICAgID4gbXVzdCBiZSBtYXJrZWQgaW5lcnQuCisKKyAgICAg ICAgUmVuZGVyU3R5bGU6OmVmZmVjdGl2ZUluZXJ0KCkgYWxyZWFkeSBtYXRjaGVzIHRoaXMgZGVm aW5pdGlvbiwgTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQoKSBkb2VzIG5vdC4KKworICAgICAgICBN YWluIHJlYXNvbiB0aGUgcmVtb3ZlZCBjaGVjayB3YXMgdGhlcmUgaXMgdG8gcHJldmVudCB0aGUg d2hvbGUgZG9jdW1lbnQgZnJvbSBiZWluZyBpbmVydCB0byBoaXQtdGVzdGluZywgYnV0IHdpdGgg dGhlIFJlbmRlclN0eWxlCisgICAgICAgIGFwcHJvYWNoLCB3ZSBpbnN0ZWFkIG92ZXJyaWRlIGVm ZmVjdGl2ZUluZXJ0IHRvIGZhbHNlIGZvciB0aGUgbW9kYWwgZGlhbG9nLiBSZW1vdmluZyB0aGlz IGNoZWNrIGZvciBmb2N1cyBpcyBhYnNvbHV0ZWx5IGZpbmUKKyAgICAgICAgaG93ZXZlciwgc2lu Y2UgZm9jdXNhYmlsaXR5IGlzbid0IGluaGVyaXRlZCAoTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQg aXMgb25seSB1c2VkIGZvciBmb2N1cykuCisKKyAgICAgICAgVGVzdHMgYWRkZWQgYnkgdGhpcyBD aHJvbWl1bSBXUFQ6IGh0dHBzOi8vZ2l0aHViLmNvbS93ZWItcGxhdGZvcm0tdGVzdHMvd3B0L2Nv bW1pdC8wNDU3MTExZTcxMDllYzNkOWU1NzVhYTQyMWI5NmQ4YzM2Y2UyYWU4CisKKyAgICAgICAg KiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpkZXByZWNhdGVkSXNJbmVy dCBjb25zdCk6CisKIDIwMjEtMTEtMTMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CiAKICAgICAgICAgUnVuIGEgU2Nyb2xsQW5pbWF0aW9uTW9tZW50dW0gZm9yIHRoZSBt b21lbnR1bSBwaGFzZSBvZiBhIHNjcm9sbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDJiMTUxNjdhNjRm NzQ0Y2QxZGU2MzFkYjRlODNmZDFkMTgzMDA2YzAuLjhkZjk2MDcxYzZiMjY4ZjliYjNmYzdlNTRj YTVmODJiNTc1NWVmMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTI2MjgsNyArMjYyOCw3IEBAIGJv b2wgTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQoKSBjb25zdAogICAgIGlmICghaXNDb25uZWN0ZWQo KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAodGhpcyAhPSAmZG9jdW1lbnQoKSAm JiB0aGlzICE9IGRvY3VtZW50KCkuZG9jdW1lbnRFbGVtZW50KCkpIHsKKyAgICBpZiAodGhpcyAh PSAmZG9jdW1lbnQoKSkgewogICAgICAgICBOb2RlKiBhY3RpdmVNb2RhbERpYWxvZyA9IGRvY3Vt ZW50KCkuYWN0aXZlTW9kYWxEaWFsb2coKTsKICAgICAgICAgaWYgKGFjdGl2ZU1vZGFsRGlhbG9n ICYmICFhY3RpdmVNb2RhbERpYWxvZy0+Y29udGFpbnNJbmNsdWRpbmdTaGFkb3dET00odGhpcykp CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmlu ZGV4IGIxZGQxZDViMjRlNGU1ODU2ZWE5YTRmNjY2MzdlYzFjYTU2YTMzM2EuLjgyZDA2OTQ3ZGMw YjdkMTgzNjZhY2UzMmRmMmJiZDcxYjc2MGY5ZWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTExLTE0ICBUaW0gTmd1eWVuICA8bnRpbUBhcHBs ZS5jb20+CisKKyAgICAgICAgTW9kYWwgZGlhbG9ncyBzaG91bGQgbWFrZSB0aGUgcm9vdCBlbGVt ZW50IHVuZm9jdXNhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzMwOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBGcm9tIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVsdGlwYWdlL2ludGVy YWN0aW9uLmh0bWwjaW5lcnQsCisKKyAgICAgICAgPiBBIERvY3VtZW50IGRvY3VtZW50IGlzIGJs b2NrZWQgYnkgYSBtb2RhbCBkaWFsb2cgc3ViamVjdCBpZiBzdWJqZWN0IGlzCisgICAgICAgID4g dGhlIHRvcG1vc3QgZGlhbG9nIGVsZW1lbnQgaW4gZG9jdW1lbnQncyB0b3AgbGF5ZXIuIFdoaWxl IGRvY3VtZW50IGlzCisgICAgICAgID4gc28gYmxvY2tlZCwgZXZlcnkgbm9kZSB0aGF0IGlzIGNv bm5lY3RlZCB0byBkb2N1bWVudCwgd2l0aCB0aGUKKyAgICAgICAgPiBleGNlcHRpb24gb2YgdGhl IHN1YmplY3QgZWxlbWVudCBhbmQgaXRzIHNoYWRvdy1pbmNsdWRpbmcgZGVzY2VuZGFudHMsCisg ICAgICAgID4gbXVzdCBiZSBtYXJrZWQgaW5lcnQuCisKKyAgICAgICAgUmVuZGVyU3R5bGU6OmVm ZmVjdGl2ZUluZXJ0KCkgYWxyZWFkeSBtYXRjaGVzIHRoaXMgZGVmaW5pdGlvbiwgTm9kZTo6ZGVw cmVjYXRlZElzSW5lcnQoKSBkb2VzIG5vdC4KKworICAgICAgICBNYWluIHJlYXNvbiB0aGUgcmVt b3ZlZCBjaGVjayB3YXMgdGhlcmUgaXMgdG8gcHJldmVudCB0aGUgd2hvbGUgZG9jdW1lbnQgZnJv bSBiZWluZyBpbmVydCB0byBoaXQtdGVzdGluZywgYnV0IHdpdGggdGhlIFJlbmRlclN0eWxlCisg ICAgICAgIGFwcHJvYWNoLCB3ZSBpbnN0ZWFkIG92ZXJyaWRlIGVmZmVjdGl2ZUluZXJ0IHRvIGZh bHNlIGZvciB0aGUgbW9kYWwgZGlhbG9nLiBSZW1vdmluZyB0aGlzIGNoZWNrIGZvciBmb2N1cyBp cyBhYnNvbHV0ZWx5IGZpbmUKKyAgICAgICAgaG93ZXZlciwgc2luY2UgZm9jdXNhYmlsaXR5IGlz bid0IGluaGVyaXRlZCAoTm9kZTo6ZGVwcmVjYXRlZElzSW5lcnQgaXMgb25seSB1c2VkIGZvciBm b2N1cykuCisKKyAgICAgICAgVGVzdHMgYWRkZWQgYnkgdGhpcyBDaHJvbWl1bSBXUFQ6IGh0dHBz Oi8vZ2l0aHViLmNvbS93ZWItcGxhdGZvcm0tdGVzdHMvd3B0L2NvbW1pdC8wNDU3MTExZTcxMDll YzNkOWU1NzVhYTQyMWI5NmQ4YzM2Y2UyYWU4CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz dHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50 L2luZXJ0LW5vZGUtaXMtdW5mb2N1c2FibGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1w bGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlh bG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy11bmZvY3VzYWJsZS5odG1sOgorCiAyMDIxLTExLTEy ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIHJldmVydGluZyByMjg1NTgzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9pbnRlcmFjdGl2ZS1lbGVtZW50 cy90aGUtZGlhbG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy11bmZvY3VzYWJsZS1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2Vt YW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9pbmVydC1ub2Rl LWlzLXVuZm9jdXNhYmxlLWV4cGVjdGVkLnR4dAppbmRleCBmZTJjNDIyMjBiYmM0M2YyNTEzNzUz M2I0M2I4MmNjMTJkNDgzMDk2Li43YWNhYzQ5OWIzMjU2ZWY3MzhlM2JiMTlmZTJhMzI0YmJmZmQ3 NTIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVu dC9pbmVydC1ub2RlLWlzLXVuZm9jdXNhYmxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0 aXZlLWVsZW1lbnRzL3RoZS1kaWFsb2ctZWxlbWVudC9pbmVydC1ub2RlLWlzLXVuZm9jdXNhYmxl LWV4cGVjdGVkLnR4dApAQCAtMSw4ICsxLDIxIEBACi1JIGdldCBmb2N1c0kgZG9uJ3QgZ2V0IGZv Y3VzLgogCiBJJ20gZWRpdGFibGUKIEknbSB0YWJpbmRleGVkLgogIExpbmsKIAotUEFTUyBUZXN0 IHRoYXQgaW5lcnQgbm9kZXMgYXJlIG5vdCBmb2N1c2FibGUuCitQQVNTICNodG1sIGlzIG5vdCAg Zm9jdXNhYmxlCitQQVNTICNib2R5IGlzIG5vdCAgZm9jdXNhYmxlCitQQVNTICN0b3AtZGlhbG9n IGlzICBmb2N1c2FibGUKK1BBU1MgI3RvcC1kaWFsb2ctYnV0dG9uIGlzICBmb2N1c2FibGUKK1BB U1MgI2JvdHRvbS1kaWFsb2cgaXMgbm90ICBmb2N1c2FibGUKK1BBU1MgI2JvdHRvbS1kaWFsb2ct YnV0dG9uIGlzIG5vdCAgZm9jdXNhYmxlCitQQVNTICNjb250YWluZXIgaXMgbm90ICBmb2N1c2Fi bGUKK1BBU1MgI3RleHQgaXMgbm90ICBmb2N1c2FibGUKK1BBU1MgI2RhdGV0aW1lIGlzIG5vdCAg Zm9jdXNhYmxlCitQQVNTICNjb2xvciBpcyBub3QgIGZvY3VzYWJsZQorUEFTUyAjc2VsZWN0IGlz IG5vdCAgZm9jdXNhYmxlCitQQVNTICNvcHRncm91cCBpcyBub3QgIGZvY3VzYWJsZQorUEFTUyAj b3B0aW9uIGlzIG5vdCAgZm9jdXNhYmxlCitQQVNTICNjb250ZW50ZWRpdGFibGUtZGl2IGlzIG5v dCAgZm9jdXNhYmxlCitQQVNTICN0YWJpbmRleC1zcGFuIGlzIG5vdCAgZm9jdXNhYmxlCiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRt bC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRpYWxvZy1lbGVtZW50L2luZXJ0 LW5vZGUtaXMtdW5mb2N1c2FibGUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvaHRtbC9zZW1hbnRpY3MvaW50ZXJhY3RpdmUtZWxlbWVudHMvdGhlLWRp YWxvZy1lbGVtZW50L2luZXJ0LW5vZGUtaXMtdW5mb2N1c2FibGUuaHRtbAppbmRleCA0OWQ2Njkw ZDY3MzZmYzE5NGIxMzBiN2I2ZGIyYzdjMjhlZGI1MzJiLi41NmYzMWYzNTkyNDk3NGYzMWIzY2Fl OTgyNTg0NmVjMDFlMWEwMTcwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvc2VtYW50aWNzL2ludGVyYWN0aXZlLWVsZW1lbnRzL3Ro ZS1kaWFsb2ctZWxlbWVudC9pbmVydC1ub2RlLWlzLXVuZm9jdXNhYmxlLmh0bWwKKysrIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9p bnRlcmFjdGl2ZS1lbGVtZW50cy90aGUtZGlhbG9nLWVsZW1lbnQvaW5lcnQtbm9kZS1pcy11bmZv Y3VzYWJsZS5odG1sCkBAIC0xLDYgKzEsOCBAQAogPCFET0NUWVBFIGh0bWw+Ci08aHRtbD4KKzxo dG1sIGlkPSJodG1sIiB0YWJpbmRleD0iMSI+CiA8aGVhZD4KKzxsaW5rIHJlbD0iaGVscCIgaHJl Zj0iaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy9tdWx0aXBhZ2UvaW50ZXJhY3Rpb24uaHRt bCNibG9ja2VkLWJ5LWEtbW9kYWwtZGlhbG9nIj4KKzxtZXRhIG5hbWU9ImFzc2VydCIgY29udGVu dD0iQ2hlY2tzIHRoYXQsIHdoZW4gb3BlbmluZyBtb2RhbCBkaWFsb2dzLCBpbmVydCBub2RlcyBh cmUgbm90IGZvY3VzYWJsZS4iPgogPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3Mu anMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQu anMiPjwvc2NyaXB0PgogPC9oZWFkPgpAQCAtMjYsMTEgKzI4LDE3IEBACiAvLyBUaGUgdGVzdCBw YXNzc2VzIGlmIG9ubHkgdGhlIHRvcG1vc3QgZGlhbG9nIGFuZCBpdHMgYnV0dG9uIGFyZSBmb2N1 c2FibGUuCiAKIGZ1bmN0aW9uIHRlc3RGb2N1cyhlbGVtZW50LCBleHBlY3RGb2N1cykgewotICAg IHZhciBmb2N1c2VkRWxlbWVudCA9IG51bGw7Ci0gICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCdmb2N1cycsIGZ1bmN0aW9uKCkgeyBmb2N1c2VkRWxlbWVudCA9IGVsZW1lbnQ7IH0sIGZhbHNl KTsKLSAgICBlbGVtZW50LmZvY3VzKCk7Ci0gICAgdmFyIHRoZUVsZW1lbnQgPSBlbGVtZW50Owot ICAgIGFzc2VydF9lcXVhbHMoZm9jdXNlZEVsZW1lbnQgPT09IHRoZUVsZW1lbnQsIGV4cGVjdEZv Y3VzLCBlbGVtZW50LmlkKTsKKyAgICB0ZXN0KGZ1bmN0aW9uKCkgeworICAgICAgICB2YXIgZm9j dXNlZEVsZW1lbnQgPSBudWxsOworICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoJ2Zv Y3VzJywgZnVuY3Rpb24oKSB7IGZvY3VzZWRFbGVtZW50ID0gZWxlbWVudDsgfSwgZmFsc2UpOwor ICAgICAgICBlbGVtZW50LmZvY3VzKCk7CisgICAgICAgIHZhciB0aGVFbGVtZW50ID0gZWxlbWVu dDsKKyAgICAgICAgaWYgKGV4cGVjdEZvY3VzKSB7CisgICAgICAgICAgICBhc3NlcnRfZXF1YWxz KGZvY3VzZWRFbGVtZW50LCB0aGVFbGVtZW50KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgIGFzc2VydF9ub3RfZXF1YWxzKGZvY3VzZWRFbGVtZW50LCB0aGVFbGVtZW50KTsKKyAgICAg ICAgfQorICAgIH0sIGAjJHtDU1MuZXNjYXBlKGVsZW1lbnQuaWQpfSBpcyAke2V4cGVjdEZvY3Vz ID8gIiIgOiAibm90ICJ9IGZvY3VzYWJsZWApOwogfQogCiBmdW5jdGlvbiB0ZXN0VHJlZShlbGVt ZW50LCBleHBlY3RGb2N1cykgewpAQCAtNDEsMTggKzQ5LDIyIEBAIGZ1bmN0aW9uIHRlc3RUcmVl KGVsZW1lbnQsIGV4cGVjdEZvY3VzKSB7CiAgICAgICAgIHRlc3RUcmVlKGNoaWxkTm9kZXNbaV0s IGV4cGVjdEZvY3VzKTsKIH0KIAotdGVzdChmdW5jdGlvbigpIHsKLSAgICB2YXIgYm90dG9tRGlh bG9nID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2JvdHRvbS1kaWFsb2cnKTsKK3ZhciBib3R0 b21EaWFsb2cgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYm90dG9tLWRpYWxvZycpOwordmFy IHRvcERpYWxvZyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0b3AtZGlhbG9nJyk7CitzZXR1 cChmdW5jdGlvbigpIHsKICAgICBib3R0b21EaWFsb2cuc2hvd01vZGFsKCk7Ci0KLSAgICB2YXIg dG9wRGlhbG9nID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RvcC1kaWFsb2cnKTsKICAgICB0 b3BEaWFsb2cuc2hvd01vZGFsKCk7CisgICAgYWRkX2NvbXBsZXRpb25fY2FsbGJhY2soZnVuY3Rp b24oKSB7CisgICAgICAgIHRvcERpYWxvZy5jbG9zZSgpOworICAgICAgICBib3R0b21EaWFsb2cu Y2xvc2UoKTsKKyAgICB9KTsKK30pOwogCi0gICAgdGVzdEZvY3VzKGRvY3VtZW50LmJvZHksIGZh bHNlKTsKLSAgICB0ZXN0VHJlZSh0b3BEaWFsb2csIHRydWUpOwotICAgIHRlc3RUcmVlKGJvdHRv bURpYWxvZywgZmFsc2UpOwotICAgIHRlc3RUcmVlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdj b250YWluZXInKSwgZmFsc2UpOwotfSwgIlRlc3QgdGhhdCBpbmVydCBub2RlcyBhcmUgbm90IGZv Y3VzYWJsZS4iKTsKK3Rlc3RGb2N1cyhkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQsIGZhbHNlKTsK K3Rlc3RGb2N1cyhkb2N1bWVudC5ib2R5LCBmYWxzZSk7Cit0ZXN0VHJlZSh0b3BEaWFsb2csIHRy dWUpOwordGVzdFRyZWUoYm90dG9tRGlhbG9nLCBmYWxzZSk7Cit0ZXN0VHJlZShkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnY29udGFpbmVyJyksIGZhbHNlKTsKIDwvc2NyaXB0PgogPC9ib2R5Pgog PC9odG1sPgo=