202180 2019-09-24 17:37:47 -0700 [results.webkit.org] Timeline support Image inner label 2019-09-26 14:54:00 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zhifei_fang zhifei_fang commit-queue jbedard webkit-bug-importer zhifei_fang oldest_to_newest 1573918 0 zhifei_fang 2019-09-24 17:37:47 -0700 [results.webkit.org] Timeline support Image inner label 1573919 1 379519 zhifei_fang 2019-09-24 17:39:34 -0700 Created attachment 379519 Patch 1574049 2 jbedard 2019-09-25 07:38:36 -0700 This is going to conflict with https://bugs.webkit.org/show_bug.cgi?id=202106, that's my only concern. Two other things I also wonder about: For the HTML, can we not just have the SVG in place of the character? Obviously won't work on the canvas Is it possible to make this symbol with zero-width unicode characters? I didn't think of that earlier, but it should be possible, and wouldn't require us to do the whole is-it-an-image check. 1574103 3 zhifei_fang 2019-09-25 10:20:46 -0700 (In reply to Jonathan Bedard from comment #2) > This is going to conflict with > https://bugs.webkit.org/show_bug.cgi?id=202106, that's my only concern. > > Two other things I also wonder about: > > For the HTML, can we not just have the SVG in place of the character? > Obviously won't work on the canvas Adding toString() for Image, Image.prototype.toString = function() {return this.outerHTML} For canvas, it is better to directly provide an Image Object, I don't want to create an image object for each dot, this can drain memory quickly. So it will need another system to cache image by its digest. > > Is it possible to make this symbol with zero-width unicode characters? I > didn't think of that earlier, but it should be possible, and wouldn't > require us to do the whole is-it-an-image check. adding toString of Image will resolve this in most case. 1574559 4 379665 zhifei_fang 2019-09-26 11:38:40 -0700 Created attachment 379665 Patch 1574586 5 jbedard 2019-09-26 12:30:34 -0700 You haven't included clock.svg in the patch. 1574588 6 379668 zhifei_fang 2019-09-26 12:47:00 -0700 Created attachment 379668 Patch 1574590 7 379670 zhifei_fang 2019-09-26 12:59:06 -0700 Created attachment 379670 Patch 1574604 8 379670 jbedard 2019-09-26 13:24:48 -0700 Comment on attachment 379670 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379670&action=review > Tools/resultsdbpy/resultsdbpy/view/static/library/icons/clock.svg:6 > + <dc:date>2019-09-24 23:32:28 +0000</dc:date> Do we need the metadata? 1574608 9 379673 zhifei_fang 2019-09-26 13:30:04 -0700 Created attachment 379673 Patch 1574639 10 379673 commit-queue 2019-09-26 14:51:41 -0700 Comment on attachment 379673 Patch Clearing flags on attachment: 379673 Committed r250399: <https://trac.webkit.org/changeset/250399> 1574640 11 commit-queue 2019-09-26 14:51:43 -0700 All reviewed patches have been landed. Closing bug. 1574641 12 webkit-bug-importer 2019-09-26 14:54:00 -0700 <rdar://problem/55759680> 379519 2019-09-24 17:39:34 -0700 2019-09-26 11:38:39 -0700 Patch bug-202180-20190924173933.patch text/plain 4901 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzEwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGE3NmI5N2IwOTU5Nzc2MzMyM2Y2NjUxMTg0YjBjZmZh ZDgyNTgyZC4uZWIxODg3YzczMTgxODMwNjQzMmNkOTM1YmRjOWEwNzA2Y2M4MWMxZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE5LTA5LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZSBzdXBwb3J0IEltYWdlIGlubmVy IGxhYmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDIxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzOgorICAg ICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dl YmtpdC5jc3M6CisgICAgICAgICgubGVuZ2VuZD4uaXRlbSAuZG90IGltZyk6IHN1cHBvcnQgaW1n IHN5bWJvbCBmb3IgbGVuZ2VuZAorICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanM6Cisg ICAgICAgIChUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQpOiBTdXBwb3J0IHVzZXIgcGFz cyBhIEltYWdlIG9iamVjdCBvciBhIGltYWdlIHVybCBhcyBpbm5lciBsYWJlbAorCiAyMDE5LTA5 LTI0ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBDb2FsZXNj ZSBvciByZW1vdmUgUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShJT1NfRkFNSUxZKQpkaWZmIC0t Z2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxp bmUuanMgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1l bGluZS5qcwppbmRleCAwZjE4MTVjNGVjODZkMWMzZWI5NmMwZmU0MDY2YjJjODQ4ODMxMjg5Li44 OWM5MzMyNWFhYmNmNjc1YjU1OTRkNmY5ZTc0MjUxYmIyZDQ4Y2ZlIDEwMDY0NAotLS0gYS9Ub29s cy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcworKysg Yi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5q cwpAQCAtNDMsMTAgKzQzLDEyIEBAIGNvbnN0IHN0YXRlVG9JRE1hcHBpbmcgPSB7CiAgICAgUEFT UzogMHg0MCwKIH07CiAKK2NvbnN0IHRpbWVvdXRJbWFnZSA9IG5ldyBJbWFnZSgpOwordGltZW91 dEltYWdlLnNyYyA9ICcvbGlicmFyeS9pY29ucy9jbG9jay5zdmcnOwogY29uc3QgVGVzdFJlc3Vs dHNTeW1ib2xNYXAgPSB7CiAgICAgc3VjY2VzczogJ+KckycsCiAgICAgZmFpbGVkOiAn8J2Wtycs Ci0gICAgdGltZWRvdXQ6ICfijosnLAorICAgIHRpbWVkb3V0OiB0aW1lb3V0SW1hZ2UsCiAgICAg Y3Jhc2hlZDogJyEnLAogfQogCkBAIC04NzMsNyArODc1LDcgQEAgZnVuY3Rpb24gTGVnZW5kKGNh bGxiYWNrPW51bGwsIHBsdXJhbD1mYWxzZSkgewogICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuIGA8ZGl2IGNsYXNzPSJpdGVt Ij4KLSAgICAgICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImRvdCAke2tleX0iIHJlZj0i JHtkb3R9Ij48ZGl2IGNsYXNzPSJ0ZXh0Ij4ke1Rlc3RSZXN1bHRzU3ltYm9sTWFwW2tleV19PC9k aXY+PC9kaXY+CisgICAgICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJkb3QgJHtrZXl9 IiByZWY9IiR7ZG90fSI+JHtUZXN0UmVzdWx0c1N5bWJvbE1hcFtrZXldIGluc3RhbmNlb2YgSW1h Z2UgPyBUZXN0UmVzdWx0c1N5bWJvbE1hcFtrZXldLm91dGVySFRNTCA6IGA8ZGl2IGNsYXNzPSJ0 ZXh0Ij4ke1Rlc3RSZXN1bHRzU3ltYm9sTWFwW2tleV19PC9kaXY+YH08L2Rpdj4KICAgICAgICAg ICAgICAgICAgICAgICAgICR7TGVnZW5kTGFiZWwodXBkYXRlTGFiZWxFdmVudHMsIGxlZ2VuZERl dGFpbHNba2V5XS5leHBlY3RlZCwgbGVnZW5kRGV0YWlsc1trZXldLnVuZXhwZWN0ZWQpfQogICAg ICAgICAgICAgICAgICAgICA8L2Rpdj5gCiAgICAgICAgICAgICB9KS5qb2luKCcnKX0KZGlmZiAt LWdpdCBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkv Y3NzL3dlYmtpdC5jc3MgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRp Yy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzCmluZGV4IDFjZjg5MzRmYjlmMmM5ODFmZTE5MzFlMzg3 OTdjMzY5ZjA5ZmJhYTMuLmJlMWNmY2I3NjhmODNlNWRlZTE2ZGY3MTIyOTgxZWVhNWMzYjIzNzgg MTAwNjQ0Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xp YnJhcnkvY3NzL3dlYmtpdC5jc3MKKysrIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv dmlldy9zdGF0aWMvbGlicmFyeS9jc3Mvd2Via2l0LmNzcwpAQCAtMjE2OCw2ICsyMTY4LDE1IEBA IGEuZGlzYWJsZWQgewogICB1c2VyLXNlbGVjdDogbm9uZTsKICAgY3Vyc29yOiBkZWZhdWx0Owog fQorLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcgeworICAgIHdpZHRoOiB2YXIoLS10aW55U2l6ZSk7 CisgICAgaGVpZ2h0OiB2YXIoLS10aW55U2l6ZSk7CisgICAgcG9zaXRpb246IGFic29sdXRlOwor ICAgIHRvcDogY2FsYygodmFyKC0tc21hbGxTaXplKSAtIHZhcigtLXRpbnlTaXplKSkgLyAyKTsK KyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1zbWFsbFNpemUpIC0gdmFyKC0tdGlueVNpemUpKSAvIDIp OworICAgIHBhZGRpbmc6IDA7CisgICAgbWFyZ2luOiAwOworfQogLnRpbWVsaW5lLmxlbmdlbmQ+ Lml0ZW0gLmRvdDo6YmVmb3JlewogICBsZWZ0OiBjYWxjKDBweCAtIHZhcigtLXRpbnlTaXplKSk7 CiAgIHdpZHRoOiB2YXIoLS10aW55U2l6ZSk7CmRpZmYgLS1naXQgYS9Ub29scy9yZXN1bHRzZGJw eS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVD b21wb25lbnRzLmpzIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMv bGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcwppbmRleCBhNWQwZTVm ODNjMmVlZTNlNjZhZDk0ZWNmOGNkOWNiZmU1MTY0MjU4Li45NmMxNmQ5MmYwNmM0YmM1YWU0MWIx NzFiNGQ1MWIxNDE5NmE4OTk1IDEwMDY0NAotLS0gYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRz ZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRz LmpzCisrKyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJh cnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKQEAgLTI3OSw3ICsyNzksMTcg QEAgVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50ID0gKGRvdHMsIHNjYWxlcywgb3B0aW9u ID0ge30pID0+IHsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgY29sb3JCYXRjaFJlbmRl ci5hZGRTZXEoY29sb3IsIChjb250ZXh0LCBjb2xvcikgPT4gewogICAgICAgICAgICAgICAgIGNv bnRleHQuYXJjKHggKyBkb3RNYXJnaW4gKyB1c2VSYWRpdXMsIGJhc2VsaW5lWSwgdXNlUmFkaXVz LCAwLCAyICogTWF0aC5QSSk7Ci0gICAgICAgICAgICAgICAgaWYgKHR5cGVvZiBpbm5lckxhYmVs ID09PSAibnVtYmVyIiB8fCB0eXBlb2YgaW5uZXJMYWJlbCA9PT0gInN0cmluZyIpIHsKKyAgICAg ICAgICAgICAgICBpZiAoaW5uZXJMYWJlbCBpbnN0YW5jZW9mIEltYWdlIHx8IHR5cGVvZiBpbm5l ckxhYmVsID09PSAic3RyaW5nIiAmJiAoaW5uZXJMYWJlbC5lbmRzV2l0aCgnLnN2ZycpIHx8IGlu bmVyTGFiZWwuZW5kc1dpdGgoJy5wbmcnKSB8fCBpbm5lckxhYmVsLmVuZHNXaXRoKCcuanBnJykg fHwgaW5uZXJMYWJlbC5lbmRzV2l0aCgnLmpwZWcnKSkpIHsKKyAgICAgICAgICAgICAgICAgICAg bGV0IGltYWdlID0gaW5uZXJMYWJlbDsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHR5cGVvZiBp bm5lckxhYmVsID09PSAic3RyaW5nIikgeworICAgICAgICAgICAgICAgICAgICAgICAgaW1hZ2Ug PSBuZXcgSW1hZ2UoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGltYWdlLnNyYyA9IGlubmVy TGFiZWw7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgY29uc3Qg aW1hZ2VfcGFkZGluZyA9IHVzZVJhZGl1cyAtIGZvbnRTaXplIC8gMjsKKyAgICAgICAgICAgICAg ICAgICAgZHJhd0xhYmVsc1NlcXMucHVzaCgoKSA9PiB7CisgICAgICAgICAgICAgICAgICAgICAg ICBjb250ZXh0LmRyYXdJbWFnZShpbWFnZSwgeCArIGRvdE1hcmdpbiArIGltYWdlX3BhZGRpbmcs IHkgKyBpbWFnZV9wYWRkaW5nLCBmb250U2l6ZSwgZm9udFNpemUpOworICAgICAgICAgICAgICAg ICAgICB9KTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHR5cGVvZiBpbm5lckxhYmVsID09 PSAibnVtYmVyIiB8fCB0eXBlb2YgaW5uZXJMYWJlbCA9PT0gInN0cmluZyIpIHsKICAgICAgICAg ICAgICAgICAgICAgZHJhd0xhYmVsc1NlcXMucHVzaCgoKSA9PiB7CiAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBsYWJlbAogICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgaW5uZXJMYWJlbFNpemUgPSBjb250ZXh0Lm1lYXN1cmVUZXh0KGlubmVyTGFiZWwpOwo= 379665 2019-09-26 11:38:40 -0700 2019-09-26 12:46:59 -0700 Patch bug-202180-20190926113840.patch text/plain 4410 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM4NmRiOTk0ZDc2OTYyYjg1MDZiNjMxYzVhNDgzNjBk MjA1NWI0Zi4uODcyMjRmY2UyODc5MWM2MWFhYTNhODUyNTI2ZWEzNTJkZDg1NWQwZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE5LTA5LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZSBzdXBwb3J0IEltYWdlIGlubmVy IGxhYmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDIxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVjdGF0aW9ucy5qczoK KyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nz cy93ZWJraXQuY3NzOgorICAgICAgICAoLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcpOiBzdXBwb3J0 IGltZyBzeW1ib2wgZm9yIGxlbmdlbmQKKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpz OgorICAgICAgICAoVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KTogU3VwcG9ydCB1c2Vy IHBhc3MgYSBJbWFnZSBvYmplY3Qgb3IgYSBpbWFnZSB1cmwgYXMgaW5uZXIgbGFiZWwKKwogMjAx OS0wOS0yNiAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFRl c3RXZWJLaXRBUEkuU09BdXRob3JpemF0aW9uU3ViRnJhbWUuQXV0aG9yaXphdGlvbk9wdGlvbnMg aXMgZmFpbGluZyBjb25zaXN0ZW50bHkgb24gaU9TIEFQSSB0ZXN0cyBFV1MKZGlmZiAtLWdpdCBh L1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVjdGF0aW9u cy5qcyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVj dGF0aW9ucy5qcwppbmRleCAzN2Q4M2JjNzk3Nzg5ODhmZmJjOGJlM2NmZmIwODBlMzY4OTNhNDNj Li5mYzM4N2IyNmE4Mjg0ZjNkMDVkNmYzNzlkNjU5N2JiNjBhNGY4NWZiIDEwMDY0NAotLS0gYS9U b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9leHBlY3RhdGlvbnMu anMKKysrIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvZXhw ZWN0YXRpb25zLmpzCkBAIC05MywxMCArOTMsMTUgQEAgRXhwZWN0YXRpb25zLmZhaWx1cmVUeXBl TWFwID0gewogICAgIHRpbWVkb3V0OiAnVElNRU9VVCcsCiAgICAgY3Jhc2hlZDogJ0NSQVNIJywK IH0KK2NvbnN0IHRpbWVvdXRJbWFnZSA9IG5ldyBJbWFnZSgpOwordGltZW91dEltYWdlLnNyYyA9 ICcvbGlicmFyeS9pY29ucy9jbG9jay5zdmcnOwordGltZW91dEltYWdlLnRvU3RyaW5nID0gZnVu Y3Rpb24gKCkgeworICAgIHJldHVybiB0aGlzLm91dGVySFRNTDsKK30KIEV4cGVjdGF0aW9ucy5z eW1ib2xNYXAgPSB7CiAgICAgc3VjY2VzczogJ+KckycsCiAgICAgZmFpbGVkOiAn8J2WtycsCi0g ICAgdGltZWRvdXQ6ICfijosnLAorICAgIHRpbWVkb3V0OiB0aW1lb3V0SW1hZ2UsCiAgICAgY3Jh c2hlZDogJyEnLAogfQogCmRpZmYgLS1naXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzIGIvVG9vbHMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9jc3Mvd2Via2l0LmNzcwppbmRleCA4YTRh YTQzNTM2ZDVhODc4MmI3Mjg5OTFjZjc3ZGQxNzNkN2JmODYwLi5jNDUxMDQzZjAwNTgyMGQ4Mzc3 NThiNzQ2MWRlOTFkNGNmZDc4ODhjIDEwMDY0NAotLS0gYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1 bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzCisrKyBiL1Rvb2xzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dlYmtpdC5jc3MK QEAgLTIxNjcsNiArMjE2NywxNSBAQCBhLmRpc2FibGVkIHsKICAgdXNlci1zZWxlY3Q6IG5vbmU7 CiAgIGN1cnNvcjogZGVmYXVsdDsKIH0KKy5sZW5nZW5kPi5pdGVtIC5kb3QgaW1nIHsKKyAgICB3 aWR0aDogdmFyKC0tdGlueVNpemUpOworICAgIGhlaWdodDogdmFyKC0tdGlueVNpemUpOworICAg IHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IGNhbGMoKHZhcigtLXNtYWxsU2l6ZSkgLSB2 YXIoLS10aW55U2l6ZSkpIC8gMik7CisgICAgbGVmdDogY2FsYygodmFyKC0tc21hbGxTaXplKSAt IHZhcigtLXRpbnlTaXplKSkgLyAyKTsKKyAgICBwYWRkaW5nOiAwOworICAgIG1hcmdpbjogMDsK K30KIC50aW1lbGluZS5sZW5nZW5kPi5pdGVtIC5kb3Q6OmJlZm9yZXsKICAgbGVmdDogY2FsYygw cHggLSB2YXIoLS10aW55U2l6ZSkpOwogICB3aWR0aDogdmFyKC0tdGlueVNpemUpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9q cy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jl c3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBv bmVudHMuanMKaW5kZXggYTVkMGU1ZjgzYzJlZWUzZTY2YWQ5NGVjZjhjZDljYmZlNTE2NDI1OC4u OTZjMTZkOTJmMDZjNGJjNWFlNDFiMTcxYjRkNTFiMTQxOTZhODk5NSAxMDA2NDQKLS0tIGEvVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25l bnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcworKysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRz ZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRz LmpzCkBAIC0yNzksNyArMjc5LDE3IEBAIFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudCA9 IChkb3RzLCBzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgICAgICAgICB9KTsKICAgICAg ICAgICAgIGNvbG9yQmF0Y2hSZW5kZXIuYWRkU2VxKGNvbG9yLCAoY29udGV4dCwgY29sb3IpID0+ IHsKICAgICAgICAgICAgICAgICBjb250ZXh0LmFyYyh4ICsgZG90TWFyZ2luICsgdXNlUmFkaXVz LCBiYXNlbGluZVksIHVzZVJhZGl1cywgMCwgMiAqIE1hdGguUEkpOwotICAgICAgICAgICAgICAg IGlmICh0eXBlb2YgaW5uZXJMYWJlbCA9PT0gIm51bWJlciIgfHwgdHlwZW9mIGlubmVyTGFiZWwg PT09ICJzdHJpbmciKSB7CisgICAgICAgICAgICAgICAgaWYgKGlubmVyTGFiZWwgaW5zdGFuY2Vv ZiBJbWFnZSB8fCB0eXBlb2YgaW5uZXJMYWJlbCA9PT0gInN0cmluZyIgJiYgKGlubmVyTGFiZWwu ZW5kc1dpdGgoJy5zdmcnKSB8fCBpbm5lckxhYmVsLmVuZHNXaXRoKCcucG5nJykgfHwgaW5uZXJM YWJlbC5lbmRzV2l0aCgnLmpwZycpIHx8IGlubmVyTGFiZWwuZW5kc1dpdGgoJy5qcGVnJykpKSB7 CisgICAgICAgICAgICAgICAgICAgIGxldCBpbWFnZSA9IGlubmVyTGFiZWw7CisgICAgICAgICAg ICAgICAgICAgIGlmICh0eXBlb2YgaW5uZXJMYWJlbCA9PT0gInN0cmluZyIpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGltYWdlID0gbmV3IEltYWdlKCk7CisgICAgICAgICAgICAgICAgICAg ICAgICBpbWFnZS5zcmMgPSBpbm5lckxhYmVsOworICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGltYWdlX3BhZGRpbmcgPSB1c2VSYWRpdXMgLSBmb250U2l6 ZSAvIDI7CisgICAgICAgICAgICAgICAgICAgIGRyYXdMYWJlbHNTZXFzLnB1c2goKCkgPT4gewor ICAgICAgICAgICAgICAgICAgICAgICAgY29udGV4dC5kcmF3SW1hZ2UoaW1hZ2UsIHggKyBkb3RN YXJnaW4gKyBpbWFnZV9wYWRkaW5nLCB5ICsgaW1hZ2VfcGFkZGluZywgZm9udFNpemUsIGZvbnRT aXplKTsKKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIGlm ICh0eXBlb2YgaW5uZXJMYWJlbCA9PT0gIm51bWJlciIgfHwgdHlwZW9mIGlubmVyTGFiZWwgPT09 ICJzdHJpbmciKSB7CiAgICAgICAgICAgICAgICAgICAgIGRyYXdMYWJlbHNTZXFzLnB1c2goKCkg PT4gewogICAgICAgICAgICAgICAgICAgICAgICAgLy8gRHJhdyB0aGUgaW5uZXIgbGFiZWwKICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGlubmVyTGFiZWxTaXplID0gY29udGV4dC5tZWFz dXJlVGV4dChpbm5lckxhYmVsKTsK 379668 2019-09-26 12:47:00 -0700 2019-09-26 12:59:05 -0700 Patch bug-202180-20190926124659.patch text/plain 5872 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM4NmRiOTk0ZDc2OTYyYjg1MDZiNjMxYzVhNDgzNjBk MjA1NWI0Zi4uODcyMjRmY2UyODc5MWM2MWFhYTNhODUyNTI2ZWEzNTJkZDg1NWQwZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE5LTA5LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZSBzdXBwb3J0IEltYWdlIGlubmVy IGxhYmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDIxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVjdGF0aW9ucy5qczoK KyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nz cy93ZWJraXQuY3NzOgorICAgICAgICAoLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcpOiBzdXBwb3J0 IGltZyBzeW1ib2wgZm9yIGxlbmdlbmQKKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpz OgorICAgICAgICAoVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KTogU3VwcG9ydCB1c2Vy IHBhc3MgYSBJbWFnZSBvYmplY3Qgb3IgYSBpbWFnZSB1cmwgYXMgaW5uZXIgbGFiZWwKKwogMjAx OS0wOS0yNiAgSmlld2VuIFRhbiAgPGppZXdlbl90YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFRl c3RXZWJLaXRBUEkuU09BdXRob3JpemF0aW9uU3ViRnJhbWUuQXV0aG9yaXphdGlvbk9wdGlvbnMg aXMgZmFpbGluZyBjb25zaXN0ZW50bHkgb24gaU9TIEFQSSB0ZXN0cyBFV1MKZGlmZiAtLWdpdCBh L1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVjdGF0aW9u cy5qcyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVj dGF0aW9ucy5qcwppbmRleCAzN2Q4M2JjNzk3Nzg5ODhmZmJjOGJlM2NmZmIwODBlMzY4OTNhNDNj Li5mYzM4N2IyNmE4Mjg0ZjNkMDVkNmYzNzlkNjU5N2JiNjBhNGY4NWZiIDEwMDY0NAotLS0gYS9U b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9leHBlY3RhdGlvbnMu anMKKysrIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvZXhw ZWN0YXRpb25zLmpzCkBAIC05MywxMCArOTMsMTUgQEAgRXhwZWN0YXRpb25zLmZhaWx1cmVUeXBl TWFwID0gewogICAgIHRpbWVkb3V0OiAnVElNRU9VVCcsCiAgICAgY3Jhc2hlZDogJ0NSQVNIJywK IH0KK2NvbnN0IHRpbWVvdXRJbWFnZSA9IG5ldyBJbWFnZSgpOwordGltZW91dEltYWdlLnNyYyA9 ICcvbGlicmFyeS9pY29ucy9jbG9jay5zdmcnOwordGltZW91dEltYWdlLnRvU3RyaW5nID0gZnVu Y3Rpb24gKCkgeworICAgIHJldHVybiB0aGlzLm91dGVySFRNTDsKK30KIEV4cGVjdGF0aW9ucy5z eW1ib2xNYXAgPSB7CiAgICAgc3VjY2VzczogJ+KckycsCiAgICAgZmFpbGVkOiAn8J2WtycsCi0g ICAgdGltZWRvdXQ6ICfijosnLAorICAgIHRpbWVkb3V0OiB0aW1lb3V0SW1hZ2UsCiAgICAgY3Jh c2hlZDogJyEnLAogfQogCmRpZmYgLS1naXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzIGIvVG9vbHMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9jc3Mvd2Via2l0LmNzcwppbmRleCA4YTRh YTQzNTM2ZDVhODc4MmI3Mjg5OTFjZjc3ZGQxNzNkN2JmODYwLi5jNDUxMDQzZjAwNTgyMGQ4Mzc3 NThiNzQ2MWRlOTFkNGNmZDc4ODhjIDEwMDY0NAotLS0gYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1 bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzCisrKyBiL1Rvb2xzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dlYmtpdC5jc3MK QEAgLTIxNjcsNiArMjE2NywxNSBAQCBhLmRpc2FibGVkIHsKICAgdXNlci1zZWxlY3Q6IG5vbmU7 CiAgIGN1cnNvcjogZGVmYXVsdDsKIH0KKy5sZW5nZW5kPi5pdGVtIC5kb3QgaW1nIHsKKyAgICB3 aWR0aDogdmFyKC0tdGlueVNpemUpOworICAgIGhlaWdodDogdmFyKC0tdGlueVNpemUpOworICAg IHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IGNhbGMoKHZhcigtLXNtYWxsU2l6ZSkgLSB2 YXIoLS10aW55U2l6ZSkpIC8gMik7CisgICAgbGVmdDogY2FsYygodmFyKC0tc21hbGxTaXplKSAt IHZhcigtLXRpbnlTaXplKSkgLyAyKTsKKyAgICBwYWRkaW5nOiAwOworICAgIG1hcmdpbjogMDsK K30KIC50aW1lbGluZS5sZW5nZW5kPi5pdGVtIC5kb3Q6OmJlZm9yZXsKICAgbGVmdDogY2FsYygw cHggLSB2YXIoLS10aW55U2l6ZSkpOwogICB3aWR0aDogdmFyKC0tdGlueVNpemUpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9p Y29ucy9jbG9jay5zdmcgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRp Yy9saWJyYXJ5L2ljb25zL2Nsb2NrLnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wM2EwY2FmYTBlOTJmYzY3NDc0 OWVmMGM0YmMzNWViZmM1NjdmNjdlCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvcmVzdWx0c2Ri cHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9pY29ucy9jbG9jay5zdmcKQEAgLTAs MCArMSwxNyBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxv bmU9Im5vIj8+Cis8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4i ICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgorPHN2 ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4 bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmRjPSJodHRwOi8vcHVybC5v cmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iLTExNDcgLTY2MyAyMjggMjI4IiB3aWR0aD0i MjI4IiBoZWlnaHQ9IjIyOCI+CisgICAgPGRlZnMvPgorICAgIDxtZXRhZGF0YT4KKyAgICAgICAg PGRjOmRhdGU+MjAxOS0wOS0yNCAyMzozMjoyOCArMDAwMDwvZGM6ZGF0ZT4KKyAgICA8L21ldGFk YXRhPgorICAgIDxnIGZpbGw9Im5vbmUiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLWRhc2hhcnJheT0i bm9uZSIgc3Ryb2tlLW9wYWNpdHk9IjEiIGZpbGwtb3BhY2l0eT0iMSI+CisgICAgICAgIDxnIGlk PSJjbG9ja19iYXNlIj4KKyAgICAgICAgICAgIDxjaXJjbGUgY3g9Ii0xMDMzLjI1IiBjeT0iLTU0 OS4yNSIgcj0iOTguNzUwMTU3NzkyODEyMiIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLWxpbmVjYXA9 InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjMwIi8+CisgICAg ICAgIDwvZz4KKyAgICAgICAgPGcgaWQ9ImNsb2NrX2hhbmQiPgorICAgICAgICAgICAgPGxpbmUg eDE9Ii0xMDMzLjI1IiB5MT0iLTU0OS4yNSIgeDI9Ii0xMDMzLjUiIHkyPSItNjEyIiBzdHJva2U9 IndoaXRlIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0 cm9rZS13aWR0aD0iMjEiLz4KKyAgICAgICAgICAgIDxsaW5lIHgxPSItMTAzMy4yNSIgeTE9Ii01 NDkuMjUiIHgyPSItMTA2MS41IiB5Mj0iLTUxNyIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLWxpbmVj YXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIxIi8+Cisg ICAgICAgIDwvZz4KKyAgICA8L2c+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1Rvb2xzL3Jlc3VsdHNk YnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGlu ZUNvbXBvbmVudHMuanMgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRp Yy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCmluZGV4IGE1ZDBl NWY4M2MyZWVlM2U2NmFkOTRlY2Y4Y2Q5Y2JmZTUxNjQyNTguLjk2YzE2ZDkyZjA2YzRiYzVhZTQx YjE3MWI0ZDUxYjE0MTk2YTg5OTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVu dHMuanMKKysrIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGli cmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcwpAQCAtMjc5LDcgKzI3OSwx NyBAQCBUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQgPSAoZG90cywgc2NhbGVzLCBvcHRp b24gPSB7fSkgPT4gewogICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICBjb2xvckJhdGNoUmVu ZGVyLmFkZFNlcShjb2xvciwgKGNvbnRleHQsIGNvbG9yKSA9PiB7CiAgICAgICAgICAgICAgICAg Y29udGV4dC5hcmMoeCArIGRvdE1hcmdpbiArIHVzZVJhZGl1cywgYmFzZWxpbmVZLCB1c2VSYWRp dXMsIDAsIDIgKiBNYXRoLlBJKTsKLSAgICAgICAgICAgICAgICBpZiAodHlwZW9mIGlubmVyTGFi ZWwgPT09ICJudW1iZXIiIHx8IHR5cGVvZiBpbm5lckxhYmVsID09PSAic3RyaW5nIikgeworICAg ICAgICAgICAgICAgIGlmIChpbm5lckxhYmVsIGluc3RhbmNlb2YgSW1hZ2UgfHwgdHlwZW9mIGlu bmVyTGFiZWwgPT09ICJzdHJpbmciICYmIChpbm5lckxhYmVsLmVuZHNXaXRoKCcuc3ZnJykgfHwg aW5uZXJMYWJlbC5lbmRzV2l0aCgnLnBuZycpIHx8IGlubmVyTGFiZWwuZW5kc1dpdGgoJy5qcGcn KSB8fCBpbm5lckxhYmVsLmVuZHNXaXRoKCcuanBlZycpKSkgeworICAgICAgICAgICAgICAgICAg ICBsZXQgaW1hZ2UgPSBpbm5lckxhYmVsOworICAgICAgICAgICAgICAgICAgICBpZiAodHlwZW9m IGlubmVyTGFiZWwgPT09ICJzdHJpbmciKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpbWFn ZSA9IG5ldyBJbWFnZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgaW1hZ2Uuc3JjID0gaW5u ZXJMYWJlbDsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBjb25z dCBpbWFnZV9wYWRkaW5nID0gdXNlUmFkaXVzIC0gZm9udFNpemUgLyAyOworICAgICAgICAgICAg ICAgICAgICBkcmF3TGFiZWxzU2Vxcy5wdXNoKCgpID0+IHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnRleHQuZHJhd0ltYWdlKGltYWdlLCB4ICsgZG90TWFyZ2luICsgaW1hZ2VfcGFkZGlu ZywgeSArIGltYWdlX3BhZGRpbmcsIGZvbnRTaXplLCBmb250U2l6ZSk7CisgICAgICAgICAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAodHlwZW9mIGlubmVyTGFiZWwg PT09ICJudW1iZXIiIHx8IHR5cGVvZiBpbm5lckxhYmVsID09PSAic3RyaW5nIikgewogICAgICAg ICAgICAgICAgICAgICBkcmF3TGFiZWxzU2Vxcy5wdXNoKCgpID0+IHsKICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIERyYXcgdGhlIGlubmVyIGxhYmVsCiAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBpbm5lckxhYmVsU2l6ZSA9IGNvbnRleHQubWVhc3VyZVRleHQoaW5uZXJMYWJlbCk7 Cg== 379670 2019-09-26 12:59:06 -0700 2019-09-26 13:42:11 -0700 Patch bug-202180-20190926125905.patch text/plain 7182 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM4NmRiOTk0ZDc2OTYyYjg1MDZiNjMxYzVhNDgzNjBk MjA1NWI0Zi4uYzc3M2M3YThkYmMzMTQ3MTM2YzkzNTM5YjFhNjdhNDk4NjA4MDRmNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE5LTA5LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZSBzdXBwb3J0IEltYWdlIGlubmVy IGxhYmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDIxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVjdGF0aW9ucy5qczoK KyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nz cy93ZWJraXQuY3NzOgorICAgICAgICAoLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcpOiBzdXBwb3J0 IGltZyBzeW1ib2wgZm9yIGxlbmdlbmQgYW5kIGRvdAorICAgICAgICAqIHJlc3VsdHNkYnB5L3Jl c3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBv bmVudHMuanM6CisgICAgICAgIChUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQpOiBTdXBw b3J0IHVzZXIgcGFzcyBhIEltYWdlIG9iamVjdCBvciBhIGltYWdlIHVybCBhcyBpbm5lciBsYWJl bAorCiAyMDE5LTA5LTI2ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgVGVzdFdlYktpdEFQSS5TT0F1dGhvcml6YXRpb25TdWJGcmFtZS5BdXRob3JpemF0aW9u T3B0aW9ucyBpcyBmYWlsaW5nIGNvbnNpc3RlbnRseSBvbiBpT1MgQVBJIHRlc3RzIEVXUwpkaWZm IC0tZ2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvZXhw ZWN0YXRpb25zLmpzIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMv anMvZXhwZWN0YXRpb25zLmpzCmluZGV4IDM3ZDgzYmM3OTc3ODk4OGZmYmM4YmUzY2ZmYjA4MGUz Njg5M2E0M2MuLmZjMzg3YjI2YTgyODRmM2QwNWQ2ZjM3OWQ2NTk3YmI2MGE0Zjg1ZmIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVj dGF0aW9ucy5qcworKysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRp Yy9qcy9leHBlY3RhdGlvbnMuanMKQEAgLTkzLDEwICs5MywxNSBAQCBFeHBlY3RhdGlvbnMuZmFp bHVyZVR5cGVNYXAgPSB7CiAgICAgdGltZWRvdXQ6ICdUSU1FT1VUJywKICAgICBjcmFzaGVkOiAn Q1JBU0gnLAogfQorY29uc3QgdGltZW91dEltYWdlID0gbmV3IEltYWdlKCk7Cit0aW1lb3V0SW1h Z2Uuc3JjID0gJy9saWJyYXJ5L2ljb25zL2Nsb2NrLnN2Zyc7Cit0aW1lb3V0SW1hZ2UudG9TdHJp bmcgPSBmdW5jdGlvbiAoKSB7CisgICAgcmV0dXJuIHRoaXMub3V0ZXJIVE1MOworfQogRXhwZWN0 YXRpb25zLnN5bWJvbE1hcCA9IHsKICAgICBzdWNjZXNzOiAn4pyTJywKICAgICBmYWlsZWQ6ICfw nZa3JywKLSAgICB0aW1lZG91dDogJ+KOiycsCisgICAgdGltZWRvdXQ6IHRpbWVvdXRJbWFnZSwK ICAgICBjcmFzaGVkOiAnIScsCiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jl c3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dlYmtpdC5jc3MgYi9Ub29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzCmlu ZGV4IDhhNGFhNDM1MzZkNWE4NzgyYjcyODk5MWNmNzdkZDE3M2Q3YmY4NjAuLjhlZWFmMjI2Nzhk YTM4ZjJkMDNkNTM3NWE4YjU3NzBiMGFiNDI1OTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNk YnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dlYmtpdC5jc3MKKysrIGIv VG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9jc3Mvd2Vi a2l0LmNzcwpAQCAtNTkyLDYgKzU5Miw3IEBAIHByZSB7CiAgIHBhZGRpbmc6IDA7CiAgIG1hcmdp bjogMCA4cHg7CiAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWdyZXlEYXJrKTsKKyAgcG9zaXRp b246IHJlbGF0aXZlOwogfQogCiAuZG90LmJsaW5rIHsKQEAgLTYyOSw2ICs2MzAsMTYgQEAgcHJl IHsKICAgbWFyZ2luLXRvcDogMXB4OwogfQogCisuZG90IGltZywgLmRvdC5zbWFsbCBpbWcgewor ICAgIHdpZHRoOiB2YXIoLS10aW55U2l6ZSk7CisgICAgaGVpZ2h0OiB2YXIoLS10aW55U2l6ZSk7 CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogY2FsYygodmFyKC0tc21hbGxTaXpl KSAtIHZhcigtLXRpbnlTaXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1zbWFsbFNp emUpIC0gdmFyKC0tdGlueVNpemUpKSAvIDIpOworICAgIHBhZGRpbmc6IDA7CisgICAgbWFyZ2lu OiAwOworfQorCiAuZG90Lm1lZGl1bSB7CiAgIGZvbnQtc2l6ZTogdmFyKC0tc21hbGxTaXplKQog ICB3aWR0aDogdmFyKC0tbWVkaXVtU2l6ZSk7CkBAIC02NDAsNiArNjUxLDE2IEBAIHByZSB7CiAg IHBhZGRpbmctdG9wOiAzcHg7CiB9CiAKKy5kb3QubWVkaXVtIGltZyB7CisgICAgd2lkdGg6IHZh cigtLXNtYWxsU2l6ZSk7CisgICAgaGVpZ2h0OiB2YXIoLS1zbWFsbFNpemUpOworICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IGNhbGMoKHZhcigtLW1lZGl1bVNpemUpIC0gdmFyKC0t c21hbGxTaXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1tZWRpdW1TaXplKSAtIHZh cigtLXNtYWxsU2l6ZSkpIC8gMik7CisgICAgcGFkZGluZzogMDsKKyAgICBtYXJnaW46IDA7Cit9 CisKIC5kb3QubGFyZ2UgewogICBmb250LXNpemU6IHZhcigtLW1lZGl1bVNpemUpOwogICB3aWR0 aDogdmFyKC0tbGFyZ2VTaXplKTsKQEAgLTY1MSw2ICs2NzIsMTYgQEAgcHJlIHsKICAgcGFkZGlu Zy10b3A6IDRweDsKIH0KIAorLmRvdC5sYXJnZSBpbWcgeworICAgIHdpZHRoOiB2YXIoLS1tZWRp dW1TaXplKTsKKyAgICBoZWlnaHQ6IHZhcigtLW1lZGl1bVNpemUpOworICAgIHBvc2l0aW9uOiBh YnNvbHV0ZTsKKyAgICB0b3A6IGNhbGMoKHZhcigtLWxhcmdlU2l6ZSkgLSB2YXIoLS1tZWRpdW1T aXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1sYXJnZVNpemUpIC0gdmFyKC0tbWVk aXVtU2l6ZSkpIC8gMik7CisgICAgcGFkZGluZzogMDsKKyAgICBtYXJnaW46IDA7Cit9CisKIC5k b3Quc3VjY2VzcyB7CiAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWdyZWVuTGlnaHQpOwogfQpA QCAtMjE2Nyw2ICsyMTk4LDE1IEBAIGEuZGlzYWJsZWQgewogICB1c2VyLXNlbGVjdDogbm9uZTsK ICAgY3Vyc29yOiBkZWZhdWx0OwogfQorLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcgeworICAgIHdp ZHRoOiB2YXIoLS10aW55U2l6ZSk7CisgICAgaGVpZ2h0OiB2YXIoLS10aW55U2l6ZSk7CisgICAg cG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogY2FsYygodmFyKC0tc21hbGxTaXplKSAtIHZh cigtLXRpbnlTaXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1zbWFsbFNpemUpIC0g dmFyKC0tdGlueVNpemUpKSAvIDIpOworICAgIHBhZGRpbmc6IDA7CisgICAgbWFyZ2luOiAwOwor fQogLnRpbWVsaW5lLmxlbmdlbmQ+Lml0ZW0gLmRvdDo6YmVmb3JlewogICBsZWZ0OiBjYWxjKDBw eCAtIHZhcigtLXRpbnlTaXplKSk7CiAgIHdpZHRoOiB2YXIoLS10aW55U2l6ZSk7CmRpZmYgLS1n aXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2lj b25zL2Nsb2NrLnN2ZyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGlj L2xpYnJhcnkvaWNvbnMvY2xvY2suc3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjAzYTBjYWZhMGU5MmZjNjc0NzQ5 ZWYwYzRiYzM1ZWJmYzU2N2Y2N2UKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9yZXN1bHRzZGJw eS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2ljb25zL2Nsb2NrLnN2ZwpAQCAtMCww ICsxLDE3IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCIgc3RhbmRhbG9u ZT0ibm8iPz4KKzwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIg Imh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+Cis8c3Zn IHZlcnNpb249IjEuMSIgeG1sbnM6eGw9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9y Zy9kYy9lbGVtZW50cy8xLjEvIiB2aWV3Qm94PSItMTE0NyAtNjYzIDIyOCAyMjgiIHdpZHRoPSIy MjgiIGhlaWdodD0iMjI4Ij4KKyAgICA8ZGVmcy8+CisgICAgPG1ldGFkYXRhPgorICAgICAgICA8 ZGM6ZGF0ZT4yMDE5LTA5LTI0IDIzOjMyOjI4ICswMDAwPC9kYzpkYXRlPgorICAgIDwvbWV0YWRh dGE+CisgICAgPGcgZmlsbD0ibm9uZSIgc3Ryb2tlPSJub25lIiBzdHJva2UtZGFzaGFycmF5PSJu b25lIiBzdHJva2Utb3BhY2l0eT0iMSIgZmlsbC1vcGFjaXR5PSIxIj4KKyAgICAgICAgPGcgaWQ9 ImNsb2NrX2Jhc2UiPgorICAgICAgICAgICAgPGNpcmNsZSBjeD0iLTEwMzMuMjUiIGN5PSItNTQ5 LjI1IiByPSI5OC43NTAxNTc3OTI4MTIyIiBzdHJva2U9IndoaXRlIiBzdHJva2UtbGluZWNhcD0i cm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMzAiLz4KKyAgICAg ICAgPC9nPgorICAgICAgICA8ZyBpZD0iY2xvY2tfaGFuZCI+CisgICAgICAgICAgICA8bGluZSB4 MT0iLTEwMzMuMjUiIHkxPSItNTQ5LjI1IiB4Mj0iLTEwMzMuNSIgeTI9Ii02MTIiIHN0cm9rZT0i d2hpdGUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ry b2tlLXdpZHRoPSIyMSIvPgorICAgICAgICAgICAgPGxpbmUgeDE9Ii0xMDMzLjI1IiB5MT0iLTU0 OS4yNSIgeDI9Ii0xMDYxLjUiIHkyPSItNTE3IiBzdHJva2U9IndoaXRlIiBzdHJva2UtbGluZWNh cD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMjEiLz4KKyAg ICAgICAgPC9nPgorICAgIDwvZz4KKzwvc3ZnPgpkaWZmIC0tZ2l0IGEvVG9vbHMvcmVzdWx0c2Ri cHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5l Q29tcG9uZW50cy5qcyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGlj L2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKaW5kZXggYTVkMGU1 ZjgzYzJlZWUzZTY2YWQ5NGVjZjhjZDljYmZlNTE2NDI1OC4uOTZjMTZkOTJmMDZjNGJjNWFlNDFi MTcxYjRkNTFiMTQxOTZhODk5NSAxMDA2NDQKLS0tIGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50 cy5qcworKysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJy YXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCkBAIC0yNzksNyArMjc5LDE3 IEBAIFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudCA9IChkb3RzLCBzY2FsZXMsIG9wdGlv biA9IHt9KSA9PiB7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIGNvbG9yQmF0Y2hSZW5k ZXIuYWRkU2VxKGNvbG9yLCAoY29udGV4dCwgY29sb3IpID0+IHsKICAgICAgICAgICAgICAgICBj b250ZXh0LmFyYyh4ICsgZG90TWFyZ2luICsgdXNlUmFkaXVzLCBiYXNlbGluZVksIHVzZVJhZGl1 cywgMCwgMiAqIE1hdGguUEkpOwotICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgaW5uZXJMYWJl bCA9PT0gIm51bWJlciIgfHwgdHlwZW9mIGlubmVyTGFiZWwgPT09ICJzdHJpbmciKSB7CisgICAg ICAgICAgICAgICAgaWYgKGlubmVyTGFiZWwgaW5zdGFuY2VvZiBJbWFnZSB8fCB0eXBlb2YgaW5u ZXJMYWJlbCA9PT0gInN0cmluZyIgJiYgKGlubmVyTGFiZWwuZW5kc1dpdGgoJy5zdmcnKSB8fCBp bm5lckxhYmVsLmVuZHNXaXRoKCcucG5nJykgfHwgaW5uZXJMYWJlbC5lbmRzV2l0aCgnLmpwZycp IHx8IGlubmVyTGFiZWwuZW5kc1dpdGgoJy5qcGVnJykpKSB7CisgICAgICAgICAgICAgICAgICAg IGxldCBpbWFnZSA9IGlubmVyTGFiZWw7CisgICAgICAgICAgICAgICAgICAgIGlmICh0eXBlb2Yg aW5uZXJMYWJlbCA9PT0gInN0cmluZyIpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGltYWdl ID0gbmV3IEltYWdlKCk7CisgICAgICAgICAgICAgICAgICAgICAgICBpbWFnZS5zcmMgPSBpbm5l ckxhYmVsOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGNvbnN0 IGltYWdlX3BhZGRpbmcgPSB1c2VSYWRpdXMgLSBmb250U2l6ZSAvIDI7CisgICAgICAgICAgICAg ICAgICAgIGRyYXdMYWJlbHNTZXFzLnB1c2goKCkgPT4geworICAgICAgICAgICAgICAgICAgICAg ICAgY29udGV4dC5kcmF3SW1hZ2UoaW1hZ2UsIHggKyBkb3RNYXJnaW4gKyBpbWFnZV9wYWRkaW5n LCB5ICsgaW1hZ2VfcGFkZGluZywgZm9udFNpemUsIGZvbnRTaXplKTsKKyAgICAgICAgICAgICAg ICAgICAgfSk7CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh0eXBlb2YgaW5uZXJMYWJlbCA9 PT0gIm51bWJlciIgfHwgdHlwZW9mIGlubmVyTGFiZWwgPT09ICJzdHJpbmciKSB7CiAgICAgICAg ICAgICAgICAgICAgIGRyYXdMYWJlbHNTZXFzLnB1c2goKCkgPT4gewogICAgICAgICAgICAgICAg ICAgICAgICAgLy8gRHJhdyB0aGUgaW5uZXIgbGFiZWwKICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGlubmVyTGFiZWxTaXplID0gY29udGV4dC5tZWFzdXJlVGV4dChpbm5lckxhYmVsKTsK 379673 2019-09-26 13:30:04 -0700 2019-09-26 14:51:41 -0700 Patch bug-202180-20190926133003.patch text/plain 7082 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWM4NmRiOTk0ZDc2OTYyYjg1MDZiNjMxYzVhNDgzNjBk MjA1NWI0Zi4uYzc3M2M3YThkYmMzMTQ3MTM2YzkzNTM5YjFhNjdhNDk4NjA4MDRmNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE5LTA5LTI0ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZSBzdXBwb3J0IEltYWdlIGlubmVy IGxhYmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDIxODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVjdGF0aW9ucy5qczoK KyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nz cy93ZWJraXQuY3NzOgorICAgICAgICAoLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcpOiBzdXBwb3J0 IGltZyBzeW1ib2wgZm9yIGxlbmdlbmQgYW5kIGRvdAorICAgICAgICAqIHJlc3VsdHNkYnB5L3Jl c3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBv bmVudHMuanM6CisgICAgICAgIChUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQpOiBTdXBw b3J0IHVzZXIgcGFzcyBhIEltYWdlIG9iamVjdCBvciBhIGltYWdlIHVybCBhcyBpbm5lciBsYWJl bAorCiAyMDE5LTA5LTI2ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgVGVzdFdlYktpdEFQSS5TT0F1dGhvcml6YXRpb25TdWJGcmFtZS5BdXRob3JpemF0aW9u T3B0aW9ucyBpcyBmYWlsaW5nIGNvbnNpc3RlbnRseSBvbiBpT1MgQVBJIHRlc3RzIEVXUwpkaWZm IC0tZ2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvZXhw ZWN0YXRpb25zLmpzIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMv anMvZXhwZWN0YXRpb25zLmpzCmluZGV4IDM3ZDgzYmM3OTc3ODk4OGZmYmM4YmUzY2ZmYjA4MGUz Njg5M2E0M2MuLmZjMzg3YjI2YTgyODRmM2QwNWQ2ZjM3OWQ2NTk3YmI2MGE0Zjg1ZmIgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2V4cGVj dGF0aW9ucy5qcworKysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRp Yy9qcy9leHBlY3RhdGlvbnMuanMKQEAgLTkzLDEwICs5MywxNSBAQCBFeHBlY3RhdGlvbnMuZmFp bHVyZVR5cGVNYXAgPSB7CiAgICAgdGltZWRvdXQ6ICdUSU1FT1VUJywKICAgICBjcmFzaGVkOiAn Q1JBU0gnLAogfQorY29uc3QgdGltZW91dEltYWdlID0gbmV3IEltYWdlKCk7Cit0aW1lb3V0SW1h Z2Uuc3JjID0gJy9saWJyYXJ5L2ljb25zL2Nsb2NrLnN2Zyc7Cit0aW1lb3V0SW1hZ2UudG9TdHJp bmcgPSBmdW5jdGlvbiAoKSB7CisgICAgcmV0dXJuIHRoaXMub3V0ZXJIVE1MOworfQogRXhwZWN0 YXRpb25zLnN5bWJvbE1hcCA9IHsKICAgICBzdWNjZXNzOiAn4pyTJywKICAgICBmYWlsZWQ6ICfw nZa3JywKLSAgICB0aW1lZG91dDogJ+KOiycsCisgICAgdGltZWRvdXQ6IHRpbWVvdXRJbWFnZSwK ICAgICBjcmFzaGVkOiAnIScsCiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jl c3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dlYmtpdC5jc3MgYi9Ub29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2Nzcy93ZWJraXQuY3NzCmlu ZGV4IDhhNGFhNDM1MzZkNWE4NzgyYjcyODk5MWNmNzdkZDE3M2Q3YmY4NjAuLjhlZWFmMjI2Nzhk YTM4ZjJkMDNkNTM3NWE4YjU3NzBiMGFiNDI1OTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNk YnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvY3NzL3dlYmtpdC5jc3MKKysrIGIv VG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9jc3Mvd2Vi a2l0LmNzcwpAQCAtNTkyLDYgKzU5Miw3IEBAIHByZSB7CiAgIHBhZGRpbmc6IDA7CiAgIG1hcmdp bjogMCA4cHg7CiAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWdyZXlEYXJrKTsKKyAgcG9zaXRp b246IHJlbGF0aXZlOwogfQogCiAuZG90LmJsaW5rIHsKQEAgLTYyOSw2ICs2MzAsMTYgQEAgcHJl IHsKICAgbWFyZ2luLXRvcDogMXB4OwogfQogCisuZG90IGltZywgLmRvdC5zbWFsbCBpbWcgewor ICAgIHdpZHRoOiB2YXIoLS10aW55U2l6ZSk7CisgICAgaGVpZ2h0OiB2YXIoLS10aW55U2l6ZSk7 CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogY2FsYygodmFyKC0tc21hbGxTaXpl KSAtIHZhcigtLXRpbnlTaXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1zbWFsbFNp emUpIC0gdmFyKC0tdGlueVNpemUpKSAvIDIpOworICAgIHBhZGRpbmc6IDA7CisgICAgbWFyZ2lu OiAwOworfQorCiAuZG90Lm1lZGl1bSB7CiAgIGZvbnQtc2l6ZTogdmFyKC0tc21hbGxTaXplKQog ICB3aWR0aDogdmFyKC0tbWVkaXVtU2l6ZSk7CkBAIC02NDAsNiArNjUxLDE2IEBAIHByZSB7CiAg IHBhZGRpbmctdG9wOiAzcHg7CiB9CiAKKy5kb3QubWVkaXVtIGltZyB7CisgICAgd2lkdGg6IHZh cigtLXNtYWxsU2l6ZSk7CisgICAgaGVpZ2h0OiB2YXIoLS1zbWFsbFNpemUpOworICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICB0b3A6IGNhbGMoKHZhcigtLW1lZGl1bVNpemUpIC0gdmFyKC0t c21hbGxTaXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1tZWRpdW1TaXplKSAtIHZh cigtLXNtYWxsU2l6ZSkpIC8gMik7CisgICAgcGFkZGluZzogMDsKKyAgICBtYXJnaW46IDA7Cit9 CisKIC5kb3QubGFyZ2UgewogICBmb250LXNpemU6IHZhcigtLW1lZGl1bVNpemUpOwogICB3aWR0 aDogdmFyKC0tbGFyZ2VTaXplKTsKQEAgLTY1MSw2ICs2NzIsMTYgQEAgcHJlIHsKICAgcGFkZGlu Zy10b3A6IDRweDsKIH0KIAorLmRvdC5sYXJnZSBpbWcgeworICAgIHdpZHRoOiB2YXIoLS1tZWRp dW1TaXplKTsKKyAgICBoZWlnaHQ6IHZhcigtLW1lZGl1bVNpemUpOworICAgIHBvc2l0aW9uOiBh YnNvbHV0ZTsKKyAgICB0b3A6IGNhbGMoKHZhcigtLWxhcmdlU2l6ZSkgLSB2YXIoLS1tZWRpdW1T aXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1sYXJnZVNpemUpIC0gdmFyKC0tbWVk aXVtU2l6ZSkpIC8gMik7CisgICAgcGFkZGluZzogMDsKKyAgICBtYXJnaW46IDA7Cit9CisKIC5k b3Quc3VjY2VzcyB7CiAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWdyZWVuTGlnaHQpOwogfQpA QCAtMjE2Nyw2ICsyMTk4LDE1IEBAIGEuZGlzYWJsZWQgewogICB1c2VyLXNlbGVjdDogbm9uZTsK ICAgY3Vyc29yOiBkZWZhdWx0OwogfQorLmxlbmdlbmQ+Lml0ZW0gLmRvdCBpbWcgeworICAgIHdp ZHRoOiB2YXIoLS10aW55U2l6ZSk7CisgICAgaGVpZ2h0OiB2YXIoLS10aW55U2l6ZSk7CisgICAg cG9zaXRpb246IGFic29sdXRlOworICAgIHRvcDogY2FsYygodmFyKC0tc21hbGxTaXplKSAtIHZh cigtLXRpbnlTaXplKSkgLyAyKTsKKyAgICBsZWZ0OiBjYWxjKCh2YXIoLS1zbWFsbFNpemUpIC0g dmFyKC0tdGlueVNpemUpKSAvIDIpOworICAgIHBhZGRpbmc6IDA7CisgICAgbWFyZ2luOiAwOwor fQogLnRpbWVsaW5lLmxlbmdlbmQ+Lml0ZW0gLmRvdDo6YmVmb3JlewogICBsZWZ0OiBjYWxjKDBw eCAtIHZhcigtLXRpbnlTaXplKSk7CiAgIHdpZHRoOiB2YXIoLS10aW55U2l6ZSk7CmRpZmYgLS1n aXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2lj b25zL2Nsb2NrLnN2ZyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGlj L2xpYnJhcnkvaWNvbnMvY2xvY2suc3ZnCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmIwNTNlNzY1OTBhNDA1YmI5ZTc5 NmE4NWQ3YTA3NjdkZDhlM2U5MDYKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9yZXN1bHRzZGJw eS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2ljb25zL2Nsb2NrLnN2ZwpAQCAtMCww ICsxLDEzIEBACis8P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCIgc3RhbmRhbG9u ZT0ibm8iPz4KKzwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIg Imh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+Cis8c3Zn IHZlcnNpb249IjEuMSIgeG1sbnM6eGw9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHht bG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9y Zy9kYy9lbGVtZW50cy8xLjEvIiB2aWV3Qm94PSItMTE0NyAtNjYzIDIyOCAyMjgiIHdpZHRoPSIy MjgiIGhlaWdodD0iMjI4Ij4KKyAgICA8ZyBmaWxsPSJub25lIiBzdHJva2U9Im5vbmUiIHN0cm9r ZS1kYXNoYXJyYXk9Im5vbmUiIHN0cm9rZS1vcGFjaXR5PSIxIiBmaWxsLW9wYWNpdHk9IjEiPgor ICAgICAgICA8ZyBpZD0iY2xvY2tfYmFzZSI+CisgICAgICAgICAgICA8Y2lyY2xlIGN4PSItMTAz My4yNSIgY3k9Ii01NDkuMjUiIHI9Ijk4Ljc1MDE1Nzc5MjgxMjIiIHN0cm9rZT0id2hpdGUiIHN0 cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRo PSIzMCIvPgorICAgICAgICA8L2c+CisgICAgICAgIDxnIGlkPSJjbG9ja19oYW5kIj4KKyAgICAg ICAgICAgIDxsaW5lIHgxPSItMTAzMy4yNSIgeTE9Ii01NDkuMjUiIHgyPSItMTAzMy41IiB5Mj0i LTYxMiIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpv aW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjIxIi8+CisgICAgICAgICAgICA8bGluZSB4MT0iLTEw MzMuMjUiIHkxPSItNTQ5LjI1IiB4Mj0iLTEwNjEuNSIgeTI9Ii01MTciIHN0cm9rZT0id2hpdGUi IHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdp ZHRoPSIyMSIvPgorICAgICAgICA8L2c+CisgICAgPC9nPgorPC9zdmc+CmRpZmYgLS1naXQgYS9U b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBv bmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzIGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2Ri cHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5q cwppbmRleCBhNWQwZTVmODNjMmVlZTNlNjZhZDk0ZWNmOGNkOWNiZmU1MTY0MjU4Li45NmMxNmQ5 MmYwNmM0YmM1YWU0MWIxNzFiNGQ1MWIxNDE5NmE4OTk1IDEwMDY0NAotLS0gYS9Ub29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGlt ZWxpbmVDb21wb25lbnRzLmpzCisrKyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKQEAg LTI3OSw3ICsyNzksMTcgQEAgVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50ID0gKGRvdHMs IHNjYWxlcywgb3B0aW9uID0ge30pID0+IHsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAg Y29sb3JCYXRjaFJlbmRlci5hZGRTZXEoY29sb3IsIChjb250ZXh0LCBjb2xvcikgPT4gewogICAg ICAgICAgICAgICAgIGNvbnRleHQuYXJjKHggKyBkb3RNYXJnaW4gKyB1c2VSYWRpdXMsIGJhc2Vs aW5lWSwgdXNlUmFkaXVzLCAwLCAyICogTWF0aC5QSSk7Ci0gICAgICAgICAgICAgICAgaWYgKHR5 cGVvZiBpbm5lckxhYmVsID09PSAibnVtYmVyIiB8fCB0eXBlb2YgaW5uZXJMYWJlbCA9PT0gInN0 cmluZyIpIHsKKyAgICAgICAgICAgICAgICBpZiAoaW5uZXJMYWJlbCBpbnN0YW5jZW9mIEltYWdl IHx8IHR5cGVvZiBpbm5lckxhYmVsID09PSAic3RyaW5nIiAmJiAoaW5uZXJMYWJlbC5lbmRzV2l0 aCgnLnN2ZycpIHx8IGlubmVyTGFiZWwuZW5kc1dpdGgoJy5wbmcnKSB8fCBpbm5lckxhYmVsLmVu ZHNXaXRoKCcuanBnJykgfHwgaW5uZXJMYWJlbC5lbmRzV2l0aCgnLmpwZWcnKSkpIHsKKyAgICAg ICAgICAgICAgICAgICAgbGV0IGltYWdlID0gaW5uZXJMYWJlbDsKKyAgICAgICAgICAgICAgICAg ICAgaWYgKHR5cGVvZiBpbm5lckxhYmVsID09PSAic3RyaW5nIikgeworICAgICAgICAgICAgICAg ICAgICAgICAgaW1hZ2UgPSBuZXcgSW1hZ2UoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlt YWdlLnNyYyA9IGlubmVyTGFiZWw7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICAgICAgY29uc3QgaW1hZ2VfcGFkZGluZyA9IHVzZVJhZGl1cyAtIGZvbnRTaXplIC8gMjsK KyAgICAgICAgICAgICAgICAgICAgZHJhd0xhYmVsc1NlcXMucHVzaCgoKSA9PiB7CisgICAgICAg ICAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdJbWFnZShpbWFnZSwgeCArIGRvdE1hcmdpbiAr IGltYWdlX3BhZGRpbmcsIHkgKyBpbWFnZV9wYWRkaW5nLCBmb250U2l6ZSwgZm9udFNpemUpOwor ICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHR5cGVv ZiBpbm5lckxhYmVsID09PSAibnVtYmVyIiB8fCB0eXBlb2YgaW5uZXJMYWJlbCA9PT0gInN0cmlu ZyIpIHsKICAgICAgICAgICAgICAgICAgICAgZHJhd0xhYmVsc1NlcXMucHVzaCgoKSA9PiB7CiAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBEcmF3IHRoZSBpbm5lciBsYWJlbAogICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgaW5uZXJMYWJlbFNpemUgPSBjb250ZXh0Lm1lYXN1cmVUZXh0 KGlubmVyTGFiZWwpOwo=