191925 2018-11-23 08:25:24 -0800 [LFC][IFC] Add support for variable height runs. 2018-11-26 07:33:19 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto ryanhaddad simon.fraser webkit-bug-importer zalan oldest_to_newest 1481130 0 zalan 2018-11-23 08:25:24 -0800 ssia 1481131 1 355516 zalan 2018-11-23 08:32:04 -0800 Created attachment 355516 Patch 1481138 2 zalan 2018-11-23 09:05:50 -0800 Committed r238460: <https://trac.webkit.org/changeset/238460> 1481140 3 webkit-bug-importer 2018-11-23 09:06:29 -0800 <rdar://problem/46223265> 1481459 4 ryanhaddad 2018-11-25 22:10:45 -0800 The layout test added with this change is failing on iOS: --- /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test-results/fast/inline/inline-content-with-image-simple-expected.txt +++ /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test-results/fast/inline/inline-content-with-image-simple-actual.txt @@ -5,8 +5,8 @@ RenderBody {BODY} at (8,8) size 784x584 layer at (8,8) size 402x202 clip at (9,9) size 400x200 RenderBlock {DIV} at (0,0) size 402x202 [border: (1px solid #008000)] - RenderText {#text} at (1,83) size 11x26 + RenderText {#text} at (1,83) size 11x25 text run at (1,83) width 11: "1" RenderImage {IMG} at (12,1) size 102x102 [border: (1px solid #FF0000)] - RenderText {#text} at (114,83) size 11x26 + RenderText {#text} at (114,83) size 11x25 text run at (114,83) width 11: "3" https://build.webkit.org/results/Apple%20iOS%2012%20Simulator%20Release%20WK2%20(Tests)/r238485%20(1146)/results.html It looks like it failed on EWS before this was landed. Would you please rebaseline it if needed? 1481518 5 zalan 2018-11-26 07:33:19 -0800 (In reply to Ryan Haddad from comment #4) > The layout test added with this change is failing on iOS: > --- > /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test- > results/fast/inline/inline-content-with-image-simple-expected.txt > +++ > /Volumes/Data/slave/ios-simulator-12-release-tests-wk2/build/layout-test- > results/fast/inline/inline-content-with-image-simple-actual.txt > @@ -5,8 +5,8 @@ > RenderBody {BODY} at (8,8) size 784x584 > layer at (8,8) size 402x202 clip at (9,9) size 400x200 > RenderBlock {DIV} at (0,0) size 402x202 [border: (1px solid #008000)] > - RenderText {#text} at (1,83) size 11x26 > + RenderText {#text} at (1,83) size 11x25 > text run at (1,83) width 11: "1" > RenderImage {IMG} at (12,1) size 102x102 [border: (1px solid #FF0000)] > - RenderText {#text} at (114,83) size 11x26 > + RenderText {#text} at (114,83) size 11x25 > text run at (114,83) width 11: "3" > > https://build.webkit.org/results/ > Apple%20iOS%2012%20Simulator%20Release%20WK2%20(Tests)/r238485%20(1146)/ > results.html > > It looks like it failed on EWS before this was landed. Would you please > rebaseline it if needed? https://trac.webkit.org/changeset/238494/webkit 355516 2018-11-23 08:32:04 -0800 2018-11-23 08:40:07 -0800 Patch bug-191925-20181123083203.patch text/plain 24599 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NDQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjdlNGI3MWQ3NTExYWQ1 MWFhZWFkMTZkN2ZkYjgzYTBkNDViYTdhNy4uNjU2NWRjMGFlYTQ1MzRlN2VlM2JjYjFhNDI3ZTM0 ZGUzNGUwMTkxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUzIEBACisyMDE4LTExLTIzICBaYWxh biBCdXRqYXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgdmFyaWFibGUgaGVpZ2h0IHJ1bnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTE5MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL3d3dy53My5vcmcvVFIvQ1NTMjIvdmlzdWRl dC5odG1sI2lubGluZS1ib3gtaGVpZ2h0CisKKyAgICAgICAgMTAuOCBMaW5lIGhlaWdodCBjYWxj dWxhdGlvbnM6IHRoZSAnbGluZS1oZWlnaHQnIGFuZCAndmVydGljYWwtYWxpZ24nIHByb3BlcnRp ZXMKKworICAgICAgICBUaGUgaGVpZ2h0IG9mIGVhY2ggaW5saW5lLWxldmVsIGJveCBpbiB0aGUg bGluZSBib3ggaXMgY2FsY3VsYXRlZC4gRm9yIHJlcGxhY2VkIGVsZW1lbnRzLCBpbmxpbmUtYmxv Y2sgZWxlbWVudHMsCisgICAgICAgIGFuZCBpbmxpbmUtdGFibGUgZWxlbWVudHMsIHRoaXMgaXMg dGhlIGhlaWdodCBvZiB0aGVpciBtYXJnaW4gYm94OyBmb3IgaW5saW5lIGJveGVzLCB0aGlzIGlz IHRoZWlyICdsaW5lLWhlaWdodCcuCisKKyAgICAgICAgVGhlIGxpbmUgYm94IGhlaWdodCBpcyB0 aGUgZGlzdGFuY2UgYmV0d2VlbiB0aGUgdXBwZXJtb3N0IGJveCB0b3AgYW5kIHRoZSBsb3dlcm1v c3QgYm94IGJvdHRvbS4KKworICAgICAgICBUaGUgbWluaW11bSBoZWlnaHQgY29uc2lzdHMgb2Yg YSBtaW5pbXVtIGhlaWdodCBhYm92ZSB0aGUgYmFzZWxpbmUgYW5kIGEgbWluaW11bSBkZXB0aCBi ZWxvdyBpdCwKKyAgICAgICAgZXhhY3RseSBhcyBpZiBlYWNoIGxpbmUgYm94IHN0YXJ0cyB3aXRo IGEgemVyby13aWR0aCBpbmxpbmUgYm94IHdpdGggdGhlIGVsZW1lbnQncyBmb250IGFuZCBsaW5l IGhlaWdodCBwcm9wZXJ0aWVzLgorICAgICAgICBXZSBjYWxsIHRoYXQgaW1hZ2luYXJ5IGJveCBh ICJzdHJ1dC4iIChUaGUgbmFtZSBpcyBpbnNwaXJlZCBieSBUZVguKS4KKworICAgICAgICBUZXN0 OiBmYXN0L2lubGluZS9pbmxpbmUtY29udGVudC13aXRoLWltYWdlLXNpbXBsZS5odG1sCisKKyAg ICAgICAgKiBsYXlvdXQvVmVyaWZpY2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Y2hlY2tGb3JNYXRjaGluZ05vblRleHRSdW5zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Y2hlY2tGb3JNYXRjaGluZ1RleHRSdW5zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 b3V0cHV0TWlzbWF0Y2hpbmdDb21wbGV4TGluZUluZm9ybWF0aW9uSWZOZWVkZWQpOgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmluaXRp YWxpemVOZXdMaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OnNwbGl0SW5saW5lUnVuSWZOZWVkZWQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y3JlYXRlRmluYWxSdW5z IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmFwcGVuZENvbnRlbnRUb0xpbmUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5saW5lQ29udGVudCBjb25zdCk6Cisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu aDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Okxp bmU6OmxvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Omp1c3RpZnlSdW5z KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW4uaDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lUnVuOjpsb2dpY2FsV2lkdGggY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVSdW46OmxvZ2ljYWxIZWlnaHQgY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVSdW46OnNldExvZ2ljYWxXaWR0aCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJ1bjo6d2lkdGggY29uc3QpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVSdW46OmhlaWdodCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVJ1bjo6c2V0V2lkdGgpOiBE ZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6aW5p dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpM aW5lOjphcHBlbmRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OkxpbmU6OmNsb3NlKToKKyAgICAgICAgKiBsYXlvdXQvbGF5b3V0dHJl ZS9MYXlvdXRUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om91dHB1 dElubGluZVJ1bnMpOgorCiAyMDE4LTExLTIyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNZXJnZSBhZGROb25CcmVha2FibGVTdGFydC9Ob25C cmVha2FibGVFbmQgY2FsbHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVy aWZpY2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJpZmljYXRpb24uY3BwCmlu ZGV4IGFmN2U2ODY0MTAyYzc3Y2QzMGQ1ZTBiNWI2OGMyZTcwYWUyNWNhYTAuLjc5ZGUxNzgzZDYw NjRmZTI1ZTRmNjg2MDQ5YTkwYjczMmZlODUzZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9WZXJpZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJp ZmljYXRpb24uY3BwCkBAIC04NywxMiArODcsMTggQEAgc3RhdGljIGJvb2wgb3V0cHV0TWlzbWF0 Y2hpbmdTaW1wbGVMaW5lSW5mb3JtYXRpb25JZk5lZWRlZChUZXh0U3RyZWFtJiBzdHJlYW0sIGMK IAogc3RhdGljIGJvb2wgY2hlY2tGb3JNYXRjaGluZ05vblRleHRSdW5zKGNvbnN0IElubGluZVJ1 biYgaW5saW5lUnVuLCBjb25zdCBXZWJDb3JlOjpJbmxpbmVCb3gmIGlubGluZUJveCkKIHsKLSAg ICByZXR1cm4gYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVCb3gubG9naWNhbExlZnQoKSwgaW5s aW5lUnVuLmxvZ2ljYWxMZWZ0KCkpICYmIGFyZUVzc2VudGlhbGx5RXF1YWwoaW5saW5lQm94Lmxv Z2ljYWxSaWdodCgpLCBpbmxpbmVSdW4ubG9naWNhbFJpZ2h0KCkpOworICAgIHJldHVybiBhcmVF c3NlbnRpYWxseUVxdWFsKGlubGluZUJveC5sb2dpY2FsTGVmdCgpLCBpbmxpbmVSdW4ubG9naWNh bExlZnQoKSkKKyAgICAgICAgJiYgYXJlRXNzZW50aWFsbHlFcXVhbChpbmxpbmVCb3gubG9naWNh bFJpZ2h0KCksIGlubGluZVJ1bi5sb2dpY2FsUmlnaHQoKSkKKyAgICAgICAgJiYgYXJlRXNzZW50 aWFsbHlFcXVhbChpbmxpbmVCb3gubG9naWNhbEhlaWdodCgpLCBpbmxpbmVSdW4ubG9naWNhbEhl aWdodCgpKTsKIH0KIAotc3RhdGljIGJvb2wgY2hlY2tGb3JNYXRjaGluZ1RleHRSdW5zKGNvbnN0 IElubGluZVJ1biYgaW5saW5lUnVuLCBmbG9hdCBsb2dpY2FsTGVmdCwgZmxvYXQgbG9naWNhbFJp Z2h0LCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kKQorc3RhdGljIGJvb2wgY2hlY2tGb3JN YXRjaGluZ1RleHRSdW5zKGNvbnN0IElubGluZVJ1biYgaW5saW5lUnVuLCBmbG9hdCBsb2dpY2Fs TGVmdCwgZmxvYXQgbG9naWNhbFJpZ2h0LCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kLCBm bG9hdCBsb2dpY2FsSGVpZ2h0KQogewotICAgIHJldHVybiBhcmVFc3NlbnRpYWxseUVxdWFsKGxv Z2ljYWxMZWZ0LCBpbmxpbmVSdW4ubG9naWNhbExlZnQoKSkgJiYgYXJlRXNzZW50aWFsbHlFcXVh bChsb2dpY2FsUmlnaHQsIGlubGluZVJ1bi5sb2dpY2FsUmlnaHQoKSkgJiYgc3RhcnQgPT0gaW5s aW5lUnVuLnRleHRDb250ZXh0KCktPnN0YXJ0KCkgJiYgKGVuZCA9PSAoaW5saW5lUnVuLnRleHRD b250ZXh0KCktPnN0YXJ0KCkgKyBpbmxpbmVSdW4udGV4dENvbnRleHQoKS0+bGVuZ3RoKCkpKTsK KyAgICByZXR1cm4gYXJlRXNzZW50aWFsbHlFcXVhbChsb2dpY2FsTGVmdCwgaW5saW5lUnVuLmxv Z2ljYWxMZWZ0KCkpCisgICAgICAgICYmIGFyZUVzc2VudGlhbGx5RXF1YWwobG9naWNhbFJpZ2h0 LCBpbmxpbmVSdW4ubG9naWNhbFJpZ2h0KCkpCisgICAgICAgICYmIHN0YXJ0ID09IGlubGluZVJ1 bi50ZXh0Q29udGV4dCgpLT5zdGFydCgpCisgICAgICAgICYmIChlbmQgPT0gKGlubGluZVJ1bi50 ZXh0Q29udGV4dCgpLT5zdGFydCgpICsgaW5saW5lUnVuLnRleHRDb250ZXh0KCktPmxlbmd0aCgp KSkKKyAgICAgICAgJiYgYXJlRXNzZW50aWFsbHlFcXVhbChsb2dpY2FsSGVpZ2h0LCBpbmxpbmVS dW4ubG9naWNhbEhlaWdodCgpKTsKIH0KIAogc3RhdGljIHZvaWQgY29sbGVjdEZsb3dCb3hTdWJ0 cmVlKGNvbnN0IElubGluZUZsb3dCb3gmIGZsb3dib3gsIFZlY3RvcjxXZWJDb3JlOjpJbmxpbmVC b3gqPiYgaW5saW5lQm94ZXMpCkBAIC0xNTksNyArMTY1LDExIEBAIHN0YXRpYyBib29sIG91dHB1 dE1pc21hdGNoaW5nQ29tcGxleExpbmVJbmZvcm1hdGlvbklmTmVlZGVkKFRleHRTdHJlYW0mIHN0 cmVhbSwKICAgICAgICAgYXV0byBtYXRjaGluZ1J1bnMgPSBmYWxzZTsKICAgICAgICAgaWYgKGlu bGluZVRleHRCb3gpIHsKICAgICAgICAgICAgIGF1dG8geE9mZnNldCA9IHJlc29sdmVGb3JSZWxh dGl2ZVBvc2l0aW9uSWZOZWVkZWQoKmlubGluZVRleHRCb3gpOwotICAgICAgICAgICAgbWF0Y2hp bmdSdW5zID0gY2hlY2tGb3JNYXRjaGluZ1RleHRSdW5zKGlubGluZVJ1biwgaW5saW5lVGV4dEJv eC0+bG9naWNhbExlZnQoKSArIHhPZmZzZXQsIGlubGluZVRleHRCb3gtPmxvZ2ljYWxSaWdodCgp ICsgeE9mZnNldCwgaW5saW5lVGV4dEJveC0+c3RhcnQoKSwgaW5saW5lVGV4dEJveC0+ZW5kKCkg KyAxKTsKKyAgICAgICAgICAgIG1hdGNoaW5nUnVucyA9IGNoZWNrRm9yTWF0Y2hpbmdUZXh0UnVu cyhpbmxpbmVSdW4sIGlubGluZVRleHRCb3gtPmxvZ2ljYWxMZWZ0KCkgKyB4T2Zmc2V0LAorICAg ICAgICAgICAgICAgIGlubGluZVRleHRCb3gtPmxvZ2ljYWxSaWdodCgpICsgeE9mZnNldCwKKyAg ICAgICAgICAgICAgICBpbmxpbmVUZXh0Qm94LT5zdGFydCgpLAorICAgICAgICAgICAgICAgIGlu bGluZVRleHRCb3gtPmVuZCgpICsgMSwKKyAgICAgICAgICAgICAgICBpbmxpbmVUZXh0Qm94LT5s b2dpY2FsSGVpZ2h0KCkpOwogCiAgICAgICAgICAgICAvLyA8c3Bhbj5mb29iYXI8L3NwYW4+Zm9v YmFyIGdlbmVyYXRlcyAyIGlubGluZSB0ZXh0IGJveGVzIHdoaWxlIHdlIG9ubHkgZ2VuZXJhdGUg b25lIGlubGluZSBydW4uCiAgICAgICAgICAgICAvLyBhbHNvIDxkaXY+Zm9vPGltZyBzdHlsZT0i ZmxvYXQ6IGxlZnQ7Ij5iYXI8L2Rpdj4gdG9vLgpAQCAtMTgyLDcgKzE5Miw3IEBAIHN0YXRpYyBi b29sIG91dHB1dE1pc21hdGNoaW5nQ29tcGxleExpbmVJbmZvcm1hdGlvbklmTmVlZGVkKFRleHRT dHJlYW0mIHN0cmVhbSwKICAgICAgICAgICAgICAgICAgICAgYXV0byB4T2Zmc2V0ID0gcmVzb2x2 ZUZvclJlbGF0aXZlUG9zaXRpb25JZk5lZWRlZCgqaW5saW5lVGV4dEJveCk7CiAgICAgICAgICAg ICAgICAgICAgIGxvZ2ljYWxSaWdodCA9IGlubGluZVRleHRCb3gtPmxvZ2ljYWxSaWdodCgpICsg eE9mZnNldDsKICAgICAgICAgICAgICAgICAgICAgZW5kICs9IChpbmxpbmVUZXh0Qm94LT5lbmQo KSArIDEpOwotICAgICAgICAgICAgICAgICAgICBpZiAoY2hlY2tGb3JNYXRjaGluZ1RleHRSdW5z KGlubGluZVJ1biwgbG9naWNhbExlZnQsIGxvZ2ljYWxSaWdodCwgc3RhcnQsIGVuZCkpIHsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKGNoZWNrRm9yTWF0Y2hpbmdUZXh0UnVucyhpbmxpbmVSdW4s IGxvZ2ljYWxMZWZ0LCBsb2dpY2FsUmlnaHQsIHN0YXJ0LCBlbmQsIGlubGluZVRleHRCb3gtPmxv Z2ljYWxIZWlnaHQoKSkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIG1hdGNoaW5nUnVucyA9 IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmxpbmVCb3hJbmRleCA9IGluZGV4Owog ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CkBAIC0yMDIsMTIgKzIxMiwxMiBAQCBzdGF0 aWMgYm9vbCBvdXRwdXRNaXNtYXRjaGluZ0NvbXBsZXhMaW5lSW5mb3JtYXRpb25JZk5lZWRlZChU ZXh0U3RyZWFtJiBzdHJlYW0sCiAKICAgICAgICAgICAgIGlmIChpbmxpbmVUZXh0Qm94KQogICAg ICAgICAgICAgICAgIHN0cmVhbSA8PCAiKCIgPDwgaW5saW5lVGV4dEJveC0+c3RhcnQoKSA8PCAi LCAiIDw8IGlubGluZVRleHRCb3gtPmVuZCgpICsgMSA8PCAiKSI7Ci0gICAgICAgICAgICBzdHJl YW0gPDwgIiAoIiA8PCBpbmxpbmVCb3gtPmxvZ2ljYWxMZWZ0KCkgPDwgIiwgIiA8PCBpbmxpbmVC b3gtPmxvZ2ljYWxSaWdodCgpIDw8ICIpICI7CisgICAgICAgICAgICBzdHJlYW0gPDwgIiAoIiA8 PCBpbmxpbmVCb3gtPmxvZ2ljYWxMZWZ0KCkgPDwgIiwgIiA8PCBpbmxpbmVCb3gtPmxvZ2ljYWxS aWdodCgpIDw8ICIpICgiIDw8IGlubGluZUJveC0+bG9naWNhbFdpZHRoKCkgPDwgIngiIDw8IGlu bGluZUJveC0+bG9naWNhbEhlaWdodCgpIDw8ICIpIjsKIAogICAgICAgICAgICAgc3RyZWFtIDw8 ICJpbmxpbmUgcnVuICI7CiAgICAgICAgICAgICBpZiAoaW5saW5lUnVuLnRleHRDb250ZXh0KCkp CiAgICAgICAgICAgICAgICAgc3RyZWFtIDw8ICIoIiA8PCBpbmxpbmVSdW4udGV4dENvbnRleHQo KS0+c3RhcnQoKSA8PCAiLCAiIDw8IGlubGluZVJ1bi50ZXh0Q29udGV4dCgpLT5zdGFydCgpICsg aW5saW5lUnVuLnRleHRDb250ZXh0KCktPmxlbmd0aCgpIDw8ICIpICI7Ci0gICAgICAgICAgICBz dHJlYW0gPDwgIigiIDw8IGlubGluZVJ1bi5sb2dpY2FsTGVmdCgpIDw8ICIsICIgPDwgaW5saW5l UnVuLmxvZ2ljYWxSaWdodCgpIDw8ICIpIjsKKyAgICAgICAgICAgIHN0cmVhbSA8PCAiKCIgPDwg aW5saW5lUnVuLmxvZ2ljYWxMZWZ0KCkgPDwgIiwgIiA8PCBpbmxpbmVSdW4ubG9naWNhbFJpZ2h0 KCkgPDwgIikgKCIgPDwgaW5saW5lUnVuLmxvZ2ljYWxXaWR0aCgpIDw8ICJ4IiA8PCBpbmxpbmVS dW4ubG9naWNhbEhlaWdodCgpIDw8ICIpIjsKICAgICAgICAgICAgIHN0cmVhbS5uZXh0TGluZSgp OwogICAgICAgICAgICAgbWlzbWF0Y2hlZCA9IHRydWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA2ZTg1ZjU3YjIzNmRmOWFkMTg5MDMzMmE5MWFj MjY2NWUwYmY5MjcyLi44MzA0ZmUzNTM3MDQyN2EwZTEwMTM2MGZkM2Y5OGVjYjkwMjZmOTJjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTcsMTMgKzExNyw3IEBA IHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmluaXRpYWxpemVOZXdMaW5lKExpbmUmIGxp bmUpIGNvbnN0CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBEaXNwbGF5OjpCb3g6OlJlY3QgbG9n aWNhbFJlY3Q7Ci0gICAgbG9naWNhbFJlY3Quc2V0VG9wKGxpbmVMb2dpY2FsVG9wKTsKLSAgICBs b2dpY2FsUmVjdC5zZXRMZWZ0KGxpbmVMb2dpY2FsTGVmdCk7Ci0gICAgbG9naWNhbFJlY3Quc2V0 V2lkdGgoYXZhaWxhYmxlV2lkdGgpOwotICAgIGxvZ2ljYWxSZWN0LnNldEhlaWdodChmb3JtYXR0 aW5nUm9vdC5zdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpKTsKLQotICAgIGxpbmUuaW5pdChs b2dpY2FsUmVjdCk7CisgICAgbGluZS5pbml0KHsgbGluZUxvZ2ljYWxMZWZ0LCBsaW5lTG9naWNh bFRvcCB9LCBhdmFpbGFibGVXaWR0aCwgZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5jb21wdXRlZExp bmVIZWlnaHQoKSk7CiB9CiAKIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNwbGl0SW5s aW5lUnVuSWZOZWVkZWQoY29uc3QgSW5saW5lUnVuJiBpbmxpbmVSdW4sIElubGluZVJ1bnMmIHNw bGl0UnVucykgY29uc3QKQEAgLTE1Nyw3ICsxNTEsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpzcGxpdElubGluZVJ1bklmTmVlZGVkKGNvbnN0IElubGluZVJ1biYgaW5saW5lUnVu LAogICAgICAgICBjb250ZW50U3RhcnQgKz0gdW5jb21taXR0ZWQtPmZpcnN0SW5saW5lSXRlbS0+ bm9uQnJlYWthYmxlU3RhcnQoKTsKIAogICAgICAgICBhdXRvIHJ1bldpZHRoID0gR2VvbWV0cnk6 OnJ1bldpZHRoKGlubGluZUNvbnRlbnQsICp1bmNvbW1pdHRlZC0+Zmlyc3RJbmxpbmVJdGVtLCBz dGFydFBvc2l0aW9uLCB1bmNvbW1pdHRlZC0+bGVuZ3RoLCBjb250ZW50U3RhcnQpOwotICAgICAg ICBhdXRvIHJ1biA9IElubGluZVJ1biB7IHsgaW5saW5lUnVuLmxvZ2ljYWxUb3AoKSwgY29udGVu dFN0YXJ0LCBydW5XaWR0aCwgaW5saW5lUnVuLmhlaWdodCgpIH0sICp1bmNvbW1pdHRlZC0+Zmly c3RJbmxpbmVJdGVtIH07CisgICAgICAgIGF1dG8gcnVuID0gSW5saW5lUnVuIHsgeyBpbmxpbmVS dW4ubG9naWNhbFRvcCgpLCBjb250ZW50U3RhcnQsIHJ1bldpZHRoLCBpbmxpbmVSdW4ubG9naWNh bEhlaWdodCgpIH0sICp1bmNvbW1pdHRlZC0+Zmlyc3RJbmxpbmVJdGVtIH07CiAgICAgICAgIHJ1 bi5zZXRUZXh0Q29udGV4dCh7IHN0YXJ0UG9zaXRpb24sIHVuY29tbWl0dGVkLT5sZW5ndGggfSk7 CiAgICAgICAgIHNwbGl0UnVucy5hcHBlbmQocnVuKTsKIApAQCAtMjM1LDkgKzIyOSw5IEBAIHZv aWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNyZWF0ZUZpbmFsUnVucyhMaW5lJiBsaW5lKSBj b25zdAogICAgICAgICAgICAgICAgIHJldHVybiBpbmxpbmVSdW47CiAKICAgICAgICAgICAgIElu bGluZVJ1biBhZGp1c3RlZFJ1biA9IGlubGluZVJ1bjsKLSAgICAgICAgICAgIGF1dG8gd2lkdGgg PSBpbmxpbmVSdW4ud2lkdGgoKSAtIGlubGluZUl0ZW0ubm9uQnJlYWthYmxlU3RhcnQoKSAtIGlu bGluZUl0ZW0ubm9uQnJlYWthYmxlRW5kKCk7CisgICAgICAgICAgICBhdXRvIHdpZHRoID0gaW5s aW5lUnVuLmxvZ2ljYWxXaWR0aCgpIC0gaW5saW5lSXRlbS5ub25CcmVha2FibGVTdGFydCgpIC0g aW5saW5lSXRlbS5ub25CcmVha2FibGVFbmQoKTsKICAgICAgICAgICAgIGFkanVzdGVkUnVuLnNl dExvZ2ljYWxMZWZ0KGlubGluZVJ1bi5sb2dpY2FsTGVmdCgpICsgaW5saW5lSXRlbS5ub25CcmVh a2FibGVTdGFydCgpKTsKLSAgICAgICAgICAgIGFkanVzdGVkUnVuLnNldFdpZHRoKHdpZHRoKTsK KyAgICAgICAgICAgIGFkanVzdGVkUnVuLnNldExvZ2ljYWxXaWR0aCh3aWR0aCk7CiAgICAgICAg ICAgICByZXR1cm4gYWRqdXN0ZWRSdW47CiAgICAgICAgIH07CiAKQEAgLTI2MywxMyArMjU3LDEz IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNsb3NlTGluZShMaW5lJiBsaW5lLCBJ c0xhc3RMaW5lIGlzTGFzdExpbmUpIGNvbnN0CiAgICAgcG9zdFByb2Nlc3NJbmxpbmVSdW5zKGxp bmUsIGlzTGFzdExpbmUpOwogfQogCi12b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjphcHBl bmRDb250ZW50VG9MaW5lKExpbmUmIGxpbmUsIGNvbnN0IElubGluZUxpbmVCcmVha2VyOjpSdW4m IHJ1bikgY29uc3QKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmFwcGVuZENvbnRlbnRU b0xpbmUoTGluZSYgbGluZSwgY29uc3QgSW5saW5lUnVuUHJvdmlkZXI6OlJ1biYgcnVuLCBjb25z dCBMYXlvdXRTaXplJiBydW5TaXplKSBjb25zdAogewogICAgIGF1dG8gbGFzdFJ1blR5cGUgPSBs aW5lLmxhc3RSdW5UeXBlKCk7Ci0gICAgbGluZS5hcHBlbmRDb250ZW50KHJ1bik7CisgICAgbGlu ZS5hcHBlbmRDb250ZW50KHJ1biwgcnVuU2l6ZSk7CiAKICAgICBpZiAocm9vdCgpLnN0eWxlKCku dGV4dEFsaWduKCkgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeSkKLSAgICAgICAgR2VvbWV0cnk6 OmNvbXB1dGVFeHBhbnNpb25PcHBvcnR1bml0aWVzKGxpbmUsIHJ1bi5jb250ZW50LCBsYXN0UnVu VHlwZS52YWx1ZV9vcihJbmxpbmVSdW5Qcm92aWRlcjo6UnVuOjpUeXBlOjpOb25XaGl0ZXNwYWNl KSk7CisgICAgICAgIEdlb21ldHJ5Ojpjb21wdXRlRXhwYW5zaW9uT3Bwb3J0dW5pdGllcyhsaW5l LCBydW4sIGxhc3RSdW5UeXBlLnZhbHVlX29yKElubGluZVJ1blByb3ZpZGVyOjpSdW46OlR5cGU6 Ok5vbldoaXRlc3BhY2UpKTsKIH0KIAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0SW5saW5lQ29udGVudChjb25zdCBJbmxpbmVSdW5Qcm92aWRlciYgaW5saW5lUnVuUHJvdmlk ZXIpIGNvbnN0CkBAIC0zMTgsOCArMzEyLDExIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lUnVuUHJvdmlkZXImIGlubGluCiAg ICAgICAgICAgICB9CiAgICAgICAgICB9CiAKLSAgICAgICAgaWYgKGdlbmVyYXRlc0lubGluZVJ1 bikKLSAgICAgICAgICAgIGFwcGVuZENvbnRlbnRUb0xpbmUobGluZSwgKnJ1bik7CisgICAgICAg IGlmIChnZW5lcmF0ZXNJbmxpbmVSdW4pIHsKKyAgICAgICAgICAgIGF1dG8gd2lkdGggPSBydW4t PndpZHRoOworICAgICAgICAgICAgYXV0byBoZWlnaHQgPSBydW4tPmNvbnRlbnQuaXNUZXh0KCkg PyBMYXlvdXRVbml0KHJvb3QoKS5zdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpKSA6IGxheW91 dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gocnVuLT5jb250ZW50LmlubGluZUl0ZW0oKS5s YXlvdXRCb3goKSkuaGVpZ2h0KCk7IAorICAgICAgICAgICAgYXBwZW5kQ29udGVudFRvTGluZShs aW5lLCBydW4tPmNvbnRlbnQsIHsgd2lkdGgsIGhlaWdodCB9KTsKKyAgICAgICAgfQogCiAgICAg ICAgIGlmIChpc0xhc3RSdW4pCiAgICAgICAgICAgICBjbG9zZUxpbmUobGluZSwgSXNMYXN0TGlu ZTo6Tm8pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggMGQ0YmU4MjZlMDY4 ZGFjMjkyMDg0Nzc3OTNhMDM4NmVkOTc3NGE2Yy4uZjBhZWQzNWRlNWMwNzc3MjNkMTNjZmIzN2Rk NTc4M2ZhNWNiZGM4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0yOSw3 ICsyOSw2IEBACiAKICNpbmNsdWRlICJEaXNwbGF5Qm94LmgiCiAjaW5jbHVkZSAiRm9ybWF0dGlu Z0NvbnRleHQuaCIKLSNpbmNsdWRlICJJbmxpbmVMaW5lQnJlYWtlci5oIgogI2luY2x1ZGUgIklu bGluZVJ1bi5oIgogI2luY2x1ZGUgPHd0Zi9Jc29NYWxsb2MuaD4KIApAQCAtNTEsMTAgKzUwLDEw IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgY2xhc3MgTGluZSB7CiAgICAgcHVibGljOgotICAg ICAgICB2b2lkIGluaXQoY29uc3QgRGlzcGxheTo6Qm94OjpSZWN0Jik7CisgICAgICAgIHZvaWQg aW5pdChjb25zdCBMYXlvdXRQb2ludCYgdG9wTGVmdCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0 aCwgTGF5b3V0VW5pdCBtaW5pbWFsSGVpZ2h0KTsKICAgICAgICAgdm9pZCBjbG9zZSgpOwogCi0g ICAgICAgIHZvaWQgYXBwZW5kQ29udGVudChjb25zdCBJbmxpbmVMaW5lQnJlYWtlcjo6UnVuJik7 CisgICAgICAgIHZvaWQgYXBwZW5kQ29udGVudChjb25zdCBJbmxpbmVSdW5Qcm92aWRlcjo6UnVu JiwgY29uc3QgTGF5b3V0U2l6ZSYpOwogCiAgICAgICAgIHZvaWQgYWRqdXN0TG9naWNhbExlZnQo TGF5b3V0VW5pdCBkZWx0YSk7CiAgICAgICAgIHZvaWQgYWRqdXN0TG9naWNhbFJpZ2h0KExheW91 dFVuaXQgZGVsdGEpOwpAQCAtNzEsNiArNzAsNyBAQCBwcml2YXRlOgogCiAgICAgICAgIExheW91 dFVuaXQgbG9naWNhbFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QudG9wKCk7IH0K ICAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsQm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9sb2dp Y2FsUmVjdC5ib3R0b20oKTsgfQorICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBj b25zdCB7IHJldHVybiBsb2dpY2FsQm90dG9tKCkgLSBsb2dpY2FsVG9wKCk7IH0KIAogICAgIHBy aXZhdGU6CiAgICAgICAgIHN0cnVjdCBUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQgewpAQCAtMTA1 LDcgKzEwNSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0 IElubGluZVJ1blByb3ZpZGVyJikgY29uc3Q7CiAgICAgdm9pZCBpbml0aWFsaXplTmV3TGluZShM aW5lJikgY29uc3Q7CiAgICAgdm9pZCBjbG9zZUxpbmUoTGluZSYsIElzTGFzdExpbmUpIGNvbnN0 OwotICAgIHZvaWQgYXBwZW5kQ29udGVudFRvTGluZShMaW5lJiwgY29uc3QgSW5saW5lTGluZUJy ZWFrZXI6OlJ1biYpIGNvbnN0OworICAgIHZvaWQgYXBwZW5kQ29udGVudFRvTGluZShMaW5lJiwg Y29uc3QgSW5saW5lUnVuUHJvdmlkZXI6OlJ1biYsIGNvbnN0IExheW91dFNpemUmKSBjb25zdDsK ICAgICB2b2lkIHBvc3RQcm9jZXNzSW5saW5lUnVucyhMaW5lJiwgSXNMYXN0TGluZSkgY29uc3Q7 CiAgICAgdm9pZCBjcmVhdGVGaW5hbFJ1bnMoTGluZSYpIGNvbnN0OwogICAgIHZvaWQgc3BsaXRJ bmxpbmVSdW5JZk5lZWRlZChjb25zdCBJbmxpbmVSdW4mLCBJbmxpbmVSdW5zJiBzcGxpdFJ1bnMp IGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAppbmRleCBhODAwYjczNTg4MDBlZTMxNzU5NjJlMTllNzRiZWNmYTA3MmFmYTVhLi4yOTIxYzNm MTk1NmY1M2Q2YzRlMzk3ZThhZDg0OTBiYzdiZjI2N2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTMxLDcgKzEzMSw3IEBAIHZvaWQg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpqdXN0aWZ5UnVucyhMaW5lJiBsaW5l KQogCiAgICAgICAgIGlubGluZVJ1bi5leHBhbnNpb25PcHBvcnR1bml0eSgpLmV4cGFuc2lvbiA9 IGV4cGFuc2lvbkZvclJ1bjsKICAgICAgICAgaW5saW5lUnVuLnNldExvZ2ljYWxMZWZ0KGlubGlu ZVJ1bi5sb2dpY2FsTGVmdCgpICsgYWNjdW11bGF0ZWRFeHBhbnNpb24pOwotICAgICAgICBpbmxp bmVSdW4uc2V0V2lkdGgoaW5saW5lUnVuLndpZHRoKCkgKyBleHBhbnNpb25Gb3JSdW4pOworICAg ICAgICBpbmxpbmVSdW4uc2V0TG9naWNhbFdpZHRoKGlubGluZVJ1bi5sb2dpY2FsV2lkdGgoKSAr IGV4cGFuc2lvbkZvclJ1bik7CiAgICAgICAgIGFjY3VtdWxhdGVkRXhwYW5zaW9uICs9IGV4cGFu c2lvbkZvclJ1bjsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVSdW4uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZVJ1bi5oCmluZGV4IDUzZWYyYmE1NzViZDI4YTg0MTFlMjUxZWEx MjNkNGQ2ZWM0MGQzZGYuLjdlZjM4NTRjMTJlODUyNjcxOTY1ZDYxYzA2MzA5OGZhNTQwODEwNWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZVJ1bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZVJ1bi5oCkBAIC00MSwxMSArNDEsMTEgQEAgc3RydWN0IElubGluZVJ1biB7CiAgICAgTGF5b3V0 VW5pdCBsb2dpY2FsVG9wKCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsUmVjdC50b3AoKTsgfQog ICAgIExheW91dFVuaXQgbG9naWNhbEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJl Y3QuYm90dG9tKCk7IH0KIAotICAgIExheW91dFVuaXQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBt X2xvZ2ljYWxSZWN0LndpZHRoKCk7IH0KLSAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0IHsg cmV0dXJuIG1fbG9naWNhbFJlY3QuaGVpZ2h0KCk7IH0KKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Qud2lkdGgoKTsgfQorICAgIExheW91 dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3QuaGVpZ2h0 KCk7IH0KICAgICBib29sIG92ZXJsYXBzTXVsdGlwbGVJbmxpbmVJdGVtcygpIGNvbnN0OwogCi0g ICAgdm9pZCBzZXRXaWR0aChMYXlvdXRVbml0IHdpZHRoKSB7IG1fbG9naWNhbFJlY3Quc2V0V2lk dGgod2lkdGgpOyB9CisgICAgdm9pZCBzZXRMb2dpY2FsV2lkdGgoTGF5b3V0VW5pdCB3aWR0aCkg eyBtX2xvZ2ljYWxSZWN0LnNldFdpZHRoKHdpZHRoKTsgfQogICAgIHZvaWQgc2V0TG9naWNhbExl ZnQoTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCkgeyBtX2xvZ2ljYWxSZWN0LnNldExlZnQobG9naWNh bExlZnQpOyB9CiAgICAgdm9pZCBzZXRMb2dpY2FsUmlnaHQoTGF5b3V0VW5pdCBsb2dpY2FsUmln aHQpIHsgbV9sb2dpY2FsUmVjdC5zaGlmdFJpZ2h0VG8obG9naWNhbFJpZ2h0KTsgfQogICAgIHZv aWQgbW92ZVZlcnRpY2FsbHkoTGF5b3V0VW5pdCBkZWx0YSkgeyBtX2xvZ2ljYWxSZWN0Lm1vdmVW ZXJ0aWNhbGx5KGRlbHRhKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9MaW5lLmNwcAppbmRleCBlOWRhMzk3OWRiZDQ5YTllMjY1NzI5N2Q0ODYyYjkxYWEz ODRlOTdjLi4zM2I0ZTM0ODljODlkODE0MzI3YzYwODY4NzNlMWM0ZmQ2NDU0MWIyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lLmNwcApAQCAtMzIs MTAgKzMyLDEyIEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAot dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6aW5pdChjb25zdCBEaXNwbGF5OjpC b3g6OlJlY3QmIGxvZ2ljYWxSZWN0KQordm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGlu ZTo6aW5pdChjb25zdCBMYXlvdXRQb2ludCYgdG9wTGVmdCwgTGF5b3V0VW5pdCBhdmFpbGFibGVX aWR0aCwgTGF5b3V0VW5pdCBtaW5pbWFsSGVpZ2h0KQogewotICAgIG1fbG9naWNhbFJlY3QgPSBs b2dpY2FsUmVjdDsKLSAgICBtX2F2YWlsYWJsZVdpZHRoID0gbG9naWNhbFJlY3Qud2lkdGgoKTsK KyAgICBtX2xvZ2ljYWxSZWN0LnNldFRvcExlZnQodG9wTGVmdCk7CisgICAgbV9sb2dpY2FsUmVj dC5zZXRXaWR0aChhdmFpbGFibGVXaWR0aCk7CisgICAgbV9sb2dpY2FsUmVjdC5zZXRIZWlnaHQo bWluaW1hbEhlaWdodCk7CisgICAgbV9hdmFpbGFibGVXaWR0aCA9IGF2YWlsYWJsZVdpZHRoOwog CiAgICAgbV9pbmxpbmVSdW5zLmNsZWFyKCk7CiAgICAgbV9sYXN0UnVuVHlwZSA9IHsgfTsKQEAg LTc2LDQxICs3OCw0MSBAQCBMYXlvdXRVbml0IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5l Ojpjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QKICAgICByZXR1cm4gbV9pbmxpbmVSdW5zLmxh c3QoKS5sb2dpY2FsUmlnaHQoKTsKIH0KIAotdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 TGluZTo6YXBwZW5kQ29udGVudChjb25zdCBJbmxpbmVMaW5lQnJlYWtlcjo6UnVuJiBydW4pCit2 b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lOjphcHBlbmRDb250ZW50KGNvbnN0IElu bGluZVJ1blByb3ZpZGVyOjpSdW4mIHJ1biwgY29uc3QgTGF5b3V0U2l6ZSYgcnVuU2l6ZSkKIHsK ICAgICBBU1NFUlQoIWlzQ2xvc2VkKCkpOwogCi0gICAgYXV0byYgY29udGVudCA9IHJ1bi5jb250 ZW50OwotCiAgICAgLy8gQXBwZW5kIHRoaXMgdGV4dCBydW4gdG8gdGhlIGVuZCBvZiB0aGUgbGFz dCB0ZXh0IHJ1biwgaWYgdGhlIGxhc3QgcnVuIGlzIGNvbnRpbnVvdXMuCiAgICAgc3RkOjpvcHRp b25hbDxJbmxpbmVSdW46OlRleHRDb250ZXh0PiB0ZXh0UnVuOwotICAgIGlmIChjb250ZW50Lmlz VGV4dCgpKSB7Ci0gICAgICAgIGF1dG8gdGV4dENvbnRleHQgPSBjb250ZW50LnRleHRDb250ZXh0 KCk7CisgICAgaWYgKHJ1bi5pc1RleHQoKSkgeworICAgICAgICBhdXRvIHRleHRDb250ZXh0ID0g cnVuLnRleHRDb250ZXh0KCk7CiAgICAgICAgIGF1dG8gcnVuTGVuZ3RoID0gdGV4dENvbnRleHQt PmlzQ29sbGFwc2VkKCkgPyAxIDogdGV4dENvbnRleHQtPmxlbmd0aCgpOwogICAgICAgICB0ZXh0 UnVuID0gSW5saW5lUnVuOjpUZXh0Q29udGV4dCB7IHRleHRDb250ZXh0LT5zdGFydCgpLCBydW5M ZW5ndGggfTsKICAgICB9CiAKLSAgICBhdXRvIHJlcXVpcmVzTmV3SW5saW5lUnVuID0gIWhhc0Nv bnRlbnQoKSB8fCAhY29udGVudC5pc1RleHQoKSB8fCAhbV9sYXN0UnVuQ2FuRXhwYW5kOworICAg IGF1dG8gcmVxdWlyZXNOZXdJbmxpbmVSdW4gPSAhaGFzQ29udGVudCgpIHx8ICFydW4uaXNUZXh0 KCkgfHwgIW1fbGFzdFJ1bkNhbkV4cGFuZDsKICAgICBpZiAocmVxdWlyZXNOZXdJbmxpbmVSdW4p IHsKICAgICAgICAgLy8gRklYTUU6IFRoaXMgbmVlZHMgcHJvcGVyIGJhc2VsaW5lIGhhbmRsaW5n Ci0gICAgICAgIGF1dG8gaW5saW5lUnVuID0gSW5saW5lUnVuIHsgeyBsb2dpY2FsVG9wKCksIGNv bnRlbnRMb2dpY2FsUmlnaHQoKSwgcnVuLndpZHRoLCBsb2dpY2FsQm90dG9tKCkgLSBsb2dpY2Fs VG9wKCkgfSwgY29udGVudC5pbmxpbmVJdGVtKCkgfTsKKyAgICAgICAgYXV0byBpbmxpbmVSdW4g PSBJbmxpbmVSdW4geyB7IGxvZ2ljYWxUb3AoKSwgY29udGVudExvZ2ljYWxSaWdodCgpLCBydW5T aXplLndpZHRoKCksIHJ1blNpemUuaGVpZ2h0KCkgfSwgcnVuLmlubGluZUl0ZW0oKSB9OwogICAg ICAgICBpZiAodGV4dFJ1bikKICAgICAgICAgICAgIGlubGluZVJ1bi5zZXRUZXh0Q29udGV4dCh7 IHRleHRSdW4tPnN0YXJ0KCksIHRleHRSdW4tPmxlbmd0aCgpIH0pOwogICAgICAgICBtX2lubGlu ZVJ1bnMuYXBwZW5kKGlubGluZVJ1bik7CisgICAgICAgIG1fbG9naWNhbFJlY3Quc2V0SGVpZ2h0 KHN0ZDo6bWF4KHJ1blNpemUuaGVpZ2h0KCksIG1fbG9naWNhbFJlY3QuaGVpZ2h0KCkpKTsKICAg ICB9IGVsc2UgewogICAgICAgICAvLyBOb24tdGV4dCBydW5zIGFsd2F5cyByZXF1aXJlIG5ldyBp bmxpbmUgcnVuLgogICAgICAgICBBU1NFUlQodGV4dFJ1bik7CiAgICAgICAgIGF1dG8mIGlubGlu ZVJ1biA9IG1faW5saW5lUnVucy5sYXN0KCk7Ci0gICAgICAgIGlubGluZVJ1bi5zZXRXaWR0aChp bmxpbmVSdW4ud2lkdGgoKSArIHJ1bi53aWR0aCk7CisgICAgICAgIEFTU0VSVChydW5TaXplLmhl aWdodCgpID09IGlubGluZVJ1bi5sb2dpY2FsSGVpZ2h0KCkpOworICAgICAgICBpbmxpbmVSdW4u c2V0TG9naWNhbFdpZHRoKGlubGluZVJ1bi5sb2dpY2FsV2lkdGgoKSArIHJ1blNpemUud2lkdGgo KSk7CiAgICAgICAgIGlubGluZVJ1bi50ZXh0Q29udGV4dCgpLT5zZXRMZW5ndGgoaW5saW5lUnVu LnRleHRDb250ZXh0KCktPmxlbmd0aCgpICsgdGV4dFJ1bi0+bGVuZ3RoKCkpOwogICAgIH0KIAot ICAgIG1fYXZhaWxhYmxlV2lkdGggLT0gcnVuLndpZHRoOwotICAgIG1fbGFzdFJ1blR5cGUgPSBj b250ZW50LnR5cGUoKTsKLSAgICBtX2xhc3RSdW5DYW5FeHBhbmQgPSBjb250ZW50LmlzVGV4dCgp ICYmICFjb250ZW50LnRleHRDb250ZXh0KCktPmlzQ29sbGFwc2VkKCk7CisgICAgbV9hdmFpbGFi bGVXaWR0aCAtPSBydW5TaXplLndpZHRoKCk7CisgICAgbV9sYXN0UnVuVHlwZSA9IHJ1bi50eXBl KCk7CisgICAgbV9sYXN0UnVuQ2FuRXhwYW5kID0gcnVuLmlzVGV4dCgpICYmICFydW4udGV4dENv bnRleHQoKS0+aXNDb2xsYXBzZWQoKTsKICAgICBtX3RyYWlsaW5nVHJpbW1hYmxlQ29udGVudCA9 IHsgfTsKLSAgICBpZiAoaXNUcmltbWFibGVDb250ZW50KGNvbnRlbnQpKQotICAgICAgICBtX3Ry YWlsaW5nVHJpbW1hYmxlQ29udGVudCA9IFRyYWlsaW5nVHJpbW1hYmxlQ29udGVudCB7IHJ1bi53 aWR0aCwgdGV4dFJ1bi0+bGVuZ3RoKCkgfTsKKyAgICBpZiAoaXNUcmltbWFibGVDb250ZW50KHJ1 bikpCisgICAgICAgIG1fdHJhaWxpbmdUcmltbWFibGVDb250ZW50ID0gVHJhaWxpbmdUcmltbWFi bGVDb250ZW50IHsgcnVuU2l6ZS53aWR0aCgpLCB0ZXh0UnVuLT5sZW5ndGgoKSB9OwogfQogCiB2 b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lOjpjbG9zZSgpCkBAIC0xMjEsNyArMTIz LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZTo6Y2xvc2UoKQogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGF1dG8mIGxhc3RJbmxpbmVSdW4gPSBtX2lubGluZVJ1 bnMubGFzdCgpOwotICAgICAgICBsYXN0SW5saW5lUnVuLnNldFdpZHRoKGxhc3RJbmxpbmVSdW4u d2lkdGgoKSAtIG1fdHJhaWxpbmdUcmltbWFibGVDb250ZW50LT53aWR0aCk7CisgICAgICAgIGxh c3RJbmxpbmVSdW4uc2V0TG9naWNhbFdpZHRoKGxhc3RJbmxpbmVSdW4ubG9naWNhbFdpZHRoKCkg LSBtX3RyYWlsaW5nVHJpbW1hYmxlQ29udGVudC0+d2lkdGgpOwogICAgICAgICBsYXN0SW5saW5l UnVuLnRleHRDb250ZXh0KCktPnNldExlbmd0aChsYXN0SW5saW5lUnVuLnRleHRDb250ZXh0KCkt Pmxlbmd0aCgpIC0gbV90cmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQtPmxlbmd0aCk7CiAKICAgICAg ICAgaWYgKCFsYXN0SW5saW5lUnVuLnRleHRDb250ZXh0KCktPmxlbmd0aCgpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3Bw CmluZGV4IGY2ZjU4Y2IyM2FmMTc1ZGYxOWRlOWJjZmRlNDVhOTZiMmY1NmQ2N2UuLjZmZDA3MWZk ZTkzNTlkMzE4ODkxMzY4ZWU5ZDg2NjI4NWRjMjQ4NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKQEAgLTE1MSw3 ICsxNTEsNyBAQCBzdGF0aWMgdm9pZCBvdXRwdXRJbmxpbmVSdW5zKFRleHRTdHJlYW0mIHN0cmVh bSwgY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLAogICAgICAgICAgICAgc3RyZWFtIDw8 ICIoIiA8PCBpbmxpbmVSdW4udGV4dENvbnRleHQoKS0+c3RhcnQoKSA8PCAiLCAiIDw8IGlubGlu ZVJ1bi50ZXh0Q29udGV4dCgpLT5zdGFydCgpICsgaW5saW5lUnVuLnRleHRDb250ZXh0KCktPmxl bmd0aCgpIDw8ICIpICI7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHN0cmVhbSA8PCAiKHgs IHgpICI7Ci0gICAgICAgIHN0cmVhbSA8PCAiYXQgWyIgPDwgaW5saW5lUnVuLmxvZ2ljYWxMZWZ0 KCkgPDwgIiwgIiA8PCBpbmxpbmVSdW4ubG9naWNhbFRvcCgpIDw8ICJdIHNpemUgWyIgPDwgaW5s aW5lUnVuLndpZHRoKCkgPDwgIiAiIDw8IGlubGluZVJ1bi5oZWlnaHQoKSA8PCAiXSI7CisgICAg ICAgIHN0cmVhbSA8PCAiYXQgWyIgPDwgaW5saW5lUnVuLmxvZ2ljYWxMZWZ0KCkgPDwgIiwgIiA8 PCBpbmxpbmVSdW4ubG9naWNhbFRvcCgpIDw8ICJdIHNpemUgWyIgPDwgaW5saW5lUnVuLmxvZ2lj YWxXaWR0aCgpIDw8ICIgIiA8PCBpbmxpbmVSdW4ubG9naWNhbEhlaWdodCgpIDw8ICJdIjsKICAg ICAgICAgc3RyZWFtLm5leHRMaW5lKCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDllZTE1YzRlMDJmYTA5MzE3NjM2NWMxMjM4 Njg0YjliZmRhMjFlYzIuLjUyMWM3ZTM1Yjk5NzYxOWJhMmYwNTU0MjQ2MmRmNjc3MjFjYmFmMTYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxOC0xMS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIHZhcmlhYmxlIGhlaWdodCBydW5z LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxOTI1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMYXlv dXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dDoKKwogMjAxOC0xMS0yMiAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gT2Zmc2V0 IGZvcm1hdHRpbmcgY29udGV4dCByb290IHJ1bnMgd2l0aCBob3Jpem9udGFsIG1hcmdpbnMuCmRp ZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4 dCBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CmluZGV4 IGEwNDk5Y2NmMmVmYTc2ZjQ3ZTdmYTU4MGMzNTg2Mjc3YTdlNGVkOWEuLmRiOTFjZjRkNjc3YWU5 NzFiMzEzOTJhZTliNDIzNDEyOTI4ZTBiYmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVk L21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CkBAIC03Niw2ICs3Niw3IEBAIGZhc3QvaW5saW5l L2lubGluZS1jb250ZW50LXdpdGgtcGFkZGluZy1sZWZ0LXJpZ2h0Lmh0bWwKIGZhc3QvaW5saW5l L2lubGluZS1jb250ZW50LXdpdGgtYm9yZGVyLWxlZnQtcmlnaHQuaHRtbAogZmFzdC9pbmxpbmUv aW5saW5lLWNvbnRlbnQtd2l0aC1tYXJnaW4tbGVmdC1yaWdodC5odG1sCiBmYXN0L2lubGluZS9p bmxpbmUtY29udGVudC1hbmQtbmVzdGVkLWZvcm1hdHRpbmctcm9vdC13aXRoLW1hcmdpbi1sZWZ0 LXJpZ2h0Lmh0bWwKK2Zhc3QvaW5saW5lL2lubGluZS1jb250ZW50LXdpdGgtaW1hZ2Utc2ltcGxl Lmh0bWwKIGZhc3QvYmxvY2svYmFzaWMvaGVpZ2h0LXBlcmNlbnRhZ2Utc2ltcGxlLmh0bWwKIGZh c3QvYmxvY2svYmFzaWMvY2hpbGQtYmxvY2stbGV2ZWwtYm94LXdpdGgtaGVpZ2h0LXBlcmNlbnQu aHRtbAogZmFzdC9ibG9jay9iYXNpYy9xdWlyay1tb2RlLXBlcmNlbnQtaGVpZ2h0Lmh0bWwKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAyOTc1N2Y1NDc0ZTFhYzBjYWFiMTFlZDgyYjg1NjhlZTQwNmUyZWI0Li43ZWUyNDAxMDM0 MDExOGRhMWYwZDcwZmU0MzExNWJjZjhjMzgxMzc0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTgtMTEtMjMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZD XVtJRkNdIEFkZCBzdXBwb3J0IGZvciB2YXJpYWJsZSBoZWlnaHQgcnVucy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTkyNQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9pbmxpbmUvaW5saW5l LWNvbnRlbnQtd2l0aC1pbWFnZS1zaW1wbGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L2lubGluZS9pbmxpbmUtY29udGVudC13aXRoLWltYWdlLXNpbXBsZS5odG1sOiBBZGRl ZC4KKwogMjAxOC0xMS0yMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdW0lGQ10gT2Zmc2V0IGZvcm1hdHRpbmcgY29udGV4dCByb290IHJ1bnMgd2l0aCBo b3Jpem9udGFsIG1hcmdpbnMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9p bmxpbmUtY29udGVudC13aXRoLWltYWdlLXNpbXBsZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2lubGluZS9pbmxpbmUtY29udGVudC13aXRoLWltYWdlLXNpbXBsZS1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uN2YzYjFiOWY4NmQxNWJhM2U3OWIyMjRlYmViM2ExNmFiZjM1MDQ4Zgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1jb250ZW50 LXdpdGgtaW1hZ2Utc2ltcGxlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEyIEBACitsYXllciBh dCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBhdCAoMCwwKSBzaXplIDgwMHg2MDAK K2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCisgICAgUmVuZGVyQm9keSB7Qk9EWX0gYXQgKDgsOCkgc2l6ZSA3ODR4 NTg0CitsYXllciBhdCAoOCw4KSBzaXplIDQwMngyMDIgY2xpcCBhdCAoOSw5KSBzaXplIDQwMHgy MDAKKyAgUmVuZGVyQmxvY2sge0RJVn0gYXQgKDAsMCkgc2l6ZSA0MDJ4MjAyIFtib3JkZXI6ICgx cHggc29saWQgIzAwODAwMCldCisgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxLDgzKSBzaXpl IDExeDI2CisgICAgICB0ZXh0IHJ1biBhdCAoMSw4Mykgd2lkdGggMTE6ICIxIgorICAgIFJlbmRl ckltYWdlIHtJTUd9IGF0ICgxMiwxKSBzaXplIDEwMngxMDIgW2JvcmRlcjogKDFweCBzb2xpZCAj RkYwMDAwKV0KKyAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDExNCw4Mykgc2l6ZSAxMXgyNgor ICAgICAgdGV4dCBydW4gYXQgKDExNCw4Mykgd2lkdGggMTE6ICIzIgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9pbmxpbmUvaW5saW5lLWNvbnRlbnQtd2l0aC1pbWFnZS1zaW1wbGUuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1jb250ZW50LXdpdGgtaW1hZ2Utc2lt cGxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uZDYxMmM5YjIyYzU2NzM2MDUwODQ2MGE3ODAyMWI2NDg0NDgy OGFmZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2lubGluZS1j b250ZW50LXdpdGgtaW1hZ2Utc2ltcGxlLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPHN0eWxlPgor LmlubGluZVJvb3QgeworCWJvcmRlcjogMXB4IHNvbGlkIGdyZWVuOworCXdpZHRoOiA0MDBweDsK KwloZWlnaHQ6IDIwMHB4OworCW92ZXJmbG93OiBoaWRkZW47CisJZm9udC1zaXplOiAyMnB4Owor fQorCisuYnJlYWtCb3RoIHsKKwlib3JkZXI6IDFweCBzb2xpZCByZWQ7Cit9Cis8L3N0eWxlPgor Cis8ZGl2IGNsYXNzPWlubGluZVJvb3Q+MTxpbWcgc3JjPSJmb28uanBnIiBoZWlnaHQ9MTAwIHdp ZHRoPTEwMCBjbGFzcz1icmVha0JvdGg+MzwvZGl2Pgo=