214976 2020-07-30 10:14:56 -0700 Drop ProcessAssertion::Client and replace with a simple invalidation handler 2020-07-31 15:46:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson ggaren webkit-bug-importer youennf oldest_to_newest 1676435 0 cdumez 2020-07-30 10:14:56 -0700 Drop ProcessAssertion::Client and replace with a simple invalidation handler. 1676440 1 405588 cdumez 2020-07-30 10:22:10 -0700 Created attachment 405588 Patch 1676481 2 405594 cdumez 2020-07-30 12:02:11 -0700 Created attachment 405594 Patch 1676870 3 405594 cdumez 2020-07-31 10:39:46 -0700 Comment on attachment 405594 Patch Ready for review. 1676997 4 405594 beidson 2020-07-31 15:20:57 -0700 Comment on attachment 405594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405594&action=review > Source/WebKit/UIProcess/ProcessAssertion.cpp:55 > +ProcessAndUIAssertion::~ProcessAndUIAssertion() > +{ > +} Why an explicitly defined empty d'tor? Default one not good enough? 1677001 5 cdumez 2020-07-31 15:23:15 -0700 Committed r265162: <https://trac.webkit.org/changeset/265162> 1677003 6 webkit-bug-importer 2020-07-31 15:24:48 -0700 <rdar://problem/66401490> 405588 2020-07-30 10:22:10 -0700 2020-07-30 12:02:10 -0700 Patch bug-214976-20200730102208.patch text/plain 8348 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQyMGJlNGU4ZThlZjU4ZTEz ZjUyZTY0YjY0N2VlNDY4Njg2NGY2ZTMuLjIyNTAyMWM4YWI3YjJjYWM4MzNhYWY1ZTc1ZTFlM2Yx OWU2Y2YyNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDkgQEAKKzIwMjAtMDctMzAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEcm9wIFByb2Nlc3NBc3NlcnRpb246 OkNsaWVudCBhbmQgcmVwbGFjZSB3aXRoIGEgc2ltcGxlIGludmFsaWRhdGlvbiBoYW5kbGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ5NzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9jZXNzQXNz ZXJ0aW9uIGhhZCBhIENsaWVudCBjbGFzcyB3aXRoIDIgZnVuY3Rpb25zOgorICAgICAgICAoMSkg b25lIHRvIGluZGljYXRlIHRoYXQgdGhlIGFzc2VydGlvbiB3YXMgaW52YWxpZGF0ZWQKKyAgICAg ICAgKDIpIG9uZSB0byBpbmRpY2F0ZSB0aGF0IHRoZSBVSSBhc3NlcnRpb24gaXMgYWJvdXQgdG8g ZXhwaXJlCisKKyAgICAgICAgV2hpbGUgUHJvY2Vzc0Fzc2VydGlvbiBpcyB1c2VkIGluIHNldmVy YWwgcGxhY2VzLCBvbmx5IHRoZSBQcm9jZXNzVGhyb3R0bGVyCisgICAgICAgIGV2ZXIgc2V0cyBp dHNlbGYgYXMgYSBjbGllbnQuIFRoZSByZWFzb24gaXMgdGhhdCBvdGhlciBjYWxsIHNpdGVzIHVz ZQorICAgICAgICBhc3NlcnRpb24gdHlwZXMgdGhhdCBkbyBub3QgZXhwaXJlLiBBbHNvLCAoMikg b25seSBtYWtlcyBzZW5zZSBmb3IKKyAgICAgICAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uLCBub3Qg Zm9yIFByb2Nlc3NBc3NlcnRpb24uIE9ubHkgdGhlIFByb2Nlc3NUaHJvdHRsZXIKKyAgICAgICAg aXMgdXNpbmcgYSBQcm9jZXNzQW5kVUlBc3NlcnRpb24uCisKKyAgICAgICAgSSB0aGluayBhIGJl dHRlciBkZXNpZ24gaXMgdG8gaGF2ZSBhIHNpbXBsZSBpbnZhbGlkYXRpb24gaGFuZGxlciBvbgor ICAgICAgICB0aGUgUHJvY2Vzc0Fzc2VydGlvbiwgdGhhdCB0aGUgY2FsbCBzaXRlIGNhbiBzZXQg aWYgdGhleSBhcmUgaW50ZXJlc3RlZAorICAgICAgICBpbiBpbnZhbGlkYXRpb24uCisKKyAgICAg ICAgU2ltaWxhcmx5LCBJIGFkZGVkIGEgVUlBc3NlcnRpb24gZXhwaXJhdGlvbiBoYW5kbGVyIG9u IFByb2Nlc3NBbmRVSUFzc2VydGlvbgorICAgICAgICBzbyB0aGF0IHRoZSBQcm9jZXNzVGhyb3R0 bGVyIGNhbiBrbm93IGlmIHRoZSBVSUFzc2VydGlvbiBpcyBhYm91dCB0byBleHBpcmUuCisKKyAg ICAgICAgVGhpcyBuZXcgZGVzaWduIGFsc28gbWF0Y2hlcyBtb3JlIGNsb3NlbHkgdGhlIHN5c3Rl bSBwcm9jZXNzIGFzc2VydGlvbiBBUEkKKyAgICAgICAgdGhhdCBQcm9jZXNzQXNzZXJ0aW9uIC8g UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uIGFyZSB3cmFwcGluZy4KKworICAgICAgICBUaGlzIHBhdGNo IGFsc28gZml4ZXMgYSBidWcgZm91bmQgYnkgWW91ZW5uIEZhYmxldCB3aGVyZSB0aGUgUHJvY2Vz c1Rocm90dGxlcgorICAgICAgICB3b3VsZCBvbmx5IHNldCBpdHMgaW52YWxpZGF0aW9uIGhhbmRs ZXIgaW4gZGlkQ29ubmVjdFRvUHJvY2VzcygpLCBpbnN0ZWFkIG9mCisgICAgICAgIGRvaW5nIGl0 IGV2ZXJ5IHRpbWUgYSBuZXcgUHJvY2Vzc0Fzc2VydGlvbiBpcyBjcmVhdGVkIGluIHNldEFzc2Vy dGlvblR5cGUoKS4KKyAgICAgICAgVGhlIGFzc2VydGlvbiB0eXBlIGNhbiBjaGFuZ2UgKGUuZy4g ZnJvbSBmb3JlZ3JvdW5kIHRvIGJhY2tncm91bmQpIGFmdGVyIHRoZQorICAgICAgICBwcm9jZXNz IGhhcyBsYXVuY2hlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmg6 CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OnNldEludmFsaWRhdGlvbkhhbmRs ZXIpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpDbGllbnQ6On5DbGllbnQp OiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpzZXRDbGllbnQp OiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpjbGllbnQpOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uVHlwZSk6CisgICAgICAg IChXZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0 aW9uOjpwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQpOgorICAgICAgICAoV2ViS2l0OjpQ cm9jZXNzQW5kVUlBc3NlcnRpb246OnVpQXNzZXJ0aW9uV2lsbEV4cGlyZUltbWluZW50bHkpOgor CiAyMDIwLTA3LTMwICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgog CiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjQ5MjUpOiBydW4tc2FmYXJpIC0tZGVidWcgbm8gbG9u Z2VyIHdvcmtzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNz ZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgKaW5k ZXggZjI4OGQ5NWNmOWRjNTQ2MzEwOWYzZWY2Y2YxN2ZlNjZhNjA3ODE3YS4uZjhiYTMzNGNkYjE2 YTk2YWViZTk4Yjk5YjI2ZmUyMmE0Y2U5MmM0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtNTgsMTkgKzU4LDEwIEBAIGVudW0gY2xhc3MgUHJvY2Vz c0Fzc2VydGlvblR5cGUgewogY2xhc3MgUHJvY2Vzc0Fzc2VydGlvbiA6IHB1YmxpYyBDYW5NYWtl V2Vha1B0cjxQcm9jZXNzQXNzZXJ0aW9uPiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7 CiBwdWJsaWM6Ci0gICAgY2xhc3MgQ2xpZW50IHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIHZpcnR1 YWwgfkNsaWVudCgpIHsgfQotCi0gICAgICAgIHZpcnR1YWwgdm9pZCB1aUFzc2VydGlvbldpbGxF eHBpcmVJbW1pbmVudGx5KCkgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgYXNzZXJ0aW9uV2Fz SW52YWxpZGF0ZWQoKSA9IDA7Ci0gICAgfTsKLQogICAgIFByb2Nlc3NBc3NlcnRpb24oUHJvY2Vz c0lELCBjb25zdCBTdHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUpOwogICAgIHZp cnR1YWwgflByb2Nlc3NBc3NlcnRpb24oKTsKIAotICAgIHZvaWQgc2V0Q2xpZW50KENsaWVudCYg Y2xpZW50KSB7IG1fY2xpZW50ID0gJmNsaWVudDsgfQotICAgIENsaWVudCogY2xpZW50KCkgeyBy ZXR1cm4gbV9jbGllbnQ7IH0KKyAgICB2b2lkIHNldEludmFsaWRhdGlvbkhhbmRsZXIoRnVuY3Rp b248dm9pZCgpPiYmIGhhbmRsZXIpIHsgbV9pbnZhbGlkYXRpb25IYW5kbGVyID0gV1RGTW92ZSho YW5kbGVyKTsgfQogCiAgICAgUHJvY2Vzc0Fzc2VydGlvblR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0 dXJuIG1fYXNzZXJ0aW9uVHlwZTsgfQogICAgIFByb2Nlc3NJRCBwaWQoKSBjb25zdCB7IHJldHVy biBtX3BpZDsgfQpAQCAtOTIsNyArODMsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxCS1NQ cm9jZXNzQXNzZXJ0aW9uPiBtX2Jrc0Fzc2VydGlvbjsgLy8gTGVnYWN5LgogI2VuZGlmCiAjZW5k aWYKLSAgICBDbGllbnQqIG1fY2xpZW50IHsgbnVsbHB0ciB9OworICAgIEZ1bmN0aW9uPHZvaWQo KT4gbV9pbnZhbGlkYXRpb25IYW5kbGVyOwogfTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CkBAIC0xMDQsMTAgKzk1LDEzIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgdWlBc3NlcnRpb25XaWxs RXhwaXJlSW1taW5lbnRseSgpOwogCisgICAgdm9pZCBzZXRVSUFzc2VydGlvbkV4cGlyYXRpb25I YW5kbGVyKEZ1bmN0aW9uPHZvaWQoKT4mJiBoYW5kbGVyKSB7IG1fdWlBc3NlcnRpb25FeHBpcmF0 aW9uSGFuZGxlciA9IFdURk1vdmUoaGFuZGxlcik7IH0KKwogcHJpdmF0ZToKICAgICB2b2lkIHBy b2Nlc3NBc3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpIGZpbmFsOwogICAgIHZvaWQgdXBkYXRlUnVu SW5CYWNrZ3JvdW5kQ291bnQoKTsKIAorICAgIEZ1bmN0aW9uPHZvaWQoKT4gbV91aUFzc2VydGlv bkV4cGlyYXRpb25IYW5kbGVyOwogICAgIGJvb2wgbV9pc0hvbGRpbmdCYWNrZ3JvdW5kVGFzayB7 IGZhbHNlIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9j ZXNzVGhyb3R0bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRs ZXIuY3BwCmluZGV4IDEzMTIyNGM0NWFmM2JlN2QxNWM3ODBhNTEwZDE0MGJhNDg0NDFlZWMuLmIz OTY5NzRlYzJlZmQ0NWFiZmU3NjM5YjVmNWZiM2U5MmMzNWM5MjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCkBAIC0xMjcsMTAgKzEyNywxOCBAQCB2 b2lkIFByb2Nlc3NUaHJvdHRsZXI6OnNldEFzc2VydGlvblR5cGUoUHJvY2Vzc0Fzc2VydGlvblR5 cGUgbmV3VHlwZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUFJPQ0VTU1RIUk9UVExFUl9SRUxF QVNFX0xPRygic2V0QXNzZXJ0aW9uVHlwZTogVXBkYXRpbmcgcHJvY2VzcyBhc3NlcnRpb24gdHlw ZSB0byAldSAoZm9yZWdyb3VuZEFjdGl2aXRpZXM6ICV1LCBiYWNrZ3JvdW5kQWN0aXZpdGllczog JXUpIiwgbmV3VHlwZSwgbV9mb3JlZ3JvdW5kQWN0aXZpdGllcy5zaXplKCksIG1fYmFja2dyb3Vu ZEFjdGl2aXRpZXMuc2l6ZSgpKTsKLSAgICBpZiAobV9zaG91bGRUYWtlVUlCYWNrZ3JvdW5kQXNz ZXJ0aW9uKQotICAgICAgICBtX2Fzc2VydGlvbiA9IG1ha2VVbmlxdWU8UHJvY2Vzc0FuZFVJQXNz ZXJ0aW9uPihtX3Byb2Nlc3NJZGVudGlmaWVyLCBhc3NlcnRpb25OYW1lKG5ld1R5cGUpLCBuZXdU eXBlKTsKLSAgICBlbHNlCisgICAgaWYgKG1fc2hvdWxkVGFrZVVJQmFja2dyb3VuZEFzc2VydGlv bikgeworICAgICAgICBhdXRvIGFzc2VydGlvbiA9IG1ha2VVbmlxdWU8UHJvY2Vzc0FuZFVJQXNz ZXJ0aW9uPihtX3Byb2Nlc3NJZGVudGlmaWVyLCBhc3NlcnRpb25OYW1lKG5ld1R5cGUpLCBuZXdU eXBlKTsKKyAgICAgICAgYXNzZXJ0aW9uLT5zZXRVSUFzc2VydGlvbkV4cGlyYXRpb25IYW5kbGVy KFt0aGlzXSB7CisgICAgICAgICAgICB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCk7 CisgICAgICAgIH0pOworICAgICAgICBtX2Fzc2VydGlvbiA9IFdURk1vdmUoYXNzZXJ0aW9uKTsK KyAgICB9IGVsc2UKICAgICAgICAgbV9hc3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBc3Nl cnRpb24+KG1fcHJvY2Vzc0lkZW50aWZpZXIsIGFzc2VydGlvbk5hbWUobmV3VHlwZSksIG5ld1R5 cGUpOworCisgICAgbV9hc3NlcnRpb24tPnNldEludmFsaWRhdGlvbkhhbmRsZXIoW3RoaXNdIHsK KyAgICAgICAgYXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKTsKKyAgICB9KTsKICAgICBtX3Byb2Nl c3MuZGlkU2V0QXNzZXJ0aW9uVHlwZShuZXdUeXBlKTsKIH0KICAgICAKQEAgLTE3MCw3ICsxNzgs NiBAQCB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MoUHJvY2Vzc0lE IHBpZCkKICAgICBtX3Byb2Nlc3NJZGVudGlmaWVyID0gcGlkOwogICAgIHNldEFzc2VydGlvblR5 cGUoZXhwZWN0ZWRBc3NlcnRpb25UeXBlKCkpOwogICAgIFJFTEVBU0VfQVNTRVJUKG1fYXNzZXJ0 aW9uKTsKLSAgICBtX2Fzc2VydGlvbi0+c2V0Q2xpZW50KCp0aGlzKTsKIH0KICAgICAKIHZvaWQg UHJvY2Vzc1Rocm90dGxlcjo6cHJlcGFyZVRvU3VzcGVuZFRpbWVvdXRUaW1lckZpcmVkKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaAppbmRleCAwOWQ2ZDMyNjc2 Y2VmYmFjMjY5ZDZjZDc4Yjg2MTlhNjdmNjkzNzA1Li5hOGMwMjg3NWUzY2FlOTQzMzgwNWRmODk0 YzZlNjE5NjNiYWY5ZTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9j ZXNzVGhyb3R0bGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90 dGxlci5oCkBAIC01MSw3ICs1MSw3IEBAIGVudW0gY2xhc3MgSXNTdXNwZW5zaW9uSW1taW5lbnQg OiBib29sIHsgTm8sIFllcyB9OwogCiBjbGFzcyBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50OwogCi1j bGFzcyBQcm9jZXNzVGhyb3R0bGVyIDogcHVibGljIENhbk1ha2VXZWFrUHRyPFByb2Nlc3NUaHJv dHRsZXI+LCBwcml2YXRlIFByb2Nlc3NBc3NlcnRpb246OkNsaWVudCB7CitjbGFzcyBQcm9jZXNz VGhyb3R0bGVyIDogcHVibGljIENhbk1ha2VXZWFrUHRyPFByb2Nlc3NUaHJvdHRsZXI+IHsKIHB1 YmxpYzoKICAgICBQcm9jZXNzVGhyb3R0bGVyKFByb2Nlc3NUaHJvdHRsZXJDbGllbnQmLCBib29s IHNob3VsZFRha2VVSUJhY2tncm91bmRBc3NlcnRpb24pOwogICAgIH5Qcm9jZXNzVGhyb3R0bGVy KCk7CkBAIC0xNDIsOSArMTQyLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGludmFsaWRhdGVBbGxB Y3Rpdml0aWVzKCk7CiAgICAgU3RyaW5nIGFzc2VydGlvbk5hbWUoUHJvY2Vzc0Fzc2VydGlvblR5 cGUpIGNvbnN0OwogCi0gICAgLy8gUHJvY2Vzc0Fzc2VydGlvbkNsaWVudAotICAgIHZvaWQgdWlB c3NlcnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSgpIGZpbmFsOwotICAgIHZvaWQgYXNzZXJ0aW9u V2FzSW52YWxpZGF0ZWQoKSBmaW5hbDsKKyAgICB2b2lkIHVpQXNzZXJ0aW9uV2lsbEV4cGlyZUlt bWluZW50bHkoKTsKKyAgICB2b2lkIGFzc2VydGlvbldhc0ludmFsaWRhdGVkKCk7CiAKICAgICB2 b2lkIGNsZWFyUGVuZGluZ1JlcXVlc3RUb1N1c3BlbmQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQppbmRleCA1OTBmN2RlYjc1 NjhiMTcwZjg3OTExZmM1ZTUxMTE3YzU0MzRlMmUwLi5kMDJiNzI3NGYxNjEyNzJlNGI2ZmRiOTkw M2ZkMjAzMGRlNDM5OTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv UHJvY2Vzc0Fzc2VydGlvbklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv UHJvY2Vzc0Fzc2VydGlvbklPUy5tbQpAQCAtNDUyLDggKzQ1Miw4IEBAIHZvaWQgUHJvY2Vzc0Fz c2VydGlvbjo6cHJvY2Vzc0Fzc2VydGlvbldhc0ludmFsaWRhdGVkKCkKICAgICBBU1NFUlQoUnVu TG9vcDo6aXNNYWluKCkpOwogICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAg LSBQcm9jZXNzQXNzZXJ0aW9uOjpwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKSBQSUQ6 ICVkIiwgdGhpcywgbV9waWQpOwogCi0gICAgaWYgKGF1dG8qIGNsaWVudCA9IHRoaXMtPmNsaWVu dCgpKQotICAgICAgICBjbGllbnQtPmFzc2VydGlvbldhc0ludmFsaWRhdGVkKCk7CisgICAgaWYg KG1faW52YWxpZGF0aW9uSGFuZGxlcikKKyAgICAgICAgbV9pbnZhbGlkYXRpb25IYW5kbGVyKCk7 CiB9CiAKIGJvb2wgUHJvY2Vzc0Fzc2VydGlvbjo6aXNWYWxpZCgpIGNvbnN0CkBAIC00OTcsOCAr NDk3LDggQEAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjp+UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKCkK IAogdm9pZCBQcm9jZXNzQW5kVUlBc3NlcnRpb246OnVpQXNzZXJ0aW9uV2lsbEV4cGlyZUltbWlu ZW50bHkoKQogewotICAgIGlmIChhdXRvKiBjbGllbnQgPSB0aGlzLT5jbGllbnQoKSkKLSAgICAg ICAgY2xpZW50LT51aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCk7CisgICAgaWYgKG1f dWlBc3NlcnRpb25FeHBpcmF0aW9uSGFuZGxlcikKKyAgICAgICAgbV91aUFzc2VydGlvbkV4cGly YXRpb25IYW5kbGVyKCk7CiB9CiAKIHZvaWQgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpwcm9jZXNz QXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKQo= 405594 2020-07-30 12:02:11 -0700 2020-07-31 15:46:20 -0700 Patch bug-214976-20200730120211.patch text/plain 9414 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1MDkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhkOTA1MDcwMzI0YzRiNTA5 NTFmY2E4MmI3YmMxODVhZDcyMjM3ZWMuLmU1MjU5NmJhMWM5ZTkxYTdkNjlmZjlhMGI4YjA0YjYx YTc4Zjc2YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDkgQEAKKzIwMjAtMDctMzAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEcm9wIFByb2Nlc3NBc3NlcnRpb246 OkNsaWVudCBhbmQgcmVwbGFjZSB3aXRoIGEgc2ltcGxlIGludmFsaWRhdGlvbiBoYW5kbGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQ5NzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9jZXNzQXNz ZXJ0aW9uIGhhZCBhIENsaWVudCBjbGFzcyB3aXRoIDIgZnVuY3Rpb25zOgorICAgICAgICAoMSkg b25lIHRvIGluZGljYXRlIHRoYXQgdGhlIGFzc2VydGlvbiB3YXMgaW52YWxpZGF0ZWQKKyAgICAg ICAgKDIpIG9uZSB0byBpbmRpY2F0ZSB0aGF0IHRoZSBVSSBhc3NlcnRpb24gaXMgYWJvdXQgdG8g ZXhwaXJlCisKKyAgICAgICAgV2hpbGUgUHJvY2Vzc0Fzc2VydGlvbiBpcyB1c2VkIGluIHNldmVy YWwgcGxhY2VzLCBvbmx5IHRoZSBQcm9jZXNzVGhyb3R0bGVyCisgICAgICAgIGV2ZXIgc2V0cyBp dHNlbGYgYXMgYSBjbGllbnQuIFRoZSByZWFzb24gaXMgdGhhdCBvdGhlciBjYWxsIHNpdGVzIHVz ZQorICAgICAgICBhc3NlcnRpb24gdHlwZXMgdGhhdCBkbyBub3QgZXhwaXJlLiBBbHNvLCAoMikg b25seSBtYWtlcyBzZW5zZSBmb3IKKyAgICAgICAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uLCBub3Qg Zm9yIFByb2Nlc3NBc3NlcnRpb24uIE9ubHkgdGhlIFByb2Nlc3NUaHJvdHRsZXIKKyAgICAgICAg aXMgdXNpbmcgYSBQcm9jZXNzQW5kVUlBc3NlcnRpb24uCisKKyAgICAgICAgSSB0aGluayBhIGJl dHRlciBkZXNpZ24gaXMgdG8gaGF2ZSBhIHNpbXBsZSBpbnZhbGlkYXRpb24gaGFuZGxlciBvbgor ICAgICAgICB0aGUgUHJvY2Vzc0Fzc2VydGlvbiwgdGhhdCB0aGUgY2FsbCBzaXRlIGNhbiBzZXQg aWYgdGhleSBhcmUgaW50ZXJlc3RlZAorICAgICAgICBpbiBpbnZhbGlkYXRpb24uCisKKyAgICAg ICAgU2ltaWxhcmx5LCBJIGFkZGVkIGEgVUlBc3NlcnRpb24gZXhwaXJhdGlvbiBoYW5kbGVyIG9u IFByb2Nlc3NBbmRVSUFzc2VydGlvbgorICAgICAgICBzbyB0aGF0IHRoZSBQcm9jZXNzVGhyb3R0 bGVyIGNhbiBrbm93IGlmIHRoZSBVSUFzc2VydGlvbiBpcyBhYm91dCB0byBleHBpcmUuCisKKyAg ICAgICAgVGhpcyBuZXcgZGVzaWduIGFsc28gbWF0Y2hlcyBtb3JlIGNsb3NlbHkgdGhlIHN5c3Rl bSBwcm9jZXNzIGFzc2VydGlvbiBBUEkKKyAgICAgICAgdGhhdCBQcm9jZXNzQXNzZXJ0aW9uIC8g UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uIGFyZSB3cmFwcGluZy4KKworICAgICAgICBUaGlzIHBhdGNo IGFsc28gZml4ZXMgYSBidWcgZm91bmQgYnkgWW91ZW5uIEZhYmxldCB3aGVyZSB0aGUgUHJvY2Vz c1Rocm90dGxlcgorICAgICAgICB3b3VsZCBvbmx5IHNldCBpdHMgaW52YWxpZGF0aW9uIGhhbmRs ZXIgaW4gZGlkQ29ubmVjdFRvUHJvY2VzcygpLCBpbnN0ZWFkIG9mCisgICAgICAgIGRvaW5nIGl0 IGV2ZXJ5IHRpbWUgYSBuZXcgUHJvY2Vzc0Fzc2VydGlvbiBpcyBjcmVhdGVkIGluIHNldEFzc2Vy dGlvblR5cGUoKS4KKyAgICAgICAgVGhlIGFzc2VydGlvbiB0eXBlIGNhbiBjaGFuZ2UgKGUuZy4g ZnJvbSBmb3JlZ3JvdW5kIHRvIGJhY2tncm91bmQpIGFmdGVyIHRoZQorICAgICAgICBwcm9jZXNz IGhhcyBsYXVuY2hlZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmg6 CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OnNldEludmFsaWRhdGlvbkhhbmRs ZXIpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpDbGllbnQ6On5DbGllbnQp OiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpzZXRDbGllbnQp OiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpjbGllbnQpOiBE ZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uVHlwZSk6CisgICAgICAg IChXZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OmRpZENvbm5lY3RUb1Byb2Nlc3MpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv cy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0 aW9uOjpwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQpOgorICAgICAgICAoV2ViS2l0OjpQ cm9jZXNzQW5kVUlBc3NlcnRpb246OnVpQXNzZXJ0aW9uV2lsbEV4cGlyZUltbWluZW50bHkpOgor CiAyMDIwLTA3LTMwICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBjb250ZW50IGdldHMgc3R1Y2sgaW4gYW4gaW5hY3RpdmUgc3RhdGUgKG5vIGN1 cnNvciB1cGRhdGVzIG9yIHRleHQgaW5zZXJ0aW9uIGNhcmV0KSB3aGVuIGFjdGl2YXRpbmcgYSB0 YWIgd2l0aCBhIHRodW1ibmFpbCB2aXNpYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1By b2Nlc3NBc3NlcnRpb24uY3BwCmluZGV4IDgzMGFhZjBkZDExNTBkNDM4YmNiNWE3ZjMzNGVhYWFk NTI3ZDcyMTguLjI2OTg0YTQ3N2FjOGNlZjNjNmEzYzZjMGYwMmM2NDA2MGY5YTNlNDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwCkBAIC00NSw2ICs0 NSwxNSBAQCBib29sIFByb2Nlc3NBc3NlcnRpb246OmlzVmFsaWQoKSBjb25zdAogICAgIHJldHVy biB0cnVlOwogfQogCitQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NBbmRVSUFzc2VydGlv bihQcm9jZXNzSUQgcGlkLCBjb25zdCBTdHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5 cGUgYXNzZXJ0aW9uVHlwZSkKKyAgICA6IFByb2Nlc3NBc3NlcnRpb24ocGlkLCByZWFzb24sIGFz c2VydGlvblR5cGUpCit7Cit9CisKK1Byb2Nlc3NBbmRVSUFzc2VydGlvbjo6flByb2Nlc3NBbmRV SUFzc2VydGlvbigpCit7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8g IVBMQVRGT1JNKElPU19GQU1JTFkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm9jZXNzQXNzZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNz ZXJ0aW9uLmgKaW5kZXggZjI4OGQ5NWNmOWRjNTQ2MzEwOWYzZWY2Y2YxN2ZlNjZhNjA3ODE3YS4u YmVlOTlmYjM0ZTYxNjAyN2MyZmRjMmQwNDVhOTJmZDViZWNlODMyZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtNTgsMTkgKzU4LDEwIEBAIGVudW0g Y2xhc3MgUHJvY2Vzc0Fzc2VydGlvblR5cGUgewogY2xhc3MgUHJvY2Vzc0Fzc2VydGlvbiA6IHB1 YmxpYyBDYW5NYWtlV2Vha1B0cjxQcm9jZXNzQXNzZXJ0aW9uPiB7CiAgICAgV1RGX01BS0VfRkFT VF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgY2xhc3MgQ2xpZW50IHsKLSAgICBwdWJsaWM6Ci0g ICAgICAgIHZpcnR1YWwgfkNsaWVudCgpIHsgfQotCi0gICAgICAgIHZpcnR1YWwgdm9pZCB1aUFz c2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQg YXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKSA9IDA7Ci0gICAgfTsKLQogICAgIFByb2Nlc3NBc3Nl cnRpb24oUHJvY2Vzc0lELCBjb25zdCBTdHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5 cGUpOwogICAgIHZpcnR1YWwgflByb2Nlc3NBc3NlcnRpb24oKTsKIAotICAgIHZvaWQgc2V0Q2xp ZW50KENsaWVudCYgY2xpZW50KSB7IG1fY2xpZW50ID0gJmNsaWVudDsgfQotICAgIENsaWVudCog Y2xpZW50KCkgeyByZXR1cm4gbV9jbGllbnQ7IH0KKyAgICB2b2lkIHNldEludmFsaWRhdGlvbkhh bmRsZXIoRnVuY3Rpb248dm9pZCgpPiYmIGhhbmRsZXIpIHsgbV9pbnZhbGlkYXRpb25IYW5kbGVy ID0gV1RGTW92ZShoYW5kbGVyKTsgfQogCiAgICAgUHJvY2Vzc0Fzc2VydGlvblR5cGUgdHlwZSgp IGNvbnN0IHsgcmV0dXJuIG1fYXNzZXJ0aW9uVHlwZTsgfQogICAgIFByb2Nlc3NJRCBwaWQoKSBj b25zdCB7IHJldHVybiBtX3BpZDsgfQpAQCAtOTIsMTEgKzgzLDkgQEAgcHJpdmF0ZToKICAgICBS ZXRhaW5QdHI8QktTUHJvY2Vzc0Fzc2VydGlvbj4gbV9ia3NBc3NlcnRpb247IC8vIExlZ2FjeS4K ICNlbmRpZgogI2VuZGlmCi0gICAgQ2xpZW50KiBtX2NsaWVudCB7IG51bGxwdHIgfTsKKyAgICBG dW5jdGlvbjx2b2lkKCk+IG1faW52YWxpZGF0aW9uSGFuZGxlcjsKIH07CiAKLSNpZiBQTEFURk9S TShJT1NfRkFNSUxZKQotCiBjbGFzcyBQcm9jZXNzQW5kVUlBc3NlcnRpb24gZmluYWwgOiBwdWJs aWMgUHJvY2Vzc0Fzc2VydGlvbiB7CiBwdWJsaWM6CiAgICAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9u KFByb2Nlc3NJRCwgY29uc3QgU3RyaW5nJiByZWFzb24sIFByb2Nlc3NBc3NlcnRpb25UeXBlKTsK QEAgLTEwNCwxNyArOTMsMTYgQEAgcHVibGljOgogCiAgICAgdm9pZCB1aUFzc2VydGlvbldpbGxF eHBpcmVJbW1pbmVudGx5KCk7CiAKKyAgICB2b2lkIHNldFVJQXNzZXJ0aW9uRXhwaXJhdGlvbkhh bmRsZXIoRnVuY3Rpb248dm9pZCgpPiYmIGhhbmRsZXIpIHsgbV91aUFzc2VydGlvbkV4cGlyYXRp b25IYW5kbGVyID0gV1RGTW92ZShoYW5kbGVyKTsgfQorCiBwcml2YXRlOgorI2lmIFBMQVRGT1JN KElPU19GQU1JTFkpCiAgICAgdm9pZCBwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKSBm aW5hbDsKKyNlbmRpZgogICAgIHZvaWQgdXBkYXRlUnVuSW5CYWNrZ3JvdW5kQ291bnQoKTsKIAor ICAgIEZ1bmN0aW9uPHZvaWQoKT4gbV91aUFzc2VydGlvbkV4cGlyYXRpb25IYW5kbGVyOwogICAg IGJvb2wgbV9pc0hvbGRpbmdCYWNrZ3JvdW5kVGFzayB7IGZhbHNlIH07CiB9OwotCi0jZWxzZQot Ci11c2luZyBQcm9jZXNzQW5kVUlBc3NlcnRpb24gPSBQcm9jZXNzQXNzZXJ0aW9uOwotCi0jZW5k aWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAppbmRleCAxMzEy MjRjNDVhZjNiZTdkMTVjNzgwYTUxMGQxNDBiYTQ4NDQxZWVjLi5iMzk2OTc0ZWMyZWZkNDVhYmZl NzYzOWI1ZjVmYjNlOTJjMzVjOTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9j ZXNzVGhyb3R0bGVyLmNwcApAQCAtMTI3LDEwICsxMjcsMTggQEAgdm9pZCBQcm9jZXNzVGhyb3R0 bGVyOjpzZXRBc3NlcnRpb25UeXBlKFByb2Nlc3NBc3NlcnRpb25UeXBlIG5ld1R5cGUpCiAgICAg ICAgIHJldHVybjsKIAogICAgIFBST0NFU1NUSFJPVFRMRVJfUkVMRUFTRV9MT0coInNldEFzc2Vy dGlvblR5cGU6IFVwZGF0aW5nIHByb2Nlc3MgYXNzZXJ0aW9uIHR5cGUgdG8gJXUgKGZvcmVncm91 bmRBY3Rpdml0aWVzOiAldSwgYmFja2dyb3VuZEFjdGl2aXRpZXM6ICV1KSIsIG5ld1R5cGUsIG1f Zm9yZWdyb3VuZEFjdGl2aXRpZXMuc2l6ZSgpLCBtX2JhY2tncm91bmRBY3Rpdml0aWVzLnNpemUo KSk7Ci0gICAgaWYgKG1fc2hvdWxkVGFrZVVJQmFja2dyb3VuZEFzc2VydGlvbikKLSAgICAgICAg bV9hc3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4obV9wcm9jZXNz SWRlbnRpZmllciwgYXNzZXJ0aW9uTmFtZShuZXdUeXBlKSwgbmV3VHlwZSk7Ci0gICAgZWxzZQor ICAgIGlmIChtX3Nob3VsZFRha2VVSUJhY2tncm91bmRBc3NlcnRpb24pIHsKKyAgICAgICAgYXV0 byBhc3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4obV9wcm9jZXNz SWRlbnRpZmllciwgYXNzZXJ0aW9uTmFtZShuZXdUeXBlKSwgbmV3VHlwZSk7CisgICAgICAgIGFz c2VydGlvbi0+c2V0VUlBc3NlcnRpb25FeHBpcmF0aW9uSGFuZGxlcihbdGhpc10geworICAgICAg ICAgICAgdWlBc3NlcnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSgpOworICAgICAgICB9KTsKKyAg ICAgICAgbV9hc3NlcnRpb24gPSBXVEZNb3ZlKGFzc2VydGlvbik7CisgICAgfSBlbHNlCiAgICAg ICAgIG1fYXNzZXJ0aW9uID0gbWFrZVVuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihtX3Byb2Nlc3NJ ZGVudGlmaWVyLCBhc3NlcnRpb25OYW1lKG5ld1R5cGUpLCBuZXdUeXBlKTsKKworICAgIG1fYXNz ZXJ0aW9uLT5zZXRJbnZhbGlkYXRpb25IYW5kbGVyKFt0aGlzXSB7CisgICAgICAgIGFzc2VydGlv bldhc0ludmFsaWRhdGVkKCk7CisgICAgfSk7CiAgICAgbV9wcm9jZXNzLmRpZFNldEFzc2VydGlv blR5cGUobmV3VHlwZSk7CiB9CiAgICAgCkBAIC0xNzAsNyArMTc4LDYgQEAgdm9pZCBQcm9jZXNz VGhyb3R0bGVyOjpkaWRDb25uZWN0VG9Qcm9jZXNzKFByb2Nlc3NJRCBwaWQpCiAgICAgbV9wcm9j ZXNzSWRlbnRpZmllciA9IHBpZDsKICAgICBzZXRBc3NlcnRpb25UeXBlKGV4cGVjdGVkQXNzZXJ0 aW9uVHlwZSgpKTsKICAgICBSRUxFQVNFX0FTU0VSVChtX2Fzc2VydGlvbik7Ci0gICAgbV9hc3Nl cnRpb24tPnNldENsaWVudCgqdGhpcyk7CiB9CiAgICAgCiB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6 OnByZXBhcmVUb1N1c3BlbmRUaW1lb3V0VGltZXJGaXJlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgKaW5kZXggMDlkNmQzMjY3NmNlZmJhYzI2OWQ2Y2Q3OGI4 NjE5YTY3ZjY5MzcwNS4uYThjMDI4NzVlM2NhZTk0MzM4MDVkZjg5NGM2ZTYxOTYzYmFmOWUwMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaApAQCAtNTEsNyAr NTEsNyBAQCBlbnVtIGNsYXNzIElzU3VzcGVuc2lvbkltbWluZW50IDogYm9vbCB7IE5vLCBZZXMg fTsKIAogY2xhc3MgUHJvY2Vzc1Rocm90dGxlckNsaWVudDsKIAotY2xhc3MgUHJvY2Vzc1Rocm90 dGxlciA6IHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxQcm9jZXNzVGhyb3R0bGVyPiwgcHJpdmF0ZSBQ cm9jZXNzQXNzZXJ0aW9uOjpDbGllbnQgeworY2xhc3MgUHJvY2Vzc1Rocm90dGxlciA6IHB1Ymxp YyBDYW5NYWtlV2Vha1B0cjxQcm9jZXNzVGhyb3R0bGVyPiB7CiBwdWJsaWM6CiAgICAgUHJvY2Vz c1Rocm90dGxlcihQcm9jZXNzVGhyb3R0bGVyQ2xpZW50JiwgYm9vbCBzaG91bGRUYWtlVUlCYWNr Z3JvdW5kQXNzZXJ0aW9uKTsKICAgICB+UHJvY2Vzc1Rocm90dGxlcigpOwpAQCAtMTQyLDkgKzE0 Miw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbnZhbGlkYXRlQWxsQWN0aXZpdGllcygpOwogICAg IFN0cmluZyBhc3NlcnRpb25OYW1lKFByb2Nlc3NBc3NlcnRpb25UeXBlKSBjb25zdDsKIAotICAg IC8vIFByb2Nlc3NBc3NlcnRpb25DbGllbnQKLSAgICB2b2lkIHVpQXNzZXJ0aW9uV2lsbEV4cGly ZUltbWluZW50bHkoKSBmaW5hbDsKLSAgICB2b2lkIGFzc2VydGlvbldhc0ludmFsaWRhdGVkKCkg ZmluYWw7CisgICAgdm9pZCB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCk7CisgICAg dm9pZCBhc3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpOwogCiAgICAgdm9pZCBjbGVhclBlbmRpbmdS ZXF1ZXN0VG9TdXNwZW5kKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KaW5kZXggNTkwZjdkZWI3NTY4YjE3MGY4NzkxMWZjNWU1 MTExN2M1NDM0ZTJlMC4uZDAyYjcyNzRmMTYxMjcyZTRiNmZkYjk5MDNmZDIwMzBkZTQzOTkzZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25J T1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25J T1MubW0KQEAgLTQ1Miw4ICs0NTIsOCBAQCB2b2lkIFByb2Nlc3NBc3NlcnRpb246OnByb2Nlc3NB c3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpCiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsK ICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlv bjo6cHJvY2Vzc0Fzc2VydGlvbldhc0ludmFsaWRhdGVkKCkgUElEOiAlZCIsIHRoaXMsIG1fcGlk KTsKIAotICAgIGlmIChhdXRvKiBjbGllbnQgPSB0aGlzLT5jbGllbnQoKSkKLSAgICAgICAgY2xp ZW50LT5hc3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpOworICAgIGlmIChtX2ludmFsaWRhdGlvbkhh bmRsZXIpCisgICAgICAgIG1faW52YWxpZGF0aW9uSGFuZGxlcigpOwogfQogCiBib29sIFByb2Nl c3NBc3NlcnRpb246OmlzVmFsaWQoKSBjb25zdApAQCAtNDk3LDggKzQ5Nyw4IEBAIFByb2Nlc3NB bmRVSUFzc2VydGlvbjo6flByb2Nlc3NBbmRVSUFzc2VydGlvbigpCiAKIHZvaWQgUHJvY2Vzc0Fu ZFVJQXNzZXJ0aW9uOjp1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkKIHsKLSAgICBp ZiAoYXV0byogY2xpZW50ID0gdGhpcy0+Y2xpZW50KCkpCi0gICAgICAgIGNsaWVudC0+dWlBc3Nl cnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSgpOworICAgIGlmIChtX3VpQXNzZXJ0aW9uRXhwaXJh dGlvbkhhbmRsZXIpCisgICAgICAgIG1fdWlBc3NlcnRpb25FeHBpcmF0aW9uSGFuZGxlcigpOwog fQogCiB2b2lkIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6cHJvY2Vzc0Fzc2VydGlvbldhc0ludmFs aWRhdGVkKCkK