208620 2020-03-04 18:25:49 -0800 Track "scrolling scope" on RenderLayers 2020-03-13 08:15:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc ews-watchlist fred.wang glenn koivisto kondapallykalyan pdr simon.fraser tsavell webkit-bug-importer zalan oldest_to_newest 1625895 0 simon.fraser 2020-03-04 18:25:49 -0800 Track "scrolling scope" on RenderLayers 1625898 1 392526 simon.fraser 2020-03-04 18:31:23 -0800 Created attachment 392526 Patch 1625920 2 392526 zalan 2020-03-04 19:39:32 -0800 Comment on attachment 392526 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392526&action=review > Source/WebCore/ChangeLog:12 > + Each layer has two scopes; a "box" scope that applies to the background/borders, and wouldn't decoration scope be a better name if it is only about background and borders? 1625929 3 simon.fraser 2020-03-04 19:59:22 -0800 (In reply to zalan from comment #2) > Comment on attachment 392526 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=392526&action=review > > > Source/WebCore/ChangeLog:12 > > + Each layer has two scopes; a "box" scope that applies to the background/borders, and > > wouldn't decoration scope be a better name if it is only about background > and borders? I thought of that, but it's more about the scrolling element's box, which doesn't move. 1626112 4 commit-queue 2020-03-05 09:17:28 -0800 The commit-queue encountered the following flaky tests while processing attachment 392526: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1626113 5 392526 commit-queue 2020-03-05 09:18:05 -0800 Comment on attachment 392526 Patch Clearing flags on attachment: 392526 Committed r257920: <https://trac.webkit.org/changeset/257920> 1626114 6 commit-queue 2020-03-05 09:18:06 -0800 All reviewed patches have been landed. Closing bug. 1626118 7 webkit-bug-importer 2020-03-05 09:19:16 -0800 <rdar://problem/60086595> 1628387 8 simon.fraser 2020-03-10 14:29:52 -0700 Partially reverted in https://trac.webkit.org/changeset/258229/webkit because it broke gmail. 1628461 9 393197 simon.fraser 2020-03-10 18:23:28 -0700 Created attachment 393197 Patch 1628497 10 393197 commit-queue 2020-03-10 20:26:09 -0700 Comment on attachment 393197 Patch Clearing flags on attachment: 393197 Committed r258249: <https://trac.webkit.org/changeset/258249> 1628498 11 commit-queue 2020-03-10 20:26:10 -0700 All reviewed patches have been landed. Closing bug. 1629609 12 tsavell 2020-03-13 08:15:16 -0700 New test added in this commit is flaky, tracking in https://bugs.webkit.org/show_bug.cgi?id=209052 392526 2020-03-04 18:31:23 -0800 2020-03-10 18:23:26 -0700 Patch bug-208620-20200304183122.patch text/plain 10023 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3ODI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzI5YWJiMTQ4NjliMDgy YTI1MjgwZGQ0ZjMyZDZlMzkwYTc0Zjc3My4uZjE5ZTg2YTIxZTI0MGM1ZmNiY2IxODM3MzgyYzJm MjYwMTliNjY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTAzLTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFRyYWNrICJzY3Jv bGxpbmcgc2NvcGUiIG9uIFJlbmRlckxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgS2VlcCB0cmFjayBvZiBhICJzY3JvbGxpbmcgc2NvcGUiIG9u IFJlbmRlckxheWVycy4gTGF5ZXJzIHRoYXQgc2hhcmUgYSBzY3JvbGxpbmcgc2NvcGUKKyAgICAg ICAgZ2V0IHNjcm9sbGVkIGJ5IHNvbWUgY29tbW9uIGFzeW5jLXNjcm9sbGFibGUgY29udGFpbmlu Zy1ibG9jayBhbmNlc3Rvci4gVGhlIHNjb3BlIGlzIGp1c3QKKyAgICAgICAgYSB1bmlxdWUgaWRl bnRpZmllci4KKyAgICAgICAgCisgICAgICAgIEVhY2ggbGF5ZXIgaGFzIHR3byBzY29wZXM7IGEg ImJveCIgc2NvcGUgdGhhdCBhcHBsaWVzIHRvIHRoZSBiYWNrZ3JvdW5kL2JvcmRlcnMsIGFuZAor ICAgICAgICBhICJjb250ZW50IiBzY29wZSB0aGF0IGFwcGxpZXMgdG8gKHBvdGVudGlhbGx5KSBz Y3JvbGxhYmxlIGNvbnRlbnQuIEZvciBtb3N0IGxheWVycywKKyAgICAgICAgdGhlc2Ugd2lsbCBi ZSB0aGUgc2FtZSwgYW5kIHNoYXJlZCB3aXRoIHRoZSBsYXllcidzIGNvbnRhaW5pbmcgYmxvY2sg YW5jZXN0b3IgbGF5ZXIuCisKKyAgICAgICAgRm9yIGFzeW5jLXNjcm9sbGFibGUgb3ZlcmZsb3cs ICJib3giIHNjb3BlIGlzIHNoYXJlZCB3aXRoIHRoZSBjYiBhbmNlc3RvciwgYnV0ICJjb250ZW50 IiBzY29wZQorICAgICAgICB3aWxsIGhhdmUgYSBuZXcgdmFsdWUgdGhhdCBhcHBsaWVzIHRvIGFs bCB0aGUgbGF5ZXJzIG1vdmVkIGJ5IHRoYXQgc2Nyb2xsZXIuCisKKyAgICAgICAgSGF2aW5nIHRo aXMgdmFsdWUgbWFrZXMgaXQgZWFzeSB0byBhc2sgdGhlIHF1ZXN0aW9uICJpcyB0aGlzIGxheWVy IHNjcm9sbGVkIGJ5IHNvbWUgYW5jZXN0b3IiLAorICAgICAgICB3aGljaCBpcyBhIHRyaWNreSBj b21wdXRhdGlvbiBmb3IgdGhpbmdzIGxpa2UgYSBwb3NpdGlvbjphYnNvbHV0ZSBsYXllciBpbnNp ZGUgYSBub24tY29udGFpbmluZyBibG9jaworICAgICAgICBzdGFja2luZyBjb250ZXh0IG92ZXJm bG93OnNjcm9sbC4gQWxzbywgcG9zaXRpb246Zml4ZWQgd2hvc2UgY29udGFpbmluZyBibG9jayBp cyB0aGUgcm9vdCB3aWxsIHNoYXJlCisgICAgICAgIHRoZSBzY3JvbGxpbmcgc2NvcGUgb2YgdGhl IHJvb3QuCisKKyAgICAgICAgTm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5leHRTY3JvbGxpbmdTY29w ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6UmVuZGVyTGF5ZXIpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6Om91dHB1dFBhaW50T3JkZXJUcmVlTGVnZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Om91 dHB1dFBhaW50T3JkZXJUcmVlUmVjdXJzaXZlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmlzU2Nyb2xsZWRCeU92ZXJmbG93U2Nyb2xsTGF5ZXIpOgorCiAy MDIwLTAzLTAzICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbQ29jb2FdIE1hcHBpbmcgZnJvbSBNSU1FIHR5cGUgdG8gVVRJIHR5cGUgc2hvdWxkIGJlIGRv bmUgaW4gdGhlIFVJIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCmluZGV4IGE5NTQ4NTQ4N2Q1YjdjZjJlMjdjMTgwYThkODE5NWZkNTgwZGI3NTYuLmZmYzM4 NTk3NGZkYjQ4YTU0OTAxMWRkYjhjYWFiOGJkY2Q4MmE0YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjgzLDYgKzI4MywxMiBAQCBzdGF0aWMgVGV4dFN0 cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgQ2xpcFJlY3RzJiBjbGlwUmVj dHMpCiAKICNlbmRpZgogCitzdGF0aWMgU2Nyb2xsaW5nU2NvcGUgbmV4dFNjcm9sbGluZ1Njb3Bl KCkKK3sKKyAgICBzdGF0aWMgU2Nyb2xsaW5nU2NvcGUgY3VycmVudFNjb3BlID0gMDsKKyAgICBy ZXR1cm4gKytjdXJyZW50U2NvcGU7Cit9CisKIERFRklORV9BTExPQ0FUT1JfV0lUSF9IRUFQX0lE RU5USUZJRVIoUmVuZGVyTGF5ZXIpOwogCiBSZW5kZXJMYXllcjo6UmVuZGVyTGF5ZXIoUmVuZGVy TGF5ZXJNb2RlbE9iamVjdCYgcmVuZGVyZXJMYXllck1vZGVsT2JqZWN0KQpAQCAtMzQzLDYgKzM0 OSw5IEBAIFJlbmRlckxheWVyOjpSZW5kZXJMYXllcihSZW5kZXJMYXllck1vZGVsT2JqZWN0JiBy ZW5kZXJlckxheWVyTW9kZWxPYmplY3QpCiAKICAgICBtX2lzU2VsZlBhaW50aW5nTGF5ZXIgPSBz aG91bGRCZVNlbGZQYWludGluZ0xheWVyKCk7CiAKKyAgICBpZiAoaXNSZW5kZXJWaWV3TGF5ZXIo KSkKKyAgICAgICAgbV9ib3hTY3JvbGxpbmdTY29wZSA9IG1fY29udGVudHNTY3JvbGxpbmdTY29w ZSA9IG5leHRTY3JvbGxpbmdTY29wZSgpOworCiAgICAgaWYgKCFyZW5kZXJlcigpLmZpcnN0Q2hp bGQoKSkgewogICAgICAgICBtX3Zpc2libGVDb250ZW50U3RhdHVzRGlydHkgPSBmYWxzZTsKICAg ICAgICAgbV9oYXNWaXNpYmxlQ29udGVudCA9IHJlbmRlcmVyKCkuc3R5bGUoKS52aXNpYmlsaXR5 KCkgPT0gVmlzaWJpbGl0eTo6VmlzaWJsZTsKQEAgLTk1OCw3ICs5NjcsNyBAQCB2b2lkIFJlbmRl ckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyhSZW5kZXJHZW9tZXRyeU1hcCogZ2VvbWV0cnlN YXAsIE9wdGlvblNldAogCiAgICAgLy8gQ2xlYXIgb3VyIGNhY2hlZCBjbGlwIHJlY3QgaW5mb3Jt YXRpb24uCiAgICAgY2xlYXJDbGlwUmVjdHMoKTsKLSAgICAKKwogICAgIGlmIChoYXNPdmVyZmxv d0NvbnRyb2xzKCkpIHsKICAgICAgICAgTGF5b3V0U2l6ZSBvZmZzZXRGcm9tUm9vdDsKICAgICAg ICAgaWYgKGdlb21ldHJ5TWFwKQpAQCAtMTczNCwxNSArMTc0MywyNyBAQCBib29sIFJlbmRlckxh eWVyOjp1cGRhdGVMYXllclBvc2l0aW9uKE9wdGlvblNldDxVcGRhdGVMYXllclBvc2l0aW9uc0Zs YWc+KiBmbGFncwogICAgICAgICBpZiAocG9zaXRpb25lZFBhcmVudC0+cmVuZGVyZXIoKS5oYXNP dmVyZmxvd0NsaXAoKSkKICAgICAgICAgICAgIGxvY2FsUG9pbnQgLT0gdG9MYXlvdXRTaXplKHBv c2l0aW9uZWRQYXJlbnQtPnNjcm9sbFBvc2l0aW9uKCkpOwogICAgICAgICAKLSAgICAgICAgaWYg KHJlbmRlcmVyKCkuaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgcG9zaXRpb25lZFBhcmVudC0+ cmVuZGVyZXIoKS5pc0luRmxvd1Bvc2l0aW9uZWQoKSAmJiBpczxSZW5kZXJJbmxpbmU+KHBvc2l0 aW9uZWRQYXJlbnQtPnJlbmRlcmVyKCkpKSB7CisgICAgICAgIGlmIChwb3NpdGlvbmVkUGFyZW50 LT5yZW5kZXJlcigpLmlzSW5GbG93UG9zaXRpb25lZCgpICYmIGlzPFJlbmRlcklubGluZT4ocG9z aXRpb25lZFBhcmVudC0+cmVuZGVyZXIoKSkpIHsKICAgICAgICAgICAgIExheW91dFNpemUgb2Zm c2V0ID0gZG93bmNhc3Q8UmVuZGVySW5saW5lPihwb3NpdGlvbmVkUGFyZW50LT5yZW5kZXJlcigp KS5vZmZzZXRGb3JJbkZsb3dQb3NpdGlvbmVkSW5saW5lKCZkb3duY2FzdDxSZW5kZXJCb3g+KHJl bmRlcmVyKCkpKTsKICAgICAgICAgICAgIGxvY2FsUG9pbnQgKz0gb2Zmc2V0OwogICAgICAgICB9 Ci0gICAgfSBlbHNlIGlmIChwYXJlbnQoKSkgewotICAgICAgICBpZiAocGFyZW50KCktPnJlbmRl cmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkpCisKKyAgICAgICAgQVNTRVJUKHBvc2l0aW9uZWRQYXJl bnQtPmNvbnRlbnRzU2Nyb2xsaW5nU2NvcGUoKSk7CisgICAgICAgIG1fYm94U2Nyb2xsaW5nU2Nv cGUgPSBwb3NpdGlvbmVkUGFyZW50LT5jb250ZW50c1Njcm9sbGluZ1Njb3BlKCk7CisgICAgfSBl bHNlIGlmIChhdXRvKiBwYXJlbnRMYXllciA9IHBhcmVudCgpKSB7CisgICAgICAgIGlmIChwYXJl bnRMYXllci0+cmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSkKICAgICAgICAgICAgIGxvY2Fs UG9pbnQgLT0gdG9MYXlvdXRTaXplKHBhcmVudCgpLT5zY3JvbGxQb3NpdGlvbigpKTsKKworICAg ICAgICBBU1NFUlQocGFyZW50TGF5ZXItPmNvbnRlbnRzU2Nyb2xsaW5nU2NvcGUoKSk7CisgICAg ICAgIG1fYm94U2Nyb2xsaW5nU2NvcGUgPSBwYXJlbnRMYXllci0+Y29udGVudHNTY3JvbGxpbmdT Y29wZSgpOwogICAgIH0KLSAgICAKKworICAgIGlmIChoYXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92 ZXJmbG93KCkpIHsKKyAgICAgICAgaWYgKCFtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGUpCisgICAg ICAgICAgICBtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGUgPSBuZXh0U2Nyb2xsaW5nU2NvcGUoKTsK KyAgICB9IGVsc2UgaWYgKCFtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGUpCisgICAgICAgIG1fY29u dGVudHNTY3JvbGxpbmdTY29wZSA9IG1fYm94U2Nyb2xsaW5nU2NvcGU7CisKICAgICBib29sIHBv c2l0aW9uT3JPZmZzZXRDaGFuZ2VkID0gZmFsc2U7CiAgICAgaWYgKHJlbmRlcmVyKCkuaXNJbkZs b3dQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgTGF5b3V0U2l6ZSBuZXdPZmZzZXQgPSBkb3duY2Fz dDxSZW5kZXJCb3hNb2RlbE9iamVjdD4ocmVuZGVyZXIoKSkub2Zmc2V0Rm9ySW5GbG93UG9zaXRp b24oKTsKQEAgLTcwOTcsNyArNzExOCw4IEBAIHN0YXRpYyB2b2lkIG91dHB1dFBhaW50T3JkZXJU cmVlTGVnZW5kKFRleHRTdHJlYW0mIHN0cmVhbSkKICAgICBzdHJlYW0gPDwgIihTKXRhY2tpbmcg Q29udGV4dC8oRilvcmNlZCBTQy9PKFApcG9ydHVuaXN0aWMgU0MsIChOKW9ybWFsIGZsb3cgb25s eSwgKE8pdmVyZmxvdyBjbGlwLCAoQSlscGhhIChvcGFjaXR5IG9yIG1hc2spLCBoYXMgKEIpbGVu ZCBtb2RlLCAoSSlzb2xhdGVzIGJsZW5kaW5nLCAoVClyYW5zZm9ybS1pc2gsIChGKWlsdGVyLCBG aShYKWVkIHBvc2l0aW9uLCBCZWhhdmVzIGFzIGZpKHgpZWQsIChDKW9tcG9zaXRlZCwgKFApcm92 aWRlcyBiYWNraW5nL3VzZXMgKHApcm92aWRlZCBiYWNraW5nL3BhaW50cyB0byAoYSluY2VzdG9y LCAoYylvbXBvc2l0ZWQgZGVzY2VuZGFudCwgKHMpc2Nyb2xsaW5nIGFuY2VzdG9yLCAodCl0cmFu c2Zvcm1lZCBhbmNlc3RvclxuIgogICAgICAgICAiRGlydHkgKHopLWxpc3RzLCBEaXJ0eSAobilv cm1hbCBmbG93IGxpc3RzXG4iCiAgICAgICAgICJUcmF2ZXJzYWwgbmVlZHM6IHJlcXVpcmVtZW50 cyAodClyYXZlcnNhbCBvbiBkZXNjZW5kYW50cywgKGIpYWNraW5nIG9yIGhpZXJhcmNoeSB0cmF2 ZXJzYWwgb24gZGVzY2VuZGFudHMsIChyKWVxdWlyZW1lbnRzIHRyYXZlcnNhbCBvbiBhbGwgZGVz Y2VuZGFudHMsIHJlcXVpcmVtZW50cyB0cmF2ZXJzYWwgb24gYWxsIChzKXVic2VxdWVudCBsYXll cnMsIChoKWllcmFyY2h5IHRyYXZlcnNhbCBvbiBhbGwgZGVzY2VuZGFudHMsIHVwZGF0ZSBvZiBw YWludCAobylyZGVyIGNoaWxkcmVuXG4iCi0gICAgICAgICJVcGRhdGUgbmVlZHM6ICAgIHBvc3Qt KGwpYXlvdXQgcmVxdWlyZW1lbnRzLCAoZyllb21ldHJ5LCAoaylpZHMgZ2VvbWV0cnksIChjKW9u ZmlnLCBsYXllciBjb25uZSh4KWlvbiwgKHMpY3JvbGxpbmcgdHJlZVxuIjsKKyAgICAgICAgIlVw ZGF0ZSBuZWVkczogICAgcG9zdC0obClheW91dCByZXF1aXJlbWVudHMsIChnKWVvbWV0cnksIChr KWlkcyBnZW9tZXRyeSwgKGMpb25maWcsIGxheWVyIGNvbm5lKHgpaW9uLCAocyljcm9sbGluZyB0 cmVlXG4iCisgICAgICAgICJTY3JvbGxpbmcgc2NvcGU6IGJveCBjb250ZW50c1xuIjsKICAgICBz dHJlYW0ubmV4dExpbmUoKTsKIH0KIApAQCAtNzE2OCw2ICs3MTkwLDEyIEBAIHN0YXRpYyB2b2lk IG91dHB1dFBhaW50T3JkZXJUcmVlUmVjdXJzaXZlKFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3Qg V2ViQ29yZTo6UmVuCiAKICAgICBzdHJlYW0gPDwgIiAiOwogCisgICAgc3RyZWFtIDw8IGxheWVy LmJveFNjcm9sbGluZ1Njb3BlKCk7CisgICAgc3RyZWFtIDw8ICIgIjsKKyAgICBzdHJlYW0gPDwg bGF5ZXIuY29udGVudHNTY3JvbGxpbmdTY29wZSgpOworCisgICAgc3RyZWFtIDw8ICIgIjsKKwog ICAgIG91dHB1dElkZW50KHN0cmVhbSwgZGVwdGgpOwogCiAgICAgc3RyZWFtIDw8IHByZWZpeDsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggZGZiMjQwYzI1YTY2ZGM3 YjcxNDhmN2IyMGIyNmRkM2QzM2FmMDk5Ni4uNWZmOGQzNzYwOWY0MzVhMjljZDQxOTkyZDU1N2Q0 NjI2OWFmMWU4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTUz LDYgKzUzLDcgQEAKICNpbmNsdWRlICJTY3JvbGxCZWhhdmlvci5oIgogI2luY2x1ZGUgIlNjcm9s bGFibGVBcmVhLmgiCiAjaW5jbHVkZSA8bWVtb3J5PgorI2luY2x1ZGUgPHd0Zi9NYXJrYWJsZS5o PgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFjZSBXVEYgewpAQCAtMTM4LDYg KzEzOSw4IEBAIHN0cnVjdCBTY3JvbGxSZWN0VG9WaXNpYmxlT3B0aW9ucyB7CiAgICAgU2Nyb2xs QmVoYXZpb3IgYmVoYXZpb3IgeyBTY3JvbGxCZWhhdmlvcjo6QXV0byB9OwogfTsKIAordXNpbmcg U2Nyb2xsaW5nU2NvcGUgPSB1aW50NjRfdDsKKwogREVDTEFSRV9BTExPQ0FUT1JfV0lUSF9IRUFQ X0lERU5USUZJRVIoUmVuZGVyTGF5ZXIpOwogY2xhc3MgUmVuZGVyTGF5ZXIgZmluYWwgOiBwdWJs aWMgU2Nyb2xsYWJsZUFyZWEgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEX1dJVEhfSEVB UF9JREVOVElGSUVSKFJlbmRlckxheWVyKTsKQEAgLTg2MSw2ICs4NjQsMTAgQEAgcHVibGljOgog ICAgIGJvb2wgaGFzQ29tcG9zaXRlZFNjcm9sbGluZ0FuY2VzdG9yKCkgY29uc3QgeyByZXR1cm4g bV9oYXNDb21wb3NpdGVkU2Nyb2xsaW5nQW5jZXN0b3I7IH0KICAgICB2b2lkIHNldEhhc0NvbXBv c2l0ZWRTY3JvbGxpbmdBbmNlc3Rvcihib29sIGhhc0NvbXBvc2l0ZWRTY3JvbGxpbmdBbmNlc3Rv cikgeyBtX2hhc0NvbXBvc2l0ZWRTY3JvbGxpbmdBbmNlc3RvciA9IGhhc0NvbXBvc2l0ZWRTY3Jv bGxpbmdBbmNlc3RvcjsgfQogCisgICAgLy8gTGF5ZXJzIHdpdGggdGhlIHNhbWUgU2Nyb2xsaW5n U2NvcGUgYXJlIHNjcm9sbGVkIGJ5IHNvbWUgY29tbW9uIGFuY2VzdG9yIHNjcm9sbGVyLiBVc2Vk IGZvciBhc3luYyBzY3JvbGxpbmcuCisgICAgT3B0aW9uYWw8U2Nyb2xsaW5nU2NvcGU+IGJveFNj cm9sbGluZ1Njb3BlKCkgY29uc3QgeyByZXR1cm4gbV9ib3hTY3JvbGxpbmdTY29wZTsgfQorICAg IE9wdGlvbmFsPFNjcm9sbGluZ1Njb3BlPiBjb250ZW50c1Njcm9sbGluZ1Njb3BlKCkgY29uc3Qg eyByZXR1cm4gbV9jb250ZW50c1Njcm9sbGluZ1Njb3BlOyB9CisKICAgICBib29sIHBhaW50c1dp dGhUcmFuc3BhcmVuY3koT3B0aW9uU2V0PFBhaW50QmVoYXZpb3I+IHBhaW50QmVoYXZpb3IpIGNv bnN0CiAgICAgewogICAgICAgICByZXR1cm4gKGlzVHJhbnNwYXJlbnQoKSB8fCBoYXNCbGVuZE1v ZGUoKSB8fCAoaXNvbGF0ZXNCbGVuZGluZygpICYmICFyZW5kZXJlcigpLmlzRG9jdW1lbnRFbGVt ZW50UmVuZGVyZXIoKSkpICYmICgocGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3I6OkZsYXR0 ZW5Db21wb3NpdGluZ0xheWVycykgfHwgIWlzQ29tcG9zaXRlZCgpKTsKQEAgLTEzMjEsNiArMTMy OCw5IEBAIHByaXZhdGU6CiAgICAgCiAgICAgSW50UG9pbnQgbV9jYWNoZWRPdmVybGF5U2Nyb2xs YmFyT2Zmc2V0OwogCisgICAgTWFya2FibGU8U2Nyb2xsaW5nU2NvcGUsIEludGVncmFsTWFya2Fi bGVUcmFpdHM8U2Nyb2xsaW5nU2NvcGUsIDA+PiBtX2JveFNjcm9sbGluZ1Njb3BlOworICAgIE1h cmthYmxlPFNjcm9sbGluZ1Njb3BlLCBJbnRlZ3JhbE1hcmthYmxlVHJhaXRzPFNjcm9sbGluZ1Nj b3BlLCAwPj4gbV9jb250ZW50c1Njcm9sbGluZ1Njb3BlOworCiAgICAgc3RkOjp1bmlxdWVfcHRy PFJlbmRlck1hcnF1ZWU+IG1fbWFycXVlZTsgLy8gVXNlZCBmb3IgPG1hcnF1ZWU+LgogICAgIAog ICAgIC8vIENhY2hlZCBub3JtYWwgZmxvdyB2YWx1ZXMgZm9yIGFic29sdXRlIHBvc2l0aW9uZWQg ZWxlbWVudHMgd2l0aCBzdGF0aWMgbGVmdC90b3AgdmFsdWVzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCBkZjlmMDI4NjQ0 NGNmOGJmNDUxYTYzMmZkNjdiMjlhOGUxMTQzN2Y3Li42MzRmZDYwYTE3MDYwNjNhNDMwOTRkNDAx OGE0NTZkODE2YmU5ODc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzE3OCwxNSArMzE3OCw3IEBAIGJvb2wgUmVuZGVy TGF5ZXJDb21wb3NpdG9yOjp1c2VDb29yZGluYXRlZFNjcm9sbGluZ0ZvckxheWVyKGNvbnN0IFJl bmRlckxheWVyJiBsCiAKIHN0YXRpYyBib29sIGlzU2Nyb2xsZWRCeU92ZXJmbG93U2Nyb2xsTGF5 ZXIoY29uc3QgUmVuZGVyTGF5ZXImIGxheWVyLCBjb25zdCBSZW5kZXJMYXllciYgb3ZlcmZsb3dT Y3JvbGxMYXllcikKIHsKLSAgICBib29sIHNjcm9sbGVkQnlPdmVyZmxvd1Njcm9sbCA9IGZhbHNl OwotICAgIHRyYXZlcnNlQW5jZXN0b3JMYXllcnMobGF5ZXIsIFsmXShjb25zdCBSZW5kZXJMYXll ciYgYW5jZXN0b3JMYXllciwgYm9vbCBpbkNvbnRhaW5pbmdCbG9ja0NoYWluLCBib29sKSB7Ci0g ICAgICAgIGlmICgmYW5jZXN0b3JMYXllciA9PSAmb3ZlcmZsb3dTY3JvbGxMYXllcikgewotICAg ICAgICAgICAgc2Nyb2xsZWRCeU92ZXJmbG93U2Nyb2xsID0gaW5Db250YWluaW5nQmxvY2tDaGFp bjsKLSAgICAgICAgICAgIHJldHVybiBBbmNlc3RvclRyYXZlcnNhbDo6U3RvcDsKLSAgICAgICAg fQotICAgICAgICByZXR1cm4gQW5jZXN0b3JUcmF2ZXJzYWw6OkNvbnRpbnVlOwotICAgIH0pOwot ICAgIHJldHVybiBzY3JvbGxlZEJ5T3ZlcmZsb3dTY3JvbGw7CisgICAgcmV0dXJuIGxheWVyLmJv eFNjcm9sbGluZ1Njb3BlKCkgPT0gb3ZlcmZsb3dTY3JvbGxMYXllci5jb250ZW50c1Njcm9sbGlu Z1Njb3BlKCk7CiB9CiAKIHN0YXRpYyBSZW5kZXJMYXllciogZW5jbG9zaW5nQ29tcG9zaXRlZFNj cm9sbGluZ0xheWVyKGNvbnN0IFJlbmRlckxheWVyJiBsYXllciwgY29uc3QgUmVuZGVyTGF5ZXIm IGludGVybWVkaWF0ZUxheWVyLCBib29sJiBzYXdJbnRlcm1lZGlhdGVMYXllcikK 393197 2020-03-10 18:23:28 -0700 2020-03-10 20:26:09 -0700 Patch bug-208620-20200310182327.patch text/plain 9228 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTIxYzE4NTgzZGVkMmJh Y2I3NjMzM2MxMTQwZDVlYjNjZWM2ZDU0Ny4uNDgzYTcxYWE2N2NiN2QyN2YzYzlkMGQxNzE5OTE3 NGQ2MjhmOTUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAzLTEwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFRyYWNrICJzY3Jv bGxpbmcgc2NvcGUiIG9uIFJlbmRlckxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisgICAgICAgIAorICAgICAgICBUaGUgc2Nyb2xsaW5nIHNjb3BlIGNvZGUgYWRk ZWQgaW4gcjI1NzkyMCBmYWlsZWQgdG8gcmVjb21wdXRlIG1fY29udGVudHNTY3JvbGxpbmdTY29w ZQorICAgICAgICB3aGVuIGhhc0NvbXBvc2l0ZWRTY3JvbGxhYmxlT3ZlcmZsb3coKSBjaGFuZ2Vk LCBjYXVzaW5nIGJ1Z3Mgb24gZ21haWwuCisKKyAgICAgICAgUmVjb21wdXRlIHRoZSBtX2NvbnRl bnRzU2Nyb2xsaW5nU2NvcGUgdG8gbWF0Y2ggb3Igbm90IG1hdGNoIHRoZSBtX2JveFNjcm9sbGlu Z1Njb3BlCisgICAgICAgIGJhc2VkIG9uIHdoZXRoZXIgdGhlIGxheWVyIGlzIGNvbXBvc2l0ZWQt c2Nyb2xsYWJsZS4KKworICAgICAgICBUZXN0OiBmYXN0L3Njcm9sbGluZy9tYWMvYWJzb2x1dGUt aW4tb3ZlcmZsb3ctc2Nyb2xsLWR5bmFtaWMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXll clBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmlzU2Nyb2xsZWRCeU92ZXJmbG93U2Nyb2xsTGF5ZXIpOgor CiAyMDIwLTAzLTEwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04gKHIyNTc5MjApOiBpbmJveCBmbGlja2VycyBhbmQgZGlzYXBwZWFy cyB3aGVuIHNjcm9sbGluZyBnbWFpbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAKaW5kZXggYjk2ODc0ZWM2MWMwODJlMmUxYTA2N2U3NmI5MWU0ZjA5YWVjNDQwNS4uMmQ3 MmM0MzdlYmNlZjYwNmE2YTY2M2E5YWU3NWViY2I3YWIyMDQyMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0xNzU5LDkgKzE3NTksOSBAQCBib29sIFJlbmRl ckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9uKE9wdGlvblNldDxVcGRhdGVMYXllclBvc2l0aW9u c0ZsYWc+KiBmbGFncwogICAgIH0KIAogICAgIGlmIChoYXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92 ZXJmbG93KCkpIHsKLSAgICAgICAgaWYgKCFtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGUpCisgICAg ICAgIGlmICghbV9jb250ZW50c1Njcm9sbGluZ1Njb3BlIHx8IG1fY29udGVudHNTY3JvbGxpbmdT Y29wZSA9PSBtX2JveFNjcm9sbGluZ1Njb3BlKQogICAgICAgICAgICAgbV9jb250ZW50c1Njcm9s bGluZ1Njb3BlID0gbmV4dFNjcm9sbGluZ1Njb3BlKCk7Ci0gICAgfSBlbHNlIGlmICghbV9jb250 ZW50c1Njcm9sbGluZ1Njb3BlKQorICAgIH0gZWxzZSBpZiAoIW1fY29udGVudHNTY3JvbGxpbmdT Y29wZSB8fCBtX2NvbnRlbnRzU2Nyb2xsaW5nU2NvcGUgIT0gbV9ib3hTY3JvbGxpbmdTY29wZSkK ICAgICAgICAgbV9jb250ZW50c1Njcm9sbGluZ1Njb3BlID0gbV9ib3hTY3JvbGxpbmdTY29wZTsK IAogICAgIGJvb2wgcG9zaXRpb25Pck9mZnNldENoYW5nZWQgPSBmYWxzZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggMmE1 MTMwYjA4ZWY2MDM4MmI5NDYwYzU4NmQ5N2UxZmQyOTM4ZTY5Yy4uMDYyNTA5YzRlZTc3Y2Q0NTg5 MGY1ZDIwNmZlYmFiMmQwODEzODAyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTMxOTQsMTUgKzMxOTQsNyBAQCBib29s IFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXNlQ29vcmRpbmF0ZWRTY3JvbGxpbmdGb3JMYXllcihj b25zdCBSZW5kZXJMYXllciYgbAogCiBzdGF0aWMgYm9vbCBpc1Njcm9sbGVkQnlPdmVyZmxvd1Nj cm9sbExheWVyKGNvbnN0IFJlbmRlckxheWVyJiBsYXllciwgY29uc3QgUmVuZGVyTGF5ZXImIG92 ZXJmbG93U2Nyb2xsTGF5ZXIpCiB7Ci0gICAgYm9vbCBzY3JvbGxlZEJ5T3ZlcmZsb3dTY3JvbGwg PSBmYWxzZTsKLSAgICB0cmF2ZXJzZUFuY2VzdG9yTGF5ZXJzKGxheWVyLCBbJl0oY29uc3QgUmVu ZGVyTGF5ZXImIGFuY2VzdG9yTGF5ZXIsIGJvb2wgaW5Db250YWluaW5nQmxvY2tDaGFpbiwgYm9v bCkgewotICAgICAgICBpZiAoJmFuY2VzdG9yTGF5ZXIgPT0gJm92ZXJmbG93U2Nyb2xsTGF5ZXIp IHsKLSAgICAgICAgICAgIHNjcm9sbGVkQnlPdmVyZmxvd1Njcm9sbCA9IGluQ29udGFpbmluZ0Js b2NrQ2hhaW47Ci0gICAgICAgICAgICByZXR1cm4gQW5jZXN0b3JUcmF2ZXJzYWw6OlN0b3A7Ci0g ICAgICAgIH0KLSAgICAgICAgcmV0dXJuIEFuY2VzdG9yVHJhdmVyc2FsOjpDb250aW51ZTsKLSAg ICB9KTsKLSAgICByZXR1cm4gc2Nyb2xsZWRCeU92ZXJmbG93U2Nyb2xsOworICAgIHJldHVybiBs YXllci5ib3hTY3JvbGxpbmdTY29wZSgpID09IG92ZXJmbG93U2Nyb2xsTGF5ZXIuY29udGVudHNT Y3JvbGxpbmdTY29wZSgpOwogfQogCiBzdGF0aWMgUmVuZGVyTGF5ZXIqIGVuY2xvc2luZ0NvbXBv c2l0ZWRTY3JvbGxpbmdMYXllcihjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIsIGNvbnN0IFJlbmRl ckxheWVyJiBpbnRlcm1lZGlhdGVMYXllciwgYm9vbCYgc2F3SW50ZXJtZWRpYXRlTGF5ZXIpCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggYTM2NjcyMzU2MDBiNDFkNzZhNDQ3MDZkM2U5YjFjYjA2MTU0NDcyOS4uZTA1YmQ4ODI3 ZDlmM2I2NGIxNmY5ZTM2NDZlZjkxOTMzOGVmNzI2YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy MDIwLTAzLTEwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAg ICAgIFRyYWNrICJzY3JvbGxpbmcgc2NvcGUiIG9uIFJlbmRlckxheWVycworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NjIwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMv YWJzb2x1dGUtaW4tb3ZlcmZsb3ctc2Nyb2xsLWR5bmFtaWMtZXhwZWN0ZWQuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvbWFjL2Fic29sdXRlLWluLW92ZXJmbG93LXNjcm9s bC1keW5hbWljLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvc2Nyb2xsaW5nL21hYy9hYnNv bHV0ZS1pbi1vdmVyZmxvdy1zY3JvbGwuaHRtbDogRml4IHR5cG8uCisKIDIwMjAtMDMtMTAgIERp ZWdvIFBpbm8gR2FyY2lhICA8ZHBpbm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBHYXJk ZW5pbmcsIGVtaXQgbmV3IGJhc2VsaW5lcyBvZiBXZWJHTCAxLjAuMyBjb25mb3JtYW5jZSB0ZXN0 cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2Fic29sdXRlLWlu LW92ZXJmbG93LXNjcm9sbC1keW5hbWljLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3Njcm9sbGluZy9tYWMvYWJzb2x1dGUtaW4tb3ZlcmZsb3ctc2Nyb2xsLWR5bmFtaWMtZXhwZWN0 ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi43YWU2ZGJmNjA0MDM5YzA3YzM1OTdmNTQwMTliYzM4YjMzZjBj ZTIzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2Fi c29sdXRlLWluLW92ZXJmbG93LXNjcm9sbC1keW5hbWljLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCAr MSw3MCBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJu YWw6QXN5bmNPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgorPGh0bWw+Cis8aGVh ZD4KKyAgICA8c3R5bGU+CisgICAgICAgIGJvZHkgeworICAgICAgICAgICAgaGVpZ2h0OiAxMDAw cHg7CisgICAgICAgIH0KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICBwb3NpdGlv bjogYWJzb2x1dGU7IC8qIENvbnRhaW5pbmcgYmxvY2sgZm9yIHRoZSBpbm5lciBhYnNvbHV0ZSAq LworICAgICAgICAgICAgdG9wOiAxMHB4OworICAgICAgICAgICAgbGVmdDogMTBweDsKKyAgICAg ICAgfQorICAgICAgICAuc2Nyb2xsZXIgeworICAgICAgICAgICAgaGVpZ2h0OiAzMDBweDsKKyAg ICAgICAgICAgIHdpZHRoOiAzMDBweDsKKyAgICAgICAgICAgIGJvcmRlcjogMjBweCBzb2xpZCBn cmF5OworICAgICAgICAgICAgcGFkZGluZzogNXB4OworICAgICAgICAgICAgb3ZlcmZsb3c6IHNj cm9sbDsKKyAgICAgICAgICAgIG9wYWNpdHk6IDAuODsgLyogRm9yY2Ugc3RhY2tpbmcgY29udGV4 dCAqLworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAuY29udGVudCB7CisgICAgICAgICAg ICB3aWR0aDogMjAwJTsKKyAgICAgICAgICAgIGhlaWdodDogMzAwJTsKKyAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgLmFic29sdXRlIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKKyAgICAgICAgICAgIHRvcDogMTAwcHg7CisgICAgICAgICAgICBsZWZ0OiA1MHB4OworICAg ICAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAg ICAgICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICAgICAgICB9CisgICAgPC9zdHlsZT4K KyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3Jp cHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgYXN5bmMgZnVuY3Rpb24gc2Nyb2xsT3ZlckNvbnRl bnQoKQorICAgICAgICB7CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2Ny b2xsQXQoNTAsIDUwKTsKKyAgICAgICAgfQorCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHNjcm9s bFRlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBhd2FpdCBzY3JvbGxPdmVyQ29udGVudCgp OworICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICAgIHRl c3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBhc3lu YyBmdW5jdGlvbiBkb1Rlc3QoKQorICAgICAgICB7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5 Lm9mZnNldFdpZHRoOworICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCdj aGFuZ2VkJyk7CisgICAgICAgICAgICBzZXRUaW1lb3V0KHNjcm9sbFRlc3QsIDApOworICAgICAg ICB9CisKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBkb1Rlc3QsIGZh bHNlKTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgY2xhc3M9ImNv bnRhaW5lciI+CisgICAgICAgIDxkaXYgY2xhc3M9InNjcm9sbGVyIj4KKyAgICAgICAgICAgIDxk aXYgY2xhc3M9ImNvbnRlbnQiPgorICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImFic29sdXRl Ij4KKyAgICAgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2PgorICAgICAgICA8 L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9hYnNvbHV0ZS1pbi1vdmVyZmxvdy1zY3JvbGwtZHluYW1p Yy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL2Fic29sdXRlLWluLW92ZXJm bG93LXNjcm9sbC1keW5hbWljLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDBkMzg5ZGUwNGRiY2I1NDZkZGZk MGQzZDMxY2UxMTljYzMzZDBlZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv c2Nyb2xsaW5nL21hYy9hYnNvbHV0ZS1pbi1vdmVyZmxvdy1zY3JvbGwtZHluYW1pYy5odG1sCkBA IC0wLDAgKzEsNzQgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBb IGludGVybmFsOkFzeW5jT3ZlcmZsb3dTY3JvbGxpbmdFbmFibGVkPXRydWUgXSAtLT4KKzxodG1s PgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICBib2R5IHsKKyAgICAgICAgICAgIGhlaWdo dDogMTAwMHB4OworICAgICAgICB9CisgICAgICAgIC5jb250YWluZXIgeworICAgICAgICAgICAg cG9zaXRpb246IGFic29sdXRlOyAvKiBDb250YWluaW5nIGJsb2NrIGZvciB0aGUgaW5uZXIgYWJz b2x1dGUgKi8KKyAgICAgICAgICAgIHRvcDogMTBweDsKKyAgICAgICAgICAgIGxlZnQ6IDEwcHg7 CisgICAgICAgIH0KKyAgICAgICAgLnNjcm9sbGVyIHsKKyAgICAgICAgICAgIGhlaWdodDogMzAw cHg7CisgICAgICAgICAgICB3aWR0aDogMzAwcHg7CisgICAgICAgICAgICBib3JkZXI6IDIwcHgg c29saWQgZ3JheTsKKyAgICAgICAgICAgIHBhZGRpbmc6IDVweDsKKyAgICAgICAgICAgIG92ZXJm bG93OiBoaWRkZW47CisgICAgICAgICAgICBvcGFjaXR5OiAwLjg7IC8qIEZvcmNlIHN0YWNraW5n IGNvbnRleHQgKi8KKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgYm9keS5jaGFuZ2VkIC5z Y3JvbGxlciB7CisgICAgICAgICAgICBvdmVyZmxvdzogc2Nyb2xsOworICAgICAgICB9CisgICAg ICAgIAorICAgICAgICAuY29udGVudCB7CisgICAgICAgICAgICB3aWR0aDogMjAwJTsKKyAgICAg ICAgICAgIGhlaWdodDogMzAwJTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgLmFic29s dXRlIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgICAgIHRvcDog MTAwcHg7CisgICAgICAgICAgICBsZWZ0OiA1MHB4OworICAgICAgICAgICAgaGVpZ2h0OiAyMDBw eDsKKyAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29s b3I6IGdyZWVuOworICAgICAgICB9CisgICAgPC9zdHlsZT4KKyAgICA8c2NyaXB0IHNyYz0iLi4v Li4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAg ICAgICAgYXN5bmMgZnVuY3Rpb24gc2Nyb2xsT3ZlckNvbnRlbnQoKQorICAgICAgICB7CisgICAg ICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2Nyb2xsQXQoNTAsIDUwKTsKKyAgICAg ICAgfQorCisgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHNjcm9sbFRlc3QoKQorICAgICAgICB7Cisg ICAgICAgICAgICBhd2FpdCBzY3JvbGxPdmVyQ29udGVudCgpOworICAgICAgICAgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgp OworICAgICAgICB9CisgICAgICAgIAorICAgICAgICBhc3luYyBmdW5jdGlvbiBkb1Rlc3QoKQor ICAgICAgICB7CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5Lm9mZnNldFdpZHRoOworICAgICAg ICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKCdjaGFuZ2VkJyk7CisgICAgICAgICAg ICBzZXRUaW1lb3V0KHNjcm9sbFRlc3QsIDApOworICAgICAgICB9CisKKyAgICAgICAgd2luZG93 LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBkb1Rlc3QsIGZhbHNlKTsKKyAgICA8L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CisgICAgICAgIDxk aXYgY2xhc3M9InNjcm9sbGVyIj4KKyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPgor ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImFic29sdXRlIj4KKyAgICAgICAgICAgICAgICA8 L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21h Yy9hYnNvbHV0ZS1pbi1vdmVyZmxvdy1zY3JvbGwuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Ny b2xsaW5nL21hYy9hYnNvbHV0ZS1pbi1vdmVyZmxvdy1zY3JvbGwuaHRtbAppbmRleCBjZGI4NGZm OWRhMzIxYTBiYmJmYWFmNDY3NTQxOGNmY2FkZjZiNGU0Li5kMDliM2VjYjQ1Y2VjOWViNGZiYTcz Zjc3YzRmYTdjYmFmYTYxYzhiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGlu Zy9tYWMvYWJzb2x1dGUtaW4tb3ZlcmZsb3ctc2Nyb2xsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zY3JvbGxpbmcvbWFjL2Fic29sdXRlLWluLW92ZXJmbG93LXNjcm9sbC5odG1sCkBAIC0x Niw3ICsxNiw3IEBACiAgICAgICAgICAgICBib3JkZXI6IDIwcHggc29saWQgZ3JheTsKICAgICAg ICAgICAgIHBhZGRpbmc6IDVweDsKICAgICAgICAgICAgIG92ZXJmbG93OiBzY3JvbGw7Ci0gICAg ICAgICAgICBvcGFjaXR5OiAwLjg7IC8qIEZvcmNlIHN0YWNraW5nYyBjb250ZXh0ICovCisgICAg ICAgICAgICBvcGFjaXR5OiAwLjg7IC8qIEZvcmNlIHN0YWNraW5nIGNvbnRleHQgKi8KICAgICAg ICAgfQogICAgICAgICAuY29udGVudCB7CiAgICAgICAgICAgICB3aWR0aDogMjAwJTsK