217400 2020-10-06 12:08:21 -0700 Adjust heuristic for checking whether view reaches visually non-empty state 2020-10-29 12:15:55 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu darin ggaren koivisto webkit-bug-importer zalan oldest_to_newest 1695259 0 sihui_liu 2020-10-06 12:08:21 -0700 We decide that view reaches visually non-empty state and fire corresponding events when main document is parsed and no more content (font or css resources) to be loaded. An edge case is when the page has an empty document and depends on async scripts to fill content (like wpt.fyi), then we may fire the events too early. 1695263 1 sihui_liu 2020-10-06 12:10:09 -0700 rdar://problem/69894849 1695264 2 410677 sihui_liu 2020-10-06 12:13:17 -0700 Created attachment 410677 Patch 1695568 3 410677 darin 2020-10-07 09:13:34 -0700 Comment on attachment 410677 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410677&action=review > Source/WebCore/page/FrameView.cpp:4580 > + bool hasScriptResource = false; Should be named isLoadingScript or something more like that. This definitely does not answer the question, “Does this have a script resource?” > Source/WebCore/page/FrameView.cpp:4584 > + auto resourceType = resource.value->type(); In this narrow context just “type” would be a good variable name. > Source/WebCore/page/FrameView.cpp:4587 > + if (!hasScriptResource && resourceType == CachedResource::Type::Script) Don’t need to check !hasScriptResource here. 1695577 4 410754 sihui_liu 2020-10-07 10:00:20 -0700 Created attachment 410754 Patch 1695625 5 410754 ggaren 2020-10-07 12:37:58 -0700 Comment on attachment 410754 Patch r=me Please double-check the iOS-wk2 EWS failure. 1695630 6 zalan 2020-10-07 12:42:01 -0700 I hope we eventually send out the non-empty milestone even when the script does not generate any content. 1695631 7 ggaren 2020-10-07 12:46:50 -0700 (In reply to zalan from comment #6) > I hope we eventually send out the non-empty milestone even when the script > does not generate any content. Good point. I think you can add an API test for this by using an empty document with a <script src="..."> that points to an empty script, and then verifying that the visually non-empty milestone fires. Seems worth doing (but probably doesn't need to block landing the patch). 1695633 8 ggaren 2020-10-07 12:50:22 -0700 Now that I think about it, the test should also verify this new behavior: that the mouth stone does not fire before the script has loaded. You can detect when the script loads by using the api testing url scheme. Or by having the script signal the api test somehow. 1695680 9 410781 sihui_liu 2020-10-07 14:37:13 -0700 Created attachment 410781 Patch 1695697 10 410786 sihui_liu 2020-10-07 14:54:30 -0700 Created attachment 410786 Patch 1695765 11 ews-feeder 2020-10-07 17:53:21 -0700 ChangeLog entry in Tools/ChangeLog contains OOPS!. 1695916 12 410849 sihui_liu 2020-10-08 09:06:41 -0700 Created attachment 410849 Patch for landing 1695962 13 ews-feeder 2020-10-08 10:59:54 -0700 Committed r268192: <https://trac.webkit.org/changeset/268192> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410849. 1702801 14 sihui_liu 2020-10-29 11:44:21 -0700 Reopening to attach new patch. 1702802 15 412670 sihui_liu 2020-10-29 11:44:22 -0700 Created attachment 412670 Patch for landing 1702813 16 ews-feeder 2020-10-29 12:15:54 -0700 Committed r269160: <https://trac.webkit.org/changeset/269160> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412670. 410677 2020-10-06 12:13:17 -0700 2020-10-07 10:00:18 -0700 Patch bug-217400-20201006121316.patch text/plain 2503 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTY3ZGU0ZjBiZmI3ZTk4 Y2IyZTZlNWJjZTRjNzZjNWU5OTFkNDk5OS4uMjdlOWVhMDMxMDY2NjcyYTU0MWQ1Yjg5YWQyNzQ2 ZDRjZmNlM2U2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTEwLTA2ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBoZXVyaXN0aWMg Zm9yIGNoZWNraW5nIHdoZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXRweSBzdGF0 ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgZGVj aWRlIHRoYXQgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0ZSBhbmQgZmlyZSBj b3JyZXNwb25kaW5nIGV2ZW50cyB3aGVuIG1haW4gZG9jdW1lbnQgaXMgcGFyc2VkIAorICAgICAg ICBhbmQgbm8gbW9yZSBjb250ZW50IChmb250IG9yIGNzcyByZXNvdXJjZXMpIGlzIHRvIGJlIGxv YWRlZC4gQW4gZWRnZSBjYXNlIGlzIHdoZW4gdGhlIHBhZ2UgaGFzIGFuIGVtcHR5IGRvY3VtZW50 IAorICAgICAgICBhbmQgZGVwZW5kcyBvbiBhc3luYyBzY3JpcHRzIHRvIGZpbGwgY29udGVudCAo bGlrZSB3cHQuZnlpKSwgdGhlbiB3ZSBtYXkgZmlyZSB0aGUgZXZlbnRzIHRvbyBlYXJseS4gVG8g bWl0aWdhdGUKKyAgICAgICAgdGhpcyBpc3N1ZSwgbm93IHdlIGRvbid0IHNldCB0aGUgc3RhdGUg aWYgdGhlIGNvbnRlbnQgaXMgY29tcGxldGVseSBlbXB0eSBhbmQgdGhlcmUgYXJlIHNjcmlwdHMg dG8gYmUgbG9hZGVkLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpjaGVja0FuZERpc3BhdGNoRGlkUmVhY2hWaXN1YWxseU5vbkVt cHR5U3RhdGUpOgorCiAyMDIwLTEwLTA2ICBMdW1pbmcgWWluICA8bHVtaW5nX3lpbkBhcHBsZS5j b20+CiAKICAgICAgICAgW21hY09TXSBCdW1wIHJlcG9ydGVkIGN1cnJlbnQgc2hpcHBpbmcgcmVs ZWFzZSBVQSB0byAxMF8xNV83CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMzU3ZDJh MTI1ZDdhNTFhNTkxNjhhZjFmOGEyNjAxYjhjZGZjNzMyZC4uOWViMjg3Nzc4NDU4NDMzYmFkZWE0 MTIxNTM0NWUzMmFjNmJjZmE3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDU3 NywxMiArNDU3NywyMCBAQCB2b2lkIEZyYW1lVmlldzo6Y2hlY2tBbmREaXNwYXRjaERpZFJlYWNo VmlzdWFsbHlOb25FbXB0eVN0YXRlKCkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICAgICAgICAgIGF1dG8mIHJlc291cmNlcyA9IHJlc291cmNlTG9hZGVyLmFsbENhY2hlZFJl c291cmNlcygpOworICAgICAgICAgICAgYm9vbCBoYXNTY3JpcHRSZXNvdXJjZSA9IGZhbHNlOwog ICAgICAgICAgICAgZm9yIChhdXRvJiByZXNvdXJjZSA6IHJlc291cmNlcykgewogICAgICAgICAg ICAgICAgIGlmIChyZXNvdXJjZS52YWx1ZS0+aXNMb2FkZWQoKSkKICAgICAgICAgICAgICAgICAg ICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgaWYgKHJlc291cmNlLnZhbHVlLT50eXBlKCkg PT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OkNTU1N0eWxlU2hlZXQgfHwgcmVzb3VyY2UudmFsdWUt PnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Rm9udFJlc291cmNlKQorICAgICAgICAg ICAgICAgIGF1dG8gcmVzb3VyY2VUeXBlID0gcmVzb3VyY2UudmFsdWUtPnR5cGUoKTsKKyAgICAg ICAgICAgICAgICBpZiAocmVzb3VyY2VUeXBlID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpDU1NT dHlsZVNoZWV0IHx8IHJlc291cmNlVHlwZSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Rm9udFJl c291cmNlKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICAg ICBpZiAoIWhhc1NjcmlwdFJlc291cmNlICYmIHJlc291cmNlVHlwZSA9PSBDYWNoZWRSZXNvdXJj ZTo6VHlwZTo6U2NyaXB0KQorICAgICAgICAgICAgICAgICAgICBoYXNTY3JpcHRSZXNvdXJjZSA9 IHRydWU7CiAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghbV92aXN1YWxseU5vbkVt cHR5UGl4ZWxDb3VudCAmJiBoYXNTY3JpcHRSZXNvdXJjZSkKKyAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9OwogCg== 410754 2020-10-07 10:00:20 -0700 2020-10-07 14:37:12 -0700 Patch bug-217400-20201007100019.patch text/plain 2863 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYwNzdkMTBlNzRkNTg4 N2RjOTgwMjBmMzgwMTI3NDQwMjZkMWJjZC4uZjhhOGE3Y2I5ZWZlNTI0ZjUyMDEwNWJiZjA0MjVk ZDAxYmM3ZTcyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTA3ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBoZXVyaXN0aWMg Zm9yIGNoZWNraW5nIHdoZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0 ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgZGVj aWRlIHRoYXQgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0ZSBhbmQgZmlyZSBj b3JyZXNwb25kaW5nIGV2ZW50cyB3aGVuIG1haW4gZG9jdW1lbnQgaXMgcGFyc2VkIAorICAgICAg ICBhbmQgbm8gbW9yZSBjb250ZW50IChmb250IG9yIGNzcyByZXNvdXJjZXMpIGlzIHRvIGJlIGxv YWRlZC4gQW4gZWRnZSBjYXNlIGlzIHdoZW4gdGhlIHBhZ2UgaGFzIGFuIGVtcHR5IGRvY3VtZW50 IAorICAgICAgICBhbmQgZGVwZW5kcyBvbiBhc3luYyBzY3JpcHRzIHRvIGZpbGwgY29udGVudCAo bGlrZSB3cHQuZnlpKSwgdGhlbiB3ZSBtYXkgZmlyZSB0aGUgZXZlbnRzIHRvbyBlYXJseS4gVG8g bWl0aWdhdGUKKyAgICAgICAgdGhpcyBpc3N1ZSwgbm93IHdlIGRvbid0IHNldCB0aGUgc3RhdGUg aWYgY29udGVudCBpcyBjb21wbGV0ZWx5IGVtcHR5IGFuZCB0aGVyZSBhcmUgc2NyaXB0cyB0byBi ZSBsb2FkZWQuIEFsc28sCisgICAgICAgIGJlY2F1c2UgbGF6aWx5IGxvYWRpbmcgZWxlbWVudHMg bmVlZCByZW5kZXJpbmcgdXBkYXRlIHRvIGRlY2lkZSBpZiB0aGV5IGNhbiBiZSBsb2FkZWQsIHdl IGNhbm5vdCB3YWl0IGZvciAKKyAgICAgICAgc2NyaXB0cyB3aGVyZSB0aGVyZSBhcmUgc3VjaCBl bGVtZW50cy4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6Y2hlY2tBbmREaXNwYXRjaERpZFJlYWNoVmlzdWFsbHlOb25FbXB0eVN0 YXRlKToKKwogMjAyMC0xMC0wNyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgTWVkaWFSZWNvcmRlcjo6Y3JlYXRlIHNob3VsZCBub3QgbmVlZCB0byBjcmVhdGUg YSBNZWRpYVJlY29yZGVyUHJpdmF0ZSB0byB2YWxpZGF0ZSBpdCBjYW4gcmVjb3JkIHByb3Blcmx5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggYWEwZTIxYmZkOWQ0NzZlM2E0ZjVkMmRi YTUzNDJiZmNiYjg5NzA0OS4uNjk1YjQ4MmQzZGMxNjYyZGFiOGJiNDI3YzAyYTExNGVlZjcyMTVk MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDU3NywxMiArNDU3NywyMyBAQCB2 b2lkIEZyYW1lVmlldzo6Y2hlY2tBbmREaXNwYXRjaERpZFJlYWNoVmlzdWFsbHlOb25FbXB0eVN0 YXRlKCkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIGF1dG8m IHJlc291cmNlcyA9IHJlc291cmNlTG9hZGVyLmFsbENhY2hlZFJlc291cmNlcygpOworICAgICAg ICAgICAgYm9vbCBzaG91bGRXYWl0Rm9yU2NyaXB0SWZFbXB0eSA9IGZhbHNlOworI2lmIEVOQUJM RShJTlRFUlNFQ1RJT05fT0JTRVJWRVIpCisgICAgICAgICAgICBzaG91bGRXYWl0Rm9yU2NyaXB0 SWZFbXB0eSA9ICFkb2N1bWVudC5udW1iZXJPZkludGVyc2VjdGlvbk9ic2VydmVycygpOworI2Vu ZGlmCisgICAgICAgICAgICBib29sIGlzTG9hZGluZ1NjcmlwdCA9IGZhbHNlOwogICAgICAgICAg ICAgZm9yIChhdXRvJiByZXNvdXJjZSA6IHJlc291cmNlcykgewogICAgICAgICAgICAgICAgIGlm IChyZXNvdXJjZS52YWx1ZS0+aXNMb2FkZWQoKSkKICAgICAgICAgICAgICAgICAgICAgY29udGlu dWU7Ci0gICAgICAgICAgICAgICAgaWYgKHJlc291cmNlLnZhbHVlLT50eXBlKCkgPT0gQ2FjaGVk UmVzb3VyY2U6OlR5cGU6OkNTU1N0eWxlU2hlZXQgfHwgcmVzb3VyY2UudmFsdWUtPnR5cGUoKSA9 PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Rm9udFJlc291cmNlKQorICAgICAgICAgICAgICAgIGF1 dG8gdHlwZSA9IHJlc291cmNlLnZhbHVlLT50eXBlKCk7CisgICAgICAgICAgICAgICAgaWYgKHR5 cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OkNTU1N0eWxlU2hlZXQgfHwgdHlwZSA9PSBDYWNo ZWRSZXNvdXJjZTo6VHlwZTo6Rm9udFJlc291cmNlKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAgICAgICAgICAgICBpZiAodHlwZSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlw ZTo6U2NyaXB0KQorICAgICAgICAgICAgICAgICAgICBpc0xvYWRpbmdTY3JpcHQgPSB0cnVlOwog ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoc2hvdWxkV2FpdEZvclNjcmlwdElmRW1w dHkgJiYgIW1fdmlzdWFsbHlOb25FbXB0eVBpeGVsQ291bnQgJiYgaXNMb2FkaW5nU2NyaXB0KQor ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICB9OwogCg== 410781 2020-10-07 14:37:13 -0700 2020-10-07 14:54:50 -0700 Patch bug-217400-20201007143713.patch text/plain 10701 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM5MTg0Yjk2YzgwNjQ0 YTBjZTljMDA1ZjZlY2U1YjJiN2Y0NDJkNi4uOGE3YmMxOWI4YmQ5ZDdhZjNjYzM1NDI5NDJlYjAz MmM4ODllYzVkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTEwLTA3ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBoZXVyaXN0aWMg Zm9yIGNoZWNraW5nIHdoZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0 ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgV2UgZGVj aWRlIHRoYXQgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0ZSBhbmQgZmlyZSBj b3JyZXNwb25kaW5nIGV2ZW50cyB3aGVuIG1haW4gZG9jdW1lbnQgaXMgcGFyc2VkIAorICAgICAg ICBhbmQgbm8gbW9yZSBjb250ZW50IChmb250IG9yIGNzcyByZXNvdXJjZXMpIGlzIHRvIGJlIGxv YWRlZC4gQW4gZWRnZSBjYXNlIGlzIHdoZW4gdGhlIHBhZ2UgaGFzIGFuIGVtcHR5IGRvY3VtZW50 IAorICAgICAgICBhbmQgZGVwZW5kcyBvbiBhc3luYyBzY3JpcHRzIHRvIGZpbGwgY29udGVudCAo bGlrZSB3cHQuZnlpKSwgdGhlbiB3ZSBtYXkgZmlyZSB0aGUgZXZlbnRzIHRvbyBlYXJseS4gVG8g bWl0aWdhdGUKKyAgICAgICAgdGhpcyBpc3N1ZSwgbm93IHdlIGRvbid0IHNldCB0aGUgc3RhdGUg aWYgY29udGVudCBpcyBjb21wbGV0ZWx5IGVtcHR5IGFuZCB0aGVyZSBhcmUgc2NyaXB0cyB0byBi ZSBsb2FkZWQuIEFsc28sCisgICAgICAgIGJlY2F1c2UgbGF6aWx5IGxvYWRpbmcgZWxlbWVudHMg bmVlZCByZW5kZXJpbmcgdXBkYXRlIHRvIGRlY2lkZSBpZiB0aGV5IGNhbiBiZSBsb2FkZWQsIHdl IHNob3VsZCBub3Qgd2FpdCBmb3IgCisgICAgICAgIHNjcmlwdHMgd2hlcmUgdGhlcmUgYXJlIHN1 Y2ggZWxlbWVudHMuCisKKyAgICAgICAgQVBJIFRlc3Q6IFdlYktpdC5GaXJzdFZpc3VhbGx5Tm9u RW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJyZWRTY3JpcHRJbkVtcHR5RG9jdW1lbnQgCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmNo ZWNrQW5kRGlzcGF0Y2hEaWRSZWFjaFZpc3VhbGx5Tm9uRW1wdHlTdGF0ZSk6CisKIDIwMjAtMTAt MDcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQ VSBQcm9jZXNzXSBTdXBwb3J0IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5kcmF3SW1hZ2UoKSB3 aXRoIEhUTUxWaWRlb0VsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhYTBl MjFiZmQ5ZDQ3NmUzYTRmNWQyZGJhNTM0MmJmY2JiODk3MDQ5Li4xODk4ZDRlMWY3MzI5Y2MyZjlm YTZjNzcxYzRjZWRkMDc3NmE0OWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00 NTc3LDEyICs0NTc3LDI0IEBAIHZvaWQgRnJhbWVWaWV3OjpjaGVja0FuZERpc3BhdGNoRGlkUmVh Y2hWaXN1YWxseU5vbkVtcHR5U3RhdGUoKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICAgICAgYXV0byYgcmVzb3VyY2VzID0gcmVzb3VyY2VMb2FkZXIuYWxsQ2FjaGVk UmVzb3VyY2VzKCk7CisgICAgICAgICAgICBib29sIHNob3VsZFdhaXRGb3JTY3JpcHRJZkVtcHR5 ID0gZmFsc2U7CisjaWYgRU5BQkxFKElOVEVSU0VDVElPTl9PQlNFUlZFUikKKyAgICAgICAgICAg IHNob3VsZFdhaXRGb3JTY3JpcHRJZkVtcHR5ID0gIWRvY3VtZW50Lm51bWJlck9mSW50ZXJzZWN0 aW9uT2JzZXJ2ZXJzKCk7CisjZW5kaWYKKyAgICAgICAgICAgIGJvb2wgaXNMb2FkaW5nU2NyaXB0 ID0gZmFsc2U7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIHJlc291cmNlIDogcmVzb3VyY2VzKSB7 CiAgICAgICAgICAgICAgICAgaWYgKHJlc291cmNlLnZhbHVlLT5pc0xvYWRlZCgpKQogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICBpZiAocmVzb3VyY2UudmFs dWUtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Q1NTU3R5bGVTaGVldCB8fCByZXNv dXJjZS52YWx1ZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpGb250UmVzb3VyY2Up CisgICAgICAgICAgICAgICAgYXV0byB0eXBlID0gcmVzb3VyY2UudmFsdWUtPnR5cGUoKTsKKyAg ICAgICAgICAgICAgICBpZiAodHlwZSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Q1NTU3R5bGVT aGVldCB8fCB0eXBlID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpGb250UmVzb3VyY2UpCiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIGlmICh0eXBlID09 IENhY2hlZFJlc291cmNlOjpUeXBlOjpTY3JpcHQpCisgICAgICAgICAgICAgICAgICAgIGlzTG9h ZGluZ1NjcmlwdCA9IHRydWU7CiAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChzaG91 bGRXYWl0Rm9yU2NyaXB0SWZFbXB0eSAmJiAhbV92aXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudCAm JiBpc0xvYWRpbmdTY3JpcHQpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDA4NTMzOTU1N2E1NDBkMDc3MjQ5NTFhYjc4 MWY3YzgzMmRmZTI3NGQuLmFlYTJmY2I2ZmVlYTBkNTM3ZjlkZGE1MTg1MTdmOWU1NTkwOTY1NzEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0xMC0wNyAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4K KworICAgICAgICBBZGp1c3QgaGV1cmlzdGljIGZvciBjaGVja2luZyB3aGV0aGVyIHZpZXcgcmVh Y2hlcyB2aXN1YWxseSBub24tZW1wdHkgc3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9GaXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmUubW06CisgICAgICAgICgtW1Jl bmRlcmluZ1Byb2dyZXNzTmF2aWdhdGlvbkRlbGVnYXRlIF93ZWJWaWV3OnJlbmRlcmluZ1Byb2dy ZXNzRGlkQ2hhbmdlOl0pOgorICAgICAgICAoVEVTVCk6CisKIDIwMjAtMTAtMDcgIEthcmwgUmFj a2xlciAgPHJhY2tsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGlu ZyByMjY4MTE1LgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJ Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJL aXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1ZTAwZDRjZjNkOGNhZDVkNTA1 MDlhM2RjMWY0Zjc3NDE2NWM0Njc2Li5hN2MwY2M3MGI3NzkwOWI5MTc5YzRhNTNjMTRiMDZlN2Vk NTZjYTYwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJL aXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNzk1LDYgKzc5NSw3IEBACiAJCTkz MjlBQTI5MURFM0Y4MUUwMDNBQkQwNyAvKiBUZXh0QnJlYWtJdGVyYXRvci5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzI5QUEyODFERTNGODFFMDAz QUJEMDcgLyogVGV4dEJyZWFrSXRlcmF0b3IuY3BwICovOyB9OwogCQk5MzJBRTUzRDFEMzcxMDQ3 MDA1REZGQUYgLyogZm9jdXMtaW5wdXRzLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM1NzVDNTUxRDMwMzY2RTAwMEQ2MDREIC8qIGZv Y3VzLWlucHV0cy5odG1sICovOyB9OwogCQk5MzNENjMxRDFGQ0I3NjIwMDAzMkVDRDYgLyogSGFz aGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkz M0Q2MzFCMUZDQjc2MTgwMDMyRUNENiAvKiBIYXNoZXIuY3BwICovOyB9OworCQk5MzQ5NEZGRTI1 MkU2NkJBMDA5OUYxNzEgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQu aHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA5MzQ5NEZGRDI1MkU2NTQ0MDA5OUYxNzEgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1w dHktZG9jdW1lbnQuaHRtbCAqLzsgfTsKIAkJOTM1Nzg2Q0MyMEY2QTI3MDAwMDBDREZDIC8qIElu ZGV4ZWREQi5zcWxpdGUzLXdhbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA5MzRGQTVDNTIwRjY5RkVEMDA0MERDMUIgLyogSW5kZXhlZERCLnNx bGl0ZTMtd2FsICovOyB9OwogCQk5MzU3ODZDRDIwRjZBMjkxMDAwMENERkMgLyogSW5kZXhlZERC LnNxbGl0ZTMgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gOTM0RkE1QzcyMEY2OUZFRTAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzICovOyB9 OwogCQk5MzU3ODZDRTIwRjZBMkExMDAwMENERkMgLyogSW5kZXhlZERCLnNxbGl0ZTMtc2htIGlu IENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEZB NUM2MjBGNjlGRUQwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMy1zaG0gKi87IH07CkBAIC0x MzU4LDYgKzEzNTksNyBAQAogCQkJCUY0ODZCMUQwMUY2Nzk1MjMwMEYzNEJERCAvKiBEYXRhVHJh bnNmZXItc2V0RHJhZ0ltYWdlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJRjQ1N0E5 RDYyMDJENjhBRjAwRjdFOUQ1IC8qIERhdGFUcmFuc2Zlci5odG1sIGluIENvcHkgUmVzb3VyY2Vz ICovLAogCQkJCUY0NTEyRTEzMUY2MEM0NDYwMEJCMzY5RSAvKiBEYXRhVHJhbnNmZXJJdGVtLWdl dEFzRW50cnkuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKKwkJCQk5MzQ5NEZGRTI1MkU2NkJB MDA5OUYxNzEgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkxMTgxNTM0NDIyMDhCN0FDMDBCMkNDRDIgLyogZGVm ZXJyZWQtc2NyaXB0LWxvYWQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkxMTgxNTM0 NjIyMDhCN0U1MDBCMkNDRDIgLyogZGVmZXJyZWQtc2NyaXB0LmpzIGluIENvcHkgUmVzb3VyY2Vz ICovLAogCQkJCUMwN0U2Q0IyMTNGRDczOTMwMDM4QjIyQiAvKiBkZXZpY2VQaXhlbFJhdGlvLmh0 bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCkBAIC0yMzg1LDYgKzIzODcsNyBAQAogCQk5MzI5QUEy ODFERTNGODFFMDAzQUJEMDcgLyogVGV4dEJyZWFrSXRlcmF0b3IuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVGV4dEJyZWFrSXRlcmF0b3IuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQk5MzMxNDA3QjE3QjQ0MTkwMDBGMDgzQjEgLyogRGlkTm90SGFu ZGxlS2V5RG93bi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEaWRO b3RIYW5kbGVLZXlEb3duLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTMzRDYz MUIxRkNCNzYxODAwMzJFQ0Q2IC8qIEhhc2hlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBIYXNoZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk5 MzQ5NEZGRDI1MkU2NTQ0MDA5OUYxNzEgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHkt ZG9jdW1lbnQuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJkZWZlcnJlZC1zY3Jp cHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJOTM0RkE1QzUyMEY2OUZFRDAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXdhbCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IGZpbGU7IHBh dGggPSAiSW5kZXhlZERCLnNxbGl0ZTMtd2FsIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJOTM0RkE1QzYyMEY2OUZFRDAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXNobSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IGZpbGU7IHBhdGgg PSAiSW5kZXhlZERCLnNxbGl0ZTMtc2htIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ OTM0RkE1QzcyMEY2OUZFRTAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9IEluZGV4 ZWREQi5zcWxpdGUzOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtNDI3Niw2ICs0Mjc5 LDcgQEAKIAkJCQk5QjI3MEZFRDFEREMyNUZEMDAyRDUzRjMgLyogY2xvc2VkLXNoYWRvdy10cmVl LXRlc3QuaHRtbCAqLywKIAkJCQk1QzlFNTY4NjFERjkxNDhFMDBDOUVFMzMgLyogY29udGVudEJs b2NrZXJDaGVjay5odG1sICovLAogCQkJCTI5MEY0Mjc0MTcyQTFGREUwMDkzOUZGMCAvKiBjdXN0 b20tcHJvdG9jb2wtc3luYy14aHIuaHRtbCAqLywKKwkJCQk5MzQ5NEZGRDI1MkU2NTQ0MDA5OUYx NzEgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCAqLywKIAkJ CQkxMTgxNTM0MzIyMDhCN0FDMDBCMkNDRDIgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQuaHRtbCAq LywKIAkJCQkxMTgxNTM0NTIyMDhCN0U1MDBCMkNDRDIgLyogZGVmZXJyZWQtc2NyaXB0LmpzICov LAogCQkJCUExNEFBQjY0MUU3OERDM0YwMEMxQURDMiAvKiBlbmNyeXB0ZWQucGRmICovLApkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9GaXJzdFZpc3Vh bGx5Tm9uRW1wdHlNaWxlc3RvbmUubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZS5tbQppbmRleCBiNDIwYWIwOWJm MmI4OGM0YzkzZWVmYmEzZWNhZGM3N2M3MGY0Y2E0Li5kMjI3MzhlNjVlZjM5ZjkyN2I1MGQ0YmY4 ODYwOTMzNDA2OWI0NDBkIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZS5tbQorKysgYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVz dG9uZS5tbQpAQCAtMzcsNiArMzcsNyBAQAogCiBzdGF0aWMgYm9vbCBkaWRGaXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXQ7CiBzdGF0aWMgYm9vbCByZWNlaXZlZE1lc3NhZ2U7CitzdGF0aWMgYm9v bCByZWNlaXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7CiAKIEBp bnRlcmZhY2UgRmlyc3RQYWludE1lc3NhZ2VIYW5kbGVyIDogTlNPYmplY3QgPFdLU2NyaXB0TWVz c2FnZUhhbmRsZXI+CiBAZW5kCkBAIC01NCw4ICs1NSwxMCBAQCBzdGF0aWMgYm9vbCByZWNlaXZl ZE1lc3NhZ2U7CiBAaW1wbGVtZW50YXRpb24gUmVuZGVyaW5nUHJvZ3Jlc3NOYXZpZ2F0aW9uRGVs ZWdhdGUKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVuZGVyaW5nUHJv Z3Jlc3NEaWRDaGFuZ2U6KF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRzKXByb2dyZXNzRXZlbnRz CiB7Ci0gICAgaWYgKHByb2dyZXNzRXZlbnRzICYgX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudEZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkKKyAgICBpZiAocHJvZ3Jlc3NFdmVudHMgJiBfV0tS ZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KSB7CisgICAg ICAgIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IHJl Y2VpdmVkTWVzc2FnZTsKICAgICAgICAgZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0ID0g dHJ1ZTsKKyAgICB9CiB9CiBAZW5kCiAKQEAgLTcxLDEyICs3NCwzNiBAQCBURVNUKFdlYktpdCwg Rmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lV2l0aERlZmVycmVkU2NyaXB0KQogICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAKICAgICByZWNl aXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNlaXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsKICAgICBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXQgPSBmYWxzZTsKIAogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImRl ZmVycmVkLXNjcmlwdC1sb2FkIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAi VGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV1dOwogCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6 cnVuKCZyZWNlaXZlZE1lc3NhZ2UpOwogICAgIEVYUEVDVF9UUlVFKGRpZEZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dCk7CisgICAgRVhQRUNUX0ZBTFNFKHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7Cit9CisKK1RFU1QoV2ViS2l0LCBGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJyZWRTY3JpcHRJbkVtcHR5RG9jdW1lbnQpCit7 CisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25m aWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0 TlMoW1tGaXJzdFBhaW50TWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW3dlYlZp ZXdDb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhh bmRsZXI6bWVzc2FnZUhhbmRsZXIuZ2V0KCkgbmFtZTpAImZpcnN0cGFpbnQiXTsKKworICAgIGF1 dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNN YWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlv bi5nZXQoKV0pOworCisgICAgUmV0YWluUHRyPFJlbmRlcmluZ1Byb2dyZXNzTmF2aWdhdGlvbkRl bGVnYXRlPiBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tSZW5kZXJpbmdQcm9ncmVzc05hdmlnYXRpb25E ZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0 ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICBy ZWNlaXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsK KyAgICBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsKKworICAgIFt3ZWJW aWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBt YWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImRlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5 LWRvY3VtZW50IiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktp dEFQSS5yZXNvdXJjZXMiXV1dOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRG aXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOworICAgIEVYUEVDVF9UUlVFKHJlY2VpdmVkTWVz c2FnZSk7CisgICAgRVhQRUNUX1RSVUUocmVjZWl2ZWRNZXNzYWdlQmVmb3JlRmlyc3RWaXN1YWxs eU5vbkVtcHR5TGF5b3V0KTsKIH0KIAogQGludGVyZmFjZSBOZXZlckZpbmlzaExvYWRpbmdTY2hl bWVIYW5kbGVyIDogTlNPYmplY3QgPFdLVVJMU2NoZW1lSGFuZGxlcj4K 410786 2020-10-07 14:54:30 -0700 2020-10-08 09:06:39 -0700 Patch bug-217400-20201007145429.patch text/plain 11231 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM5MTg0Yjk2YzgwNjQ0 YTBjZTljMDA1ZjZlY2U1YjJiN2Y0NDJkNi4uOGE3YmMxOWI4YmQ5ZDdhZjNjYzM1NDI5NDJlYjAz MmM4ODllYzVkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTEwLTA3ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBoZXVyaXN0aWMg Zm9yIGNoZWNraW5nIHdoZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0 ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgV2UgZGVj aWRlIHRoYXQgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0ZSBhbmQgZmlyZSBj b3JyZXNwb25kaW5nIGV2ZW50cyB3aGVuIG1haW4gZG9jdW1lbnQgaXMgcGFyc2VkIAorICAgICAg ICBhbmQgbm8gbW9yZSBjb250ZW50IChmb250IG9yIGNzcyByZXNvdXJjZXMpIGlzIHRvIGJlIGxv YWRlZC4gQW4gZWRnZSBjYXNlIGlzIHdoZW4gdGhlIHBhZ2UgaGFzIGFuIGVtcHR5IGRvY3VtZW50 IAorICAgICAgICBhbmQgZGVwZW5kcyBvbiBhc3luYyBzY3JpcHRzIHRvIGZpbGwgY29udGVudCAo bGlrZSB3cHQuZnlpKSwgdGhlbiB3ZSBtYXkgZmlyZSB0aGUgZXZlbnRzIHRvbyBlYXJseS4gVG8g bWl0aWdhdGUKKyAgICAgICAgdGhpcyBpc3N1ZSwgbm93IHdlIGRvbid0IHNldCB0aGUgc3RhdGUg aWYgY29udGVudCBpcyBjb21wbGV0ZWx5IGVtcHR5IGFuZCB0aGVyZSBhcmUgc2NyaXB0cyB0byBi ZSBsb2FkZWQuIEFsc28sCisgICAgICAgIGJlY2F1c2UgbGF6aWx5IGxvYWRpbmcgZWxlbWVudHMg bmVlZCByZW5kZXJpbmcgdXBkYXRlIHRvIGRlY2lkZSBpZiB0aGV5IGNhbiBiZSBsb2FkZWQsIHdl IHNob3VsZCBub3Qgd2FpdCBmb3IgCisgICAgICAgIHNjcmlwdHMgd2hlcmUgdGhlcmUgYXJlIHN1 Y2ggZWxlbWVudHMuCisKKyAgICAgICAgQVBJIFRlc3Q6IFdlYktpdC5GaXJzdFZpc3VhbGx5Tm9u RW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJyZWRTY3JpcHRJbkVtcHR5RG9jdW1lbnQgCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmNo ZWNrQW5kRGlzcGF0Y2hEaWRSZWFjaFZpc3VhbGx5Tm9uRW1wdHlTdGF0ZSk6CisKIDIwMjAtMTAt MDcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQ VSBQcm9jZXNzXSBTdXBwb3J0IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5kcmF3SW1hZ2UoKSB3 aXRoIEhUTUxWaWRlb0VsZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhYTBl MjFiZmQ5ZDQ3NmUzYTRmNWQyZGJhNTM0MmJmY2JiODk3MDQ5Li4xODk4ZDRlMWY3MzI5Y2MyZjlm YTZjNzcxYzRjZWRkMDc3NmE0OWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00 NTc3LDEyICs0NTc3LDI0IEBAIHZvaWQgRnJhbWVWaWV3OjpjaGVja0FuZERpc3BhdGNoRGlkUmVh Y2hWaXN1YWxseU5vbkVtcHR5U3RhdGUoKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICAgICAgYXV0byYgcmVzb3VyY2VzID0gcmVzb3VyY2VMb2FkZXIuYWxsQ2FjaGVk UmVzb3VyY2VzKCk7CisgICAgICAgICAgICBib29sIHNob3VsZFdhaXRGb3JTY3JpcHRJZkVtcHR5 ID0gZmFsc2U7CisjaWYgRU5BQkxFKElOVEVSU0VDVElPTl9PQlNFUlZFUikKKyAgICAgICAgICAg IHNob3VsZFdhaXRGb3JTY3JpcHRJZkVtcHR5ID0gIWRvY3VtZW50Lm51bWJlck9mSW50ZXJzZWN0 aW9uT2JzZXJ2ZXJzKCk7CisjZW5kaWYKKyAgICAgICAgICAgIGJvb2wgaXNMb2FkaW5nU2NyaXB0 ID0gZmFsc2U7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIHJlc291cmNlIDogcmVzb3VyY2VzKSB7 CiAgICAgICAgICAgICAgICAgaWYgKHJlc291cmNlLnZhbHVlLT5pc0xvYWRlZCgpKQogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICBpZiAocmVzb3VyY2UudmFs dWUtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Q1NTU3R5bGVTaGVldCB8fCByZXNv dXJjZS52YWx1ZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpGb250UmVzb3VyY2Up CisgICAgICAgICAgICAgICAgYXV0byB0eXBlID0gcmVzb3VyY2UudmFsdWUtPnR5cGUoKTsKKyAg ICAgICAgICAgICAgICBpZiAodHlwZSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Q1NTU3R5bGVT aGVldCB8fCB0eXBlID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpGb250UmVzb3VyY2UpCiAgICAg ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIGlmICh0eXBlID09 IENhY2hlZFJlc291cmNlOjpUeXBlOjpTY3JpcHQpCisgICAgICAgICAgICAgICAgICAgIGlzTG9h ZGluZ1NjcmlwdCA9IHRydWU7CiAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChzaG91 bGRXYWl0Rm9yU2NyaXB0SWZFbXB0eSAmJiAhbV92aXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudCAm JiBpc0xvYWRpbmdTY3JpcHQpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDA4NTMzOTU1N2E1NDBkMDc3MjQ5NTFhYjc4 MWY3YzgzMmRmZTI3NGQuLjZhMTBjYzY2N2NlNzYyNGYxMzFhYWMwZmQ2NGVkNjA1NGMwNGExYWUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMC0xMC0wNyAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4K KworICAgICAgICBBZGp1c3QgaGV1cmlzdGljIGZvciBjaGVja2luZyB3aGV0aGVyIHZpZXcgcmVh Y2hlcyB2aXN1YWxseSBub24tZW1wdHkgc3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQvZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbDogQWRkZWQuCisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9GaXJzdFZpc3VhbGx5Tm9u RW1wdHlNaWxlc3RvbmUubW06CisgICAgICAgICgtW1JlbmRlcmluZ1Byb2dyZXNzTmF2aWdhdGlv bkRlbGVnYXRlIF93ZWJWaWV3OnJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlOl0pOgorICAgICAg ICAoVEVTVCk6CisKIDIwMjAtMTAtMDcgIEthcmwgUmFja2xlciAgPHJhY2tsZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjY4MTE1LgpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagppbmRleCA1ZTAwZDRjZjNkOGNhZDVkNTA1MDlhM2RjMWY0Zjc3NDE2NWM0Njc2Li5h N2MwY2M3MGI3NzkwOWI5MTc5YzRhNTNjMTRiMDZlN2VkNTZjYTYwIDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagpAQCAtNzk1LDYgKzc5NSw3IEBACiAJCTkzMjlBQTI5MURFM0Y4MUUwMDNBQkQwNyAv KiBUZXh0QnJlYWtJdGVyYXRvci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA5MzI5QUEyODFERTNGODFFMDAzQUJEMDcgLyogVGV4dEJyZWFrSXRlcmF0 b3IuY3BwICovOyB9OwogCQk5MzJBRTUzRDFEMzcxMDQ3MDA1REZGQUYgLyogZm9jdXMtaW5wdXRz Lmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gOTM1NzVDNTUxRDMwMzY2RTAwMEQ2MDREIC8qIGZvY3VzLWlucHV0cy5odG1sICovOyB9Owog CQk5MzNENjMxRDFGQ0I3NjIwMDAzMkVDRDYgLyogSGFzaGVyLmNwcCBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzM0Q2MzFCMUZDQjc2MTgwMDMyRUNENiAv KiBIYXNoZXIuY3BwICovOyB9OworCQk5MzQ5NEZGRTI1MkU2NkJBMDA5OUYxNzEgLyogZGVmZXJy ZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzQ5NEZGRDI1MkU2NTQ0MDA5OUYx NzEgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCAqLzsgfTsK IAkJOTM1Nzg2Q0MyMEY2QTI3MDAwMDBDREZDIC8qIEluZGV4ZWREQi5zcWxpdGUzLXdhbCBpbiBD b3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzRGQTVD NTIwRjY5RkVEMDA0MERDMUIgLyogSW5kZXhlZERCLnNxbGl0ZTMtd2FsICovOyB9OwogCQk5MzU3 ODZDRDIwRjZBMjkxMDAwMENERkMgLyogSW5kZXhlZERCLnNxbGl0ZTMgaW4gQ29weSBSZXNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM0RkE1QzcyMEY2OUZFRTAw NDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzICovOyB9OwogCQk5MzU3ODZDRTIwRjZBMkExMDAw MENERkMgLyogSW5kZXhlZERCLnNxbGl0ZTMtc2htIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEZBNUM2MjBGNjlGRUQwMDQwREMxQiAvKiBJ bmRleGVkREIuc3FsaXRlMy1zaG0gKi87IH07CkBAIC0xMzU4LDYgKzEzNTksNyBAQAogCQkJCUY0 ODZCMUQwMUY2Nzk1MjMwMEYzNEJERCAvKiBEYXRhVHJhbnNmZXItc2V0RHJhZ0ltYWdlLmh0bWwg aW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJRjQ1N0E5RDYyMDJENjhBRjAwRjdFOUQ1IC8qIERh dGFUcmFuc2Zlci5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0NTEyRTEzMUY2MEM0 NDYwMEJCMzY5RSAvKiBEYXRhVHJhbnNmZXJJdGVtLWdldEFzRW50cnkuaHRtbCBpbiBDb3B5IFJl c291cmNlcyAqLywKKwkJCQk5MzQ5NEZGRTI1MkU2NkJBMDA5OUYxNzEgLyogZGVmZXJyZWQtc2Ny aXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJ CQkxMTgxNTM0NDIyMDhCN0FDMDBCMkNDRDIgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLywKIAkJCQkxMTgxNTM0NjIyMDhCN0U1MDBCMkNDRDIgLyogZGVm ZXJyZWQtc2NyaXB0LmpzIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUMwN0U2Q0IyMTNGRDcz OTMwMDM4QjIyQiAvKiBkZXZpY2VQaXhlbFJhdGlvLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8s CkBAIC0yMzg1LDYgKzIzODcsNyBAQAogCQk5MzI5QUEyODFERTNGODFFMDAzQUJEMDcgLyogVGV4 dEJyZWFrSXRlcmF0b3IuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g VGV4dEJyZWFrSXRlcmF0b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzMx NDA3QjE3QjQ0MTkwMDBGMDgzQjEgLyogRGlkTm90SGFuZGxlS2V5RG93bi5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEaWROb3RIYW5kbGVLZXlEb3duLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTMzRDYzMUIxRkNCNzYxODAwMzJFQ0Q2IC8qIEhh c2hlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBIYXNoZXIuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk5MzQ5NEZGRDI1MkU2NTQ0MDA5OUYxNzEg LyogZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHRleHQuaHRtbDsgcGF0aCA9ICJkZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVu dC5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM0RkE1QzUyMEY2OUZFRDAw NDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXdhbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IGZpbGU7IHBhdGggPSAiSW5kZXhlZERCLnNxbGl0ZTMt d2FsIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM0RkE1QzYyMEY2OUZFRDAwNDBE QzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXNobSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBsYXN0S25vd25GaWxlVHlwZSA9IGZpbGU7IHBhdGggPSAiSW5kZXhlZERCLnNxbGl0ZTMtc2ht Ijsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTM0RkE1QzcyMEY2OUZFRTAwNDBEQzFC IC8qIEluZGV4ZWREQi5zcWxpdGUzICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RL bm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9IEluZGV4ZWREQi5zcWxpdGUzOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwpAQCAtNDI3Niw2ICs0Mjc5LDcgQEAKIAkJCQk5QjI3MEZFRDFEREMy NUZEMDAyRDUzRjMgLyogY2xvc2VkLXNoYWRvdy10cmVlLXRlc3QuaHRtbCAqLywKIAkJCQk1QzlF NTY4NjFERjkxNDhFMDBDOUVFMzMgLyogY29udGVudEJsb2NrZXJDaGVjay5odG1sICovLAogCQkJ CTI5MEY0Mjc0MTcyQTFGREUwMDkzOUZGMCAvKiBjdXN0b20tcHJvdG9jb2wtc3luYy14aHIuaHRt bCAqLywKKwkJCQk5MzQ5NEZGRDI1MkU2NTQ0MDA5OUYxNzEgLyogZGVmZXJyZWQtc2NyaXB0LWxv YWQtaW4tZW1wdHktZG9jdW1lbnQuaHRtbCAqLywKIAkJCQkxMTgxNTM0MzIyMDhCN0FDMDBCMkND RDIgLyogZGVmZXJyZWQtc2NyaXB0LWxvYWQuaHRtbCAqLywKIAkJCQkxMTgxNTM0NTIyMDhCN0U1 MDBCMkNDRDIgLyogZGVmZXJyZWQtc2NyaXB0LmpzICovLAogCQkJCUExNEFBQjY0MUU3OERDM0Yw MEMxQURDMiAvKiBlbmNyeXB0ZWQucGRmICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQvZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQu aHRtbCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2RlZmVycmVkLXNjcmlwdC1s b2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzY1YWI2YTlmM2ZjYWRmMGFm ZDgzZmE4OGU1NWFlN2JlOWFjZDY2NQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0L2RlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50 Lmh0bWwKQEAgLTAsMCArMSBAQAorPHNjcmlwdCBkZWZlciBzcmM9ImRlZmVycmVkLXNjcmlwdC5q cyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZS5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lLm1t CmluZGV4IGI0MjBhYjA5YmYyYjg4YzRjOTNlZWZiYTNlY2FkYzc3YzcwZjRjYTQuLmQyMjczOGU2 NWVmMzlmOTI3YjUwZDRiZjg4NjA5MzM0MDY5YjQ0MGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25l Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlyc3RWaXN1 YWxseU5vbkVtcHR5TWlsZXN0b25lLm1tCkBAIC0zNyw2ICszNyw3IEBACiAKIHN0YXRpYyBib29s IGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dDsKIHN0YXRpYyBib29sIHJlY2VpdmVkTWVz c2FnZTsKK3N0YXRpYyBib29sIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dDsKIAogQGludGVyZmFjZSBGaXJzdFBhaW50TWVzc2FnZUhhbmRsZXIgOiBOU09i amVjdCA8V0tTY3JpcHRNZXNzYWdlSGFuZGxlcj4KIEBlbmQKQEAgLTU0LDggKzU1LDEwIEBAIHN0 YXRpYyBib29sIHJlY2VpdmVkTWVzc2FnZTsKIEBpbXBsZW1lbnRhdGlvbiBSZW5kZXJpbmdQcm9n cmVzc05hdmlnYXRpb25EZWxlZ2F0ZQogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyByZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5nZTooX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVu dHMpcHJvZ3Jlc3NFdmVudHMKIHsKLSAgICBpZiAocHJvZ3Jlc3NFdmVudHMgJiBfV0tSZW5kZXJp bmdQcm9ncmVzc0V2ZW50Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KQorICAgIGlmIChwcm9n cmVzc0V2ZW50cyAmIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXQpIHsKKyAgICAgICAgcmVjZWl2ZWRNZXNzYWdlQmVmb3JlRmlyc3RWaXN1YWxseU5v bkVtcHR5TGF5b3V0ID0gcmVjZWl2ZWRNZXNzYWdlOwogICAgICAgICBkaWRGaXJzdFZpc3VhbGx5 Tm9uRW1wdHlMYXlvdXQgPSB0cnVlOworICAgIH0KIH0KIEBlbmQKIApAQCAtNzEsMTIgKzc0LDM2 IEBAIFRFU1QoV2ViS2l0LCBGaXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJy ZWRTY3JpcHQpCiAgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdl dCgpXTsKIAogICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZhbHNlOworICAgIHJlY2VpdmVkTWVzc2Fn ZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZhbHNlOwogICAgIGRpZEZpcnN0 VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZhbHNlOwogCiAgICAgW3dlYlZpZXcgbG9hZFJlcXVl c3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVS TEZvclJlc291cmNlOkAiZGVmZXJyZWQtc2NyaXB0LWxvYWQiIHdpdGhFeHRlbnNpb246QCJodG1s IiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07CiAKICAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkTWVzc2FnZSk7CiAgICAgRVhQRUNUX1RSVUUo ZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKKyAgICBFWFBFQ1RfRkFMU0UocmVjZWl2 ZWRNZXNzYWdlQmVmb3JlRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKK30KKworVEVTVChX ZWJLaXQsIEZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZVdpdGhEZWZlcnJlZFNjcmlwdElu RW1wdHlEb2N1bWVudCkKK3sKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHRO UyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIG1lc3Nh Z2VIYW5kbGVyID0gYWRvcHROUyhbW0ZpcnN0UGFpbnRNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5p dF0pOworICAgIFtbd2ViVmlld0NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBh ZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxlci5nZXQoKSBuYW1lOkAiZmlyc3Rw YWludCJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndl YlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBSZXRhaW5QdHI8UmVuZGVyaW5nUHJv Z3Jlc3NOYXZpZ2F0aW9uRGVsZWdhdGU+IGRlbGVnYXRlID0gYWRvcHROUyhbW1JlbmRlcmluZ1By b2dyZXNzTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0 TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKworICAgIHJlY2VpdmVkTWVzc2Fn ZSA9IGZhbHNlOworICAgIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dCA9IGZhbHNlOworICAgIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZh bHNlOworCisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0 aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiZGVmZXJyZWQtc2Ny aXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJl Y3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07CisKKyAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJmRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7CisgICAgRVhQRUNU X1RSVUUocmVjZWl2ZWRNZXNzYWdlKTsKKyAgICBFWFBFQ1RfVFJVRShyZWNlaXZlZE1lc3NhZ2VC ZWZvcmVGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOwogfQogCiBAaW50ZXJmYWNlIE5ldmVy RmluaXNoTG9hZGluZ1NjaGVtZUhhbmRsZXIgOiBOU09iamVjdCA8V0tVUkxTY2hlbWVIYW5kbGVy Pgo= 410849 2020-10-08 09:06:41 -0700 2020-10-29 11:44:18 -0700 Patch for landing bug-217400-20201008090640.patch text/plain 11355 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGIyZDllMGNlNmM4NGM4 ZmRkZWM4OGFiNGNiYmJlNDY5MDVhODhiZi4uMmQ0Yjk3Mzc0N2FiMjNmYTI3MjEyNGMzNGM1OTQw YWI4ODkwMjhkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTEwLTA4ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBoZXVyaXN0aWMg Zm9yIGNoZWNraW5nIHdoZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0 ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgV2UgZGVj aWRlIHRoYXQgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0ZSBhbmQgZmlyZSBj b3JyZXNwb25kaW5nIGV2ZW50cyB3aGVuIG1haW4gZG9jdW1lbnQgaXMgcGFyc2VkIAorICAgICAg ICBhbmQgbm8gbW9yZSBjb250ZW50IChmb250IG9yIGNzcyByZXNvdXJjZXMpIGlzIHRvIGJlIGxv YWRlZC4gQW4gZWRnZSBjYXNlIGlzIHdoZW4gdGhlIHBhZ2UgaGFzIGFuIGVtcHR5IGRvY3VtZW50 IAorICAgICAgICBhbmQgZGVwZW5kcyBvbiBhc3luYyBzY3JpcHRzIHRvIGZpbGwgY29udGVudCAo bGlrZSB3cHQuZnlpKSwgdGhlbiB3ZSBtYXkgZmlyZSB0aGUgZXZlbnRzIHRvbyBlYXJseS4gVG8g bWl0aWdhdGUKKyAgICAgICAgdGhpcyBpc3N1ZSwgbm93IHdlIGRvbid0IHNldCB0aGUgc3RhdGUg aWYgY29udGVudCBpcyBjb21wbGV0ZWx5IGVtcHR5IGFuZCB0aGVyZSBhcmUgc2NyaXB0cyB0byBi ZSBsb2FkZWQuIEFsc28sCisgICAgICAgIGJlY2F1c2UgbGF6aWx5IGxvYWRpbmcgZWxlbWVudHMg bmVlZCByZW5kZXJpbmcgdXBkYXRlIHRvIGRlY2lkZSBpZiB0aGV5IGNhbiBiZSBsb2FkZWQsIHdl IHNob3VsZCBub3Qgd2FpdCBmb3IgCisgICAgICAgIHNjcmlwdHMgd2hlcmUgdGhlcmUgYXJlIHN1 Y2ggZWxlbWVudHMuCisKKyAgICAgICAgQVBJIFRlc3Q6IFdlYktpdC5GaXJzdFZpc3VhbGx5Tm9u RW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJyZWRTY3JpcHRJbkVtcHR5RG9jdW1lbnQgCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmNo ZWNrQW5kRGlzcGF0Y2hEaWRSZWFjaFZpc3VhbGx5Tm9uRW1wdHlTdGF0ZSk6CisKIDIwMjAtMTAt MDggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNd IFVzaW5nIHRoZSBtaXh0dXJlIG9mIExheW91dFVuaXQgYW5kIElubGluZUxheW91dFVuaXQgdHlw ZXMgY2F1c2VzIEFTU0VSVCh2ZXJ0aWNhbEdhcCA+PSAwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCmluZGV4IGFhMGUyMWJmZDlkNDc2ZTNhNGY1ZDJkYmE1MzQyYmZjYmI4OTcwNDkuLjE4OThk NGUxZjczMjljYzJmOWZhNmM3NzFjNGNlZGQwNzc2YTQ5YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAKQEAgLTQ1NzcsMTIgKzQ1NzcsMjQgQEAgdm9pZCBGcmFtZVZpZXc6OmNoZWNrQW5k RGlzcGF0Y2hEaWRSZWFjaFZpc3VhbGx5Tm9uRW1wdHlTdGF0ZSgpCiAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICBhdXRvJiByZXNvdXJjZXMgPSByZXNvdXJjZUxv YWRlci5hbGxDYWNoZWRSZXNvdXJjZXMoKTsKKyAgICAgICAgICAgIGJvb2wgc2hvdWxkV2FpdEZv clNjcmlwdElmRW1wdHkgPSBmYWxzZTsKKyNpZiBFTkFCTEUoSU5URVJTRUNUSU9OX09CU0VSVkVS KQorICAgICAgICAgICAgc2hvdWxkV2FpdEZvclNjcmlwdElmRW1wdHkgPSAhZG9jdW1lbnQubnVt YmVyT2ZJbnRlcnNlY3Rpb25PYnNlcnZlcnMoKTsKKyNlbmRpZgorICAgICAgICAgICAgYm9vbCBp c0xvYWRpbmdTY3JpcHQgPSBmYWxzZTsKICAgICAgICAgICAgIGZvciAoYXV0byYgcmVzb3VyY2Ug OiByZXNvdXJjZXMpIHsKICAgICAgICAgICAgICAgICBpZiAocmVzb3VyY2UudmFsdWUtPmlzTG9h ZGVkKCkpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIGlm IChyZXNvdXJjZS52YWx1ZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpUeXBlOjpDU1NTdHls ZVNoZWV0IHx8IHJlc291cmNlLnZhbHVlLT50eXBlKCkgPT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6 OkZvbnRSZXNvdXJjZSkKKyAgICAgICAgICAgICAgICBhdXRvIHR5cGUgPSByZXNvdXJjZS52YWx1 ZS0+dHlwZSgpOworICAgICAgICAgICAgICAgIGlmICh0eXBlID09IENhY2hlZFJlc291cmNlOjpU eXBlOjpDU1NTdHlsZVNoZWV0IHx8IHR5cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OkZvbnRS ZXNvdXJjZSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAg ICAgaWYgKHR5cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OlNjcmlwdCkKKyAgICAgICAgICAg ICAgICAgICAgaXNMb2FkaW5nU2NyaXB0ID0gdHJ1ZTsKICAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgaWYgKHNob3VsZFdhaXRGb3JTY3JpcHRJZkVtcHR5ICYmICFtX3Zpc3VhbGx5Tm9uRW1w dHlQaXhlbENvdW50ICYmIGlzTG9hZGluZ1NjcmlwdCkKKyAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9OwogCmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmY4MmNhZDIyZjg2 ZmVmN2ExNzFlZmNlNzVmZWZmYjJkNGY2MTY0Ny4uMzA4OTg5M2IxYjg5ZjIzZDQ1ZTZkZjJkOTBm NjkwYTkyMWYxYTg0YiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEwLTA4ICBTaWh1aSBMaXUgIDxzaWh1aV9s aXVAYXBwbGUuY29tPgorCisgICAgICAgIEFkanVzdCBoZXVyaXN0aWMgZm9yIGNoZWNraW5nIHdo ZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5IG5vbi1lbXB0eSBzdGF0ZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RX ZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdC9kZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0Zp cnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZS5tbToKKyAgICAgICAgKC1bUmVuZGVyaW5nUHJv Z3Jlc3NOYXZpZ2F0aW9uRGVsZWdhdGUgX3dlYlZpZXc6cmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFu Z2U6XSk6CisgICAgICAgIChURVNUKToKKwogMjAyMC0xMC0wNyAgQWRpdHlhIEtlZXJ0aGkgIDxh a2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjY4MTIzKTogWyBpT1Mg XSA0IFRlc3RXZWJLaXRBUEkuV2ViS2l0TGVnYWN5IGZhaWx1cmVzOiBGaWxlIG5hbWUgdW5hdmFp bGFibGUuIFVua25vd24gQysrIGV4Y2VwdGlvbiB0aHJvd24gaW4gdGhlIHRlc3QgYm9keS4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggNWUwMGQ0Y2YzZDhjYWQ1ZDUwNTA5YTNkYzFmNGY3NzQx NjVjNDY3Ni4uYTdjMGNjNzBiNzc5MDliOTE3OWM0YTUzYzE0YjA2ZTdlZDU2Y2E2MCAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKQEAgLTc5NSw2ICs3OTUsNyBAQAogCQk5MzI5QUEyOTFERTNGODFF MDAzQUJEMDcgLyogVGV4dEJyZWFrSXRlcmF0b3IuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTMyOUFBMjgxREUzRjgxRTAwM0FCRDA3IC8qIFRleHRC cmVha0l0ZXJhdG9yLmNwcCAqLzsgfTsKIAkJOTMyQUU1M0QxRDM3MTA0NzAwNURGRkFGIC8qIGZv Y3VzLWlucHV0cy5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDkzNTc1QzU1MUQzMDM2NkUwMDBENjA0RCAvKiBmb2N1cy1pbnB1dHMuaHRt bCAqLzsgfTsKIAkJOTMzRDYzMUQxRkNCNzYyMDAwMzJFQ0Q2IC8qIEhhc2hlci5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzNENjMxQjFGQ0I3NjE4 MDAzMkVDRDYgLyogSGFzaGVyLmNwcCAqLzsgfTsKKwkJOTM0OTRGRkUyNTJFNjZCQTAwOTlGMTcx IC8qIGRlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0bWwgaW4gQ29weSBS ZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTM0OTRGRkQyNTJF NjU0NDAwOTlGMTcxIC8qIGRlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0 bWwgKi87IH07CiAJCTkzNTc4NkNDMjBGNkEyNzAwMDAwQ0RGQyAvKiBJbmRleGVkREIuc3FsaXRl My13YWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gOTM0RkE1QzUyMEY2OUZFRDAwNDBEQzFCIC8qIEluZGV4ZWREQi5zcWxpdGUzLXdhbCAqLzsg fTsKIAkJOTM1Nzg2Q0QyMEY2QTI5MTAwMDBDREZDIC8qIEluZGV4ZWREQi5zcWxpdGUzIGluIENv cHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEZBNUM3 MjBGNjlGRUUwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMyAqLzsgfTsKIAkJOTM1Nzg2Q0Uy MEY2QTJBMTAwMDBDREZDIC8qIEluZGV4ZWREQi5zcWxpdGUzLXNobSBpbiBDb3B5IFJlc291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzRGQTVDNjIwRjY5RkVEMDA0 MERDMUIgLyogSW5kZXhlZERCLnNxbGl0ZTMtc2htICovOyB9OwpAQCAtMTM1OCw2ICsxMzU5LDcg QEAKIAkJCQlGNDg2QjFEMDFGNjc5NTIzMDBGMzRCREQgLyogRGF0YVRyYW5zZmVyLXNldERyYWdJ bWFnZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUY0NTdBOUQ2MjAyRDY4QUYwMEY3 RTlENSAvKiBEYXRhVHJhbnNmZXIuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlGNDUx MkUxMzFGNjBDNDQ2MDBCQjM2OUUgLyogRGF0YVRyYW5zZmVySXRlbS1nZXRBc0VudHJ5Lmh0bWwg aW4gQ29weSBSZXNvdXJjZXMgKi8sCisJCQkJOTM0OTRGRkUyNTJFNjZCQTAwOTlGMTcxIC8qIGRl ZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0bWwgaW4gQ29weSBSZXNvdXJj ZXMgKi8sCiAJCQkJMTE4MTUzNDQyMjA4QjdBQzAwQjJDQ0QyIC8qIGRlZmVycmVkLXNjcmlwdC1s b2FkLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJMTE4MTUzNDYyMjA4QjdFNTAwQjJD Q0QyIC8qIGRlZmVycmVkLXNjcmlwdC5qcyBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlDMDdF NkNCMjEzRkQ3MzkzMDAzOEIyMkIgLyogZGV2aWNlUGl4ZWxSYXRpby5odG1sIGluIENvcHkgUmVz b3VyY2VzICovLApAQCAtMjM4NSw2ICsyMzg3LDcgQEAKIAkJOTMyOUFBMjgxREUzRjgxRTAwM0FC RDA3IC8qIFRleHRCcmVha0l0ZXJhdG9yLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IFRleHRCcmVha0l0ZXJhdG9yLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJOTMzMTQwN0IxN0I0NDE5MDAwRjA4M0IxIC8qIERpZE5vdEhhbmRsZUtleURvd24uY3Bw ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRGlkTm90SGFuZGxlS2V5RG93 bi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzM0Q2MzFCMUZDQjc2MTgwMDMy RUNENiAvKiBIYXNoZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g SGFzaGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJOTM0OTRGRkQyNTJFNjU0 NDAwOTlGMTcxIC8qIGRlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0bWwg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAiZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1w dHktZG9jdW1lbnQuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzNEZBNUM1 MjBGNjlGRUQwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMy13YWwgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBmaWxlOyBwYXRoID0gIkluZGV4ZWRE Qi5zcWxpdGUzLXdhbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzNEZBNUM2MjBG NjlGRUQwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMy1zaG0gKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBmaWxlOyBwYXRoID0gIkluZGV4ZWREQi5z cWxpdGUzLXNobSI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzNEZBNUM3MjBGNjlG RUUwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IGZpbGU7IHBhdGggPSBJbmRleGVkREIuc3FsaXRlMzsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTQyNzYsNiArNDI3OSw3IEBACiAJCQkJOUIy NzBGRUQxRERDMjVGRDAwMkQ1M0YzIC8qIGNsb3NlZC1zaGFkb3ctdHJlZS10ZXN0Lmh0bWwgKi8s CiAJCQkJNUM5RTU2ODYxREY5MTQ4RTAwQzlFRTMzIC8qIGNvbnRlbnRCbG9ja2VyQ2hlY2suaHRt bCAqLywKIAkJCQkyOTBGNDI3NDE3MkExRkRFMDA5MzlGRjAgLyogY3VzdG9tLXByb3RvY29sLXN5 bmMteGhyLmh0bWwgKi8sCisJCQkJOTM0OTRGRkQyNTJFNjU0NDAwOTlGMTcxIC8qIGRlZmVycmVk LXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0bWwgKi8sCiAJCQkJMTE4MTUzNDMyMjA4 QjdBQzAwQjJDQ0QyIC8qIGRlZmVycmVkLXNjcmlwdC1sb2FkLmh0bWwgKi8sCiAJCQkJMTE4MTUz NDUyMjA4QjdFNTAwQjJDQ0QyIC8qIGRlZmVycmVkLXNjcmlwdC5qcyAqLywKIAkJCQlBMTRBQUI2 NDFFNzhEQzNGMDBDMUFEQzIgLyogZW5jcnlwdGVkLnBkZiAqLywKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2RlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5 LWRvY3VtZW50Lmh0bWwgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9kZWZlcnJl ZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM2NWFiNmE5 ZjNmY2FkZjBhZmQ4M2ZhODhlNTVhZTdiZTlhY2Q2NjUKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdC9kZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0 eS1kb2N1bWVudC5odG1sCkBAIC0wLDAgKzEgQEAKKzxzY3JpcHQgZGVmZXIgc3JjPSJkZWZlcnJl ZC1zY3JpcHQuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9GaXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmUubW0gYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1p bGVzdG9uZS5tbQppbmRleCBiNDIwYWIwOWJmMmI4OGM0YzkzZWVmYmEzZWNhZGM3N2M3MGY0Y2E0 Li5kMjI3MzhlNjVlZjM5ZjkyN2I1MGQ0YmY4ODYwOTMzNDA2OWI0NDBkIDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0 eU1pbGVzdG9uZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZS5tbQpAQCAtMzcsNiArMzcsNyBAQAogCiBz dGF0aWMgYm9vbCBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7CiBzdGF0aWMgYm9vbCBy ZWNlaXZlZE1lc3NhZ2U7CitzdGF0aWMgYm9vbCByZWNlaXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZp c3VhbGx5Tm9uRW1wdHlMYXlvdXQ7CiAKIEBpbnRlcmZhY2UgRmlyc3RQYWludE1lc3NhZ2VIYW5k bGVyIDogTlNPYmplY3QgPFdLU2NyaXB0TWVzc2FnZUhhbmRsZXI+CiBAZW5kCkBAIC01NCw4ICs1 NSwxMCBAQCBzdGF0aWMgYm9vbCByZWNlaXZlZE1lc3NhZ2U7CiBAaW1wbGVtZW50YXRpb24gUmVu ZGVyaW5nUHJvZ3Jlc3NOYXZpZ2F0aW9uRGVsZWdhdGUKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2Vi VmlldyAqKXdlYlZpZXcgcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U6KF9XS1JlbmRlcmluZ1By b2dyZXNzRXZlbnRzKXByb2dyZXNzRXZlbnRzCiB7Ci0gICAgaWYgKHByb2dyZXNzRXZlbnRzICYg X1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkKKyAg ICBpZiAocHJvZ3Jlc3NFdmVudHMgJiBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RWaXN1 YWxseU5vbkVtcHR5TGF5b3V0KSB7CisgICAgICAgIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0 VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IHJlY2VpdmVkTWVzc2FnZTsKICAgICAgICAgZGlkRmly c3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0ID0gdHJ1ZTsKKyAgICB9CiB9CiBAZW5kCiAKQEAgLTcx LDEyICs3NCwzNiBAQCBURVNUKFdlYktpdCwgRmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25l V2l0aERlZmVycmVkU2NyaXB0KQogICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpk ZWxlZ2F0ZS5nZXQoKV07CiAKICAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNl aXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsKICAg ICBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsKIAogICAgIFt3ZWJWaWV3 IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWlu QnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImRlZmVycmVkLXNjcmlwdC1sb2FkIiB3aXRoRXh0ZW5z aW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV1dOwog CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZE1lc3NhZ2UpOwogICAgIEVY UEVDVF9UUlVFKGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7CisgICAgRVhQRUNUX0ZB TFNFKHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCk7Cit9 CisKK1RFU1QoV2ViS2l0LCBGaXJzdFZpc3VhbGx5Tm9uRW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJy ZWRTY3JpcHRJbkVtcHR5RG9jdW1lbnQpCit7CisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlv biA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAg YXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMoW1tGaXJzdFBhaW50TWVzc2FnZUhhbmRsZXIg YWxsb2NdIGluaXRdKTsKKyAgICBbW3dlYlZpZXdDb25maWd1cmF0aW9uIHVzZXJDb250ZW50Q29u dHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6bWVzc2FnZUhhbmRsZXIuZ2V0KCkgbmFt ZTpAImZpcnN0cGFpbnQiXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZp ZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmln dXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgUmV0YWluUHRyPFJl bmRlcmluZ1Byb2dyZXNzTmF2aWdhdGlvbkRlbGVnYXRlPiBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tS ZW5kZXJpbmdQcm9ncmVzc05hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICByZWNl aXZlZE1lc3NhZ2UgPSBmYWxzZTsKKyAgICByZWNlaXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXQgPSBmYWxzZTsKKyAgICBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXQgPSBmYWxzZTsKKworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImRl ZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50IiB3aXRoRXh0ZW5zaW9uOkAiaHRt bCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV1dOworCisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOwor ICAgIEVYUEVDVF9UUlVFKHJlY2VpdmVkTWVzc2FnZSk7CisgICAgRVhQRUNUX1RSVUUocmVjZWl2 ZWRNZXNzYWdlQmVmb3JlRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKIH0KIAogQGludGVy ZmFjZSBOZXZlckZpbmlzaExvYWRpbmdTY2hlbWVIYW5kbGVyIDogTlNPYmplY3QgPFdLVVJMU2No ZW1lSGFuZGxlcj4K 412670 2020-10-29 11:44:22 -0700 2020-10-29 12:15:54 -0700 Patch for landing bug-217400-20201029114420.patch text/plain 10463 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDU1YmE3MDhjYjUxOGQw ZTMzYmE5OTY2NzQwODFkYjllM2MzNGUxNS4uZGU2M2Y5ODg3ODkyNGZkYTA0Mjc2OGViYTViZmM3 MjBhYmQ5NGQ0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEwLTI5ICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJldmVy dGluZyByMjY4MTkyLgorCisgICAgICAgIFBMVCByZWdyZXNzaW9uIC0gcmRhcjovL3Byb2JsZW0v NzAxNDEzNTAKKworICAgICAgICBSZXZlcnRlZCBjaGFuZ2VzZXQ6CisKKyAgICAgICAgIkFkanVz dCBoZXVyaXN0aWMgZm9yIGNoZWNraW5nIHdoZXRoZXIgdmlldyByZWFjaGVzIHZpc3VhbGx5Cisg ICAgICAgIG5vbi1lbXB0eSBzdGF0ZSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNzQwMAorICAgICAgICBodHRwczovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvMjY4MTkyCisKIDIwMjAtMTAtMjkgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTigyNjkwNjUpOiBbR1BVIFByb2Nlc3NdOiBP cmRlciBvZiBkcmF3aW5nIGhhcyB0byBiZSBwcmVzZXJ2ZWQgd2hlbiBkcmF3aW5nIGEgY2FudmFz IHRvIGFub3RoZXIgY2FudmFzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMGY0Yzhi MDNhYTk5NTA2ODM4OGYwMjljN2JjNDYxNTExZTYwNTVlOC4uZjZiYTQzOGRkZGM1NmQ4ZTQ0Zjdh NjIyMTljM2QwMzAxOTI4NWYyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDU2 NiwyNCArNDU2NiwxMiBAQCB2b2lkIEZyYW1lVmlldzo6Y2hlY2tBbmREaXNwYXRjaERpZFJlYWNo VmlzdWFsbHlOb25FbXB0eVN0YXRlKCkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICAgICAgICAgIGF1dG8mIHJlc291cmNlcyA9IHJlc291cmNlTG9hZGVyLmFsbENhY2hlZFJl c291cmNlcygpOwotICAgICAgICAgICAgYm9vbCBzaG91bGRXYWl0Rm9yU2NyaXB0SWZFbXB0eSA9 IGZhbHNlOwotI2lmIEVOQUJMRShJTlRFUlNFQ1RJT05fT0JTRVJWRVIpCi0gICAgICAgICAgICBz aG91bGRXYWl0Rm9yU2NyaXB0SWZFbXB0eSA9ICFkb2N1bWVudC5udW1iZXJPZkludGVyc2VjdGlv bk9ic2VydmVycygpOwotI2VuZGlmCi0gICAgICAgICAgICBib29sIGlzTG9hZGluZ1NjcmlwdCA9 IGZhbHNlOwogICAgICAgICAgICAgZm9yIChhdXRvJiByZXNvdXJjZSA6IHJlc291cmNlcykgewog ICAgICAgICAgICAgICAgIGlmIChyZXNvdXJjZS52YWx1ZS0+aXNMb2FkZWQoKSkKICAgICAgICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgYXV0byB0eXBlID0gcmVzb3Vy Y2UudmFsdWUtPnR5cGUoKTsKLSAgICAgICAgICAgICAgICBpZiAodHlwZSA9PSBDYWNoZWRSZXNv dXJjZTo6VHlwZTo6Q1NTU3R5bGVTaGVldCB8fCB0eXBlID09IENhY2hlZFJlc291cmNlOjpUeXBl OjpGb250UmVzb3VyY2UpCisgICAgICAgICAgICAgICAgaWYgKHJlc291cmNlLnZhbHVlLT50eXBl KCkgPT0gQ2FjaGVkUmVzb3VyY2U6OlR5cGU6OkNTU1N0eWxlU2hlZXQgfHwgcmVzb3VyY2UudmFs dWUtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6VHlwZTo6Rm9udFJlc291cmNlKQogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgICAgICBpZiAodHlwZSA9PSBD YWNoZWRSZXNvdXJjZTo6VHlwZTo6U2NyaXB0KQotICAgICAgICAgICAgICAgICAgICBpc0xvYWRp bmdTY3JpcHQgPSB0cnVlOwogICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAoc2hvdWxk V2FpdEZvclNjcmlwdElmRW1wdHkgJiYgIW1fdmlzdWFsbHlOb25FbXB0eVBpeGVsQ291bnQgJiYg aXNMb2FkaW5nU2NyaXB0KQotICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH07CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzYTU1ZTVhMzQwMTdiMmU2MWUzMjViNGMyYWM5 YTc0ZmU3ODk1ZDYzLi5hOTY0NDgwN2RmNThmMTEzMTdmNGJkNTc2NDFlOGMxNDBmNDg2NDY1IDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjAtMTAtMjkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisK KyAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjgxOTIuCisKKyAgICAgICAgUExUIHJl Z3Jlc3Npb24gLSByZGFyOi8vcHJvYmxlbS83MDE0MTM1MAorCisgICAgICAgIFJldmVydGVkIGNo YW5nZXNldDoKKworICAgICAgICAiQWRqdXN0IGhldXJpc3RpYyBmb3IgY2hlY2tpbmcgd2hldGhl ciB2aWV3IHJlYWNoZXMgdmlzdWFsbHkKKyAgICAgICAgbm9uLWVtcHR5IHN0YXRlIgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3NDAwCisgICAgICAg IGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8yNjgxOTIKKwogMjAyMC0xMC0yOSAg U2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW1Rlc3RpbmddIFJlbW92 ZSByZXF1aXJlbWVudCBvZiBhZGRpbmcgbmV3IFNQSSBmb3IgZWFjaCBwcmVmZXJlbmNlIHRoYXQg bmVlZHMgdGVzdGluZyAoV2ViS2l0TGVnYWN5IFdpbmRvd3MpCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CmluZGV4IDU1YzEyNDI0MGE0MGIyODZmMTIzNTIwMWZhMjE0OGEwM2UwOGY2MTAuLjgyZTNmY2Qx NmQ0YTUxNWMzNDQ0YjU1NDI2MTE0NmY0YWFjMjdkMDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CkBAIC03OTYsNyArNzk2LDYgQEAKIAkJOTMyOUFBMjkxREUzRjgxRTAwM0FCRDA3IC8qIFRleHRC cmVha0l0ZXJhdG9yLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDkzMjlBQTI4MURFM0Y4MUUwMDNBQkQwNyAvKiBUZXh0QnJlYWtJdGVyYXRvci5jcHAg Ki87IH07CiAJCTkzMkFFNTNEMUQzNzEwNDcwMDVERkZBRiAvKiBmb2N1cy1pbnB1dHMuaHRtbCBp biBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzU3 NUM1NTFEMzAzNjZFMDAwRDYwNEQgLyogZm9jdXMtaW5wdXRzLmh0bWwgKi87IH07CiAJCTkzM0Q2 MzFEMUZDQjc2MjAwMDMyRUNENiAvKiBIYXNoZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTMzRDYzMUIxRkNCNzYxODAwMzJFQ0Q2IC8qIEhhc2hl ci5jcHAgKi87IH07Ci0JCTkzNDk0RkZFMjUyRTY2QkEwMDk5RjE3MSAvKiBkZWZlcnJlZC1zY3Jp cHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNDk0RkZEMjUyRTY1NDQwMDk5RjE3MSAvKiBk ZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sICovOyB9OwogCQk5MzU3 ODZDQzIwRjZBMjcwMDAwMENERkMgLyogSW5kZXhlZERCLnNxbGl0ZTMtd2FsIGluIENvcHkgUmVz b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzNEZBNUM1MjBGNjlG RUQwMDQwREMxQiAvKiBJbmRleGVkREIuc3FsaXRlMy13YWwgKi87IH07CiAJCTkzNTc4NkNEMjBG NkEyOTEwMDAwQ0RGQyAvKiBJbmRleGVkREIuc3FsaXRlMyBpbiBDb3B5IFJlc291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzRGQTVDNzIwRjY5RkVFMDA0MERDMUIg LyogSW5kZXhlZERCLnNxbGl0ZTMgKi87IH07CiAJCTkzNTc4NkNFMjBGNkEyQTEwMDAwQ0RGQyAv KiBJbmRleGVkREIuc3FsaXRlMy1zaG0gaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gOTM0RkE1QzYyMEY2OUZFRDAwNDBEQzFCIC8qIEluZGV4ZWRE Qi5zcWxpdGUzLXNobSAqLzsgfTsKQEAgLTEzNjIsNyArMTM2MSw2IEBACiAJCQkJRjQ4NkIxRDAx RjY3OTUyMzAwRjM0QkREIC8qIERhdGFUcmFuc2Zlci1zZXREcmFnSW1hZ2UuaHRtbCBpbiBDb3B5 IFJlc291cmNlcyAqLywKIAkJCQlGNDU3QTlENjIwMkQ2OEFGMDBGN0U5RDUgLyogRGF0YVRyYW5z ZmVyLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJRjQ1MTJFMTMxRjYwQzQ0NjAwQkIz NjlFIC8qIERhdGFUcmFuc2Zlckl0ZW0tZ2V0QXNFbnRyeS5odG1sIGluIENvcHkgUmVzb3VyY2Vz ICovLAotCQkJCTkzNDk0RkZFMjUyRTY2QkEwMDk5RjE3MSAvKiBkZWZlcnJlZC1zY3JpcHQtbG9h ZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTExODE1 MzQ0MjIwOEI3QUMwMEIyQ0NEMiAvKiBkZWZlcnJlZC1zY3JpcHQtbG9hZC5odG1sIGluIENvcHkg UmVzb3VyY2VzICovLAogCQkJCTExODE1MzQ2MjIwOEI3RTUwMEIyQ0NEMiAvKiBkZWZlcnJlZC1z Y3JpcHQuanMgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQzA3RTZDQjIxM0ZENzM5MzAwMzhC MjJCIC8qIGRldmljZVBpeGVsUmF0aW8uaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLywKQEAgLTIz OTEsNyArMjM4OSw2IEBACiAJCTkzMjlBQTI4MURFM0Y4MUUwMDNBQkQwNyAvKiBUZXh0QnJlYWtJ dGVyYXRvci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBUZXh0QnJl YWtJdGVyYXRvci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzMzE0MDdCMTdC NDQxOTAwMEYwODNCMSAvKiBEaWROb3RIYW5kbGVLZXlEb3duLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IERpZE5vdEhhbmRsZUtleURvd24uY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQk5MzNENjMxQjFGQ0I3NjE4MDAzMkVDRDYgLyogSGFzaGVyLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEhhc2hlci5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTkzNDk0RkZEMjUyRTY1NDQwMDk5RjE3MSAvKiBkZWZl cnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5o dG1sOyBwYXRoID0gImRlZmVycmVkLXNjcmlwdC1sb2FkLWluLWVtcHR5LWRvY3VtZW50Lmh0bWwi OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzRGQTVDNTIwRjY5RkVEMDA0MERDMUIg LyogSW5kZXhlZERCLnNxbGl0ZTMtd2FsICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxh c3RLbm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9ICJJbmRleGVkREIuc3FsaXRlMy13YWwiOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzRGQTVDNjIwRjY5RkVEMDA0MERDMUIgLyog SW5kZXhlZERCLnNxbGl0ZTMtc2htICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RL bm93bkZpbGVUeXBlID0gZmlsZTsgcGF0aCA9ICJJbmRleGVkREIuc3FsaXRlMy1zaG0iOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5MzRGQTVDNzIwRjY5RkVFMDA0MERDMUIgLyogSW5k ZXhlZERCLnNxbGl0ZTMgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSBmaWxlOyBwYXRoID0gSW5kZXhlZERCLnNxbGl0ZTM7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CkBAIC00Mjg4LDcgKzQyODUsNiBAQAogCQkJCTlCMjcwRkVEMUREQzI1RkQwMDJE NTNGMyAvKiBjbG9zZWQtc2hhZG93LXRyZWUtdGVzdC5odG1sICovLAogCQkJCTVDOUU1Njg2MURG OTE0OEUwMEM5RUUzMyAvKiBjb250ZW50QmxvY2tlckNoZWNrLmh0bWwgKi8sCiAJCQkJMjkwRjQy NzQxNzJBMUZERTAwOTM5RkYwIC8qIGN1c3RvbS1wcm90b2NvbC1zeW5jLXhoci5odG1sICovLAot CQkJCTkzNDk0RkZEMjUyRTY1NDQwMDk5RjE3MSAvKiBkZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1l bXB0eS1kb2N1bWVudC5odG1sICovLAogCQkJCTExODE1MzQzMjIwOEI3QUMwMEIyQ0NEMiAvKiBk ZWZlcnJlZC1zY3JpcHQtbG9hZC5odG1sICovLAogCQkJCTExODE1MzQ1MjIwOEI3RTUwMEIyQ0NE MiAvKiBkZWZlcnJlZC1zY3JpcHQuanMgKi8sCiAJCQkJQTE0QUFCNjQxRTc4REMzRjAwQzFBREMy IC8qIGVuY3J5cHRlZC5wZGYgKi8sCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdC9kZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4t ZW1wdHktZG9jdW1lbnQuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzY1YWI2 YTlmM2ZjYWRmMGFmZDgzZmE4OGU1NWFlN2JlOWFjZDY2NS4uMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9kZWZlcnJlZC1zY3JpcHQtbG9hZC1pbi1lbXB0eS1kb2N1bWVudC5odG1sCisrKyAvZGV2L251 bGwKQEAgLTEgKzAsMCBAQAotPHNjcmlwdCBkZWZlciBzcmM9ImRlZmVycmVkLXNjcmlwdC5qcyI+ PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0ZpcnN0VmlzdWFsbHlOb25FbXB0eU1pbGVzdG9uZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lLm1tCmlu ZGV4IGQyMjczOGU2NWVmMzlmOTI3YjUwZDRiZjg4NjA5MzM0MDY5YjQ0MGQuLmI0MjBhYjA5YmYy Yjg4YzRjOTNlZWZiYTNlY2FkYzc3YzcwZjRjYTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlyc3RWaXN1YWxseU5vbkVtcHR5TWlsZXN0b25lLm1t CisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRmlyc3RWaXN1YWxs eU5vbkVtcHR5TWlsZXN0b25lLm1tCkBAIC0zNyw3ICszNyw2IEBACiAKIHN0YXRpYyBib29sIGRp ZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dDsKIHN0YXRpYyBib29sIHJlY2VpdmVkTWVzc2Fn ZTsKLXN0YXRpYyBib29sIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dDsKIAogQGludGVyZmFjZSBGaXJzdFBhaW50TWVzc2FnZUhhbmRsZXIgOiBOU09iamVj dCA8V0tTY3JpcHRNZXNzYWdlSGFuZGxlcj4KIEBlbmQKQEAgLTU1LDEwICs1NCw4IEBAIHN0YXRp YyBib29sIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dDsK IEBpbXBsZW1lbnRhdGlvbiBSZW5kZXJpbmdQcm9ncmVzc05hdmlnYXRpb25EZWxlZ2F0ZQogLSAo dm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyByZW5kZXJpbmdQcm9ncmVzc0RpZENo YW5nZTooX1dLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHMpcHJvZ3Jlc3NFdmVudHMKIHsKLSAgICBp ZiAocHJvZ3Jlc3NFdmVudHMgJiBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RWaXN1YWxs eU5vbkVtcHR5TGF5b3V0KSB7Ci0gICAgICAgIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0Vmlz dWFsbHlOb25FbXB0eUxheW91dCA9IHJlY2VpdmVkTWVzc2FnZTsKKyAgICBpZiAocHJvZ3Jlc3NF dmVudHMgJiBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0KQogICAgICAgICBkaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQgPSB0cnVlOwotICAg IH0KIH0KIEBlbmQKIApAQCAtNzQsMzYgKzcxLDEyIEBAIFRFU1QoV2ViS2l0LCBGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlNaWxlc3RvbmVXaXRoRGVmZXJyZWRTY3JpcHQpCiAgICAgW3dlYlZpZXcgc2V0 TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKIAogICAgIHJlY2VpdmVkTWVzc2Fn ZSA9IGZhbHNlOwotICAgIHJlY2VpdmVkTWVzc2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0 eUxheW91dCA9IGZhbHNlOwogICAgIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZh bHNlOwogCiAgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0 aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiZGVmZXJyZWQtc2Ny aXB0LWxvYWQiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0 QVBJLnJlc291cmNlcyJdXV07CiAKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2Vp dmVkTWVzc2FnZSk7CiAgICAgRVhQRUNUX1RSVUUoZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0KTsKLSAgICBFWFBFQ1RfRkFMU0UocmVjZWl2ZWRNZXNzYWdlQmVmb3JlRmlyc3RWaXN1YWxs eU5vbkVtcHR5TGF5b3V0KTsKLX0KLQotVEVTVChXZWJLaXQsIEZpcnN0VmlzdWFsbHlOb25FbXB0 eU1pbGVzdG9uZVdpdGhEZWZlcnJlZFNjcmlwdEluRW1wdHlEb2N1bWVudCkKLXsKLSAgICBhdXRv IHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g YWxsb2NdIGluaXRdKTsKLSAgICBhdXRvIG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW0ZpcnN0 UGFpbnRNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOwotICAgIFtbd2ViVmlld0NvbmZpZ3Vy YXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNz YWdlSGFuZGxlci5nZXQoKSBuYW1lOkAiZmlyc3RwYWludCJdOwotCi0gICAgYXV0byB3ZWJWaWV3 ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAs IDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7 Ci0KLSAgICBSZXRhaW5QdHI8UmVuZGVyaW5nUHJvZ3Jlc3NOYXZpZ2F0aW9uRGVsZWdhdGU+IGRl bGVnYXRlID0gYWRvcHROUyhbW1JlbmRlcmluZ1Byb2dyZXNzTmF2aWdhdGlvbkRlbGVnYXRlIGFs bG9jXSBpbml0XSk7Ci0gICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRl LmdldCgpXTsKLQotICAgIHJlY2VpdmVkTWVzc2FnZSA9IGZhbHNlOwotICAgIHJlY2VpdmVkTWVz c2FnZUJlZm9yZUZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZhbHNlOwotICAgIGRpZEZp cnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCA9IGZhbHNlOwotCi0gICAgW3dlYlZpZXcgbG9hZFJl cXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVd IFVSTEZvclJlc291cmNlOkAiZGVmZXJyZWQtc2NyaXB0LWxvYWQtaW4tZW1wdHktZG9jdW1lbnQi IHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291 cmNlcyJdXV07Ci0KLSAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEZpcnN0VmlzdWFs bHlOb25FbXB0eUxheW91dCk7Ci0gICAgRVhQRUNUX1RSVUUocmVjZWl2ZWRNZXNzYWdlKTsKLSAg ICBFWFBFQ1RfVFJVRShyZWNlaXZlZE1lc3NhZ2VCZWZvcmVGaXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXQpOwogfQogCiBAaW50ZXJmYWNlIE5ldmVyRmluaXNoTG9hZGluZ1NjaGVtZUhhbmRsZXIg OiBOU09iamVjdCA8V0tVUkxTY2hlbWVIYW5kbGVyPgo=