213572 2020-06-24 13:36:16 -0700 REGRESSION (r260276): Scrolling through shelves on music.apple.com is not smooth 2020-06-26 09:16:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser cdumez changseok cmarcelo esprehn+autocc ews-watchlist fred.wang glenn jamesr kangil.han kondapallykalyan luiz pdr simon.fraser tonikitoo tsavell webkit-bug-importer wenson_hsieh oldest_to_newest 1665848 0 simon.fraser 2020-06-24 13:36:16 -0700 REGRESSION (r260276): Scrolling through shelves on music.apple.com is not smooth 1665855 1 402681 simon.fraser 2020-06-24 13:49:59 -0700 Created attachment 402681 Patch 1665856 2 simon.fraser 2020-06-24 13:50:02 -0700 <rdar://problem/64306590> 1665859 3 402681 wenson_hsieh 2020-06-24 13:57:01 -0700 Comment on attachment 402681 Patch r=mews 1665910 4 ews-feeder 2020-06-24 16:58:35 -0700 Committed r263485: <https://trac.webkit.org/changeset/263485> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402681. 1666471 5 tsavell 2020-06-26 09:16:48 -0700 The new test: fast/scrolling/mac/scroll-snapping-in-progress.html added in https://trac.webkit.org/changeset/263485/webkit is a flaky failure on Mojave wk2. History: https://results.webkit.org/?suite=layout-tests&test=fast%2Fscrolling%2Fmac%2Fscroll-snapping-in-progress.html Diff: --- /Volumes/Data/slave/mojave-release-tests-wk2/build/layout-test-results/fast/scrolling/mac/scroll-snapping-in-progress-expected.txt +++ /Volumes/Data/slave/mojave-release-tests-wk2/build/layout-test-results/fast/scrolling/mac/scroll-snapping-in-progress-actual.txt @@ -4,8 +4,9 @@ Sending wheel events PASS container.scrollTop > 0 is true -PASS window.internals.isScrollSnapInProgress(container) is true +FAIL window.internals.isScrollSnapInProgress(container) should be true. Was false. PASS successfullyParsed is true +Some tests failed. TEST COMPLETE 402681 2020-06-24 13:49:59 -0700 2020-06-24 16:58:36 -0700 Patch bug-213572-20200624134958.patch text/plain 28192 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTJhMTQwMmVmZDdiODg1 NTEzMjg0YzRiYzE4ODJjOTc4N2NiNWNjNS4uZWM1M2VhYTFlY2FiMmM2ZDA0M2JiNDNjNjFkZDhh NGQzYjdiODViZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDIwLTA2LTI0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g KHIyNjAyNzYpOiBTY3JvbGxpbmcgdGhyb3VnaCBzaGVsdmVzIG9uIG11c2ljLmFwcGxlLmNvbSBp cyBub3Qgc21vb3RoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTM1NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGUgc2Nyb2xsIHBvc2l0aW9uIGZvciBhbiBvdmVyZmxvdzpzY3JvbGwgZWxlbWVudCB3 aXRoIHNjcm9sbC1zbmFwIGNvdWxkIGp1bXAgYXJvdW5kCisgICAgICAgIGR1cmluZyBzY3JvbGxp bmcsIGlmIGxheW91dCB0cmlnZ2VyZWQgYSBjYWxsIHRvIFNjcm9sbGFibGVBcmVhOjp1cGRhdGVT Y3JvbGxTbmFwU3RhdGUoKS4KKyAgICAgICAgVGhlIGNydXggb2YgdGhlIGlzc3VlIGlzIHRoYXQg aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpIHJldHVybmVkIGZhbHNlIGZvciBvdmVyZmxvdzpzY3Jv bGxlcnMKKyAgICAgICAgd2hpY2ggYXJlIHNjcm9sbGluZyBhc3luY2hyb25vdXNseS4KKworICAg ICAgICBGaXggYnkgZXh0ZW5kaW5nIHRoZSBleGlzdGluZyBTY3JvbGxpbmdUcmVlOjppc1Njcm9s bFNuYXBJblByb2dyZXNzKCkgdG8gdHJhY2sgYWxsIHNjcm9sbGluZworICAgICAgICBub2RlcyBi eSBzdG9yaW5nIGEgSGFzaFNldDxTY3JvbGxpbmdOb2RlSUQ+IHJhdGhlciB0aGFuIGp1c3QgYSBm bGFnIGZvciB0aGUgbWFpbiBmcmFtZS4KKworICAgICAgICBSZW5kZXJMYXllcjo6aXNTY3JvbGxT bmFwSW5Qcm9ncmVzcygpIHRoZW4gY29uc3VsdHMgdGhlIFNjcm9sbGluZ0Nvb3JkaW5hdG9yLCB3 aGljaCBjb25zdWx0cworICAgICAgICB0aGUgc2Nyb2xsaW5nIHRyZWUgZm9yIHRoaXMgc3RhdGUu CisKKyAgICAgICAgQWRkIHRoZSBhYmlsaXR5IHRvIHRlc3QgdmlhIGludGVybmFscy5pc1Njcm9s bFNuYXBJblByb2dyZXNzKCkuCisKKyAgICAgICAgVGVzdDogZmFzdC9zY3JvbGxpbmcvbWFjL3Nj cm9sbC1zbmFwcGluZy1pbi1wcm9ncmVzcy5odG1sCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQu aDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MgY29uc3QpOiBUaGUgbWFpbiB0aHJlYWQgY2Fu IHJ1biBzbmFwcGluZyBsb2dpYworICAgICAgICBldmVuIGZvciBhc3luYy1zY3JvbGxhYmxlIGZy YW1lcywgc28gY29uc3VsdCB0aGUgU2Nyb2xsaW5nQ29vcmRpbmF0b3IgYW5kIEZyYW1lVmlldydz IFNjcm9sbEFuaW1hdG9yLgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvcjo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcyBjb25zdCk6CisgICAgICAgICogcGFnZS9zY3Jv bGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xs aW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdD b29yZGluYXRvcjo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcyBjb25zdCk6CisgICAgICAgICogcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdUcmVlOjppc1Njcm9sbFNuYXBJblByb2dyZXNzRm9yTm9kZSk6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxpbmdUcmVlOjpzZXROb2RlU2Nyb2xsU25hcEluUHJvZ3Jlc3MpOgorICAgICAgICAo V2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcyk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpzZXRNYWluRnJhbWVJc1Njcm9sbFNu YXBwaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl Lmg6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnNldFNj cm9sbFNuYXBJblByb2dyZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3Jv bGxpbmdOb2RlOjppc1Njcm9sbFNuYXBJblByb2dyZXNzIGNvbnN0KToKKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oOgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6aGFuZGxl V2hlZWxFdmVudCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlRGVsZWdhdGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlTWFjOjp3aWxsU3RhcnRTY3JvbGxTbmFwQW5pbWF0aW9u KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVN YWM6OmRpZFN0b3BTY3JvbGxTbmFwQW5pbWF0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlcXVlc3RTY3Jv bGxQb3NpdGlvblVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6aXNTY3Jv bGxTbmFwSW5Qcm9ncmVzcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 c2V0dXBGb250U3VicGl4ZWxRdWFudGl6YXRpb24pOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJu YWxzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJ bnRlcm5hbHM6OnNjcm9sbFNuYXBPZmZzZXRzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFs czo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcyk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMu aDoKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5pZGw6CisKIDIwMjAtMDYtMjIgIEpvaG4g V2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcmFnZSBBY2Nlc3Mg QVBJOiBBZGQgdGhlIGNhcGFiaWxpdHkgdG8gY2FsbCB0aGUgU3RvcmFnZSBBY2Nlc3MgQVBJIGFz IGEgcXVpcmssIG9uIGJlaGFsZiBvZiB3ZWJzaXRlcyB0aGF0IHNob3VsZCBiZSBkb2luZyBpdCB0 aGVtc2VsdmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJjMTg5NTA2MmQ0MDBlNDgzYzhkZWUxZjkwNDM1NWMwMmUw MzA5YmEuLmI2NDBjYTE3ZTZhNjE4ODIzMDdkY2M2NDY3YzIxNGJlOWRhZGJjZWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjggQEAKKzIwMjAtMDYtMjQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2MDI3Nik6IFNjcm9sbGluZyB0 aHJvdWdoIHNoZWx2ZXMgb24gbXVzaWMuYXBwbGUuY29tIGlzIG5vdCBzbW9vdGgKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzU3MgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNjQzMDY1OTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhlIHNjcm9sbCBwb3NpdGlvbiBmb3IgYW4gb3ZlcmZsb3c6c2Ny b2xsIGVsZW1lbnQgd2l0aCBzY3JvbGwtc25hcCBjb3VsZCBqdW1wIGFyb3VuZAorICAgICAgICBk dXJpbmcgc2Nyb2xsaW5nLCBpZiBsYXlvdXQgdHJpZ2dlcmVkIGEgY2FsbCB0byBTY3JvbGxhYmxl QXJlYTo6dXBkYXRlU2Nyb2xsU25hcFN0YXRlKCkuCisgICAgICAgIFRoZSBjcnV4IG9mIHRoZSBp c3N1ZSBpcyB0aGF0IGlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSByZXR1cm5lZCBmYWxzZSBmb3Ig b3ZlcmZsb3c6c2Nyb2xsZXJzCisgICAgICAgIHdoaWNoIGFyZSBzY3JvbGxpbmcgYXN5bmNocm9u b3VzbHkuCisKKyAgICAgICAgRml4IGJ5IGV4dGVuZGluZyB0aGUgZXhpc3RpbmcgU2Nyb2xsaW5n VHJlZTo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpIHRvIHRyYWNrIGFsbCBzY3JvbGxpbmcKKyAg ICAgICAgbm9kZXMgYnkgc3RvcmluZyBhIEhhc2hTZXQ8U2Nyb2xsaW5nTm9kZUlEPiByYXRoZXIg dGhhbiBqdXN0IGEgZmxhZyBmb3IgdGhlIG1haW4gZnJhbWUuCisKKyAgICAgICAgUmVuZGVyTGF5 ZXI6OmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSB0aGVuIGNvbnN1bHRzIHRoZSBTY3JvbGxpbmdD b29yZGluYXRvciwgd2hpY2ggY29uc3VsdHMKKyAgICAgICAgdGhlIHNjcm9sbGluZyB0cmVlIGZv ciB0aGlzIHN0YXRlLgorCisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byB0ZXN0IHZpYSBpbnRl cm5hbHMuaXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5oOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5n Q29vcmRpbmF0b3IubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5h dG9yOjppc1Njcm9sbFNuYXBJblByb2dyZXNzIGNvbnN0KToKKwogMjAyMC0wNi0yMiAgSm9obiBX aWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTdG9yYWdlIEFjY2VzcyBB UEk6IEFkZCB0aGUgY2FwYWJpbGl0eSB0byBjYWxsIHRoZSBTdG9yYWdlIEFjY2VzcyBBUEkgYXMg YSBxdWlyaywgb24gYmVoYWxmIG9mIHdlYnNpdGVzIHRoYXQgc2hvdWxkIGJlIGRvaW5nIGl0IHRo ZW1zZWx2ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggN2U2ZTk5MDMzYzAyYWNlM2NiYzUxODc0 NTk1ZDQ5ZjAwYzM3ODJjOC4uZWM0ZGY5ZTZjYjI4YTRkMGJjZmViMjdhMzhlNzYzNTdkZThlOTQ4 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTQ2MSw3ICs0NjEsNyBAQCBwdWJsaWM6CiAgICAg UmVmUHRyPFJhbmdlPiBjYXJldFJhbmdlRnJvbVBvaW50KGNvbnN0IExheW91dFBvaW50JiBjbGll bnRQb2ludCk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBFbGVtZW50KiBzY3JvbGxpbmdFbGVtZW50 Rm9yQVBJKCk7Ci0gICAgRWxlbWVudCogc2Nyb2xsaW5nRWxlbWVudCgpOworICAgIFdFQkNPUkVf RVhQT1JUIEVsZW1lbnQqIHNjcm9sbGluZ0VsZW1lbnQoKTsKIAogICAgIGVudW0gUmVhZHlTdGF0 ZSB7IExvYWRpbmcsIEludGVyYWN0aXZlLCAgQ29tcGxldGUgfTsKICAgICBSZWFkeVN0YXRlIHJl YWR5U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX3JlYWR5U3RhdGU7IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAppbmRleCA3YjUyYzg2ZDRjMjljMTUzODM5YzNkZTA2Zjc3Y2M2YzQ1OGJmOGU4 Li43YWU3Mjk5MmUxZGQ5NWNhNzQ2MzkyZDE2YzNlOTJkNDA3MDRmM2I4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCkBAIC05MzMsMTkgKzkzMywxOSBAQCBib29sIEZyYW1lVmlldzo6aXNT Y3JvbGxTbmFwSW5Qcm9ncmVzcygpIGNvbnN0CiB7CiAgICAgaWYgKHNjcm9sbGJhcnNTdXBwcmVz c2VkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKKwogICAgIC8vIElmIHRoZSBzY3Jv bGxpbmcgdGhyZWFkIHVwZGF0ZXMgdGhlIHNjcm9sbCBwb3NpdGlvbiBmb3IgdGhpcyBGcmFtZVZp ZXcsIHRoZW4gd2Ugc2hvdWxkIHJldHVybgogICAgIC8vIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpp c1Njcm9sbFNuYXBJblByb2dyZXNzKCkuCiAgICAgaWYgKGF1dG8gc2Nyb2xsaW5nQ29vcmRpbmF0 b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29yZGluYXRvcigpKSB7Ci0gICAgICAgIGlmICghc2Nyb2xs aW5nQ29vcmRpbmF0b3ItPnNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRpb25TeW5jaHJvbm91 c2x5KCp0aGlzKSkKLSAgICAgICAgICAgIHJldHVybiBzY3JvbGxpbmdDb29yZGluYXRvci0+aXNT Y3JvbGxTbmFwSW5Qcm9ncmVzcygpOworICAgICAgICBpZiAoc2Nyb2xsaW5nQ29vcmRpbmF0b3It PmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3Moc2Nyb2xsaW5nTm9kZUlEKCkpKQorICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQotICAgIAorCiAgICAgLy8gSWYgdGhlIG1haW4gdGhyZWFkIHVw ZGF0ZXMgdGhlIHNjcm9sbCBwb3NpdGlvbiBmb3IgdGhpcyBGcmFtZVZpZXcsIHdlIHNob3VsZCBy ZXR1cm4KICAgICAvLyBTY3JvbGxBbmltYXRvcjo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpLgog ICAgIGlmIChTY3JvbGxBbmltYXRvciogc2Nyb2xsQW5pbWF0b3IgPSBleGlzdGluZ1Njcm9sbEFu aW1hdG9yKCkpCiAgICAgICAgIHJldHVybiBzY3JvbGxBbmltYXRvci0+aXNTY3JvbGxTbmFwSW5Q cm9ncmVzcygpOwotICAgIAorCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuY3BwCmluZGV4IDdiYjEzMjc3MzdiN2NhYzZhMjY0MGY1MmJjOWNhMWJiMzU3MTZlMGYuLjUz ZDY0ZGE4Nzg4Njc3NGZmMGQwYjZiNzk1ODU2MGRjYTNjNDUyMzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuY3BwCkBAIC05MDQsOSArOTA0LDkgQEAgdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9y OjpzZXRBY3RpdmVTY3JvbGxTbmFwSW5kaWNlcyhTY3JvbGxpbmdOb2RlSUQgc2Nyb2wKICNlbmRp ZgogCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKLWJvb2wgQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvcjo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpIGNvbnN0Citib29sIEFzeW5jU2Nyb2xs aW5nQ29vcmRpbmF0b3I6OmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoU2Nyb2xsaW5nTm9kZUlEIG5v ZGVJRCkgY29uc3QKIHsKLSAgICByZXR1cm4gc2Nyb2xsaW5nVHJlZSgpLT5pc1Njcm9sbFNuYXBJ blByb2dyZXNzKCk7CisgICAgcmV0dXJuIHNjcm9sbGluZ1RyZWUoKS0+aXNTY3JvbGxTbmFwSW5Q cm9ncmVzc0Zvck5vZGUobm9kZUlEKTsKIH0KIAogdm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yOjp1cGRhdGVTY3JvbGxTbmFwUHJvcGVydGllc1dpdGhGcmFtZVZpZXcoY29uc3QgRnJhbWVW aWV3JiBmcmFtZVZpZXcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggMjcyNjY4ODFlOTUxMTY4ZmE2 ODFiNTZlM2FmMmE1NjdkYmMxZDU1Yy4uYjYzNjY1ZTYwNDAwYWQ2NmY4ZDRlYzJiYmUzN2I2OTNk YzNkZmI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNT Y3JvbGxpbmdDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtMTMyLDcgKzEzMiw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBzZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Nyb2xsUGlubmluZ0JlaGF2aW9y KSBvdmVycmlkZTsKIAogI2lmIEVOQUJMRShDU1NfU0NST0xMX1NOQVApCi0gICAgYm9vbCBpc1Nj cm9sbFNuYXBJblByb2dyZXNzKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgYm9vbCBpc1Njcm9sbFNu YXBJblByb2dyZXNzKFNjcm9sbGluZ05vZGVJRCkgY29uc3Qgb3ZlcnJpZGU7CiAjZW5kaWYKIAog ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVjb25jaWxlVmlld3BvcnRDb25zdHJhaW5lZExheWVy UG9zaXRpb25zKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgTGF5b3V0UmVjdCYgdmlld3BvcnRSZWN0 LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCmluZGV4IGIx Yjc3MDFjMmMwOGNiYWFmZTI3ZGZiYTUzMjMyNTk5ZjMwMGJlZjIuLjRmYmRlNmYwMjQ5NDg1NDJk N2EyOTM1NWRmMjgyM2RmZmZhYzVhOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtMTcxLDcgKzE3MSw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIFN0cmluZyBzY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHQoU2Nyb2xs aW5nU3RhdGVUcmVlQXNUZXh0QmVoYXZpb3IgPSBTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhh dmlvck5vcm1hbCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgc2Nyb2xsaW5nVHJlZUFzVGV4 dChTY3JvbGxpbmdTdGF0ZVRyZWVBc1RleHRCZWhhdmlvciA9IFNjcm9sbGluZ1N0YXRlVHJlZUFz VGV4dEJlaGF2aW9yTm9ybWFsKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgaXNSdWJiZXJCYW5k SW5Qcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBib29sIGlz U2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1 YWwgYm9vbCBpc1Njcm9sbFNuYXBJblByb2dyZXNzKFNjcm9sbGluZ05vZGVJRCkgY29uc3QgeyBy ZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU2Nyb2xsU25hcFByb3BlcnRp ZXNXaXRoRnJhbWVWaWV3KGNvbnN0IEZyYW1lVmlldyYpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBz ZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Nyb2xsUGlubmluZ0JlaGF2aW9yKSB7IH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcAppbmRleCA3 MjZhMzU1Zjk3Njc1MTgyYzE2MTA1YmE5MzFhMTA1N2JhMTdjOTQ5Li43YjU5YTEzMjY5ODc3NTQ4 MzA1OTc5MzQ2ZDY0ODY1NmNiYmNjNjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcApAQCAtNDY3LDE2ICs0NjcsMjMgQEAgdm9pZCBTY3Jv bGxpbmdUcmVlOjpzZXRNYWluRnJhbWVJc1J1YmJlckJhbmRpbmcoYm9vbCBpc1J1YmJlckJhbmRp bmcpCiB9CiAKIC8vIENhbiBiZSBjYWxsZWQgZnJvbSB0aGUgbWFpbiB0aHJlYWQuCi1ib29sIFNj cm9sbGluZ1RyZWU6OmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoKQorYm9vbCBTY3JvbGxpbmdUcmVl Ojppc1Njcm9sbFNuYXBJblByb2dyZXNzRm9yTm9kZShTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQog eworICAgIGlmICghbm9kZUlEKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBMb2NrSG9s ZGVyIGxvY2sobV90cmVlU3RhdGVNdXRleCk7Ci0gICAgcmV0dXJuIG1fdHJlZVN0YXRlLm1haW5G cmFtZUlzU2Nyb2xsU25hcHBpbmc7CisgICAgcmV0dXJuIG1fdHJlZVN0YXRlLm5vZGVzV2l0aEFj dGl2ZVNjcm9sbFNuYXAuY29udGFpbnMobm9kZUlEKTsKIH0KICAgICAKLXZvaWQgU2Nyb2xsaW5n VHJlZTo6c2V0TWFpbkZyYW1lSXNTY3JvbGxTbmFwcGluZyhib29sIGlzU2Nyb2xsU25hcHBpbmcp Cit2b2lkIFNjcm9sbGluZ1RyZWU6OnNldE5vZGVTY3JvbGxTbmFwSW5Qcm9ncmVzcyhTY3JvbGxp bmdOb2RlSUQgbm9kZUlELCBib29sIGlzU2Nyb2xsU25hcHBpbmcpCiB7CisgICAgQVNTRVJUKG5v ZGVJRCk7CiAgICAgTG9ja0hvbGRlciBsb2NrZXIobV90cmVlU3RhdGVNdXRleCk7Ci0gICAgbV90 cmVlU3RhdGUubWFpbkZyYW1lSXNTY3JvbGxTbmFwcGluZyA9IGlzU2Nyb2xsU25hcHBpbmc7Cisg ICAgaWYgKGlzU2Nyb2xsU25hcHBpbmcpCisgICAgICAgIG1fdHJlZVN0YXRlLm5vZGVzV2l0aEFj dGl2ZVNjcm9sbFNuYXAuYWRkKG5vZGVJRCk7CisgICAgZWxzZQorICAgICAgICBtX3RyZWVTdGF0 ZS5ub2Rlc1dpdGhBY3RpdmVTY3JvbGxTbmFwLnJlbW92ZShub2RlSUQpOwogfQogCiB2b2lkIFNj cm9sbGluZ1RyZWU6OnNldE1haW5GcmFtZVBpbm5lZFN0YXRlKFJlY3RFZGdlczxib29sPiBlZGdl UGlubmluZ1N0YXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n VHJlZS5oCmluZGV4IDRiZGZlNTQxNjFlNWQzNDhlMmYwYTQ3OGJhYmQ1ZjI5YTMwMGE4YmUuLmEy YzQzZDlhYzNjZDIyMjc5Y2RkOTBhMDYyNGU4ZTFhM2JiYzEwMjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTk0LDggKzk0LDkgQEAgcHVi bGljOgogCiAgICAgdm9pZCBzZXRNYWluRnJhbWVJc1J1YmJlckJhbmRpbmcoYm9vbCk7CiAgICAg Ym9vbCBpc1J1YmJlckJhbmRJblByb2dyZXNzKCk7Ci0gICAgdm9pZCBzZXRNYWluRnJhbWVJc1Nj cm9sbFNuYXBwaW5nKGJvb2wpOwotICAgIGJvb2wgaXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpOwor CisgICAgdm9pZCBzZXROb2RlU2Nyb2xsU25hcEluUHJvZ3Jlc3MoU2Nyb2xsaW5nTm9kZUlELCBi b29sKTsKKyAgICBib29sIGlzU2Nyb2xsU25hcEluUHJvZ3Jlc3NGb3JOb2RlKFNjcm9sbGluZ05v ZGVJRCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZSgpIHsgfQogICAgIFdFQkNPUkVf RVhQT1JUIHZpcnR1YWwgdm9pZCBjb21taXRUcmVlU3RhdGUoc3RkOjp1bmlxdWVfcHRyPFNjcm9s bGluZ1N0YXRlVHJlZT4mJik7CkBAIC0yNDQsOCArMjQ1LDggQEAgcHJpdmF0ZToKICAgICAgICAg RmxvYXRQb2ludCBtYWluRnJhbWVTY3JvbGxQb3NpdGlvbjsKICAgICAgICAgUGxhdGZvcm1EaXNw bGF5SUQgZGlzcGxheUlEIHsgMCB9OwogICAgICAgICBPcHRpb25hbDx1bnNpZ25lZD4gbm9taW5h bEZyYW1lc1BlclNlY29uZDsKKyAgICAgICAgSGFzaFNldDxTY3JvbGxpbmdOb2RlSUQ+IG5vZGVz V2l0aEFjdGl2ZVNjcm9sbFNuYXA7CiAgICAgICAgIGJvb2wgbWFpbkZyYW1lSXNSdWJiZXJCYW5k aW5nIHsgZmFsc2UgfTsKLSAgICAgICAgYm9vbCBtYWluRnJhbWVJc1Njcm9sbFNuYXBwaW5nIHsg ZmFsc2UgfTsKICAgICB9OwogICAgIAogICAgIExvY2sgbV90cmVlU3RhdGVNdXRleDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxp bmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlLmNwcAppbmRleCBkMDdlYWVlMjAxNzk0YTVjNjAyYjY0Y2M5MmE5ZmQ0YWJi MzdhNzFkLi44ODUzZmM5MDQzOWUyMzQ4OTJjNDUxNDM4YWJjMmUxYzhkMmVkMzM2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0yMTksNiArMjE5LDE2IEBAIGJvb2wgU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGU6OmlzUnViYmVyQmFuZGluZygpIGNvbnN0CiAgICAgICAgIHx8IHNjcm9s bFBvc2l0aW9uLnkoKSA+IG1heFNjcm9sbFBvc2l0aW9uLnkoKTsKIH0KIAordm9pZCBTY3JvbGxp bmdUcmVlU2Nyb2xsaW5nTm9kZTo6c2V0U2Nyb2xsU25hcEluUHJvZ3Jlc3MoYm9vbCBpc1NuYXBw aW5nKQoreworICAgIHNjcm9sbGluZ1RyZWUoKS5zZXROb2RlU2Nyb2xsU25hcEluUHJvZ3Jlc3Mo c2Nyb2xsaW5nTm9kZUlEKCksIGlzU25hcHBpbmcpOworfQorCitib29sIFNjcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlOjppc1Njcm9sbFNuYXBJblByb2dyZXNzKCkgY29uc3QKK3sKKyAgICByZXR1 cm4gc2Nyb2xsaW5nVHJlZSgpLmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3NGb3JOb2RlKHNjcm9sbGlu Z05vZGVJRCgpKTsKK30KKwogRmxvYXRQb2ludCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6 YWRqdXN0ZWRTY3JvbGxQb3NpdGlvbihjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwg U2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcpIGNvbnN0CiB7CiAgICAgaWYgKGNsYW1waW5nID09IFNj cm9sbENsYW1waW5nOjpDbGFtcGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmgKaW5kZXggNDU4ZWI0MzU3 ZmU0Mzc3MTlhZTA0NDhkYzU1YWNkNTk0YjczMWEyMC4uODk4ZmVhNDVjMzVlY2FjN2RmN2I2OTcy YjRlMzljNGY3MzA1N2JmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCkBAIC02OCw2ICs2OCw5IEBA IHB1YmxpYzoKICAgICBSZWN0RWRnZXM8Ym9vbD4gZWRnZVBpbm5lZFN0YXRlKCkgY29uc3Q7CiAg ICAgYm9vbCBpc1J1YmJlckJhbmRpbmcoKSBjb25zdDsKIAorICAgIHZvaWQgc2V0U2Nyb2xsU25h cEluUHJvZ3Jlc3MoYm9vbCk7CisgICAgYm9vbCBpc1Njcm9sbFNuYXBJblByb2dyZXNzKCkgY29u c3Q7CisKICAgICAvLyBUaGVzZSBhcmUgaW1wZXJhdGl2ZTsgdGhleSBhZGp1c3QgdGhlIHNjcm9s bGluZyBsYXllcnMuCiAgICAgdm9pZCBzY3JvbGxUbyhjb25zdCBGbG9hdFBvaW50JiwgU2Nyb2xs VHlwZSA9IFNjcm9sbFR5cGU6OlVzZXIsIFNjcm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6 OkNsYW1wZWQpOwogICAgIHZvaWQgc2Nyb2xsQnkoY29uc3QgRmxvYXRTaXplJiwgU2Nyb2xsQ2xh bXBpbmcgPSBTY3JvbGxDbGFtcGluZzo6Q2xhbXBlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1h Yy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJh bWVTY3JvbGxpbmdOb2RlTWFjLm1tCmluZGV4IGFjNjNhOGRiZDUwZDY1YzFkNDA3YjAzMTZjYzI2 Zjg2YTU5NGQ2YzkuLmE5MWQ3ZjMwMTY4MTFlYWYwOWYyMWZmYWQzNGNlMDk1YTFiMWRkZTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tCkBAIC0xMjQsOCAr MTI0LDcgQEAgV2hlZWxFdmVudEhhbmRsaW5nUmVzdWx0IFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGVNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY28KICAgICBib29sIGhhbmRsZWQgPSBtX2Rl bGVnYXRlLmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7CiAKICNpZiBFTkFCTEUoQ1NTX1ND Uk9MTF9TTkFQKQotICAgIGlmIChpc1Jvb3ROb2RlKCkpCi0gICAgICAgIHNjcm9sbGluZ1RyZWUo KS5zZXRNYWluRnJhbWVJc1Njcm9sbFNuYXBwaW5nKG1fZGVsZWdhdGUuaXNTY3JvbGxTbmFwSW5Q cm9ncmVzcygpKTsKKyAgICBzZXRTY3JvbGxTbmFwSW5Qcm9ncmVzcyhtX2RlbGVnYXRlLmlzU2Ny b2xsU25hcEluUHJvZ3Jlc3MoKSk7CiAKICAgICBpZiAobV9kZWxlZ2F0ZS5hY3RpdmVTY3JvbGxT bmFwSW5kZXhEaWRDaGFuZ2UoKSkKICAgICAgICAgc2Nyb2xsaW5nVHJlZSgpLnNldEFjdGl2ZVNj cm9sbFNuYXBJbmRpY2VzKHNjcm9sbGluZ05vZGVJRCgpLCBtX2RlbGVnYXRlLmFjdGl2ZVNjcm9s bFNuYXBJbmRleEZvckF4aXMoU2Nyb2xsRXZlbnRBeGlzOjpIb3Jpem9udGFsKSwgbV9kZWxlZ2F0 ZS5hY3RpdmVTY3JvbGxTbmFwSW5kZXhGb3JBeGlzKFNjcm9sbEV2ZW50QXhpczo6VmVydGljYWwp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxp bmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVNYWMubW0KaW5k ZXggYTBiYzk3YTcyMzZlY2NhYzFmN2FlMjAxYTgzMmFmNzMzYzc5ZDA2NC4uN2M3MjY0YWZhYjY4 YjgyM2RhYzIyOWZlZDgxNzM1ZTRkZTFiYTA4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVT Y3JvbGxpbmdOb2RlRGVsZWdhdGVNYWMubW0KQEAgLTM1MSwxMiArMzUxLDEyIEBAIGZsb2F0IFNj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVNYWM6OnBhZ2VTY2FsZUZhY3RvcigpIGNv bnN0CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1hYzo6d2lsbFN0 YXJ0U2Nyb2xsU25hcEFuaW1hdGlvbigpCiB7Ci0gICAgc2Nyb2xsaW5nVHJlZSgpLnNldE1haW5G cmFtZUlzU2Nyb2xsU25hcHBpbmcodHJ1ZSk7CisgICAgc2Nyb2xsaW5nTm9kZSgpLnNldFNjcm9s bFNuYXBJblByb2dyZXNzKHRydWUpOwogfQogCiB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdO b2RlRGVsZWdhdGVNYWM6OmRpZFN0b3BTY3JvbGxTbmFwQW5pbWF0aW9uKCkKIHsKLSAgICBzY3Jv bGxpbmdUcmVlKCkuc2V0TWFpbkZyYW1lSXNTY3JvbGxTbmFwcGluZyhmYWxzZSk7CisgICAgc2Ny b2xsaW5nTm9kZSgpLnNldFNjcm9sbFNuYXBJblByb2dyZXNzKGZhbHNlKTsKIH0KICAgICAKIExh eW91dFNpemUgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1hYzo6c2Nyb2xsRXh0 ZW50KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4 IGZlMTc4ODJiZDI3NGNlODc0Mjc3M2RiNmVkZmU3NTE2ODRlNDZlZjguLjZiMTliYzM4N2VhOGQ4 OGZhMTAzZTgzYmVmMzUwOTA3NWRmOTU3OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcApAQCAtMjU5MCw3ICsyNTkwLDcgQEAgYm9vbCBSZW5kZXJMYXllcjo6cmVx dWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlKGNvbnN0IFNjcm9sbFBvc2l0aW9uJiBwb3NpdGlvbiwg U2MKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQogICAgIExPR19XSVRIX1NUUkVBTShTY3Jv bGxpbmcsIHN0cmVhbSA8PCAqdGhpcyA8PCAiIHJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZSAi IDw8IHBvc2l0aW9uKTsKIAotICAgIGlmIChTY3JvbGxpbmdDb29yZGluYXRvciogc2Nyb2xsaW5n Q29vcmRpbmF0b3IgPSBwYWdlKCkuc2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkKKyAgICBpZiAoYXV0 byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSBwYWdlKCkuc2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkK ICAgICAgICAgcmV0dXJuIHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5yZXF1ZXN0U2Nyb2xsUG9zaXRp b25VcGRhdGUoKnRoaXMsIHBvc2l0aW9uLCBzY3JvbGxUeXBlLCBjbGFtcGluZyk7CiAjZW5kaWYK ICAgICByZXR1cm4gZmFsc2U7CkBAIC0zNTcwLDEyICszNTcwLDE4IEBAIGJvb2wgUmVuZGVyTGF5 ZXI6OmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSBjb25zdAogewogICAgIGlmICghc2Nyb2xsc092 ZXJmbG93KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICBpZiAoU2Nyb2xsQW5p bWF0b3IqIHNjcm9sbEFuaW1hdG9yID0gZXhpc3RpbmdTY3JvbGxBbmltYXRvcigpKQorCisgICAg aWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gcGFnZSgpLnNjcm9sbGluZ0Nvb3JkaW5h dG9yKCkpIHsKKyAgICAgICAgaWYgKHNjcm9sbGluZ0Nvb3JkaW5hdG9yLT5pc1Njcm9sbFNuYXBJ blByb2dyZXNzKHNjcm9sbGluZ05vZGVJRCgpKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwor ICAgIH0KKworICAgIGlmIChhdXRvKiBzY3JvbGxBbmltYXRvciA9IGV4aXN0aW5nU2Nyb2xsQW5p bWF0b3IoKSkKICAgICAgICAgcmV0dXJuIHNjcm9sbEFuaW1hdG9yLT5pc1Njcm9sbFNuYXBJblBy b2dyZXNzKCk7Ci0gICAgCisKICAgICByZXR1cm4gZmFsc2U7CiB9CisKICNlbmRpZgogCiBib29s IFJlbmRlckxheWVyOjp1c2VzTW9ja1Njcm9sbEFuaW1hdG9yKCkgY29uc3QKQEAgLTQzNzUsNyAr NDM4MSw3IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnNldHVwRm9udFN1YnBpeGVsUXVhbnRpemF0aW9u KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgYm9vbCYKIAogICAgIGJvb2wgc2Nyb2xsaW5nT25N YWluVGhyZWFkID0gdHJ1ZTsKICNpZiBFTkFCTEUoQVNZTkNfU0NST0xMSU5HKQotICAgIGlmIChT Y3JvbGxpbmdDb29yZGluYXRvciogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSBwYWdlKCkuc2Nyb2xs aW5nQ29vcmRpbmF0b3IoKSkKKyAgICBpZiAoYXV0byogc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSBw YWdlKCkuc2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkKICAgICAgICAgc2Nyb2xsaW5nT25NYWluVGhy ZWFkID0gc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNob3VsZFVwZGF0ZVNjcm9sbExheWVyUG9zaXRp b25TeW5jaHJvbm91c2x5KHJlbmRlcmVyKCkudmlldygpLmZyYW1lVmlldygpKTsKICNlbmRpZgog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggNjcyMTg3MjBhNmFhYzNkMmJm ZDNiNTMyMTIwMWEyYTU3ZDE2MmE3NC4uNDY3MTE4ZGQ1ZmNlODBlNDA1NGFjMTk1YTAxNmIxZmVj Y2I1N2I5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMjg0MCw2ICsy ODQwLDEyIEBAIEV4Y2VwdGlvbk9yPFNjcm9sbGFibGVBcmVhKj4gSW50ZXJuYWxzOjpzY3JvbGxh YmxlQXJlYUZvck5vZGUoTm9kZSogbm9kZSkgY29uc3QKICAgICAgICAgaWYgKCFmcmFtZVZpZXcp CiAgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxpZEFjY2Vzc0Vycm9yIH07CiAK KyAgICAgICAgc2Nyb2xsYWJsZUFyZWEgPSBmcmFtZVZpZXc7CisgICAgfSBlbHNlIGlmIChub2Rl ID09IG5vZGVSZWYtPmRvY3VtZW50KCkuc2Nyb2xsaW5nRWxlbWVudCgpKSB7CisgICAgICAgIGF1 dG8qIGZyYW1lVmlldyA9IG5vZGVSZWYtPmRvY3VtZW50KCkudmlldygpOworICAgICAgICBpZiAo IWZyYW1lVmlldykKKyAgICAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkQWNjZXNz RXJyb3IgfTsKKwogICAgICAgICBzY3JvbGxhYmxlQXJlYSA9IGZyYW1lVmlldzsKICAgICB9IGVs c2UgaWYgKGlzPEVsZW1lbnQ+KG5vZGVSZWYpKSB7CiAgICAgICAgIGF1dG8mIGVsZW1lbnQgPSBk b3duY2FzdDxFbGVtZW50Pihub2RlUmVmLmdldCgpKTsKQEAgLTI4NDcsNiArMjg1Myw5IEBAIEV4 Y2VwdGlvbk9yPFNjcm9sbGFibGVBcmVhKj4gSW50ZXJuYWxzOjpzY3JvbGxhYmxlQXJlYUZvck5v ZGUoTm9kZSogbm9kZSkgY29uc3QKICAgICAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZh bGlkQWNjZXNzRXJyb3IgfTsKIAogICAgICAgICBhdXRvJiByZW5kZXJCb3ggPSAqZWxlbWVudC5y ZW5kZXJCb3goKTsKKyAgICAgICAgaWYgKCFyZW5kZXJCb3guY2FuQmVTY3JvbGxlZEFuZEhhc1Nj cm9sbGFibGVBcmVhKCkpCisgICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxpZEFj Y2Vzc0Vycm9yIH07CisKICAgICAgICAgaWYgKGlzPFJlbmRlckxpc3RCb3g+KHJlbmRlckJveCkp CiAgICAgICAgICAgICBzY3JvbGxhYmxlQXJlYSA9ICZkb3duY2FzdDxSZW5kZXJMaXN0Qm94Pihy ZW5kZXJCb3gpOwogICAgICAgICBlbHNlCkBAIC00NjQzLDMxICs0NjUyLDE1IEBAIHZvaWQgSW50 ZXJuYWxzOjpzZXRQbGF0Zm9ybU1vbWVudHVtU2Nyb2xsaW5nUHJlZGljdGlvbkVuYWJsZWQoYm9v bCBlbmFibGVkKQogCiBFeGNlcHRpb25PcjxTdHJpbmc+IEludGVybmFsczo6c2Nyb2xsU25hcE9m ZnNldHMoRWxlbWVudCYgZWxlbWVudCkKIHsKLSAgICBlbGVtZW50LmRvY3VtZW50KCkudXBkYXRl TGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7Ci0KLSAgICBpZiAoIWVsZW1lbnQucmVu ZGVyQm94KCkpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQotICAgIFJlbmRlckJveCYgYm94 ID0gKmVsZW1lbnQucmVuZGVyQm94KCk7Ci0gICAgU2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVB cmVhOwotCi0gICAgaWYgKGJveC5pc0JvZHkoKSkgewotICAgICAgICBGcmFtZVZpZXcqIGZyYW1l VmlldyA9IGJveC5mcmFtZSgpLm1haW5GcmFtZSgpLnZpZXcoKTsKLSAgICAgICAgaWYgKCFmcmFt ZVZpZXcgfHwgIWZyYW1lVmlldy0+aXNTY3JvbGxhYmxlKCkpCi0gICAgICAgICAgICByZXR1cm4g RXhjZXB0aW9uIHsgSW52YWxpZEFjY2Vzc0Vycm9yIH07Ci0gICAgICAgIHNjcm9sbGFibGVBcmVh ID0gZnJhbWVWaWV3OwotCi0gICAgfSBlbHNlIHsKLSAgICAgICAgaWYgKCFib3guY2FuQmVTY3Jv bGxlZEFuZEhhc1Njcm9sbGFibGVBcmVhKCkpCi0gICAgICAgICAgICByZXR1cm4gRXhjZXB0aW9u IHsgSW52YWxpZEFjY2Vzc0Vycm9yIH07Ci0gICAgICAgIHNjcm9sbGFibGVBcmVhID0gYm94Lmxh eWVyKCk7Ci0gICAgfQorICAgIGF1dG8gYXJlYU9yRXhjZXB0aW9uID0gc2Nyb2xsYWJsZUFyZWFG b3JOb2RlKCZlbGVtZW50KTsKKyAgICBpZiAoYXJlYU9yRXhjZXB0aW9uLmhhc0V4Y2VwdGlvbigp KQorICAgICAgICByZXR1cm4gYXJlYU9yRXhjZXB0aW9uLnJlbGVhc2VFeGNlcHRpb24oKTsKIAor ICAgIGF1dG8qIHNjcm9sbGFibGVBcmVhID0gYXJlYU9yRXhjZXB0aW9uLnJlbGVhc2VSZXR1cm5W YWx1ZSgpOwogICAgIGlmICghc2Nyb2xsYWJsZUFyZWEpCi0gICAgICAgIHJldHVybiBTdHJpbmco KTsKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IEludmFsaWRBY2Nlc3NFcnJvciB9OwogCiAg ICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7Ci0KICAgICBpZiAoYXV0byogb2Zmc2V0cyA9IHNjcm9s bGFibGVBcmVhLT5ob3Jpem9udGFsU25hcE9mZnNldHMoKSkgewogICAgICAgICBpZiAob2Zmc2V0 cy0+c2l6ZSgpKSB7CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiaG9yaXpvbnRh bCA9ICIpOwpAQCAtNDY4OCw2ICs0NjgxLDE4IEBAIEV4Y2VwdGlvbk9yPFN0cmluZz4gSW50ZXJu YWxzOjpzY3JvbGxTbmFwT2Zmc2V0cyhFbGVtZW50JiBlbGVtZW50KQogICAgIHJldHVybiByZXN1 bHQudG9TdHJpbmcoKTsKIH0KIAorRXhjZXB0aW9uT3I8Ym9vbD4gSW50ZXJuYWxzOjppc1Njcm9s bFNuYXBJblByb2dyZXNzKEVsZW1lbnQmIGVsZW1lbnQpCit7CisgICAgYXV0byBhcmVhT3JFeGNl cHRpb24gPSBzY3JvbGxhYmxlQXJlYUZvck5vZGUoJmVsZW1lbnQpOworICAgIGlmIChhcmVhT3JF eGNlcHRpb24uaGFzRXhjZXB0aW9uKCkpCisgICAgICAgIHJldHVybiBhcmVhT3JFeGNlcHRpb24u cmVsZWFzZUV4Y2VwdGlvbigpOworCisgICAgYXV0byogc2Nyb2xsYWJsZUFyZWEgPSBhcmVhT3JF eGNlcHRpb24ucmVsZWFzZVJldHVyblZhbHVlKCk7CisgICAgaWYgKCFzY3JvbGxhYmxlQXJlYSkK KyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IEludmFsaWRBY2Nlc3NFcnJvciB9OworCisgICAg cmV0dXJuIHNjcm9sbGFibGVBcmVhLT5pc1Njcm9sbFNuYXBJblByb2dyZXNzKCk7Cit9CiAjZW5k aWYKIAogYm9vbCBJbnRlcm5hbHM6OnRlc3RQcmVsb2FkZXJTZXR0aW5nVmlld3BvcnQoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1NvdXJjZS9XZWJD b3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmgKaW5kZXggZGFhOTRjODNlZWY4NzAxMDdlNTE3MGVmMzZm Yjk2NzdmZGFhMjE2YS4uMTUzYjM3M2M5MWFkOWM1NGVhNTM3NjVmOWVjZDVlNGIyNTAzZmViMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCkBAIC03MDUsNiArNzA1LDcgQEAgcHVibGlj OgogCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkKICAgICBFeGNlcHRpb25PcjxTdHJpbmc+ IHNjcm9sbFNuYXBPZmZzZXRzKEVsZW1lbnQmKTsKKyAgICBFeGNlcHRpb25Pcjxib29sPiBpc1Nj cm9sbFNuYXBJblByb2dyZXNzKEVsZW1lbnQmKTsKICAgICB2b2lkIHNldFBsYXRmb3JtTW9tZW50 dW1TY3JvbGxpbmdQcmVkaWN0aW9uRW5hYmxlZChib29sKTsKICNlbmRpZgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFscy5pZGwKaW5kZXggYTU2MWI5N2VjMDVjNTA3ODNjYTBmZTdhYTUxOGVl M2E0OTIzMDI0YS4uNTk0YWE1YTE2ZjlkMjhkN2RjNmZjMGQzNTdkYjBiNWFkMWU1MGZmZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmlkbApAQCAtNzE2LDYgKzcxNiw3IEBAIGVudW0g Q29tcG9zaXRpbmdQb2xpY3kgewogICAgIFtDb25kaXRpb25hbD1DT05URU5UX0ZJTFRFUklOR10g cmVhZG9ubHkgYXR0cmlidXRlIE1vY2tDb250ZW50RmlsdGVyU2V0dGluZ3MgbW9ja0NvbnRlbnRG aWx0ZXJTZXR0aW5nczsKIAogICAgIFtDb25kaXRpb25hbD1DU1NfU0NST0xMX1NOQVAsIE1heVRo cm93RXhjZXB0aW9uXSBET01TdHJpbmcgc2Nyb2xsU25hcE9mZnNldHMoRWxlbWVudCBlbGVtZW50 KTsKKyAgICBbQ29uZGl0aW9uYWw9Q1NTX1NDUk9MTF9TTkFQLCBNYXlUaHJvd0V4Y2VwdGlvbl0g Ym9vbGVhbiBpc1Njcm9sbFNuYXBJblByb2dyZXNzKEVsZW1lbnQgZWxlbWVudCk7CiAgICAgW0Nv bmRpdGlvbmFsPUNTU19TQ1JPTExfU05BUF0gdm9pZCBzZXRQbGF0Zm9ybU1vbWVudHVtU2Nyb2xs aW5nUHJlZGljdGlvbkVuYWJsZWQoYm9vbGVhbiBlbmFibGVkKTsKIAogICAgIFtNYXlUaHJvd0V4 Y2VwdGlvbl0gRE9NU3RyaW5nIHBhdGhTdHJpbmdXaXRoU2hyaW5rV3JhcHBlZFJlY3RzKHNlcXVl bmNlPGRvdWJsZT4gcmVjdENvbXBvbmVudHMsIGRvdWJsZSByYWRpdXMpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNj cm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9S ZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAppbmRleCA4ZTY0OTM1 NTQ1ODNhYmYzOTVkODkxYWNhYWJmMDE1ZjE3NjQ0NTk3Li4yNGI0YTczMDU4NjgzZDRiYzZhZjFj NDg2NjVhNGQ1ZDdkOTBiZTA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3Rl U2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtNjQsNyArNjQsNyBAQCBwcml2YXRlOgogCiAgICAg Ym9vbCBpc1J1YmJlckJhbmRJblByb2dyZXNzKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBz ZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoV2ViQ29yZTo6U2Nyb2xsUGlubmluZ0JlaGF2aW9yKSBv dmVycmlkZTsKLSAgICBib29sIGlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoKSBjb25zdCBvdmVycmlk ZTsKKyAgICBib29sIGlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoV2ViQ29yZTo6U2Nyb2xsaW5nTm9k ZUlEKSBjb25zdCBvdmVycmlkZTsKIAogICAgIC8vIElQQzo6TWVzc2FnZVJlY2VpdmVyCiAgICAg dm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXImKSBv dmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1Jl bW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvci5tbSBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29y ZGluYXRvci5tbQppbmRleCBjYmZhMzFiMjdmMWJkOGE2MjY1ZGE4Nzc2NTQ1Mzk2OWUyNmY3ODRi Li41ODhkMjQwMWEwMDUxNzI4Y2Q4Y2EyZTQ0N2VkZDlmMzc2NDgyNzgwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Ny b2xsaW5nQ29vcmRpbmF0b3IubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yLm1tCkBAIC03Niw3 ICs3Niw3IEBAIGJvb2wgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmlzUnViYmVyQmFuZElu UHJvZ3Jlc3MoKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBSZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvcjo6aXNTY3JvbGxTbmFwSW5Qcm9ncmVzcygpIGNvbnN0Citib29sIFJl bW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yOjppc1Njcm9sbFNuYXBJblByb2dyZXNzKFNjcm9sbGlu Z05vZGVJRCkgY29uc3QKIHsKICAgICAvLyBGSVhNRTogbmVlZCB0byBtYWludGFpbiBzdGF0ZSBp biB0aGUgd2ViIHByb2Nlc3M/CiAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZjNTMxYWJmZTk0 YjM4NGRjYmY4ZTg5Y2Q3ZmMxZmM2OGMwNWJjYjguLjUwN2VmZWZiYzVlNWNlY2I4NGQ4YThjODY4 ZmYxNGZmYTYyZTJiNzAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wNi0yNCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChy MjYwMjc2KTogU2Nyb2xsaW5nIHRocm91Z2ggc2hlbHZlcyBvbiBtdXNpYy5hcHBsZS5jb20gaXMg bm90IHNtb290aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjEzNTcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvc2Nyb2xsLXNuYXBwaW5nLWluLXByb2dyZXNzLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvbWFjL3Njcm9sbC1zbmFw cGluZy1pbi1wcm9ncmVzcy5odG1sOiBBZGRlZC4KKwogMjAyMC0wNi0yMiAgRnVqaWkgSGlyb25v cmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXSBmYXN0L2RvbS9X aW5kb3cvYWxlcnQtd2l0aC11bm1hdGNoZWQtdXRmMTYtc3Vycm9nYXRlLXNob3VsZC1ub3QtY3Jh c2guaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGlu Zy9tYWMvc2Nyb2xsLXNuYXBwaW5nLWluLXByb2dyZXNzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9zY3JvbGwtc25hcHBpbmctaW4tcHJvZ3Jlc3MtZXhwZWN0 ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjQwYzRkZmZlNmQ3MDBhMWUwYmViNWI1MzJlMzBhYzAwYTZjMDRh YzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvc2Ny b2xsLXNuYXBwaW5nLWluLXByb2dyZXNzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBACitT Y3JvbGwtc25hcCBvZmZzZXRzIGZvciAnY29udGFpbmVyJzogdmVydGljYWwgPSB7IDAsIDMwLCAx NTAsIDI3MCwgMzkwLCA1MTAsIDYxNSB9CitJbml0aWFsIHN0YXRlOgorUEFTUyB3aW5kb3cuaW50 ZXJuYWxzLmlzU2Nyb2xsU25hcEluUHJvZ3Jlc3MoY29udGFpbmVyKSBpcyBmYWxzZQorCitTZW5k aW5nIHdoZWVsIGV2ZW50cworUEFTUyBjb250YWluZXIuc2Nyb2xsVG9wID4gMCBpcyB0cnVlCitQ QVNTIHdpbmRvdy5pbnRlcm5hbHMuaXNTY3JvbGxTbmFwSW5Qcm9ncmVzcyhjb250YWluZXIpIGlz IHRydWUKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQor CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvc2Nyb2xsLXNuYXBw aW5nLWluLXByb2dyZXNzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvc2Ny b2xsLXNuYXBwaW5nLWluLXByb2dyZXNzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzkxM2NhZDlmYjUzZjZi ZmUxY2UxOTVjODkzMDY3NzAzYzY1ZTEzYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3Qvc2Nyb2xsaW5nL21hYy9zY3JvbGwtc25hcHBpbmctaW4tcHJvZ3Jlc3MuaHRtbApAQCAt MCwwICsxLDc0IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBp bnRlcm5hbDpBc3luY092ZXJmbG93U2Nyb2xsaW5nRW5hYmxlZD10cnVlIF0gLS0+Cis8aHRtbD4K KzxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICB3 aWR0aDogMTUwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDQwMHB4OworICAgICAgICAgICAgYm9y ZGVyOiAxcHggc29saWQgYmxhY2s7CisgICAgICAgICAgICBwYWRkaW5nOiAxMHB4OworICAgICAg ICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgICAgICAgb3ZlcmZsb3cteDogc2Nyb2xsOworICAg ICAgICAgICAgc2Nyb2xsLXNuYXAtdHlwZTogeSBtYW5kYXRvcnk7CisgICAgICAgIH0KKworICAg ICAgICAuYm94IHsKKyAgICAgICAgICAgIG1hcmdpbjogMjBweDsKKyAgICAgICAgICAgIHdpZHRo OiAxMDBweDsKKyAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICBzY3JvbGwt c25hcC1hbGlnbjogc3RhcnQ7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOwor ICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3Vy Y2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNv dXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorICAgICAgICBqc1Rl c3RJc0FzeW5jID0gdHJ1ZTsKKyAgICAgICAgCisgICAgICAgIGxldCBjb250YWluZXIgPSB1bmRl ZmluZWQ7CisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHJ1blRlc3QoKQorICAgICAgICB7CisgICAg ICAgICAgICBsZXQgZmlyc3RTY3JvbGwgPSB0cnVlOworICAgICAgICAgICAgY29udGFpbmVyID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2NvbnRhaW5lcicpOworICAgICAgICAgICAgY29udGFp bmVyLmFkZEV2ZW50TGlzdGVuZXIoJ3Njcm9sbCcsICgpID0+IHsKKyAgICAgICAgICAgICAgICBp ZiAoZmlyc3RTY3JvbGwpIHsKKyAgICAgICAgICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCdjb250 YWluZXIuc2Nyb2xsVG9wID4gMCcpOworICAgICAgICAgICAgICAgICAgICBzaG91bGRCZVRydWUo J3dpbmRvdy5pbnRlcm5hbHMuaXNTY3JvbGxTbmFwSW5Qcm9ncmVzcyhjb250YWluZXIpJyk7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGZpcnN0U2Nyb2xsID0gZmFsc2U7Cisg ICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgZGVidWcoJ1Njcm9sbC1z bmFwIG9mZnNldHMgZm9yIFwnY29udGFpbmVyXCc6ICcgKyB3aW5kb3cuaW50ZXJuYWxzLnNjcm9s bFNuYXBPZmZzZXRzKGNvbnRhaW5lcikpOworCisgICAgICAgICAgICBkZWJ1ZygnSW5pdGlhbCBz dGF0ZTonKTsKKyAgICAgICAgICAgIHNob3VsZEJlRmFsc2UoJ3dpbmRvdy5pbnRlcm5hbHMuaXNT Y3JvbGxTbmFwSW5Qcm9ncmVzcyhjb250YWluZXIpJyk7CisKKyAgICAgICAgICAgIGRlYnVnKCcn KTsKKyAgICAgICAgICAgIGRlYnVnKCdTZW5kaW5nIHdoZWVsIGV2ZW50cycpOworICAgICAgICAg ICAgYXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNjcm9sbEF0KDEwMCwgMTAwKTsKKworICAgICAg ICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0KKworICAgICAgICB3aW5kb3cuYWRkRXZl bnRMaXN0ZW5lcignbG9hZCcsICgpID0+IHsKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1 bm5lcikKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KHJ1blRlc3QsIDApOworICAgICAgICB9 LCBmYWxzZSk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJj b250YWluZXIiIGNsYXNzPSJjb250YWluZXIiPgorICAgICAgICA8ZGl2IGNsYXNzPSJjb250ZW50 cyI+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorICAgICAgICAgICAgPGRp diBjbGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+ CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorICAgICAgICAgICAgPGRpdiBj bGFzcz0iYm94Ij48L2Rpdj4KKyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImJveCI+PC9kaXY+Cisg ICAgICAgICAgICA8ZGl2IGNsYXNzPSJib3giPjwvZGl2PgorICAgICAgICAgICAgPGRpdiBjbGFz cz0iYm94Ij48L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+CisgICAgPGRpdiBpZD0i Y29uc29sZSI+PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==