233628 2021-11-30 02:21:29 -0800 [Performance test][css-contain] Add test large-grid.html 2021-12-07 03:37:11 -0800 1 1 1 Unclassified WebKit CSS WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228696 InRadar P2 Normal --- 1 cathiechen cathiechen cdumez ews-watchlist jbedard rbuis rniwa simon.fraser webkit-bug-importer oldest_to_newest 1818659 0 cathiechen 2021-11-30 02:21:29 -0800 Add test large-grid.html 1818671 1 445404 cathiechen 2021-11-30 02:56:52 -0800 Created attachment 445404 Patch 1818672 2 cathiechen 2021-11-30 02:57:53 -0800 The testing results in my Mac: Enabled CSS contain: :Runs -> [14.749262536873152, 13.080444735120986, 14.534883720930232, 14.814814814814815, 15.071590052750565, 12.987012987012987, 14.947683109118087, 14.771048744460856, 15.003750937734454, 15.128593040847223, 15.186028853454822, 14.936519790888722, 15.082956259426888, 14.85884101040119, 14.9812734082397, 14.947683109118087, 14.936519790888683, 14.716703458425313, 14.903129657227977, 15.015015015015015] runs/s mean: 14.732687751637487 runs/s median: 14.936519790888703 runs/s stdev: 0.6008961401762974 runs/s min: 12.987012987012987 runs/s max: 15.186028853454822 runs/s Disabled CSS contain: :Runs -> [5.980861244019139, 5.847953216374269, 5.917159763313613, 6.016847172081829, 5.959475566150179, 6.053268765133165, 6.067961165048544, 6.038647342995169, 6.105006105006091, 6.112469437652812, 6.067961165048544, 6.097560975609756, 6.112469437652812, 5.903187721369539, 6.097560975609756, 6.112469437652812, 5.973715651135006, 6.249999999999972, 6.165228113440198, 6.242197253433237] runs/s mean: 6.056100025436322 runs/s median: 6.067961165048544 runs/s stdev: 0.10498908615013607 runs/s min: 5.847953216374269 runs/s max: 6.249999999999972 runs/s 1818674 3 445404 cathiechen 2021-11-30 03:15:13 -0800 Comment on attachment 445404 Patch I think this patch is ready for review now:) 1818760 4 445404 rbuis 2021-11-30 08:46:46 -0800 Comment on attachment 445404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445404&action=review > PerformanceTests/Layout/large-grid.html:148 > + description: "Measures performance of getting offsetHeight of a large grid container.", I think the focus is more on performance of relayout rather than offsetHeight. Also getting offsetHeight from document element rather than grid container should be about the same time right? So maybe it is better to use that? 1819060 5 445404 cathiechen 2021-11-30 19:50:20 -0800 Comment on attachment 445404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445404&action=review >> PerformanceTests/Layout/large-grid.html:148 >> + description: "Measures performance of getting offsetHeight of a large grid container.", > > I think the focus is more on performance of relayout rather than offsetHeight. Also getting offsetHeight from document element rather than grid container should be about the same time right? So maybe it is better to use that? You mean `document.body.offsetHeight`? It's same to gridContainer.offsetHeight, doesn't relayout, if the element is outside the relayout boundary. The following interfaces are same: offsetWidth / offsetHeight, scrollWidth / scrollHeight, clientWidth / clientHeight of element and innerWidth / innerHeight of window. As to the performance of relayout(like getBoundingClientRect), containment doesn't change the performance much in this scenario. Layout containment generates a relayout boundary. It is very efficient to changes of a small part inside a complex document. But in this scenario, it changes a large part of the page, so the performance is not improved. On the other way, for interfaces like offsetHeight, the performance is improved. The relayout boundary makes it's possible to perform the relayout requirement asynchronously. 1820942 6 445404 rbuis 2021-12-07 02:03:09 -0800 Comment on attachment 445404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445404&action=review > PerformanceTests/ChangeLog:14 > + relayout. Then it can schedule the relayout requirement of substree asynchronously. I think the last sentence may be confusing or not relevant, so probably better to remove it. >>> PerformanceTests/Layout/large-grid.html:148 >>> + description: "Measures performance of getting offsetHeight of a large grid container.", >> >> I think the focus is more on performance of relayout rather than offsetHeight. Also getting offsetHeight from document element rather than grid container should be about the same time right? So maybe it is better to use that? > > You mean `document.body.offsetHeight`? It's same to gridContainer.offsetHeight, doesn't relayout, if the element is outside the relayout boundary. > The following interfaces are same: offsetWidth / offsetHeight, scrollWidth / scrollHeight, clientWidth / clientHeight of element and innerWidth / innerHeight of window. > > As to the performance of relayout(like getBoundingClientRect), containment doesn't change the performance much in this scenario. Layout containment generates a relayout boundary. It is very efficient to changes of a small part inside a complex document. > But in this scenario, it changes a large part of the page, so the performance is not improved. On the other way, for interfaces like offsetHeight, the performance is improved. > The relayout boundary makes it's possible to perform the relayout requirement asynchronously. Ok thanks, that clears things up. 1820951 7 webkit-bug-importer 2021-12-07 02:22:26 -0800 <rdar://problem/86147146> 1820954 8 445404 cathiechen 2021-12-07 02:31:53 -0800 Comment on attachment 445404 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=445404&action=review >> PerformanceTests/ChangeLog:14 >> + relayout. Then it can schedule the relayout requirement of substree asynchronously. > > I think the last sentence may be confusing or not relevant, so probably better to remove it. Done, thanks! 1820956 9 446144 cathiechen 2021-12-07 02:34:25 -0800 Created attachment 446144 Patch 1820968 10 ews-feeder 2021-12-07 03:37:07 -0800 Committed r286595 (?): <https://commits.webkit.org/r286595> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446144. 445404 2021-11-30 02:56:52 -0800 2021-12-07 02:34:19 -0800 Patch bug-233628-20211130185650.patch text/plain 5932 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTA4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDg5MjM5MmQ4N2Y3 NDAwZWJmYTk4ZjVhODY1M2M5ZmQ0ZTI3NTVmNTkuLmRjNWQ3ZjYyNGFmNTU4MGNlMGExNzZkODc2 ZWUwOWUxYWM1YzdhYzIgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMTEt MzAgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIHRlc3QgbGFyZ2UtZ3JpZC5odG1sCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM2MjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHRlc3QgbGFy Z2UtZ3JpZC5odG1sIGlzIGltcG9ydGVkIGZyb20gQ2hyb21pdW0sIGFuZCB3ZSBjaGFuZ2UgaXQg YSBsaXR0bGUgYml0LgorICAgICAgICBUaGlzIGNhc2UgdGVzdHMgdGhlIHBlcmZvcm1hbmNlIG9m IGdldHRpbmcgZ3JpZENvbnRhaW5lci5vZmZzZXRIZWlnaHQgd2hpY2ggaXMgdGhlIHBhcmVudCBv ZgorICAgICAgICBhIGxhcmdlIGdyaWQgd2l0aCBgY29udGFpbjogc3RyaWN0YC4gVGhlIHBlcmZv cm1hbmNlIGlzIGltcHJvdmVkIHdoZW4gZW5hYmxlIENTUyBjb250YWluLAorICAgICAgICBiZWNh dXNlIG9mZnNldEhlaWdodCByZXR1cm5zIHRoZSB2YWx1ZSBkaXJlY3RseSBpZiB0aGUgZWxlbWVu dCBkb2Vzbid0IG5lZWQgcmVsYXlvdXQsIHNlZQorICAgICAgICBgRG9jdW1lbnQ6OnVwZGF0ZUxh eW91dElmRGltZW5zaW9uc091dE9mRGF0ZWAuIGBjb250YWluOiBzdHJpY3RgIHNldHMgYSByZWxh eW91dCBib3VuZGFyeSB0bworICAgICAgICB0aGUgbGFyZ2UgZ3JpZCwgc28gd2hlbiBpdHMgc3Vi dHJlZSBjaGFuZ2VzLCB0aGUgY29udGFpbmVyIG9mIHRoZSBsYXJnZSBncmlkIGRvZXNuJ3QgbmVl ZAorICAgICAgICByZWxheW91dC4gVGhlbiBpdCBjYW4gc2NoZWR1bGUgdGhlIHJlbGF5b3V0IHJl cXVpcmVtZW50IG9mIHN1YnN0cmVlIGFzeW5jaHJvbm91c2x5LgorCisgICAgICAgICogTGF5b3V0 L2xhcmdlLWdyaWQuaHRtbDogQWRkZWQuCisKIDIwMjEtMTEtMjEgIENhdGhpZSBDaGVuICA8Y2F0 aGllY2hlbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtQZXJmb3JtYW5jZSB0ZXN0XVtjc3MtY29u dGFpbl0gQWRkIGNhc2UgdG8gdGVzdCBjb250YWluOiBsYXlvdXQgaW5zaWRlIGEgY29tcGxleCBk b2N1bWVudApkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGFyZ2UtZ3JpZC5o dG1sIGIvUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGFyZ2UtZ3JpZC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjY3ODFjZmIzYjBjMzhmOGRmN2IyYzcxZTIwZDgyMzUyODRjMWU1ZTkKLS0tIC9kZXYvbnVsbAor KysgYi9QZXJmb3JtYW5jZVRlc3RzL0xheW91dC9sYXJnZS1ncmlkLmh0bWwKQEAgLTAsMCArMSwx NTUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisKKzxoZWFkPgorICAgIDxzY3JpcHQgc3Jj PSIuLi9yZXNvdXJjZXMvcnVubmVyLmpzIj48L3NjcmlwdD4KKyAgICA8bWV0YSBodHRwLWVxdWl2 PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCI+CisKKzxz dHlsZT4KK2h0bWwsIGJvZHksICNncmlkQ29udGFpbmVyIHsgaGVpZ2h0OiAxMDAlOyB9CisKK3Vp LXBhbmUjbWFpbiB7CisgICAgY29udGFpbjogc3RyaWN0OworICAgIG1pbi13aWR0aDogMTAwJSAh aW1wb3J0YW50OworICAgIHdpZHRoOiAxMDAlICFpbXBvcnRhbnQ7CisgICAgbWF4LXdpZHRoOiAx MDAlICFpbXBvcnRhbnQ7CisgICAgbWluLWhlaWdodDogMTAwJSAhaW1wb3J0YW50OworICAgIGhl aWdodDogMTAwJSAhaW1wb3J0YW50OworICAgIG1heC1oZWlnaHQ6IDEwMCUgIWltcG9ydGFudDsK KyAgICBvdmVyZmxvdzogaGlkZGVuOworfQorCitbcm93MV0geworICAgIGdyaWQtcm93LXN0YXJ0 OiAxOworICAgIGdyaWQtcm93LWVuZDogYXV0bzsKK30KKworW3JvdzJdIHsKKyAgICBncmlkLXJv dy1zdGFydDogMjsKKyAgICBncmlkLXJvdy1lbmQ6IGF1dG87Cit9CisKKworW2NvbDJdIHsKKyAg ICBncmlkLWNvbHVtbi1zdGFydDogMjsKKyAgICBncmlkLWNvbHVtbi1lbmQ6IGF1dG87Cit9CisK K3VpLXBhbmUgeworICAgIGRpc3BsYXk6IGdyaWQ7CisgICAgaGVpZ2h0OiAxMDAlOworICAgIGNv bnRhaW46IGNvbnRlbnQ7Cit9CisKK1toZ3JpZF0geworICAgIGdyaWQtdGVtcGxhdGUtcm93czog MWZyOworfQorCitbdmdyaWRdIHsKKyAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDFmcjsKK30K KwordWktaWNvbiB7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworfQorCitbY29sbGFwc2Vk IF0geyBkaXNwbGF5OiBub25lOyB9CisKKy5ldmVudENoaWxkcmVuV3JhcCB7CisgICAgZ3JpZC1j b2x1bW46IDEvc3BhbiAzOworICAgIGNvbnRhaW46IGNvbnRlbnQ7Cit9CisKKy5ldmVudENoaWxk cmVuQ29udGFpbmVyIHsKKyAgICBkaXNwbGF5OiBncmlkOworICAgIGdyaWQtdGVtcGxhdGUtY29s dW1uczogM2VtIDBweCAxZnI7CisgICAgY29udGFpbjogY29udGVudDsKK30KKworLmFjdGlvbkJs b2NrV3JhcCB7CisgICAgZ3JpZC1jb2x1bW46IDM7CisgICAgYWxpZ24tc2VsZjogc3RhcnQ7Cisg ICAgY29udGFpbjogbGF5b3V0IHN0eWxlOworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKK30KKwor LmFjdGlvbkJsb2NrIHsKKyAgICBkaXNwbGF5OiBncmlkOworICAgIGdyaWQtdGVtcGxhdGUtY29s dW1uczogMWZyOworICAgIG92ZXJmbG93OiBoaWRkZW47CisgICAgY29udGFpbjogY29udGVudDsK K30KKworPC9zdHlsZT4KKworPC9oZWFkPgorCis8Ym9keT4KKyAgICA8cHJlIGlkPSJsb2ciPjwv cHJlPgorCisgICAgPGRpdiBpZD0iZ3JpZENvbnRhaW5lciI+CisgICAgICAgIDx1aS1wYW5lIGlk PSJtYWluIiB2Z3JpZD0iIiBzdHlsZT0iZ3JpZC10ZW1wbGF0ZS1yb3dzOiAxZnI7Ij4KKyAgICAg ICAgICAgIDx1aS1wYW5lIGlkPSJtaWRkbGUiIHJvdzE9IiIgaGdyaWQ9IiIgc3R5bGU9ImdyaWQt dGVtcGxhdGUtY29sdW1uczogMzIwcHggMWZyIDMwMHB4OyI+CisgICAgICAgICAgICAgICAgPHVp LXBhbmUgY29sMj0iIj4KKyAgICAgICAgICAgICAgICAgICAgPHVpLWJvZHkgcm93Mj0iIj4KKyAg ICAgICAgICAgICAgICAgICAgICAgIDx1aS1wYW5lIGNsYXNzPSJldmVudFNoZWV0Vmlld1BhbmUi PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx1aS1ib2R5IHJvdzI9IiIgY2xhc3M9ImV2 ZW50U2hlZXRWaWV3Ij4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxkaXYg aWQ9InRoaXNpc3RoZW9uZSIgY2xhc3M9ImV2ZW50Q2hpbGRyZW5XcmFwIj4KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJldmVudENoaWxkcmVuQ29u dGFpbmVyIj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGRp diBjbGFzcz0iYWN0aW9uQmxvY2tXcmFwIj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImFjdGlvbkJsb2NrIiBpZD0iaW5zZXJ0aGVy ZSI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2Rp dj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPC9kaXY+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC91aS1ib2R5Pgor ICAgICAgICAgICAgICAgICAgICAgICAgPC91aS1wYW5lPgorICAgICAgICAgICAgICAgICAgICA8 L3VpLWJvZHk+CisgICAgICAgICAgICAgICAgPC91aS1wYW5lPgorCisgICAgICAgICAgICA8L3Vp LXBhbmU+CisgICAgICAgIDwvdWktcGFuZT4KKyAgICA8L2Rpdj4KKworICAgIDxzY3JpcHQ+Cisg ICAgICAgIHZhciB0YXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGhpc2lzdGhlb25l Jyk7CisgICAgICAgIHZhciBncmlkQ29udGFpbmVyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2dyaWRDb250YWluZXInKTsKKworICAgICAgICBmdW5jdGlvbiBzZXR1cCgpIHsKKyAgICAgICAg ICBsZXQgaW5zZXJ0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2luc2VydGhlcmUnKTsKKyAg ICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IDUwOyArK2kpIHsKKyAgICAgICAgICAgIGxldCBu YW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAgICAgICAgICBuYW1lLmNs YXNzTmFtZSA9ICdhY3Rpb25OYW1lQ2VsbCc7CisgICAgICAgICAgICBuYW1lLmlubmVySFRNTCA9 ICc8dWktaWNvbiBzdHlsZT0id2lkdGg6IDIwcHg7IGhlaWdodDogMjBweDsgIj48L3VpLWljb24+ PHNwYW4gY2xhc3M9ImFjdGlvbk9iamVjdE5hbWVTcGFuIj5CdXR0b248L3NwYW4+JzsKKyAgICAg ICAgICAgIGxldCBkZXNjID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CisgICAgICAg ICAgICBkZXNjLmNsYXNzTmFtZSA9ICdhY3Rpb25EZXNjQ2VsbCc7CisgICAgICAgICAgICBkZXNj LmlubmVySFRNTCA9ICdTZXQgcG9zaXRpb24gdG8gPGV2ZW50LXBhcmFtZXRlciBkYXRhLWluZGV4 PSIwIj4gPHVpLWljb24gY2xhc3M9Im9iamVjdFBhcmFtZXRlckljb24iIHN0eWxlPSJ3aWR0aDog MjBweDsgaGVpZ2h0OiAyMHB4OyAiPjwvdWktaWNvbj48c3BhbiBjbGFzcz0ib2JqZWN0UGFyYW1l dGVyT2JqZWN0TmFtZSI+U3ByaXRlPC9zcGFuPiA8L2V2ZW50LXBhcmFtZXRlcj4gPGVtPihpbWFn ZSBwb2ludCA8ZXZlbnQtcGFyYW1ldGVyIGRhdGEtaW5kZXg9IjEiPjMyMTMyMTM8L2V2ZW50LXBh cmFtZXRlcj4pPC9lbT4nOworICAgICAgICAgICAgaW5zZXJ0LmFwcGVuZENoaWxkKG5hbWUpOwor ICAgICAgICAgICAgaW5zZXJ0LmFwcGVuZENoaWxkKGRlc2MpOworICAgICAgICAgIH0KKyAgICAg ICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3QoKSB7CisgICAgICAgICAgICB0YXJnZXQuc2V0 QXR0cmlidXRlKCdjb2xsYXBzZWQnLCAnJyk7CisgICAgICAgICAgICBncmlkQ29udGFpbmVyLm9m ZnNldEhlaWdodDsKKworICAgICAgICAgICAgdGFyZ2V0LnJlbW92ZUF0dHJpYnV0ZSgnY29sbGFw c2VkJyk7CisgICAgICAgICAgICBncmlkQ29udGFpbmVyLm9mZnNldEhlaWdodDsKKyAgICAgICAg fQorCisgICAgICAgIGZ1bmN0aW9uIGRvbmUoKSB7CisgICAgICAgICAgbGV0IGluc2VydCA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnNlcnRoZXJlJyk7CisgICAgICAgICAgaW5zZXJ0Lmlu bmVySFRNTCA9ICIiOworICAgICAgICB9CisKKyAgICAgICAgc2V0dXAoKTsKKyAgICAgICAgUGVy ZlRlc3RSdW5uZXIubWVhc3VyZVJ1bnNQZXJTZWNvbmQoeworICAgICAgICAgICAgZGVzY3JpcHRp b246ICJNZWFzdXJlcyBwZXJmb3JtYW5jZSBvZiBnZXR0aW5nIG9mZnNldEhlaWdodCBvZiBhIGxh cmdlIGdyaWQgY29udGFpbmVyLiIsCisgICAgICAgICAgICBydW46IHRlc3QsCisgICAgICAgICAg ICBkb25lOiBkb25lCisgICAgICAgIH0pOworICAgIDwvc2NyaXB0PgorPC9ib2R5PgorCis8L2h0 bWw+Cg== 446144 2021-12-07 02:34:25 -0800 2021-12-07 03:37:09 -0800 Patch bug-233628-20211207183423.patch text/plain 5852 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTA4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDg5MjM5MmQ4N2Y3 NDAwZWJmYTk4ZjVhODY1M2M5ZmQ0ZTI3NTVmNTkuLjY4MTU1MGIwN2Y2MDhmOGM4MzQwMDBkYjY2 OGQxOWQxMTQxOWU3NWEgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMTEt MzAgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIHRlc3QgbGFyZ2UtZ3JpZC5odG1sCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM2MjgKKworICAg ICAgICBSZXZpZXdlZCBieSBSb2IgQnVpcy4KKworICAgICAgICBUaGlzIHRlc3QgbGFyZ2UtZ3Jp ZC5odG1sIGlzIGltcG9ydGVkIGZyb20gQ2hyb21pdW0sIGFuZCB3ZSBjaGFuZ2UgaXQgYSBsaXR0 bGUgYml0LgorICAgICAgICBUaGlzIGNhc2UgdGVzdHMgdGhlIHBlcmZvcm1hbmNlIG9mIGdldHRp bmcgZ3JpZENvbnRhaW5lci5vZmZzZXRIZWlnaHQgd2hpY2ggaXMgdGhlIHBhcmVudCBvZgorICAg ICAgICBhIGxhcmdlIGdyaWQgd2l0aCBgY29udGFpbjogc3RyaWN0YC4gVGhlIHBlcmZvcm1hbmNl IGlzIGltcHJvdmVkIHdoZW4gZW5hYmxlIENTUyBjb250YWluLAorICAgICAgICBiZWNhdXNlIG9m ZnNldEhlaWdodCByZXR1cm5zIHRoZSB2YWx1ZSBkaXJlY3RseSBpZiB0aGUgZWxlbWVudCBkb2Vz bid0IG5lZWQgcmVsYXlvdXQsIHNlZQorICAgICAgICBgRG9jdW1lbnQ6OnVwZGF0ZUxheW91dElm RGltZW5zaW9uc091dE9mRGF0ZWAuIGBjb250YWluOiBzdHJpY3RgIHNldHMgYSByZWxheW91dCBi b3VuZGFyeSB0bworICAgICAgICB0aGUgbGFyZ2UgZ3JpZCwgc28gd2hlbiBpdHMgc3VidHJlZSBj aGFuZ2VzLCB0aGUgY29udGFpbmVyIG9mIHRoZSBsYXJnZSBncmlkIGRvZXNuJ3QgbmVlZAorICAg ICAgICByZWxheW91dC4KKworICAgICAgICAqIExheW91dC9sYXJnZS1ncmlkLmh0bWw6IEFkZGVk LgorCiAyMDIxLTExLTIxICBDYXRoaWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbUGVyZm9ybWFuY2UgdGVzdF1bY3NzLWNvbnRhaW5dIEFkZCBjYXNlIHRvIHRlc3Qg Y29udGFpbjogbGF5b3V0IGluc2lkZSBhIGNvbXBsZXggZG9jdW1lbnQKZGlmZiAtLWdpdCBhL1Bl cmZvcm1hbmNlVGVzdHMvTGF5b3V0L2xhcmdlLWdyaWQuaHRtbCBiL1BlcmZvcm1hbmNlVGVzdHMv TGF5b3V0L2xhcmdlLWdyaWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42NzgxY2ZiM2IwYzM4ZjhkZjdiMmM3 MWUyMGQ4MjM1Mjg0YzFlNWU5Ci0tLSAvZGV2L251bGwKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9M YXlvdXQvbGFyZ2UtZ3JpZC5odG1sCkBAIC0wLDAgKzEsMTU1IEBACis8IURPQ1RZUEUgaHRtbD4K KzxodG1sPgorCis8aGVhZD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3J1bm5lci5q cyI+PC9zY3JpcHQ+CisgICAgPG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50 PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPgorCis8c3R5bGU+CitodG1sLCBib2R5LCAjZ3Jp ZENvbnRhaW5lciB7IGhlaWdodDogMTAwJTsgfQorCit1aS1wYW5lI21haW4geworICAgIGNvbnRh aW46IHN0cmljdDsKKyAgICBtaW4td2lkdGg6IDEwMCUgIWltcG9ydGFudDsKKyAgICB3aWR0aDog MTAwJSAhaW1wb3J0YW50OworICAgIG1heC13aWR0aDogMTAwJSAhaW1wb3J0YW50OworICAgIG1p bi1oZWlnaHQ6IDEwMCUgIWltcG9ydGFudDsKKyAgICBoZWlnaHQ6IDEwMCUgIWltcG9ydGFudDsK KyAgICBtYXgtaGVpZ2h0OiAxMDAlICFpbXBvcnRhbnQ7CisgICAgb3ZlcmZsb3c6IGhpZGRlbjsK K30KKworW3JvdzFdIHsKKyAgICBncmlkLXJvdy1zdGFydDogMTsKKyAgICBncmlkLXJvdy1lbmQ6 IGF1dG87Cit9CisKK1tyb3cyXSB7CisgICAgZ3JpZC1yb3ctc3RhcnQ6IDI7CisgICAgZ3JpZC1y b3ctZW5kOiBhdXRvOworfQorCisKK1tjb2wyXSB7CisgICAgZ3JpZC1jb2x1bW4tc3RhcnQ6IDI7 CisgICAgZ3JpZC1jb2x1bW4tZW5kOiBhdXRvOworfQorCit1aS1wYW5lIHsKKyAgICBkaXNwbGF5 OiBncmlkOworICAgIGhlaWdodDogMTAwJTsKKyAgICBjb250YWluOiBjb250ZW50OworfQorCitb aGdyaWRdIHsKKyAgICBncmlkLXRlbXBsYXRlLXJvd3M6IDFmcjsKK30KKworW3ZncmlkXSB7Cisg ICAgZ3JpZC10ZW1wbGF0ZS1jb2x1bW5zOiAxZnI7Cit9CisKK3VpLWljb24geworICAgIGRpc3Bs YXk6IGlubGluZS1ibG9jazsKK30KKworW2NvbGxhcHNlZCBdIHsgZGlzcGxheTogbm9uZTsgfQor CisuZXZlbnRDaGlsZHJlbldyYXAgeworICAgIGdyaWQtY29sdW1uOiAxL3NwYW4gMzsKKyAgICBj b250YWluOiBjb250ZW50OworfQorCisuZXZlbnRDaGlsZHJlbkNvbnRhaW5lciB7CisgICAgZGlz cGxheTogZ3JpZDsKKyAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDNlbSAwcHggMWZyOworICAg IGNvbnRhaW46IGNvbnRlbnQ7Cit9CisKKy5hY3Rpb25CbG9ja1dyYXAgeworICAgIGdyaWQtY29s dW1uOiAzOworICAgIGFsaWduLXNlbGY6IHN0YXJ0OworICAgIGNvbnRhaW46IGxheW91dCBzdHls ZTsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7Cit9CisKKy5hY3Rpb25CbG9jayB7CisgICAgZGlz cGxheTogZ3JpZDsKKyAgICBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDFmcjsKKyAgICBvdmVyZmxv dzogaGlkZGVuOworICAgIGNvbnRhaW46IGNvbnRlbnQ7Cit9CisKKzwvc3R5bGU+CisKKzwvaGVh ZD4KKworPGJvZHk+CisgICAgPHByZSBpZD0ibG9nIj48L3ByZT4KKworICAgIDxkaXYgaWQ9Imdy aWRDb250YWluZXIiPgorICAgICAgICA8dWktcGFuZSBpZD0ibWFpbiIgdmdyaWQ9IiIgc3R5bGU9 ImdyaWQtdGVtcGxhdGUtcm93czogMWZyOyI+CisgICAgICAgICAgICA8dWktcGFuZSBpZD0ibWlk ZGxlIiByb3cxPSIiIGhncmlkPSIiIHN0eWxlPSJncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDMyMHB4 IDFmciAzMDBweDsiPgorICAgICAgICAgICAgICAgIDx1aS1wYW5lIGNvbDI9IiI+CisgICAgICAg ICAgICAgICAgICAgIDx1aS1ib2R5IHJvdzI9IiI+CisgICAgICAgICAgICAgICAgICAgICAgICA8 dWktcGFuZSBjbGFzcz0iZXZlbnRTaGVldFZpZXdQYW5lIj4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8dWktYm9keSByb3cyPSIiIGNsYXNzPSJldmVudFNoZWV0VmlldyI+CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8ZGl2IGlkPSJ0aGlzaXN0aGVvbmUiIGNsYXNz PSJldmVudENoaWxkcmVuV3JhcCI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPGRpdiBjbGFzcz0iZXZlbnRDaGlsZHJlbkNvbnRhaW5lciI+CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImFjdGlvbkJsb2NrV3Jh cCI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8ZGl2 IGNsYXNzPSJhY3Rpb25CbG9jayIgaWQ9Imluc2VydGhlcmUiPgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDwvZGl2PgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDwvZGl2PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPC9kaXY+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvZGl2PgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDwvdWktYm9keT4KKyAgICAgICAgICAgICAgICAgICAgICAg IDwvdWktcGFuZT4KKyAgICAgICAgICAgICAgICAgICAgPC91aS1ib2R5PgorICAgICAgICAgICAg ICAgIDwvdWktcGFuZT4KKworICAgICAgICAgICAgPC91aS1wYW5lPgorICAgICAgICA8L3VpLXBh bmU+CisgICAgPC9kaXY+CisKKyAgICA8c2NyaXB0PgorICAgICAgICB2YXIgdGFyZ2V0ID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RoaXNpc3RoZW9uZScpOworICAgICAgICB2YXIgZ3JpZENv bnRhaW5lciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdncmlkQ29udGFpbmVyJyk7CisKKyAg ICAgICAgZnVuY3Rpb24gc2V0dXAoKSB7CisgICAgICAgICAgbGV0IGluc2VydCA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdpbnNlcnRoZXJlJyk7CisgICAgICAgICAgZm9yIChsZXQgaSA9IDA7 IGkgPCA1MDsgKytpKSB7CisgICAgICAgICAgICBsZXQgbmFtZSA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoJ2RpdicpOworICAgICAgICAgICAgbmFtZS5jbGFzc05hbWUgPSAnYWN0aW9uTmFtZUNl bGwnOworICAgICAgICAgICAgbmFtZS5pbm5lckhUTUwgPSAnPHVpLWljb24gc3R5bGU9IndpZHRo OiAyMHB4OyBoZWlnaHQ6IDIwcHg7ICI+PC91aS1pY29uPjxzcGFuIGNsYXNzPSJhY3Rpb25PYmpl Y3ROYW1lU3BhbiI+QnV0dG9uPC9zcGFuPic7CisgICAgICAgICAgICBsZXQgZGVzYyA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOworICAgICAgICAgICAgZGVzYy5jbGFzc05hbWUgPSAn YWN0aW9uRGVzY0NlbGwnOworICAgICAgICAgICAgZGVzYy5pbm5lckhUTUwgPSAnU2V0IHBvc2l0 aW9uIHRvIDxldmVudC1wYXJhbWV0ZXIgZGF0YS1pbmRleD0iMCI+IDx1aS1pY29uIGNsYXNzPSJv YmplY3RQYXJhbWV0ZXJJY29uIiBzdHlsZT0id2lkdGg6IDIwcHg7IGhlaWdodDogMjBweDsgIj48 L3VpLWljb24+PHNwYW4gY2xhc3M9Im9iamVjdFBhcmFtZXRlck9iamVjdE5hbWUiPlNwcml0ZTwv c3Bhbj4gPC9ldmVudC1wYXJhbWV0ZXI+IDxlbT4oaW1hZ2UgcG9pbnQgPGV2ZW50LXBhcmFtZXRl ciBkYXRhLWluZGV4PSIxIj4zMjEzMjEzPC9ldmVudC1wYXJhbWV0ZXI+KTwvZW0+JzsKKyAgICAg ICAgICAgIGluc2VydC5hcHBlbmRDaGlsZChuYW1lKTsKKyAgICAgICAgICAgIGluc2VydC5hcHBl bmRDaGlsZChkZXNjKTsKKyAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlv biB0ZXN0KCkgeworICAgICAgICAgICAgdGFyZ2V0LnNldEF0dHJpYnV0ZSgnY29sbGFwc2VkJywg JycpOworICAgICAgICAgICAgZ3JpZENvbnRhaW5lci5vZmZzZXRIZWlnaHQ7CisKKyAgICAgICAg ICAgIHRhcmdldC5yZW1vdmVBdHRyaWJ1dGUoJ2NvbGxhcHNlZCcpOworICAgICAgICAgICAgZ3Jp ZENvbnRhaW5lci5vZmZzZXRIZWlnaHQ7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBk b25lKCkgeworICAgICAgICAgIGxldCBpbnNlcnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn aW5zZXJ0aGVyZScpOworICAgICAgICAgIGluc2VydC5pbm5lckhUTUwgPSAiIjsKKyAgICAgICAg fQorCisgICAgICAgIHNldHVwKCk7CisgICAgICAgIFBlcmZUZXN0UnVubmVyLm1lYXN1cmVSdW5z UGVyU2Vjb25kKHsKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAiTWVhc3VyZXMgcGVyZm9ybWFu Y2Ugb2YgZ2V0dGluZyBvZmZzZXRIZWlnaHQgb2YgYSBsYXJnZSBncmlkIGNvbnRhaW5lci4iLAor ICAgICAgICAgICAgcnVuOiB0ZXN0LAorICAgICAgICAgICAgZG9uZTogZG9uZQorICAgICAgICB9 KTsKKyAgICA8L3NjcmlwdD4KKzwvYm9keT4KKworPC9odG1sPgo=