228259 2021-07-23 17:25:14 -0700 [iOS] REGRESSION(r277505): `-[WKWebView underPageBackgroundColor]` also changes the scroll bar color 2021-07-24 01:20:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi hi thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1779265 0 hi 2021-07-23 17:25:14 -0700 e.g. if an application overrides the `-underPageBackgroundColor` with a dark color on a page that has a light background color, the scroll bar will appear light to "match" the overridden `-underPageBackgroundColor` instead of dark to "match" the page's background color 1779267 1 hi 2021-07-23 17:38:11 -0700 <rdar://problem/80116822> 1779272 2 434150 hi 2021-07-23 17:49:50 -0700 Created attachment 434150 Patch 1779275 3 434151 hi 2021-07-23 17:57:03 -0700 Created attachment 434151 Patch 1779307 4 ews-feeder 2021-07-24 01:20:14 -0700 Committed r280283 (239941@main): <https://commits.webkit.org/239941@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434151. 434150 2021-07-23 17:49:50 -0700 2021-07-23 18:26:40 -0700 Patch bug-228259-20210723174950.patch text/plain 8702 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMjdiMGQ5MWMxM2NmZTc5YWNlZDY4YWNlZDI4YTNkZDRmMDQ1MjIzNy4uODQw ZTNiZDg3ODY2MmQ5Njg0YmRmYWMxM2M4ZmUyMTdhMjI0MTI5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyOCBAQAorMjAyMS0wNy0yMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gUkVHUkVTU0lPTihyMjc3NTA1KTogYC1bV0tXZWJWaWV3IHVuZGVyUGFn ZUJhY2tncm91bmRDb2xvcl1gIGFsc28gY2hhbmdlcyB0aGUgc2Nyb2xsIGJhciBjb2xvcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjU5CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84MDExNjgyMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhbiBhcHBsaWNhdGlvbiBvdmVycmlkZXMgdGhlIGAt dW5kZXJQYWdlQmFja2dyb3VuZENvbG9yYCB3aXRoIGEgZGFyayBjb2xvciBvbiBhIHBhZ2UgdGhh dAorICAgICAgICBoYXMgYSBsaWdodCBiYWNrZ3JvdW5kIGNvbG9yLCB0aGUgc2Nyb2xsIGJhciB3 aWxsIGFwcGVhciBsaWdodCB0byBtYXRjaCB0aGUgb3ZlcnJpZGRlbiB2YWx1ZQorICAgICAgICBv ZiBgLXVuZGVyUGFnZUJhY2tncm91bmRDb2xvcmAgaW5zdGVhZCBvZiBkYXJrIHRvIG1hdGNoIHRo ZSBwYWdlJ3MgYmFja2dyb3VuZCBjb2xvci4KKworICAgICAgICBUZXN0OiBXS1dlYlZpZXdVbmRl clBhZ2VCYWNrZ3JvdW5kQ29sb3IuTWF0Y2hlc1Njcm9sbFZpZXcKKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbToKKyAgICAgICAgKGJhc2VTY3JvbGxWaWV3QmFj a2dyb3VuZENvbG9yKToKKyAgICAgICAgKHNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IpOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX3VwZGF0ZVNjcm9sbFZpZXdCYWNrZ3JvdW5kXSk6CisgICAgICAg IEFkZCBhIGZsYWcgdG8gaW5kaWNhdGUgd2hldGhlciB0aGUgYHVuZGVyUGFnZUJhY2tncm91bmRD b2xvcmAgKHdoaWNoIGNhbiBiZSBvdmVycmlkZGVuIGJ5CisgICAgICAgIEFQSSkgb3IgYHBhZ2VF eHRlbmRlZEJhY2tncm91bmRDb2xvcmAgc2hvdWxkIGJlIHVzZWQgd2hlbiBjYWxjdWxhdGluZyB0 aGUgdmFsdWUgcHJvdmlkZWQgdG8KKyAgICAgICAgYC1bVUlTY3JvbGxWaWV3IHNldEJhY2tncm91 bmRDb2xvcjpdYCBhbmQgYC1bVUlTY3JvbGxWaWV3IHNldEluZGljYXRvclN0eWxlOl1gLiBUaGUg Zm9ybWVyCisgICAgICAgIHVzZXMgdGhlIGB1bmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3JgIHNpbmNl IHRoYXQgaXMgd2h5IHRoYXQgQVBJIGV4aXN0cyBhbmQgdGhlIGxhdHRlciB1c2VzCisgICAgICAg IHRoZSBgYHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcmAgc2luY2UgaXQgaXMgYmFzZWQgb24g d2hhdCBpcyBzaG93biBpbiB0aGUgcGFnZSwgd2hpY2ggaXMKKyAgICAgICAgd2hhdCB0aGUgc2Ny b2xsIGJhciBpcyBkcmF3biBvbiB0b3Agb2YuCisKIDIwMjEtMDctMjMgIFdlbnNvbiBIc2llaCAg PHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW3dhdGNoT1NdIEl0IHNob3VsZCBi ZSBwb3NzaWJsZSB0byBzZWxlY3QgY29udGFjdCBBdXRvRmlsbCB0ZXh0IHN1Z2dlc3Rpb25zIGlu IGVtYWlsIGFuZCB1c2VybmFtZSBmaWVsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KaW5kZXggNWQwNDlhMGUyNmUwMGIxNDU3YzlhMzFlYzE2 MDQ2MzI1NmM2Y2Y2ZC4uMWYwZGFmY2Q4ZmE4NjhjZDEyNDY5MGNhN2VjYzdjYmY0YzhhMTFlZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1Mu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0K QEAgLTQ3Niw3ICs0NzYsOSBAQCBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNjYWxlKFdLV2Vi VmlldyAqd2ViVmlldykKICAgICByZXR1cm4gc2NhbGU7CiB9CiAKLXN0YXRpYyBXZWJDb3JlOjpD b2xvciBiYXNlU2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCitl bnVtIGNsYXNzIEFsbG93UGFnZUJhY2tncm91bmRDb2xvck92ZXJyaWRlIDogYm9vbCB7IE5vLCBZ ZXMgfTsKKworc3RhdGljIFdlYkNvcmU6OkNvbG9yIGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENv bG9yKFdLV2ViVmlldyAqd2ViVmlldywgQWxsb3dQYWdlQmFja2dyb3VuZENvbG9yT3ZlcnJpZGUg YWxsb3dQYWdlQmFja2dyb3VuZENvbG9yT3ZlcnJpZGUpCiB7CiAgICAgaWYgKHdlYlZpZXctPl9j dXN0b21Db250ZW50VmlldykKICAgICAgICAgcmV0dXJuIFt3ZWJWaWV3LT5fY3VzdG9tQ29udGVu dFZpZXcgYmFja2dyb3VuZENvbG9yXS5DR0NvbG9yOwpAQCAtNDkwLDEwICs0OTIsMTAgQEAgc3Rh dGljIFdlYkNvcmU6OkNvbG9yIGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmll dyAqd2ViVmlldykKICAgICBpZiAoIXdlYlZpZXctPl9wYWdlKQogICAgICAgICByZXR1cm4geyB9 OwogCi0gICAgcmV0dXJuIHdlYlZpZXctPl9wYWdlLT51bmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3Io KTsKKyAgICByZXR1cm4gYWxsb3dQYWdlQmFja2dyb3VuZENvbG9yT3ZlcnJpZGUgPT0gQWxsb3dQ YWdlQmFja2dyb3VuZENvbG9yT3ZlcnJpZGU6OlllcyA/IHdlYlZpZXctPl9wYWdlLT51bmRlclBh Z2VCYWNrZ3JvdW5kQ29sb3IoKSA6IHdlYlZpZXctPl9wYWdlLT5wYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IoKTsKIH0KIAotc3RhdGljIFdlYkNvcmU6OkNvbG9yIHNjcm9sbFZpZXdCYWNrZ3Jv dW5kQ29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3KQorc3RhdGljIFdlYkNvcmU6OkNvbG9yIHNjcm9s bFZpZXdCYWNrZ3JvdW5kQ29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3LCBBbGxvd1BhZ2VCYWNrZ3Jv dW5kQ29sb3JPdmVycmlkZSBhbGxvd1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZSkKIHsKICAg ICBpZiAoIXdlYlZpZXcub3BhcXVlKQogICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29sb3I6OnRy YW5zcGFyZW50QmxhY2s7CkBAIC01MDIsNyArNTA0LDcgQEAgc3RhdGljIFdlYkNvcmU6OkNvbG9y IHNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IoV0tXZWJWaWV3ICp3ZWJWaWV3KQogICAgIFdlYkNv cmU6OkxvY2FsQ3VycmVudFRyYWl0Q29sbGVjdGlvbiBsb2NhbFRyYWl0Q29sbGVjdGlvbih3ZWJW aWV3LnRyYWl0Q29sbGVjdGlvbik7CiAjZW5kaWYKIAotICAgIFdlYkNvcmU6OkNvbG9yIGNvbG9y ID0gYmFzZVNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3Iod2ViVmlldyk7CisgICAgV2ViQ29yZTo6 Q29sb3IgY29sb3IgPSBiYXNlU2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcih3ZWJWaWV3LCBhbGxv d1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZSk7CiAKICAgICBpZiAoIWNvbG9yLmlzVmFsaWQo KSAmJiB3ZWJWaWV3LT5fY29udGVudFZpZXcpCiAgICAgICAgIGNvbG9yID0gW3dlYlZpZXctPl9j b250ZW50VmlldyBiYWNrZ3JvdW5kQ29sb3JdLkNHQ29sb3I7CkBAIC01MjgsMTggKzUzMCwxNyBA QCBzdGF0aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZp ZXcgKndlYlZpZXcpCiAKIC0gKHZvaWQpX3VwZGF0ZVNjcm9sbFZpZXdCYWNrZ3JvdW5kCiB7Ci0g ICAgV2ViQ29yZTo6Q29sb3IgY29sb3IgPSBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKHNlbGYp OworICAgIGF1dG8gbmV3U2Nyb2xsVmlld0JhY2tncm91bmRDb2xvciA9IHNjcm9sbFZpZXdCYWNr Z3JvdW5kQ29sb3Ioc2VsZiwgQWxsb3dQYWdlQmFja2dyb3VuZENvbG9yT3ZlcnJpZGU6Olllcyk7 CisgICAgaWYgKF9zY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yICE9IG5ld1Njcm9sbFZpZXdCYWNr Z3JvdW5kQ29sb3IpIHsKKyAgICAgICAgX3Njcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IgPSBuZXdT Y3JvbGxWaWV3QmFja2dyb3VuZENvbG9yOwogCi0gICAgaWYgKF9zY3JvbGxWaWV3QmFja2dyb3Vu ZENvbG9yID09IGNvbG9yKQotICAgICAgICByZXR1cm47Ci0KLSAgICBfc2Nyb2xsVmlld0JhY2tn cm91bmRDb2xvciA9IGNvbG9yOwotCi0gICAgYXV0byB1aUJhY2tncm91bmRDb2xvciA9IGFkb3B0 TlMoW1tVSUNvbG9yIGFsbG9jXSBpbml0V2l0aENHQ29sb3I6Y2FjaGVkQ0dDb2xvcihjb2xvcild KTsKLSAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9yOnVpQmFja2dyb3VuZENvbG9y LmdldCgpXTsKKyAgICAgICAgYXV0byB1aUJhY2tncm91bmRDb2xvciA9IGFkb3B0TlMoW1tVSUNv bG9yIGFsbG9jXSBpbml0V2l0aENHQ29sb3I6Y2FjaGVkQ0dDb2xvcihuZXdTY3JvbGxWaWV3QmFj a2dyb3VuZENvbG9yKV0pOworICAgICAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9y OnVpQmFja2dyb3VuZENvbG9yLmdldCgpXTsKKyAgICB9CiAKICAgICAvLyBVcGRhdGUgdGhlIGlu ZGljYXRvciBzdHlsZSBiYXNlZCBvbiB0aGUgbGlnaHRuZXNzL2RhcmtuZXNzIG9mIHRoZSBiYWNr Z3JvdW5kIGNvbG9yLgotICAgIGlmIChjb2xvci5saWdodG5lc3MoKSA8PSAuNWYgJiYgY29sb3Iu aXNWaXNpYmxlKCkpCisgICAgYXV0byBuZXdQYWdlQmFja2dyb3VuZENvbG9yID0gc2Nyb2xsVmll d0JhY2tncm91bmRDb2xvcihzZWxmLCBBbGxvd1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZTo6 Tm8pOworICAgIGlmIChuZXdQYWdlQmFja2dyb3VuZENvbG9yLmxpZ2h0bmVzcygpIDw9IC41ZiAm JiBuZXdQYWdlQmFja2dyb3VuZENvbG9yLmlzVmlzaWJsZSgpKQogICAgICAgICBbX3Njcm9sbFZp ZXcgc2V0SW5kaWNhdG9yU3R5bGU6VUlTY3JvbGxWaWV3SW5kaWNhdG9yU3R5bGVXaGl0ZV07CiAg ICAgZWxzZQogICAgICAgICBbX3Njcm9sbFZpZXcgc2V0SW5kaWNhdG9yU3R5bGU6VUlTY3JvbGxW aWV3SW5kaWNhdG9yU3R5bGVCbGFja107CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggMjQ3Mjc5OTUzZmIyNGE3M2Q2OGU1NWJlY2NkMzg5YzlhMDJh ZjAzMC4uYTcyNjg0NzhhZDQxMGYzNzhiNzBkNjQzNDMyODYwNTE0MzEwOWY4NCAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA3LTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAg ICBbaU9TXSBSRUdSRVNTSU9OKHIyNzc1MDUpOiBgLVtXS1dlYlZpZXcgdW5kZXJQYWdlQmFja2dy b3VuZENvbG9yXWAgYWxzbyBjaGFuZ2VzIHRoZSBzY3JvbGwgYmFyIGNvbG9yCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgyNTkKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzgwMTE2ODIyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZp ZXdVbmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3IubW06CisgICAgICAgIChURVNULldLV2ViVmlld1Vu ZGVyUGFnZUJhY2tncm91bmRDb2xvci5NYXRjaGVzU2Nyb2xsVmlldyk6CisKIDIwMjEtMDctMjMg IFRydWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBNaWdyYXRlIGlP UyAxNSBleHBlY3RhdGlvbnMgdG8gT3BlblNvdXJjZSBhbmQgYnVtcCB2ZXJzaW9uIG51bWJlcnMK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJW aWV3VW5kZXJQYWdlQmFja2dyb3VuZENvbG9yLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdVbmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3IubW0KaW5kZXgg M2FjOTY3ZWI5N2RjMDAwNGI4ZDEwOGZlMTJmMzA0N2UxMTM4ZDYzZC4uODYwZWRjMTNjYTdjYmY2 OTU3ZWI4ZDI0MTk0MmMyM2UwMjIxY2QxOCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdVbmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3IubW0K KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1dlYlZpZXdVbmRl clBhZ2VCYWNrZ3JvdW5kQ29sb3IubW0KQEAgLTM5LDYgKzM5LDcgQEAKICAgICBFWFBFQ1RfVFJV RShbYWN0dWFsIGlzS2luZE9mQ2xhc3M6W05TU3RyaW5nIGNsYXNzXV0pOyBcCiAgICAgRVhQRUNU X1dLX1NUUkVRKGV4cGVjdGVkLCAoTlNTdHJpbmcgKilhY3R1YWwpOwogCitjb25zdGV4cHIgQ0dG bG9hdCB3aGl0ZUNvbG9yQ29tcG9uZW50c1s0XSA9IHsgMSwgMSwgMSwgMSB9OwogY29uc3RleHBy IENHRmxvYXQgcmVkQ29sb3JDb21wb25lbnRzWzRdID0geyAxLCAwLCAwLCAxIH07CiBjb25zdGV4 cHIgQ0dGbG9hdCBibHVlQ29sb3JDb21wb25lbnRzWzRdID0geyAwLCAwLCAxLCAxIH07CiAKQEAg LTI4Myw2ICsyODQsNyBAQCBURVNUKFdLV2ViVmlld1VuZGVyUGFnZUJhY2tncm91bmRDb2xvciwg TWF0Y2hlc1Njcm9sbFZpZXcpCiAgICAgYXV0byBzUkdCQ29sb3JTcGFjZSA9IGFkb3B0Q0YoQ0dD b2xvclNwYWNlQ3JlYXRlV2l0aE5hbWUoa0NHQ29sb3JTcGFjZVNSR0IpKTsKICAgICBhdXRvIHJl ZENvbG9yID0gYWRvcHRDRihDR0NvbG9yQ3JlYXRlKHNSR0JDb2xvclNwYWNlLmdldCgpLCByZWRD b2xvckNvbXBvbmVudHMpKTsKICAgICBhdXRvIGJsdWVDb2xvciA9IGFkb3B0Q0YoQ0dDb2xvckNy ZWF0ZShzUkdCQ29sb3JTcGFjZS5nZXQoKSwgYmx1ZUNvbG9yQ29tcG9uZW50cykpOworICAgIGF1 dG8gd2hpdGVDb2xvciA9IGFkb3B0Q0YoQ0dDb2xvckNyZWF0ZShzUkdCQ29sb3JTcGFjZS5nZXQo KSwgd2hpdGVDb2xvckNvbXBvbmVudHMpKTsKIAogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMo W1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAw LCA2MDApXSk7CiAgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyB1 bmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3JdLkNHQ29sb3IsIGRlZmF1bHRCYWNrZ3JvdW5kQ29sb3Io KS5nZXQoKSkpOwpAQCAtMjkxLDExICsyOTMsMTkgQEAgVEVTVChXS1dlYlZpZXdVbmRlclBhZ2VC YWNrZ3JvdW5kQ29sb3IsIE1hdGNoZXNTY3JvbGxWaWV3KQogICAgIFt3ZWJWaWV3IHN5bmNocm9u b3VzbHlMb2FkSFRNTFN0cmluZ0FuZFdhaXRVbnRpbEFsbEltbWVkaWF0ZUNoaWxkRnJhbWVzUGFp bnQ6QCI8c3R5bGU+IGJvZHkgeyBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7IH0gPC9zdHlsZT4iXTsK ICAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3IHVuZGVyUGFnZUJh Y2tncm91bmRDb2xvcl0uQ0dDb2xvciwgcmVkQ29sb3IuZ2V0KCkpKTsKICAgICBFWFBFQ1RfVFJV RShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3IHNjcm9sbFZpZXddLmJhY2tncm91bmRDb2xv ci5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkpOworICAgIEVYUEVDVF9FUShbd2ViVmlldyBzY3Jv bGxWaWV3XS5pbmRpY2F0b3JTdHlsZSwgVUlTY3JvbGxWaWV3SW5kaWNhdG9yU3R5bGVXaGl0ZSk7 CiAKICAgICBbd2ViVmlldyBzZXRVbmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3I6W0NvY29hQ29sb3Ig Y29sb3JXaXRoQ0dDb2xvcjpibHVlQ29sb3IuZ2V0KCldXTsKICAgICBbd2ViVmlldyB3YWl0Rm9y TmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiAgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9D b2xvcihbd2ViVmlldyB1bmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3JdLkNHQ29sb3IsIGJsdWVDb2xv ci5nZXQoKSkpOwogICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcg c2Nyb2xsVmlld10uYmFja2dyb3VuZENvbG9yLkNHQ29sb3IsIGJsdWVDb2xvci5nZXQoKSkpOwor ICAgIEVYUEVDVF9FUShbd2ViVmlldyBzY3JvbGxWaWV3XS5pbmRpY2F0b3JTdHlsZSwgVUlTY3Jv bGxWaWV3SW5kaWNhdG9yU3R5bGVXaGl0ZSk7CisKKyAgICBbd2ViVmlldyBzZXRVbmRlclBhZ2VC YWNrZ3JvdW5kQ29sb3I6W0NvY29hQ29sb3IgY29sb3JXaXRoQ0dDb2xvcjp3aGl0ZUNvbG9yLmdl dCgpXV07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOworICAg IEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgdW5kZXJQYWdlQmFja2dy b3VuZENvbG9yXS5DR0NvbG9yLCB3aGl0ZUNvbG9yLmdldCgpKSk7CisgICAgRVhQRUNUX1RSVUUo Q0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyBzY3JvbGxWaWV3XS5iYWNrZ3JvdW5kQ29sb3Iu Q0dDb2xvciwgd2hpdGVDb2xvci5nZXQoKSkpOworICAgIEVYUEVDVF9FUShbd2ViVmlldyBzY3Jv bGxWaWV3XS5pbmRpY2F0b3JTdHlsZSwgVUlTY3JvbGxWaWV3SW5kaWNhdG9yU3R5bGVXaGl0ZSk7 CiB9CiAKICNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZKQo= 434151 2021-07-23 17:57:03 -0700 2021-07-24 01:20:14 -0700 Patch bug-228259-20210723175702.patch text/plain 8679 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMjdiMGQ5MWMxM2NmZTc5YWNlZDY4YWNlZDI4YTNkZDRmMDQ1MjIzNy4uMDY4 ZDFhNTE0OTk4MmE0NzI5M2UwNGM3ZDI4ZGU2OWVkOWNlOWIwYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyOCBAQAorMjAyMS0wNy0yMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gUkVHUkVTU0lPTihyMjc3NTA1KTogYC1bV0tXZWJWaWV3IHVuZGVyUGFn ZUJhY2tncm91bmRDb2xvcl1gIGFsc28gY2hhbmdlcyB0aGUgc2Nyb2xsIGJhciBjb2xvcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjU5CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84MDExNjgyMj4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgIElmIGFuIGFwcGxpY2F0aW9uIG92ZXJyaWRlcyB0aGUgYC11bmRl clBhZ2VCYWNrZ3JvdW5kQ29sb3JgIHdpdGggYSBkYXJrIGNvbG9yIG9uIGEgcGFnZSB0aGF0Cisg ICAgICAgIGhhcyBhIGxpZ2h0IGJhY2tncm91bmQgY29sb3IsIHRoZSBzY3JvbGwgYmFyIHdpbGwg YXBwZWFyIGxpZ2h0IHRvIG1hdGNoIHRoZSBvdmVycmlkZGVuIHZhbHVlCisgICAgICAgIG9mIGAt dW5kZXJQYWdlQmFja2dyb3VuZENvbG9yYCBpbnN0ZWFkIG9mIGRhcmsgdG8gbWF0Y2ggdGhlIHBh Z2UncyBiYWNrZ3JvdW5kIGNvbG9yLgorCisgICAgICAgIFRlc3Q6IFdLV2ViVmlld1VuZGVyUGFn ZUJhY2tncm91bmRDb2xvci5NYXRjaGVzU2Nyb2xsVmlldworCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgorICAgICAgICAoYmFzZVNjcm9sbFZpZXdCYWNrZ3Jv dW5kQ29sb3IpOgorICAgICAgICAoc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcik6CisgICAgICAg ICgtW1dLV2ViVmlldyBfdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmRdKToKKyAgICAgICAgQWRk IGEgZmxhZyB0byBpbmRpY2F0ZSB3aGV0aGVyIHRoZSBgdW5kZXJQYWdlQmFja2dyb3VuZENvbG9y YCAod2hpY2ggY2FuIGJlIG92ZXJyaWRkZW4gYnkKKyAgICAgICAgQVBJKSBvciBgcGFnZUV4dGVu ZGVkQmFja2dyb3VuZENvbG9yYCBzaG91bGQgYmUgdXNlZCB3aGVuIGNhbGN1bGF0aW5nIHRoZSB2 YWx1ZSBwcm92aWRlZCB0bworICAgICAgICBgLVtVSVNjcm9sbFZpZXcgc2V0QmFja2dyb3VuZENv bG9yOl1gIGFuZCBgLVtVSVNjcm9sbFZpZXcgc2V0SW5kaWNhdG9yU3R5bGU6XWAuIFRoZSBmb3Jt ZXIKKyAgICAgICAgdXNlcyB0aGUgYHVuZGVyUGFnZUJhY2tncm91bmRDb2xvcmAgc2luY2UgdGhh dCBpcyB3aHkgdGhhdCBBUEkgZXhpc3RzIGFuZCB0aGUgbGF0dGVyIHVzZXMKKyAgICAgICAgdGhl IGBgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yYCBzaW5jZSBpdCBpcyBiYXNlZCBvbiB3aGF0 IGlzIHNob3duIGluIHRoZSBwYWdlLCB3aGljaCBpcworICAgICAgICB3aGF0IHRoZSBzY3JvbGwg YmFyIGlzIGRyYXduIG9uIHRvcCBvZi4KKwogMjAyMS0wNy0yMyAgV2Vuc29uIEhzaWVoICA8d2Vu c29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2F0Y2hPU10gSXQgc2hvdWxkIGJlIHBv c3NpYmxlIHRvIHNlbGVjdCBjb250YWN0IEF1dG9GaWxsIHRleHQgc3VnZ2VzdGlvbnMgaW4gZW1h aWwgYW5kIHVzZXJuYW1lIGZpZWxkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv aW9zL1dLV2ViVmlld0lPUy5tbQppbmRleCA1ZDA0OWEwZTI2ZTAwYjE0NTdjOWEzMWVjMTYwNDYz MjU2YzZjZjZkLi4xZjBkYWZjZDhmYTg2OGNkMTI0NjkwY2E3ZWNjN2NiZjRjOGExMWVlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAt NDc2LDcgKzQ3Niw5IEBAIHN0YXRpYyBDR0Zsb2F0IGNvbnRlbnRab29tU2NhbGUoV0tXZWJWaWV3 ICp3ZWJWaWV3KQogICAgIHJldHVybiBzY2FsZTsKIH0KIAotc3RhdGljIFdlYkNvcmU6OkNvbG9y IGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKK2VudW0g Y2xhc3MgQWxsb3dQYWdlQmFja2dyb3VuZENvbG9yT3ZlcnJpZGUgOiBib29sIHsgTm8sIFllcyB9 OworCitzdGF0aWMgV2ViQ29yZTo6Q29sb3IgYmFzZVNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3Io V0tXZWJWaWV3ICp3ZWJWaWV3LCBBbGxvd1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZSBhbGxv d1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZSkKIHsKICAgICBpZiAod2ViVmlldy0+X2N1c3Rv bUNvbnRlbnRWaWV3KQogICAgICAgICByZXR1cm4gW3dlYlZpZXctPl9jdXN0b21Db250ZW50Vmll dyBiYWNrZ3JvdW5kQ29sb3JdLkNHQ29sb3I7CkBAIC00OTAsMTAgKzQ5MiwxMCBAQCBzdGF0aWMg V2ViQ29yZTo6Q29sb3IgYmFzZVNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IoV0tXZWJWaWV3ICp3 ZWJWaWV3KQogICAgIGlmICghd2ViVmlldy0+X3BhZ2UpCiAgICAgICAgIHJldHVybiB7IH07CiAK LSAgICByZXR1cm4gd2ViVmlldy0+X3BhZ2UtPnVuZGVyUGFnZUJhY2tncm91bmRDb2xvcigpOwor ICAgIHJldHVybiBhbGxvd1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZSA9PSBBbGxvd1BhZ2VC YWNrZ3JvdW5kQ29sb3JPdmVycmlkZTo6WWVzID8gd2ViVmlldy0+X3BhZ2UtPnVuZGVyUGFnZUJh Y2tncm91bmRDb2xvcigpIDogd2ViVmlldy0+X3BhZ2UtPnBhZ2VFeHRlbmRlZEJhY2tncm91bmRD b2xvcigpOwogfQogCi1zdGF0aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91bmRD b2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCitzdGF0aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmll d0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcsIEFsbG93UGFnZUJhY2tncm91bmRD b2xvck92ZXJyaWRlIGFsbG93UGFnZUJhY2tncm91bmRDb2xvck92ZXJyaWRlKQogewogICAgIGlm ICghd2ViVmlldy5vcGFxdWUpCiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpDb2xvcjo6dHJhbnNw YXJlbnRCbGFjazsKQEAgLTUwMiw3ICs1MDQsNyBAQCBzdGF0aWMgV2ViQ29yZTo6Q29sb3Igc2Ny b2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcpCiAgICAgV2ViQ29yZTo6 TG9jYWxDdXJyZW50VHJhaXRDb2xsZWN0aW9uIGxvY2FsVHJhaXRDb2xsZWN0aW9uKHdlYlZpZXcu dHJhaXRDb2xsZWN0aW9uKTsKICNlbmRpZgogCi0gICAgV2ViQ29yZTo6Q29sb3IgY29sb3IgPSBi YXNlU2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcih3ZWJWaWV3KTsKKyAgICBXZWJDb3JlOjpDb2xv ciBjb2xvciA9IGJhc2VTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKHdlYlZpZXcsIGFsbG93UGFn ZUJhY2tncm91bmRDb2xvck92ZXJyaWRlKTsKIAogICAgIGlmICghY29sb3IuaXNWYWxpZCgpICYm IHdlYlZpZXctPl9jb250ZW50VmlldykKICAgICAgICAgY29sb3IgPSBbd2ViVmlldy0+X2NvbnRl bnRWaWV3IGJhY2tncm91bmRDb2xvcl0uQ0dDb2xvcjsKQEAgLTUyOCwxOCArNTMwLDE3IEBAIHN0 YXRpYyBXZWJDb3JlOjpDb2xvciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAq d2ViVmlldykKIAogLSAodm9pZClfdXBkYXRlU2Nyb2xsVmlld0JhY2tncm91bmQKIHsKLSAgICBX ZWJDb3JlOjpDb2xvciBjb2xvciA9IHNjcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3Ioc2VsZik7Cisg ICAgYXV0byBuZXdTY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yID0gc2Nyb2xsVmlld0JhY2tncm91 bmRDb2xvcihzZWxmLCBBbGxvd1BhZ2VCYWNrZ3JvdW5kQ29sb3JPdmVycmlkZTo6WWVzKTsKKyAg ICBpZiAoX3Njcm9sbFZpZXdCYWNrZ3JvdW5kQ29sb3IgIT0gbmV3U2Nyb2xsVmlld0JhY2tncm91 bmRDb2xvcikgeworICAgICAgICBfc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvciA9IG5ld1Njcm9s bFZpZXdCYWNrZ3JvdW5kQ29sb3I7CiAKLSAgICBpZiAoX3Njcm9sbFZpZXdCYWNrZ3JvdW5kQ29s b3IgPT0gY29sb3IpCi0gICAgICAgIHJldHVybjsKLQotICAgIF9zY3JvbGxWaWV3QmFja2dyb3Vu ZENvbG9yID0gY29sb3I7Ci0KLSAgICBhdXRvIHVpQmFja2dyb3VuZENvbG9yID0gYWRvcHROUyhb W1VJQ29sb3IgYWxsb2NdIGluaXRXaXRoQ0dDb2xvcjpjYWNoZWRDR0NvbG9yKGNvbG9yKV0pOwot ICAgIFtfc2Nyb2xsVmlldyBzZXRCYWNrZ3JvdW5kQ29sb3I6dWlCYWNrZ3JvdW5kQ29sb3IuZ2V0 KCldOworICAgICAgICBhdXRvIHVpQmFja2dyb3VuZENvbG9yID0gYWRvcHROUyhbW1VJQ29sb3Ig YWxsb2NdIGluaXRXaXRoQ0dDb2xvcjpjYWNoZWRDR0NvbG9yKG5ld1Njcm9sbFZpZXdCYWNrZ3Jv dW5kQ29sb3IpXSk7CisgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRCYWNrZ3JvdW5kQ29sb3I6dWlC YWNrZ3JvdW5kQ29sb3IuZ2V0KCldOworICAgIH0KIAogICAgIC8vIFVwZGF0ZSB0aGUgaW5kaWNh dG9yIHN0eWxlIGJhc2VkIG9uIHRoZSBsaWdodG5lc3MvZGFya25lc3Mgb2YgdGhlIGJhY2tncm91 bmQgY29sb3IuCi0gICAgaWYgKGNvbG9yLmxpZ2h0bmVzcygpIDw9IC41ZiAmJiBjb2xvci5pc1Zp c2libGUoKSkKKyAgICBhdXRvIG5ld1BhZ2VCYWNrZ3JvdW5kQ29sb3IgPSBzY3JvbGxWaWV3QmFj a2dyb3VuZENvbG9yKHNlbGYsIEFsbG93UGFnZUJhY2tncm91bmRDb2xvck92ZXJyaWRlOjpObyk7 CisgICAgaWYgKG5ld1BhZ2VCYWNrZ3JvdW5kQ29sb3IubGlnaHRuZXNzKCkgPD0gLjVmICYmIG5l d1BhZ2VCYWNrZ3JvdW5kQ29sb3IuaXNWaXNpYmxlKCkpCiAgICAgICAgIFtfc2Nyb2xsVmlldyBz ZXRJbmRpY2F0b3JTdHlsZTpVSVNjcm9sbFZpZXdJbmRpY2F0b3JTdHlsZVdoaXRlXTsKICAgICBl bHNlCiAgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRJbmRpY2F0b3JTdHlsZTpVSVNjcm9sbFZpZXdJ bmRpY2F0b3JTdHlsZUJsYWNrXTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAyNDcyNzk5NTNmYjI0YTczZDY4ZTU1YmVjY2QzODljOWEwMmFmMDMw Li5mODEwODkwMzU3YjUwOTM2ZDRmM2MxYzBkNTdhNDRkOTFjYjg4NWI0IDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MjEtMDctMjMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFtp T1NdIFJFR1JFU1NJT04ocjI3NzUwNSk6IGAtW1dLV2ViVmlldyB1bmRlclBhZ2VCYWNrZ3JvdW5k Q29sb3JdYCBhbHNvIGNoYW5nZXMgdGhlIHNjcm9sbCBiYXIgY29sb3IKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODI1OQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vODAxMTY4MjI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3VW5kZXJQ YWdlQmFja2dyb3VuZENvbG9yLm1tOgorICAgICAgICAoVEVTVC5XS1dlYlZpZXdVbmRlclBhZ2VC YWNrZ3JvdW5kQ29sb3IuTWF0Y2hlc1Njcm9sbFZpZXcpOgorCiAyMDIxLTA3LTIzICBUcnVpdHQg U2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgTWlncmF0ZSBpT1MgMTUgZXhw ZWN0YXRpb25zIHRvIE9wZW5Tb3VyY2UgYW5kIGJ1bXAgdmVyc2lvbiBudW1iZXJzCmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLV2ViVmlld1VuZGVy UGFnZUJhY2tncm91bmRDb2xvci5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV0tXZWJWaWV3VW5kZXJQYWdlQmFja2dyb3VuZENvbG9yLm1tCmluZGV4IDNhYzk2N2Vi OTdkYzAwMDRiOGQxMDhmZTEyZjMwNDdlMTEzOGQ2M2QuLjlhOTFjZWZkNzMwOWMxZDFmM2QwNTNh ODA0M2QwYzA5ZWM2N2E1MDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tXZWJWaWV3VW5kZXJQYWdlQmFja2dyb3VuZENvbG9yLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tXZWJWaWV3VW5kZXJQYWdlQmFj a2dyb3VuZENvbG9yLm1tCkBAIC0yNzYsNiArMjc2LDggQEAgVEVTVChXS1dlYlZpZXdVbmRlclBh Z2VCYWNrZ3JvdW5kQ29sb3IsIEtWTykKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAKK2Nv bnN0ZXhwciBDR0Zsb2F0IHdoaXRlQ29sb3JDb21wb25lbnRzWzRdID0geyAxLCAxLCAxLCAxIH07 CisKIC8vIFRoZXJlJ3Mgbm8gQVBJL1NQSSB0byBnZXQgdGhlIGJhY2tncm91bmQgY29sb3Igb2Yg dGhlIHNjcm9sbCBhcmVhIG9uIG1hY09TLgogCiBURVNUKFdLV2ViVmlld1VuZGVyUGFnZUJhY2tn cm91bmRDb2xvciwgTWF0Y2hlc1Njcm9sbFZpZXcpCkBAIC0yODMsNiArMjg1LDcgQEAgVEVTVChX S1dlYlZpZXdVbmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3IsIE1hdGNoZXNTY3JvbGxWaWV3KQogICAg IGF1dG8gc1JHQkNvbG9yU3BhY2UgPSBhZG9wdENGKENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1l KGtDR0NvbG9yU3BhY2VTUkdCKSk7CiAgICAgYXV0byByZWRDb2xvciA9IGFkb3B0Q0YoQ0dDb2xv ckNyZWF0ZShzUkdCQ29sb3JTcGFjZS5nZXQoKSwgcmVkQ29sb3JDb21wb25lbnRzKSk7CiAgICAg YXV0byBibHVlQ29sb3IgPSBhZG9wdENGKENHQ29sb3JDcmVhdGUoc1JHQkNvbG9yU3BhY2UuZ2V0 KCksIGJsdWVDb2xvckNvbXBvbmVudHMpKTsKKyAgICBhdXRvIHdoaXRlQ29sb3IgPSBhZG9wdENG KENHQ29sb3JDcmVhdGUoc1JHQkNvbG9yU3BhY2UuZ2V0KCksIHdoaXRlQ29sb3JDb21wb25lbnRz KSk7CiAKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOwogICAgIEVYUEVDVF9U UlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgdW5kZXJQYWdlQmFja2dyb3VuZENvbG9y XS5DR0NvbG9yLCBkZWZhdWx0QmFja2dyb3VuZENvbG9yKCkuZ2V0KCkpKTsKQEAgLTI5MSwxMSAr Mjk0LDE5IEBAIFRFU1QoV0tXZWJWaWV3VW5kZXJQYWdlQmFja2dyb3VuZENvbG9yLCBNYXRjaGVz U2Nyb2xsVmlldykKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmdBbmRX YWl0VW50aWxBbGxJbW1lZGlhdGVDaGlsZEZyYW1lc1BhaW50OkAiPHN0eWxlPiBib2R5IHsgYmFj a2dyb3VuZC1jb2xvcjogcmVkOyB9IDwvc3R5bGU+Il07CiAgICAgRVhQRUNUX1RSVUUoQ0dDb2xv ckVxdWFsVG9Db2xvcihbd2ViVmlldyB1bmRlclBhZ2VCYWNrZ3JvdW5kQ29sb3JdLkNHQ29sb3Is IHJlZENvbG9yLmdldCgpKSk7CiAgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihb d2ViVmlldyBzY3JvbGxWaWV3XS5iYWNrZ3JvdW5kQ29sb3IuQ0dDb2xvciwgcmVkQ29sb3IuZ2V0 KCkpKTsKKyAgICBFWFBFQ1RfRVEoW3dlYlZpZXcgc2Nyb2xsVmlld10uaW5kaWNhdG9yU3R5bGUs IFVJU2Nyb2xsVmlld0luZGljYXRvclN0eWxlV2hpdGUpOwogCiAgICAgW3dlYlZpZXcgc2V0VW5k ZXJQYWdlQmFja2dyb3VuZENvbG9yOltDb2NvYUNvbG9yIGNvbG9yV2l0aENHQ29sb3I6Ymx1ZUNv bG9yLmdldCgpXV07CiAgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVd OwogICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgdW5kZXJQYWdl QmFja2dyb3VuZENvbG9yXS5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsKICAgICBFWFBFQ1Rf VFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3IHNjcm9sbFZpZXddLmJhY2tncm91bmRD b2xvci5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsKKyAgICBFWFBFQ1RfRVEoW3dlYlZpZXcg c2Nyb2xsVmlld10uaW5kaWNhdG9yU3R5bGUsIFVJU2Nyb2xsVmlld0luZGljYXRvclN0eWxlV2hp dGUpOworCisgICAgW3dlYlZpZXcgc2V0VW5kZXJQYWdlQmFja2dyb3VuZENvbG9yOltDb2NvYUNv bG9yIGNvbG9yV2l0aENHQ29sb3I6d2hpdGVDb2xvci5nZXQoKV1dOworICAgIFt3ZWJWaWV3IHdh aXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKKyAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1 YWxUb0NvbG9yKFt3ZWJWaWV3IHVuZGVyUGFnZUJhY2tncm91bmRDb2xvcl0uQ0dDb2xvciwgd2hp dGVDb2xvci5nZXQoKSkpOworICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dl YlZpZXcgc2Nyb2xsVmlld10uYmFja2dyb3VuZENvbG9yLkNHQ29sb3IsIHdoaXRlQ29sb3IuZ2V0 KCkpKTsKKyAgICBFWFBFQ1RfRVEoW3dlYlZpZXcgc2Nyb2xsVmlld10uaW5kaWNhdG9yU3R5bGUs IFVJU2Nyb2xsVmlld0luZGljYXRvclN0eWxlV2hpdGUpOwogfQogCiAjZW5kaWYgLy8gUExBVEZP Uk0oSU9TX0ZBTUlMWSkK