216275 2020-09-08 10:17:19 -0700 REGRESSION(r266634): [macOS release] 4 layout tests became flaky failures 2020-09-10 11:50:50 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=216012 InRadar P2 Normal --- 216258 1 ryanhaddad sihui_liu darin sihui_liu thorton webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1686609 0 ryanhaddad 2020-09-08 10:17:19 -0700 The following layout tests have become flaky failures on macOS release bots: compositing/tiling/tiled-mask-inwindow.html fast/events/page-visibility-iframe-move-test.html pageoverlay/overlay-remove-reinsert-view.html tiled-drawing/tiled-backing-in-window.html https://results.webkit.org/?suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&test=compositing%2Ftiling%2Ftiled-mask-inwindow.html&test=fast%2Fevents%2Fpage-visibility-iframe-move-test.html&test=pageoverlay%2Foverlay-remove-reinsert-view.html&test=tiled-drawing%2Ftiled-backing-in-window.html 1686610 1 ryanhaddad 2020-09-08 10:18:38 -0700 I was able to reproduce one of the failures with the following on r266634: run-webkit-tests compositing/tiling/tiled-mask-inwindow.html --iterations 100 --exit-after-n-failures 1 I could not reproduce with r266629. 1686611 2 webkit-bug-importer 2020-09-08 10:18:57 -0700 <rdar://problem/68515242> 1686613 3 ryanhaddad 2020-09-08 10:20:04 -0700 Not sure if this is fixed by the patch in https://bugs.webkit.org/show_bug.cgi?id=216261 1686912 4 408312 sihui_liu 2020-09-08 23:12:53 -0700 Created attachment 408312 Patch 1687239 5 408403 sihui_liu 2020-09-09 19:42:04 -0700 Created attachment 408403 Patch 1687260 6 408403 darin 2020-09-09 20:33:18 -0700 Comment on attachment 408403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408403&action=review > Source/WebKit/ChangeLog:10 > + transation is committed in UI process. To make sure web process picks up the changes, we need to invoke the typo: "transition" > Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:357 > +- (void)_doAfterActivityStateUpdate:(void (^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); Why is this not in WKWebViewPrivateForTesting.h? 1687261 7 408403 darin 2020-09-09 20:33:39 -0700 Comment on attachment 408403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408403&action=review > LayoutTests/fast/events/page-visibility-iframe-move-test.html:58 > + debug("VisibilityChanage event is received"); typo: "VisibilityChange" 1687278 8 408403 sihui_liu 2020-09-09 23:03:34 -0700 Comment on attachment 408403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408403&action=review >> Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:357 >> +- (void)_doAfterActivityStateUpdate:(void (^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); > > Why is this not in WKWebViewPrivateForTesting.h? ah, will move it to WKWebViewPrivateForTesting.h! 1687279 9 408415 sihui_liu 2020-09-09 23:04:40 -0700 Created attachment 408415 Patch 1687438 10 408415 thorton 2020-09-10 10:28:26 -0700 Comment on attachment 408415 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408415&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h:79 > +- (void)_doAfterActivityStateUpdate:(void (^)(void))completionHandler; Nice! 1687482 11 ews-feeder 2020-09-10 11:50:49 -0700 Committed r266847: <https://trac.webkit.org/changeset/266847> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408415. 408312 2020-09-08 23:12:53 -0700 2020-09-09 19:42:02 -0700 Patch bug-216275-20200908231252.patch text/plain 7208 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjYmJkMTUyMTYxOTUwMTJm N2E1MzlmOGExY2ZmN2YxYjcyYjhlMTQuLmM5NzQ2YTFiMmJlYzQ2ODg1N2NiNTA1YWFkN2Q1YzVl NDg5MTZiOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMDktMDggIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NjYzNCk6 IFttYWNPUyByZWxlYXNlXSA0IGxheW91dCB0ZXN0cyBiZWNhbWUgZmxha3kgZmFpbHVyZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjI3NQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjg1MTUyNDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWZ0ZXIgcjI2NjYzNCwgYWN0aXZpdHkgc3RhdGUgY2hh bmdlcyBjYXVzZWQgYnkgYWRkaW5nL3JlbW92aW5nIHZpZXcgd2lsbCBub3QgYmUgZGlzcGF0Y2hl ZCB0byB3ZWIgcHJvY2VzcyB1bnRpbAorICAgICAgICB0cmFuc2F0aW9uIGlzIGNvbW1pdHRlZCBp biBVSSBwcm9jZXNzLiBUbyBtYWtlIHN1cmUgd2ViIHByb2Nlc3MgcGlja3MgdXAgdGhlIGNoYW5n ZXMsIHdlIG5lZWQgdG8gaW52b2tlIHRoZSAKKyAgICAgICAgY2FsbGJhY2tzIGFmdGVyIGFjdGl2 aXR5IHN0YXRlIGNoYW5nZXMgYXJlIGRpc3BhdGNoZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kb0FmdGVyQWN0 aXZpdHlTdGF0ZVVwZGF0ZTpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlld1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29j b2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YWRkQWN0aXZpdHlTdGF0ZVVw ZGF0ZUNvbXBsZXRpb25IYW5kbGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaXNwYXRjaEFjdGl2aXR5U3Rh dGVDaGFuZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKwogMjAyMC0w OS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Np b24ocjI2MDYxNCkgUG93ZXIgdXNhZ2UgaGFzIGluY3JlYXNlZCBkdWUgdG8gZXh0cmEgdGhyZWFk IGhvcHBpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCmluZGV4IGNlNTE0YjkyMTFjNDhhNjI4YmE3YzZiNmNmZDU1MjBlNTk4YTYyZWYuLjQ0MTc4 OGEwMTQ4Yjk1M2ZkZTU2MzFiZGRkNTczM2RmNDI0ZjJmNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMjY4Myw2ICsyNjgzLDExIEBA IHN0YXRpYyBpbmxpbmUgT3B0aW9uU2V0PFdlYktpdDo6RmluZE9wdGlvbnM+IHRvRmluZE9wdGlv bnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kCiAgICAgX3BhZ2UtPnNldENhblVzZUNyZWRlbnRpYWxT dG9yYWdlKGNhblVzZUNyZWRlbnRpYWxTdG9yYWdlKTsKIH0KIAorLSAodm9pZClfZG9BZnRlckFj dGl2aXR5U3RhdGVVcGRhdGU6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCit7Cisg ICAgX3BhZ2UtPmFkZEFjdGl2aXR5U3RhdGVVcGRhdGVDb21wbGV0aW9uSGFuZGxlcihtYWtlQmxv Y2tQdHIoY29tcGxldGlvbkhhbmRsZXIpKTsKK30KKwogLSAoaWQgPF9XS0lucHV0RGVsZWdhdGU+ KV9pbnB1dERlbGVnYXRlCiB7CiAgICAgcmV0dXJuIF9pbnB1dERlbGVnYXRlLmdldEF1dG9yZWxl YXNlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdQcml2YXRlLmgKaW5kZXggMDcxNGIxN2FhNzk1Nzg3NzI1YjBiZGUwYjdlY2ZhODgyMTdl ZjdjMC4uYmE3NWI1NDBhNWI2YjZhOTI2ZmU1OThkN2Q1Y2MzMmFjMjQwNTg5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5o CkBAIC0zNTQsNiArMzU0LDggQEAgZm9yIHRoaXMgcHJvcGVydHkuCiAKIEBwcm9wZXJ0eSAobm9u YXRvbWljLCBzZXR0ZXI9X3NldENhblVzZUNyZWRlbnRpYWxTdG9yYWdlOikgQk9PTCBfY2FuVXNl Q3JlZGVudGlhbFN0b3JhZ2UgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9z KFdLX0lPU19UQkEpKTsKIAorLSAodm9pZClfZG9BZnRlckFjdGl2aXR5U3RhdGVVcGRhdGU6KHZv aWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tf TUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisKIEBlbmQKIAogI2lmIFRBUkdFVF9PU19JUEhP TkUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94 eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29j b2EubW0KaW5kZXggMGZmZTljMTZiOGRlYjA3ZThmZWNhYTRjMzQ0NDE4NzFhMWY5Yjk0Yi4uYWM5 ZjNjYTRhMzc5MmVjZmMyNTU5ZWUxMTg3ZWZjZTVkNmI0NWU2NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KQEAgLTUyNyw2ICs1 MjcsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNjaGVkdWxlQWN0aXZpdHlTdGF0ZVVwZGF0ZSgp CiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hhbmdlRGlzcGF0Y2hlci0+c2NoZWR1bGUoKTsKIH0KIAor dm9pZCBXZWJQYWdlUHJveHk6OmFkZEFjdGl2aXR5U3RhdGVVcGRhdGVDb21wbGV0aW9uSGFuZGxl cihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAg aWYgKCFtX2hhc1NjaGVkdWxlZEFjdGl2aXR5U3RhdGVVcGRhdGUpIHsKKyAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fYWN0aXZpdHlT dGF0ZVVwZGF0ZUNhbGxiYWNrcy5hcHBlbmQoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor fQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI3VuZGVmIE1FU1NBR0VfQ0hFQ0tfQ09NUExF VElPTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZjMzZjJi MDNlZmZkMzY3MWRjNTJhMjY5MzQxMGMxOTMyNGZiNjEzYS4uNGJhZTNjMGJmYWU1NmI3YTcyYzMw MTA1MGI5NmRiMWFhZDAxZjk3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC0yMDU2LDYgKzIwNTYsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpc3BhdGNo QWN0aXZpdHlTdGF0ZUNoYW5nZSgpCiAgICAgbV9wb3RlbnRpYWxseUNoYW5nZWRBY3Rpdml0eVN0 YXRlRmxhZ3MgPSB7IH07CiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hhbmdlV2FudHNTeW5jaHJvbm91 c1JlcGx5ID0gZmFsc2U7CiAgICAgbV92aWV3V2FzRXZlckluV2luZG93IHw9IGlzTm93SW5XaW5k b3c7CisKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogbV9h Y3Rpdml0eVN0YXRlVXBkYXRlQ2FsbGJhY2tzKQorICAgICAgICBjYWxsYmFjaygpOworICAgIG1f YWN0aXZpdHlTdGF0ZVVwZGF0ZUNhbGxiYWNrcy5jbGVhcigpOworI2VuZGlmCiB9CiAKIGJvb2wg V2ViUGFnZVByb3h5Ojppc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkZDJjMzRjZWExNjA4MmI2Yzg4YWU3NDUz MDcyZmQyZGE3OWEyOTM2Li4wOTE1ZDJkZDE1MzlmYWZjNDgyMzZlYjVkMDE0ZGI3MWUwOTFjMDJi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtOTAxLDYgKzkwMSw3 IEBAIHB1YmxpYzoKICAgICBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEq IHNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YSgpIHsgcmV0dXJuIG1fc2Nyb2xsaW5nUGVyZm9ybWFu Y2VEYXRhLmdldCgpOyB9CiAKICAgICB2b2lkIHNjaGVkdWxlQWN0aXZpdHlTdGF0ZVVwZGF0ZSgp OworICAgIHZvaWQgYWRkQWN0aXZpdHlTdGF0ZVVwZGF0ZUNvbXBsZXRpb25IYW5kbGVyKENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAjZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpCiAKICAg ICB2b2lkIGNoYW5nZUZvbnRBdHRyaWJ1dGVzKFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVDaGFuZ2Vz JiYpOwpAQCAtMjczNyw2ICsyNzM4LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2Nyb2xsUGVy Zm9ybWFuY2VEYXRhQ29sbGVjdGlvbkVuYWJsZWQgeyBmYWxzZSB9OwogCiAgICAgYm9vbCBtX2hh c1NjaGVkdWxlZEFjdGl2aXR5U3RhdGVVcGRhdGUgeyBmYWxzZSB9OworICAgIFZlY3RvcjxDb21w bGV0aW9uSGFuZGxlcjx2b2lkKCk+PiBtX2FjdGl2aXR5U3RhdGVVcGRhdGVDYWxsYmFja3M7CiAj ZW5kaWYKICAgICBVc2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyOjpUb2tlbiBtX3BhZ2VJc1VzZXJP YnNlcnZhYmxlQ291bnQ7CiAgICAgUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRUb2tlbiBtX3By ZXZlbnRQcm9jZXNzU3VwcHJlc3Npb25Db3VudDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxNzIzYmI1MTcwODk5MTgyMjlmZTNlOWFkNDBkNDNm Njg1NjZiOGU4Li40OGQ3ZGJiZmI2OWJkMDcyNDZhZmM1Y2MyYzZmNGJkYmM4YzMyOTlhIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMjAtMDktMDggIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAg ICAgICAgUkVHUkVTU0lPTiAocjI2NjYzNCk6IFttYWNPUyByZWxlYXNlXSA0IGxheW91dCB0ZXN0 cyBiZWNhbWUgZmxha3kgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNjI3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg1MTUyNDI+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxlckNvY29hLm1tOgorICAgICAgICAo V1RSOjpVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6cmVtb3ZlVmlld0Zyb21XaW5kb3cpOgorICAg ICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6YWRkVmlld1RvV2luZG93KToKKwog MjAyMC0wOS0wOCAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAog ICAgICAgICBbV2luQ2Fpcm9dIFRlc3RXVEYuV1RGLlVuaXF1ZVJlZiBpcyBjcmFzaGluZyBpbiBE ZWJ1ZyBidWlsZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVUlT Y3JpcHRDb250cm9sbGVyQ29jb2EubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1VJ U2NyaXB0Q29udHJvbGxlckNvY29hLm1tCmluZGV4IGE4MmNjMzU1Y2Q3ZmU5OTU1N2E0MWQ2MjIx NTY2ZDcwMGMzNGY3NzguLjcyZDNiOGU1YjUyZGQ5ZjFhMjI0MmVmYTExNGI3YTE5YjgzN2Q4ZmQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVUlTY3JpcHRDb250cm9s bGVyQ29jb2EubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9VSVNjcmlwdENv bnRyb2xsZXJDb2NvYS5tbQpAQCAtOTgsNyArOTgsNyBAQCB2b2lkIFVJU2NyaXB0Q29udHJvbGxl ckNvY29hOjpyZW1vdmVWaWV3RnJvbVdpbmRvdyhKU1ZhbHVlUmVmIGNhbGxiYWNrKQogICAgIG1h aW5XZWJWaWV3LT5yZW1vdmVGcm9tV2luZG93KCk7CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAg W21haW5XZWJWaWV3LT5wbGF0Zm9ybVZpZXcoKSBfZG9BZnRlck5leHRQcmVzZW50YXRpb25VcGRh dGU6XnsKKyAgICBbbWFpbldlYlZpZXctPnBsYXRmb3JtVmlldygpIF9kb0FmdGVyQWN0aXZpdHlT dGF0ZVVwZGF0ZTpeewogICAgICAgICBpZiAoIW1fY29udGV4dCkKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgbV9jb250ZXh0LT5hc3luY1Rhc2tDb21wbGV0ZShjYWxsYmFja0lEKTsKQEAg LTExOCw3ICsxMTgsNyBAQCB2b2lkIFVJU2NyaXB0Q29udHJvbGxlckNvY29hOjphZGRWaWV3VG9X aW5kb3coSlNWYWx1ZVJlZiBjYWxsYmFjaykKICAgICBtYWluV2ViVmlldy0+YWRkVG9XaW5kb3co KTsKIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICBbbWFpbldlYlZpZXctPnBsYXRmb3JtVmlldygp IF9kb0FmdGVyTmV4dFByZXNlbnRhdGlvblVwZGF0ZTpeeworICAgIFttYWluV2ViVmlldy0+cGxh dGZvcm1WaWV3KCkgX2RvQWZ0ZXJBY3Rpdml0eVN0YXRlVXBkYXRlOl57CiAgICAgICAgIGlmICgh bV9jb250ZXh0KQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtX2NvbnRleHQtPmFzeW5j VGFza0NvbXBsZXRlKGNhbGxiYWNrSUQpOwo= 408403 2020-09-09 19:42:04 -0700 2020-09-09 23:04:39 -0700 Patch bug-216275-20200909194202.patch text/plain 12611 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjYmJkMTUyMTYxOTUwMTJm N2E1MzlmOGExY2ZmN2YxYjcyYjhlMTQuLjZkZjBmZDk0OTBiZjY5ZTI4NjUwZjY2NGRhYWJiMzdi NWMzM2I5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMDktMDkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NjYzNCk6 IFttYWNPUyByZWxlYXNlXSA0IGxheW91dCB0ZXN0cyBiZWNhbWUgZmxha3kgZmFpbHVyZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjI3NQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjg1MTUyNDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWZ0ZXIgcjI2NjYzNCwgYWN0aXZpdHkgc3RhdGUgY2hh bmdlcyBjYXVzZWQgYnkgYWRkaW5nL3JlbW92aW5nIHZpZXcgd2lsbCBub3QgYmUgZGlzcGF0Y2hl ZCB0byB3ZWIgcHJvY2VzcyB1bnRpbAorICAgICAgICB0cmFuc2F0aW9uIGlzIGNvbW1pdHRlZCBp biBVSSBwcm9jZXNzLiBUbyBtYWtlIHN1cmUgd2ViIHByb2Nlc3MgcGlja3MgdXAgdGhlIGNoYW5n ZXMsIHdlIG5lZWQgdG8gaW52b2tlIHRoZSAKKyAgICAgICAgY2FsbGJhY2tzIGFmdGVyIGFjdGl2 aXR5IHN0YXRlIGNoYW5nZXMgYXJlIGRpc3BhdGNoZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kb0FmdGVyQWN0 aXZpdHlTdGF0ZVVwZGF0ZTpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlld1ByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29j b2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6YWRkQWN0aXZpdHlTdGF0ZVVw ZGF0ZUNvbXBsZXRpb25IYW5kbGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaXNwYXRjaEFjdGl2aXR5U3Rh dGVDaGFuZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKwogMjAyMC0w OS0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Np b24ocjI2MDYxNCkgUG93ZXIgdXNhZ2UgaGFzIGluY3JlYXNlZCBkdWUgdG8gZXh0cmEgdGhyZWFk IGhvcHBpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCmluZGV4IGNlNTE0YjkyMTFjNDhhNjI4YmE3YzZiNmNmZDU1MjBlNTk4YTYyZWYuLjQ0MTc4 OGEwMTQ4Yjk1M2ZkZTU2MzFiZGRkNTczM2RmNDI0ZjJmNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMjY4Myw2ICsyNjgzLDExIEBA IHN0YXRpYyBpbmxpbmUgT3B0aW9uU2V0PFdlYktpdDo6RmluZE9wdGlvbnM+IHRvRmluZE9wdGlv bnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kCiAgICAgX3BhZ2UtPnNldENhblVzZUNyZWRlbnRpYWxT dG9yYWdlKGNhblVzZUNyZWRlbnRpYWxTdG9yYWdlKTsKIH0KIAorLSAodm9pZClfZG9BZnRlckFj dGl2aXR5U3RhdGVVcGRhdGU6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyCit7Cisg ICAgX3BhZ2UtPmFkZEFjdGl2aXR5U3RhdGVVcGRhdGVDb21wbGV0aW9uSGFuZGxlcihtYWtlQmxv Y2tQdHIoY29tcGxldGlvbkhhbmRsZXIpKTsKK30KKwogLSAoaWQgPF9XS0lucHV0RGVsZWdhdGU+ KV9pbnB1dERlbGVnYXRlCiB7CiAgICAgcmV0dXJuIF9pbnB1dERlbGVnYXRlLmdldEF1dG9yZWxl YXNlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdQcml2YXRlLmgKaW5kZXggMDcxNGIxN2FhNzk1Nzg3NzI1YjBiZGUwYjdlY2ZhODgyMTdl ZjdjMC4uYmE3NWI1NDBhNWI2YjZhOTI2ZmU1OThkN2Q1Y2MzMmFjMjQwNTg5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5o CkBAIC0zNTQsNiArMzU0LDggQEAgZm9yIHRoaXMgcHJvcGVydHkuCiAKIEBwcm9wZXJ0eSAobm9u YXRvbWljLCBzZXR0ZXI9X3NldENhblVzZUNyZWRlbnRpYWxTdG9yYWdlOikgQk9PTCBfY2FuVXNl Q3JlZGVudGlhbFN0b3JhZ2UgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9z KFdLX0lPU19UQkEpKTsKIAorLSAodm9pZClfZG9BZnRlckFjdGl2aXR5U3RhdGVVcGRhdGU6KHZv aWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tf TUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisKIEBlbmQKIAogI2lmIFRBUkdFVF9PU19JUEhP TkUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94 eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29j b2EubW0KaW5kZXggMGZmZTljMTZiOGRlYjA3ZThmZWNhYTRjMzQ0NDE4NzFhMWY5Yjk0Yi4uYWM5 ZjNjYTRhMzc5MmVjZmMyNTU5ZWUxMTg3ZWZjZTVkNmI0NWU2NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KQEAgLTUyNyw2ICs1 MjcsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNjaGVkdWxlQWN0aXZpdHlTdGF0ZVVwZGF0ZSgp CiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hhbmdlRGlzcGF0Y2hlci0+c2NoZWR1bGUoKTsKIH0KIAor dm9pZCBXZWJQYWdlUHJveHk6OmFkZEFjdGl2aXR5U3RhdGVVcGRhdGVDb21wbGV0aW9uSGFuZGxl cihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAg aWYgKCFtX2hhc1NjaGVkdWxlZEFjdGl2aXR5U3RhdGVVcGRhdGUpIHsKKyAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fYWN0aXZpdHlT dGF0ZVVwZGF0ZUNhbGxiYWNrcy5hcHBlbmQoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor fQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI3VuZGVmIE1FU1NBR0VfQ0hFQ0tfQ09NUExF VElPTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZjMzZjJi MDNlZmZkMzY3MWRjNTJhMjY5MzQxMGMxOTMyNGZiNjEzYS4uNGJhZTNjMGJmYWU1NmI3YTcyYzMw MTA1MGI5NmRiMWFhZDAxZjk3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCkBAIC0yMDU2LDYgKzIwNTYsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpc3BhdGNo QWN0aXZpdHlTdGF0ZUNoYW5nZSgpCiAgICAgbV9wb3RlbnRpYWxseUNoYW5nZWRBY3Rpdml0eVN0 YXRlRmxhZ3MgPSB7IH07CiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hhbmdlV2FudHNTeW5jaHJvbm91 c1JlcGx5ID0gZmFsc2U7CiAgICAgbV92aWV3V2FzRXZlckluV2luZG93IHw9IGlzTm93SW5XaW5k b3c7CisKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogbV9h Y3Rpdml0eVN0YXRlVXBkYXRlQ2FsbGJhY2tzKQorICAgICAgICBjYWxsYmFjaygpOworICAgIG1f YWN0aXZpdHlTdGF0ZVVwZGF0ZUNhbGxiYWNrcy5jbGVhcigpOworI2VuZGlmCiB9CiAKIGJvb2wg V2ViUGFnZVByb3h5Ojppc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkZDJjMzRjZWExNjA4MmI2Yzg4YWU3NDUz MDcyZmQyZGE3OWEyOTM2Li4wOTE1ZDJkZDE1MzlmYWZjNDgyMzZlYjVkMDE0ZGI3MWUwOTFjMDJi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtOTAxLDYgKzkwMSw3 IEBAIHB1YmxpYzoKICAgICBSZW1vdGVMYXllclRyZWVTY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEq IHNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YSgpIHsgcmV0dXJuIG1fc2Nyb2xsaW5nUGVyZm9ybWFu Y2VEYXRhLmdldCgpOyB9CiAKICAgICB2b2lkIHNjaGVkdWxlQWN0aXZpdHlTdGF0ZVVwZGF0ZSgp OworICAgIHZvaWQgYWRkQWN0aXZpdHlTdGF0ZVVwZGF0ZUNvbXBsZXRpb25IYW5kbGVyKENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAjZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpCiAKICAg ICB2b2lkIGNoYW5nZUZvbnRBdHRyaWJ1dGVzKFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVDaGFuZ2Vz JiYpOwpAQCAtMjczNyw2ICsyNzM4LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fc2Nyb2xsUGVy Zm9ybWFuY2VEYXRhQ29sbGVjdGlvbkVuYWJsZWQgeyBmYWxzZSB9OwogCiAgICAgYm9vbCBtX2hh c1NjaGVkdWxlZEFjdGl2aXR5U3RhdGVVcGRhdGUgeyBmYWxzZSB9OworICAgIFZlY3RvcjxDb21w bGV0aW9uSGFuZGxlcjx2b2lkKCk+PiBtX2FjdGl2aXR5U3RhdGVVcGRhdGVDYWxsYmFja3M7CiAj ZW5kaWYKICAgICBVc2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyOjpUb2tlbiBtX3BhZ2VJc1VzZXJP YnNlcnZhYmxlQ291bnQ7CiAgICAgUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRUb2tlbiBtX3By ZXZlbnRQcm9jZXNzU3VwcHJlc3Npb25Db3VudDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYWNhOWU4YWUwNjllMDA2MzE1NDRkODkxMzQ4NmFm M2E3MDMyNTczLi5mNjVjMTZjNjJlZDM2N2MxNWZlNTFiMzVmOTJjNDVlY2NlYjVjOTJlIDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMjAtMDktMDkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAg ICAgICAgUkVHUkVTU0lPTiAocjI2NjYzNCk6IFttYWNPUyByZWxlYXNlXSA0IGxheW91dCB0ZXN0 cyBiZWNhbWUgZmxha3kgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNjI3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg1MTUyNDI+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxlckNvY29hLm1tOgorICAgICAgICAo V1RSOjpVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6cmVtb3ZlVmlld0Zyb21XaW5kb3cpOgorICAg ICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6YWRkVmlld1RvV2luZG93KToKKwog MjAyMC0wOS0wOSAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRkIFBoaWxpcHBlIE5vcm1hbmQgdG8gRVdTIGVtYWlscyB1bnN1YnNjcmliZSBsaXN0CmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxl ckNvY29hLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9VSVNjcmlwdENvbnRyb2xs ZXJDb2NvYS5tbQppbmRleCBhODJjYzM1NWNkN2ZlOTk1NTdhNDFkNjIyMTU2NmQ3MDBjMzRmNzc4 Li43MmQzYjhlNWI1MmRkOWYxYTIyNDJlZmExMTRiN2ExOWI4MzdkOGZkIDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxlckNvY29hLm1tCisr KyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY29jb2EvVUlTY3JpcHRDb250cm9sbGVyQ29jb2Eu bW0KQEAgLTk4LDcgKzk4LDcgQEAgdm9pZCBVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6cmVtb3Zl Vmlld0Zyb21XaW5kb3coSlNWYWx1ZVJlZiBjYWxsYmFjaykKICAgICBtYWluV2ViVmlldy0+cmVt b3ZlRnJvbVdpbmRvdygpOwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFttYWluV2ViVmlldy0+ cGxhdGZvcm1WaWV3KCkgX2RvQWZ0ZXJOZXh0UHJlc2VudGF0aW9uVXBkYXRlOl57CisgICAgW21h aW5XZWJWaWV3LT5wbGF0Zm9ybVZpZXcoKSBfZG9BZnRlckFjdGl2aXR5U3RhdGVVcGRhdGU6XnsK ICAgICAgICAgaWYgKCFtX2NvbnRleHQpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1f Y29udGV4dC0+YXN5bmNUYXNrQ29tcGxldGUoY2FsbGJhY2tJRCk7CkBAIC0xMTgsNyArMTE4LDcg QEAgdm9pZCBVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6YWRkVmlld1RvV2luZG93KEpTVmFsdWVS ZWYgY2FsbGJhY2spCiAgICAgbWFpbldlYlZpZXctPmFkZFRvV2luZG93KCk7CiAKICNpZiBQTEFU Rk9STShNQUMpCi0gICAgW21haW5XZWJWaWV3LT5wbGF0Zm9ybVZpZXcoKSBfZG9BZnRlck5leHRQ cmVzZW50YXRpb25VcGRhdGU6XnsKKyAgICBbbWFpbldlYlZpZXctPnBsYXRmb3JtVmlldygpIF9k b0FmdGVyQWN0aXZpdHlTdGF0ZVVwZGF0ZTpeewogICAgICAgICBpZiAoIW1fY29udGV4dCkKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgbV9jb250ZXh0LT5hc3luY1Rhc2tDb21wbGV0ZShj YWxsYmFja0lEKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCAxNWVhZjY5ZGQ4MzY3MDU2YWFmNDAxZmEwNzcyMTA0NWY2ZDky ODU3Li5kZTM1NDVjMDYzNjkxYzYyOGNiOTJkYmM0YTk4OTc4YzZmNzYxYTc4IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTYgQEAKKzIwMjAtMDktMDkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+ CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NjYzNCk6IFttYWNPUyByZWxlYXNlXSA0IGxheW91 dCB0ZXN0cyBiZWNhbWUgZmxha3kgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjI3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg1 MTUyNDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIG1vcmUgZXZlbnQgaGFuZGxlcnMgdG8gbWFrZSB0ZXN0IG1vcmUgc3RhYmxlLCBhbmQgYWRk IGV4dHJhIGxvZ2dpbmcgZm9yIGRlYnVnZ2luZy4KKworICAgICAgICAqIGZhc3QvZXZlbnRzL3Bh Z2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92ZS10ZXN0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBm YXN0L2V2ZW50cy9wYWdlLXZpc2liaWxpdHktaWZyYW1lLW1vdmUtdGVzdC5odG1sOgorCiAyMDIw LTA5LTA0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtXZWJYUl0gSW1wbGVtZW50IFhSU2Vzc2lvbiBlbmQgZXZlbnQKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92ZS10ZXN0LWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1pZnJh bWUtbW92ZS10ZXN0LWV4cGVjdGVkLnR4dAppbmRleCA5YzA1ZjhhOGJiNzE2M2QyMGEzODgwZmVj M2FjNmM2ODhhOTRmYjkwLi5jMzk4Yjk1OWEwNDA0MzllN2VjMzUyMWY5YzEwNjAyYTc3NjIxOTNl IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wYWdlLXZpc2liaWxpdHktaWZy YW1lLW1vdmUtdGVzdC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMv cGFnZS12aXNpYmlsaXR5LWlmcmFtZS1tb3ZlLXRlc3QtZXhwZWN0ZWQudHh0CkBAIC0zLDE1ICsz LDE2IEBAIFRoaXMgdGVzdCBjaGVja3MgdGhhdCBhbiBpZnJhbWUgdGhhdCBtb3ZlcyBiZXR3ZWVu IHBhZ2VzIHdpdGggZGlmZmVyZW50IHZpc2liaWxpCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CiAKIAotV2luZG93IDEgTG9hZGVkCi1XaW5kb3cgMiBMb2FkZWQKK1dpbmRvdyAxIGlzIGxvYWRl ZAorV2luZG93IDIgaXMgbG9hZGVkCiBQQVNTIHdpbmRvdy5kb2N1bWVudC5oaWRkZW4gaXMgZmFs c2UKIFBBU1Mgd2luZG93Mi5kb2N1bWVudC5oaWRkZW4gaXMgZmFsc2UKIFBBU1MgaWZyYW1lLmNv bnRlbnREb2N1bWVudC5oaWRkZW4gaXMgZmFsc2UKK1Zpc2liaWxpdHlDaGFuYWdlIGV2ZW50IGlz IHJlY2VpdmVkCiBQQVNTIHdpbmRvdy5kb2N1bWVudC5oaWRkZW4gaXMgdHJ1ZQogUEFTUyB3aW5k b3cyLmRvY3VtZW50LmhpZGRlbiBpcyBmYWxzZQogUEFTUyBpZnJhbWUuY29udGVudERvY3VtZW50 LmhpZGRlbiBpcyBmYWxzZQotQWRvcHRlZCBpZnJhbWUgdG8gV2luZG93IDEKK0ZyYW1lIGlzIG1v dmVkCiBQQVNTIHdpbmRvdy5kb2N1bWVudC5oaWRkZW4gaXMgdHJ1ZQogUEFTUyB3aW5kb3cyLmRv Y3VtZW50LmhpZGRlbiBpcyBmYWxzZQogUEFTUyBpZnJhbWUuY29udGVudERvY3VtZW50LmhpZGRl biBpcyB0cnVlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wYWdlLXZpc2li aWxpdHktaWZyYW1lLW1vdmUtdGVzdC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGFn ZS12aXNpYmlsaXR5LWlmcmFtZS1tb3ZlLXRlc3QuaHRtbAppbmRleCAxMzYwMDg0MmRkODMzZWQy NmQyZWNlMDRlODVkZGIwNGI1NDg1ZjI0Li5hZjMyOGU3OTc5Nzg4MWRjMjA4YzcxNTdiYTMzMGM2 ZTRiODE1N2Q1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wYWdlLXZpc2li aWxpdHktaWZyYW1lLW1vdmUtdGVzdC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRz L3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92ZS10ZXN0Lmh0bWwKQEAgLTgsNjYgKzgsNzYgQEAK IGRlc2NyaXB0aW9uKCJUaGlzIHRlc3QgY2hlY2tzIHRoYXQgYW4gaWZyYW1lIHRoYXQgbW92ZXMg YmV0d2VlbiBwYWdlcyB3aXRoIGRpZmZlcmVudCB2aXNpYmlsaXR5IHdpbGwgaGF2ZSB0aGUgY29y cmVjdCB2aXNpYmlsaXR5IHZhbHVlLiIpOwogCiB2YXIganNUZXN0SXNBc3luYyA9IHRydWU7Ci0K IHZhciB3aW5kb3cyLCBpZnJhbWU7Ci12YXIgbnVtVmlzaWJpbGl0eUNoYW5nZXMgPSAwOworCitm dW5jdGlvbiBzdGFydFRlc3QoKSB7CisgICAgaWYgKCF3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAg ICAgcmV0dXJuOworICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIHRlc3RSdW5u ZXIuc2V0Q2FuT3BlbldpbmRvd3MoKTsKKworICAgIGRlYnVnKCJXaW5kb3cgMSBpcyBsb2FkZWQi KTsKKworICAgIGlmICh3aW5kb3cuZG9jdW1lbnQuaGlkZGVuKSB7CisgICAgICAgIGRvY3VtZW50 LmFkZEV2ZW50TGlzdGVuZXIoInZpc2liaWxpdHljaGFuZ2UiLCBvcGVuV2luZG93LCBmYWxzZSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBvcGVuV2luZG93KCk7Cit9CisKK2Z1bmN0 aW9uIG9wZW5XaW5kb3coKSB7CisgICAgd2luZG93MiA9IHdpbmRvdy5vcGVuKCJyZXNvdXJjZXMv cGFnZS12aXNpYmlsaXR5LWlmcmFtZS1tb3ZlLW5ldy1wYWdlLmh0bWwiKTsKKyAgICB3aW5kb3cy LmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCB3aW5kb3cyTG9hZGVkLCBmYWxzZSk7Cit9CiAKIGZ1 bmN0aW9uIHdpbmRvdzJMb2FkZWQoKSB7Ci0gICAgZGVidWcoIldpbmRvdyAyIExvYWRlZCIpOwor ICAgIGRlYnVnKCJXaW5kb3cgMiBpcyBsb2FkZWQiKTsKKworICAgIGlmICh3aW5kb3cyLmRvY3Vt ZW50LmhpZGRlbikgeworICAgICAgICB3aW5kb3cyLmRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIo InZpc2liaWxpdHljaGFuZ2UiLCBjaGFuZ2VQYWdlVmlzaWJpbGl0eSwgZmFsc2UpOworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgY2hhbmdlUGFnZVZpc2liaWxpdHkoKTsKK30KIAorZnVu Y3Rpb24gY2hhbmdlUGFnZVZpc2liaWxpdHkoKSB7CiAgICAgaWZyYW1lID0gd2luZG93Mi5kb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiaWZyYW1lIik7CiAKICAgICBzaG91bGRCZUZhbHNlKCJ3aW5k b3cuZG9jdW1lbnQuaGlkZGVuIik7CiAgICAgc2hvdWxkQmVGYWxzZSgid2luZG93Mi5kb2N1bWVu dC5oaWRkZW4iKTsKICAgICBzaG91bGRCZUZhbHNlKCJpZnJhbWUuY29udGVudERvY3VtZW50Lmhp ZGRlbiIpOwogCi0gICAgLy8gQ2hhbmdlIHRoZSB2aXNpYmlsaXR5IG9mIHRoZSBjdXJyZW50IHBh Z2UgdG8gaW52aXNpYmxlLgotICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewotICAgICAgICBu dW1WaXNpYmlsaXR5Q2hhbmdlcysrOworICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoInZp c2liaWxpdHljaGFuZ2UiLCBvblZpc2liaWxpdHlDaGFuZ2UsIGZhbHNlKTsKKyAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpCiAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVyLnNldFBhZ2VWaXNpYmls aXR5KCJoaWRkZW4iKTsKLSAgICB9CiB9CiAKIGZ1bmN0aW9uIG9uVmlzaWJpbGl0eUNoYW5nZSgp IHsKKyAgICBkZWJ1ZygiVmlzaWJpbGl0eUNoYW5hZ2UgZXZlbnQgaXMgcmVjZWl2ZWQiKTsKKwog ICAgIHNob3VsZEJlVHJ1ZSgid2luZG93LmRvY3VtZW50LmhpZGRlbiIpOwogICAgIHNob3VsZEJl RmFsc2UoIndpbmRvdzIuZG9jdW1lbnQuaGlkZGVuIik7CiAgICAgc2hvdWxkQmVGYWxzZSgiaWZy YW1lLmNvbnRlbnREb2N1bWVudC5oaWRkZW4iKTsKIAogICAgIHdpbmRvdy5kb2N1bWVudC5hZG9w dE5vZGUoaWZyYW1lKTsKICAgICB3aW5kb3cuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChpZnJh bWUpOwotICAgIGRlYnVnKCJBZG9wdGVkIGlmcmFtZSB0byBXaW5kb3cgMSIpOwogCisgICAgZGVi dWcoIkZyYW1lIGlzIG1vdmVkIikKICAgICBzaG91bGRCZVRydWUoIndpbmRvdy5kb2N1bWVudC5o aWRkZW4iKTsKICAgICBzaG91bGRCZUZhbHNlKCJ3aW5kb3cyLmRvY3VtZW50LmhpZGRlbiIpOwog ICAgIHNob3VsZEJlVHJ1ZSgiaWZyYW1lLmNvbnRlbnREb2N1bWVudC5oaWRkZW4iKTsKIAotICAg IHdpbmRvdzIuY2xvc2UoKTsKLQogICAgIGZpbmlzaFRlc3QoKTsKIH0KIAotZnVuY3Rpb24gc3Rh cnRUZXN0KCkgewotICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewotICAgICAgICB0ZXN0UnVu bmVyLndhaXRVbnRpbERvbmUoKTsKLSAgICAgICAgdGVzdFJ1bm5lci5zZXRDYW5PcGVuV2luZG93 cygpOwotICAgIH0KLQotICAgIGRlYnVnKCJXaW5kb3cgMSBMb2FkZWQiKTsKLSAgICBkb2N1bWVu dC5hZGRFdmVudExpc3RlbmVyKCJ2aXNpYmlsaXR5Y2hhbmdlIiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG9uVmlzaWJpbGl0eUNoYW5nZSwgZmFsc2UpOwotCi0gICAgd2luZG93MiA9 IHdpbmRvdy5vcGVuKCJyZXNvdXJjZXMvcGFnZS12aXNpYmlsaXR5LWlmcmFtZS1tb3ZlLW5ldy1w YWdlLmh0bWwiKTsKLSAgICB3aW5kb3cyLmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCB3aW5kb3cy TG9hZGVkLCBmYWxzZSk7Ci19Ci0KIGZ1bmN0aW9uIGZpbmlzaFRlc3QoKSB7Ci0gICAgZG9jdW1l bnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigidmlzaWJpbGl0eWNoYW5nZSIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBvblZpc2liaWxpdHlDaGFuZ2UsIGZhbHNlKTsKKyAgICB3aW5kb3cy LmNsb3NlKCk7CisgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigidmlzaWJpbGl0eWNo YW5nZSIsIG9uVmlzaWJpbGl0eUNoYW5nZSwgZmFsc2UpOwogICAgIHdpbmRvdzIucmVtb3ZlRXZl bnRMaXN0ZW5lcigibG9hZCIsIHdpbmRvdzJMb2FkZWQsIGZhbHNlKTsKKyAgICB3aW5kb3cyLmRv Y3VtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInZpc2liaWxpdHljaGFuZ2UiLCBjaGFuZ2VQYWdl VmlzaWJpbGl0eSwgZmFsc2UpOwogCi0gICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7Ci0gICAg ICAgIHRlc3RSdW5uZXIucmVzZXRQYWdlVmlzaWJpbGl0eSgpOwotICAgIH0KICAgICBmaW5pc2hK U1Rlc3QoKTsKIH0KIAo= 408415 2020-09-09 23:04:40 -0700 2020-09-10 11:50:49 -0700 Patch bug-216275-20200909230439.patch text/plain 12480 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIzYmE5MzE4M2YzZDM5Y2Ni NGUzYTcwODI3ZWEzNjhlZWVkYTliZjguLjBhYmFlN2NlODhhYjUxYWNiNDQ5MDBmZDgwNGZjYmM2 NDI1OTMzODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMDktMDkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjY2NjM0KTog W21hY09TIHJlbGVhc2VdIDQgbGF5b3V0IHRlc3RzIGJlY2FtZSBmbGFreSBmYWlsdXJlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2Mjc1CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82ODUxNTI0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZnRlciByMjY2NjM0LCBhY3Rpdml0eSBzdGF0ZSBjaGFu Z2VzIGNhdXNlZCBieSBhZGRpbmcvcmVtb3ZpbmcgdmlldyB3aWxsIG5vdCBiZSBkaXNwYXRjaGVk IHRvIHdlYiBwcm9jZXNzIHVudGlsCisgICAgICAgIHRyYW5zYWN0aW9uIGlzIGNvbW1pdHRlZCBp biBVSSBwcm9jZXNzLiBUbyBtYWtlIHN1cmUgd2ViIHByb2Nlc3MgcGlja3MgdXAgdGhlIGNoYW5n ZXMsIHdlIG5lZWQgdG8gaW52b2tlIHRoZSAKKyAgICAgICAgY2FsbGJhY2tzIGFmdGVyIGFjdGl2 aXR5IHN0YXRlIGNoYW5nZXMgYXJlIGRpc3BhdGNoZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nLmg6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcg X2RvQWZ0ZXJBY3Rpdml0eVN0YXRlVXBkYXRlOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9XZWJQYWdlUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojph ZGRBY3Rpdml0eVN0YXRlVXBkYXRlQ29tcGxldGlvbkhhbmRsZXIpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRp c3BhdGNoQWN0aXZpdHlTdGF0ZUNoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oOgorCiAyMDIwLTA5LTA5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu Y29tPgogCiAgICAgICAgIG1hY0NhdGFseXN0OiBGb3JtIGNvbnRyb2xzIGJlaGF2ZSBzdHJhbmdl bHkgKGxpa2UgaVBob25lKSBpbiBtYWNPUy1pZGlvbSBhcHBzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZUZvclRlc3RpbmcuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlRm9yVGVz dGluZy5oCmluZGV4IDM4YmM3MjIwOTE4MzJhMzJhYzE5NGMzMWQ1YmM5MjNmMjFhOWNhOTYuLjlj NDViZWViYmQyNTc1MWFmY2EwNDAyMGMwODZkMzFjNGJhZTdhMmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZy5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRl Rm9yVGVzdGluZy5oCkBAIC03NSw0ICs3NSw2IEBAIHR5cGVkZWYgZW51bSB7CiAtIChCT09MKV9o YXNTbGVlcERpc2FibGVyOwogLSAoV0tXZWJWaWV3QXVkaW9Sb3V0aW5nQXJiaXRyYXRpb25TdGF0 dXMpX2F1ZGlvUm91dGluZ0FyYml0cmF0aW9uU3RhdHVzOwogLSAoZG91YmxlKV9hdWRpb1JvdXRp bmdBcmJpdHJhdGlvblVwZGF0ZVRpbWU7CisKKy0gKHZvaWQpX2RvQWZ0ZXJBY3Rpdml0eVN0YXRl VXBkYXRlOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcjsKIEBlbmQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdUZXN0aW5nLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1Rlc3RpbmcubW0K aW5kZXggMzBhMWU0N2YzNDQyNGJiNTE1MDU3MzkxNjJjZWU4OGE0N2Q4MDYzYi4uMTkwYjY1NTZh ZWQ1YTYwYjM3MjgxNTFmNTI3ZWRkZmM4ZGFhYTY5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1Rlc3RpbmcubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1Rlc3RpbmcubW0KQEAgLTI3MSw0ICsy NzEsOSBAQAogI2VuZGlmCiB9CiAKKy0gKHZvaWQpX2RvQWZ0ZXJBY3Rpdml0eVN0YXRlVXBkYXRl Oih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIF9wYWdlLT5hZGRBY3Rp dml0eVN0YXRlVXBkYXRlQ29tcGxldGlvbkhhbmRsZXIobWFrZUJsb2NrUHRyKGNvbXBsZXRpb25I YW5kbGVyKSk7Cit9CisKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViUGFnZVByb3h5Q29jb2EubW0KaW5kZXggMGZmZTljMTZiOGRlYjA3ZThmZWNhYTRjMzQ0 NDE4NzFhMWY5Yjk0Yi4uYWM5ZjNjYTRhMzc5MmVjZmMyNTU5ZWUxMTg3ZWZjZTVkNmI0NWU2NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29j b2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29j b2EubW0KQEAgLTUyNyw2ICs1MjcsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNjaGVkdWxlQWN0 aXZpdHlTdGF0ZVVwZGF0ZSgpCiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hhbmdlRGlzcGF0Y2hlci0+ c2NoZWR1bGUoKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmFkZEFjdGl2aXR5U3RhdGVVcGRh dGVDb21wbGV0aW9uSGFuZGxlcihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlv bkhhbmRsZXIpCit7CisgICAgaWYgKCFtX2hhc1NjaGVkdWxlZEFjdGl2aXR5U3RhdGVVcGRhdGUp IHsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIG1fYWN0aXZpdHlTdGF0ZVVwZGF0ZUNhbGxiYWNrcy5hcHBlbmQoV1RGTW92ZShjb21w bGV0aW9uSGFuZGxlcikpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI3VuZGVmIE1F U1NBR0VfQ0hFQ0tfQ09NUExFVElPTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKaW5kZXggZjMzZjJiMDNlZmZkMzY3MWRjNTJhMjY5MzQxMGMxOTMyNGZiNjEzYS4uNGJh ZTNjMGJmYWU1NmI3YTcyYzMwMTA1MGI5NmRiMWFhZDAxZjk3NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0yMDU2LDYgKzIwNTYsMTIgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpc3BhdGNoQWN0aXZpdHlTdGF0ZUNoYW5nZSgpCiAgICAgbV9wb3RlbnRpYWxs eUNoYW5nZWRBY3Rpdml0eVN0YXRlRmxhZ3MgPSB7IH07CiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hh bmdlV2FudHNTeW5jaHJvbm91c1JlcGx5ID0gZmFsc2U7CiAgICAgbV92aWV3V2FzRXZlckluV2lu ZG93IHw9IGlzTm93SW5XaW5kb3c7CisKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBmb3IgKGF1 dG8mIGNhbGxiYWNrIDogbV9hY3Rpdml0eVN0YXRlVXBkYXRlQ2FsbGJhY2tzKQorICAgICAgICBj YWxsYmFjaygpOworICAgIG1fYWN0aXZpdHlTdGF0ZVVwZGF0ZUNhbGxiYWNrcy5jbGVhcigpOwor I2VuZGlmCiB9CiAKIGJvb2wgV2ViUGFnZVByb3h5Ojppc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQo KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkZDJjMzRj ZWExNjA4MmI2Yzg4YWU3NDUzMDcyZmQyZGE3OWEyOTM2Li4wOTE1ZDJkZDE1MzlmYWZjNDgyMzZl YjVkMDE0ZGI3MWUwOTFjMDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aApAQCAtOTAxLDYgKzkwMSw3IEBAIHB1YmxpYzoKICAgICBSZW1vdGVMYXllclRyZWVTY3JvbGxp bmdQZXJmb3JtYW5jZURhdGEqIHNjcm9sbGluZ1BlcmZvcm1hbmNlRGF0YSgpIHsgcmV0dXJuIG1f c2Nyb2xsaW5nUGVyZm9ybWFuY2VEYXRhLmdldCgpOyB9CiAKICAgICB2b2lkIHNjaGVkdWxlQWN0 aXZpdHlTdGF0ZVVwZGF0ZSgpOworICAgIHZvaWQgYWRkQWN0aXZpdHlTdGF0ZVVwZGF0ZUNvbXBs ZXRpb25IYW5kbGVyKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAjZW5kaWYgLy8gUExB VEZPUk0oQ09DT0EpCiAKICAgICB2b2lkIGNoYW5nZUZvbnRBdHRyaWJ1dGVzKFdlYkNvcmU6OkZv bnRBdHRyaWJ1dGVDaGFuZ2VzJiYpOwpAQCAtMjczNyw2ICsyNzM4LDcgQEAgcHJpdmF0ZToKICAg ICBib29sIG1fc2Nyb2xsUGVyZm9ybWFuY2VEYXRhQ29sbGVjdGlvbkVuYWJsZWQgeyBmYWxzZSB9 OwogCiAgICAgYm9vbCBtX2hhc1NjaGVkdWxlZEFjdGl2aXR5U3RhdGVVcGRhdGUgeyBmYWxzZSB9 OworICAgIFZlY3RvcjxDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+PiBtX2FjdGl2aXR5U3RhdGVV cGRhdGVDYWxsYmFja3M7CiAjZW5kaWYKICAgICBVc2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyOjpU b2tlbiBtX3BhZ2VJc1VzZXJPYnNlcnZhYmxlQ291bnQ7CiAgICAgUHJvY2Vzc1N1cHByZXNzaW9u RGlzYWJsZWRUb2tlbiBtX3ByZXZlbnRQcm9jZXNzU3VwcHJlc3Npb25Db3VudDsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNGZhNTFjOGQ4MzE3 YWQ0YTVlNDc4YjNiMzVhOGY1MjJkNzY0NDZiLi4zOWRjNWI4NjkzNjkwZjk2YmM3NmZiYjE3YTA0 M2QzYTNmMDIwOTJjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDktMDkgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI2NjYzNCk6IFttYWNPUyByZWxl YXNlXSA0IGxheW91dCB0ZXN0cyBiZWNhbWUgZmxha3kgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjI3NQorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNjg1MTUyNDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxlckNv Y29hLm1tOgorICAgICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6cmVtb3ZlVmll d0Zyb21XaW5kb3cpOgorICAgICAgICAoV1RSOjpVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6YWRk Vmlld1RvV2luZG93KToKKwogMjAyMC0wOS0wOSAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlh LmNvbT4KIAogICAgICAgICBraWxsLW9sZC1wcm9jZXNzZXM6IEF2b2lkIGNhbGxpbmcga2lsbCBj b21tYW5kIHdpdGggZW1wdHkgc3RyaW5nIHdpdGggR05VIHhhcmdzCmRpZmYgLS1naXQgYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxlckNvY29hLm1tIGIvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9jb2NvYS9VSVNjcmlwdENvbnRyb2xsZXJDb2NvYS5tbQppbmRl eCBhODJjYzM1NWNkN2ZlOTk1NTdhNDFkNjIyMTU2NmQ3MDBjMzRmNzc4Li43MmQzYjhlNWI1MmRk OWYxYTIyNDJlZmExMTRiN2ExOWI4MzdkOGZkIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL2NvY29hL1VJU2NyaXB0Q29udHJvbGxlckNvY29hLm1tCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvY29jb2EvVUlTY3JpcHRDb250cm9sbGVyQ29jb2EubW0KQEAgLTk4LDcgKzk4 LDcgQEAgdm9pZCBVSVNjcmlwdENvbnRyb2xsZXJDb2NvYTo6cmVtb3ZlVmlld0Zyb21XaW5kb3co SlNWYWx1ZVJlZiBjYWxsYmFjaykKICAgICBtYWluV2ViVmlldy0+cmVtb3ZlRnJvbVdpbmRvdygp OwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFttYWluV2ViVmlldy0+cGxhdGZvcm1WaWV3KCkg X2RvQWZ0ZXJOZXh0UHJlc2VudGF0aW9uVXBkYXRlOl57CisgICAgW21haW5XZWJWaWV3LT5wbGF0 Zm9ybVZpZXcoKSBfZG9BZnRlckFjdGl2aXR5U3RhdGVVcGRhdGU6XnsKICAgICAgICAgaWYgKCFt X2NvbnRleHQpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1fY29udGV4dC0+YXN5bmNU YXNrQ29tcGxldGUoY2FsbGJhY2tJRCk7CkBAIC0xMTgsNyArMTE4LDcgQEAgdm9pZCBVSVNjcmlw dENvbnRyb2xsZXJDb2NvYTo6YWRkVmlld1RvV2luZG93KEpTVmFsdWVSZWYgY2FsbGJhY2spCiAg ICAgbWFpbldlYlZpZXctPmFkZFRvV2luZG93KCk7CiAKICNpZiBQTEFURk9STShNQUMpCi0gICAg W21haW5XZWJWaWV3LT5wbGF0Zm9ybVZpZXcoKSBfZG9BZnRlck5leHRQcmVzZW50YXRpb25VcGRh dGU6XnsKKyAgICBbbWFpbldlYlZpZXctPnBsYXRmb3JtVmlldygpIF9kb0FmdGVyQWN0aXZpdHlT dGF0ZVVwZGF0ZTpeewogICAgICAgICBpZiAoIW1fY29udGV4dCkKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgbV9jb250ZXh0LT5hc3luY1Rhc2tDb21wbGV0ZShjYWxsYmFja0lEKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA3ZTg2N2I0NmUzNTNhZTcyYTlkOWVhMjYwM2M4NmQ1YjY5OGM4ZjEwLi4xMjRhZDUxZjJk ZWMyNTlhMDQyMmYyZDM2Mjc0OTY1ODA5ZTdjNDkxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MjAtMDktMDkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUkVH UkVTU0lPTiAocjI2NjYzNCk6IFttYWNPUyByZWxlYXNlXSA0IGxheW91dCB0ZXN0cyBiZWNhbWUg Zmxha3kgZmFpbHVyZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNjI3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg1MTUyNDI+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1vcmUgZXZlbnQg aGFuZGxlcnMgdG8gbWFrZSB0ZXN0IG1vcmUgc3RhYmxlLCBhbmQgYWRkIGV4dHJhIGxvZ2dpbmcg Zm9yIGRlYnVnZ2luZy4KKworICAgICAgICAqIGZhc3QvZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1p ZnJhbWUtbW92ZS10ZXN0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9wYWdl LXZpc2liaWxpdHktaWZyYW1lLW1vdmUtdGVzdC5odG1sOgorCiAyMDIwLTA5LTA5ICBIZWN0b3Ig TG9wZXogIDxoZWN0b3JfaV9sb3BlekBhcHBsZS5jb20+CiAKICAgICAgICAgWyBtYWNPUyBpT1Mg XSBjb21wb3NpdGluZy9jbGlwcGluZy9ib3JkZXItcmFkaXVzLWFzeW5jLW92ZXJmbG93LXN0YWNr aW5nLmh0bWwgaXMgZmxha3kgZmFpbGluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92ZS10ZXN0LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92ZS10ZXN0LWV4 cGVjdGVkLnR4dAppbmRleCA5YzA1ZjhhOGJiNzE2M2QyMGEzODgwZmVjM2FjNmM2ODhhOTRmYjkw Li43ODNiNDNhY2ZjMTQ4ZDgxODkyOGY5MDFhZDI3ODcwZDYzNWQwMDk2IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wYWdlLXZpc2liaWxpdHktaWZyYW1lLW1vdmUtdGVzdC1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGFnZS12aXNpYmlsaXR5 LWlmcmFtZS1tb3ZlLXRlc3QtZXhwZWN0ZWQudHh0CkBAIC0zLDE1ICszLDE2IEBAIFRoaXMgdGVz dCBjaGVja3MgdGhhdCBhbiBpZnJhbWUgdGhhdCBtb3ZlcyBiZXR3ZWVuIHBhZ2VzIHdpdGggZGlm ZmVyZW50IHZpc2liaWxpCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBB U1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAotV2luZG93IDEg TG9hZGVkCi1XaW5kb3cgMiBMb2FkZWQKK1dpbmRvdyAxIGlzIGxvYWRlZAorV2luZG93IDIgaXMg bG9hZGVkCiBQQVNTIHdpbmRvdy5kb2N1bWVudC5oaWRkZW4gaXMgZmFsc2UKIFBBU1Mgd2luZG93 Mi5kb2N1bWVudC5oaWRkZW4gaXMgZmFsc2UKIFBBU1MgaWZyYW1lLmNvbnRlbnREb2N1bWVudC5o aWRkZW4gaXMgZmFsc2UKK1Zpc2liaWxpdHlDaGFuZ2UgZXZlbnQgaXMgcmVjZWl2ZWQKIFBBU1Mg d2luZG93LmRvY3VtZW50LmhpZGRlbiBpcyB0cnVlCiBQQVNTIHdpbmRvdzIuZG9jdW1lbnQuaGlk ZGVuIGlzIGZhbHNlCiBQQVNTIGlmcmFtZS5jb250ZW50RG9jdW1lbnQuaGlkZGVuIGlzIGZhbHNl Ci1BZG9wdGVkIGlmcmFtZSB0byBXaW5kb3cgMQorRnJhbWUgaXMgbW92ZWQKIFBBU1Mgd2luZG93 LmRvY3VtZW50LmhpZGRlbiBpcyB0cnVlCiBQQVNTIHdpbmRvdzIuZG9jdW1lbnQuaGlkZGVuIGlz IGZhbHNlCiBQQVNTIGlmcmFtZS5jb250ZW50RG9jdW1lbnQuaGlkZGVuIGlzIHRydWUKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92 ZS10ZXN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9wYWdlLXZpc2liaWxpdHktaWZy YW1lLW1vdmUtdGVzdC5odG1sCmluZGV4IDEzNjAwODQyZGQ4MzNlZDI2ZDJlY2UwNGU4NWRkYjA0 YjU0ODVmMjQuLmRlOGRiOTNlMTc5ZmRlNjIzZTg4MTIwOTRkZDI4YTY5MmM4MTNhNjYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92 ZS10ZXN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcGFnZS12aXNpYmlsaXR5 LWlmcmFtZS1tb3ZlLXRlc3QuaHRtbApAQCAtOCw2NiArOCw3NiBAQAogZGVzY3JpcHRpb24oIlRo aXMgdGVzdCBjaGVja3MgdGhhdCBhbiBpZnJhbWUgdGhhdCBtb3ZlcyBiZXR3ZWVuIHBhZ2VzIHdp dGggZGlmZmVyZW50IHZpc2liaWxpdHkgd2lsbCBoYXZlIHRoZSBjb3JyZWN0IHZpc2liaWxpdHkg dmFsdWUuIik7CiAKIHZhciBqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKLQogdmFyIHdpbmRvdzIsIGlm cmFtZTsKLXZhciBudW1WaXNpYmlsaXR5Q2hhbmdlcyA9IDA7CisKK2Z1bmN0aW9uIHN0YXJ0VGVz dCgpIHsKKyAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICByZXR1cm47CisgICAg dGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgdGVzdFJ1bm5lci5zZXRDYW5PcGVuV2lu ZG93cygpOworCisgICAgZGVidWcoIldpbmRvdyAxIGlzIGxvYWRlZCIpOworCisgICAgaWYgKHdp bmRvdy5kb2N1bWVudC5oaWRkZW4pIHsKKyAgICAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigidmlzaWJpbGl0eWNoYW5nZSIsIG9wZW5XaW5kb3csIGZhbHNlKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIG9wZW5XaW5kb3coKTsKK30KKworZnVuY3Rpb24gb3BlbldpbmRvdygp IHsKKyAgICB3aW5kb3cyID0gd2luZG93Lm9wZW4oInJlc291cmNlcy9wYWdlLXZpc2liaWxpdHkt aWZyYW1lLW1vdmUtbmV3LXBhZ2UuaHRtbCIpOworICAgIHdpbmRvdzIuYWRkRXZlbnRMaXN0ZW5l cigibG9hZCIsIHdpbmRvdzJMb2FkZWQsIGZhbHNlKTsKK30KIAogZnVuY3Rpb24gd2luZG93Mkxv YWRlZCgpIHsKLSAgICBkZWJ1ZygiV2luZG93IDIgTG9hZGVkIik7CisgICAgZGVidWcoIldpbmRv dyAyIGlzIGxvYWRlZCIpOworCisgICAgaWYgKHdpbmRvdzIuZG9jdW1lbnQuaGlkZGVuKSB7Cisg ICAgICAgIHdpbmRvdzIuZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigidmlzaWJpbGl0eWNoYW5n ZSIsIGNoYW5nZVBhZ2VWaXNpYmlsaXR5LCBmYWxzZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICBjaGFuZ2VQYWdlVmlzaWJpbGl0eSgpOworfQogCitmdW5jdGlvbiBjaGFuZ2VQYWdl VmlzaWJpbGl0eSgpIHsKICAgICBpZnJhbWUgPSB3aW5kb3cyLmRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJpZnJhbWUiKTsKIAogICAgIHNob3VsZEJlRmFsc2UoIndpbmRvdy5kb2N1bWVudC5oaWRk ZW4iKTsKICAgICBzaG91bGRCZUZhbHNlKCJ3aW5kb3cyLmRvY3VtZW50LmhpZGRlbiIpOwogICAg IHNob3VsZEJlRmFsc2UoImlmcmFtZS5jb250ZW50RG9jdW1lbnQuaGlkZGVuIik7CiAKLSAgICAv LyBDaGFuZ2UgdGhlIHZpc2liaWxpdHkgb2YgdGhlIGN1cnJlbnQgcGFnZSB0byBpbnZpc2libGUu Ci0gICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7Ci0gICAgICAgIG51bVZpc2liaWxpdHlDaGFu Z2VzKys7CisgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigidmlzaWJpbGl0eWNoYW5nZSIs IG9uVmlzaWJpbGl0eUNoYW5nZSwgZmFsc2UpOworICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikK ICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIuc2V0UGFnZVZpc2liaWxpdHkoImhpZGRlbiIpOwot ICAgIH0KIH0KIAogZnVuY3Rpb24gb25WaXNpYmlsaXR5Q2hhbmdlKCkgeworICAgIGRlYnVnKCJW aXNpYmlsaXR5Q2hhbmdlIGV2ZW50IGlzIHJlY2VpdmVkIik7CisKICAgICBzaG91bGRCZVRydWUo IndpbmRvdy5kb2N1bWVudC5oaWRkZW4iKTsKICAgICBzaG91bGRCZUZhbHNlKCJ3aW5kb3cyLmRv Y3VtZW50LmhpZGRlbiIpOwogICAgIHNob3VsZEJlRmFsc2UoImlmcmFtZS5jb250ZW50RG9jdW1l bnQuaGlkZGVuIik7CiAKICAgICB3aW5kb3cuZG9jdW1lbnQuYWRvcHROb2RlKGlmcmFtZSk7CiAg ICAgd2luZG93LmRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaWZyYW1lKTsKLSAgICBkZWJ1Zygi QWRvcHRlZCBpZnJhbWUgdG8gV2luZG93IDEiKTsKIAorICAgIGRlYnVnKCJGcmFtZSBpcyBtb3Zl ZCIpCiAgICAgc2hvdWxkQmVUcnVlKCJ3aW5kb3cuZG9jdW1lbnQuaGlkZGVuIik7CiAgICAgc2hv dWxkQmVGYWxzZSgid2luZG93Mi5kb2N1bWVudC5oaWRkZW4iKTsKICAgICBzaG91bGRCZVRydWUo ImlmcmFtZS5jb250ZW50RG9jdW1lbnQuaGlkZGVuIik7CiAKLSAgICB3aW5kb3cyLmNsb3NlKCk7 Ci0KICAgICBmaW5pc2hUZXN0KCk7CiB9CiAKLWZ1bmN0aW9uIHN0YXJ0VGVzdCgpIHsKLSAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpIHsKLSAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25l KCk7Ci0gICAgICAgIHRlc3RSdW5uZXIuc2V0Q2FuT3BlbldpbmRvd3MoKTsKLSAgICB9Ci0KLSAg ICBkZWJ1ZygiV2luZG93IDEgTG9hZGVkIik7Ci0gICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigidmlzaWJpbGl0eWNoYW5nZSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvblZp c2liaWxpdHlDaGFuZ2UsIGZhbHNlKTsKLQotICAgIHdpbmRvdzIgPSB3aW5kb3cub3BlbigicmVz b3VyY2VzL3BhZ2UtdmlzaWJpbGl0eS1pZnJhbWUtbW92ZS1uZXctcGFnZS5odG1sIik7Ci0gICAg d2luZG93Mi5hZGRFdmVudExpc3RlbmVyKCJsb2FkIiwgd2luZG93MkxvYWRlZCwgZmFsc2UpOwot fQotCiBmdW5jdGlvbiBmaW5pc2hUZXN0KCkgewotICAgIGRvY3VtZW50LnJlbW92ZUV2ZW50TGlz dGVuZXIoInZpc2liaWxpdHljaGFuZ2UiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg b25WaXNpYmlsaXR5Q2hhbmdlLCBmYWxzZSk7CisgICAgd2luZG93Mi5jbG9zZSgpOworICAgIGRv Y3VtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInZpc2liaWxpdHljaGFuZ2UiLCBvblZpc2liaWxp dHlDaGFuZ2UsIGZhbHNlKTsKICAgICB3aW5kb3cyLnJlbW92ZUV2ZW50TGlzdGVuZXIoImxvYWQi LCB3aW5kb3cyTG9hZGVkLCBmYWxzZSk7CisgICAgd2luZG93Mi5kb2N1bWVudC5yZW1vdmVFdmVu dExpc3RlbmVyKCJ2aXNpYmlsaXR5Y2hhbmdlIiwgY2hhbmdlUGFnZVZpc2liaWxpdHksIGZhbHNl KTsKIAotICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewotICAgICAgICB0ZXN0UnVubmVyLnJl c2V0UGFnZVZpc2liaWxpdHkoKTsKLSAgICB9CiAgICAgZmluaXNoSlNUZXN0KCk7CiB9CiAK