195382 2019-03-06 15:03:33 -0800 [iOS] ProcessDidResume() IPC should be sent upon resuming when ProcessWillSuspendImminently() IPC was sent 2019-03-07 10:31:38 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 195416 1 cdumez cdumez commit-queue ggaren jer.noble koivisto rniwa webkit-bug-importer oldest_to_newest 1513214 0 cdumez 2019-03-06 15:03:33 -0800 ProcessDidResume() IPC should be sent upon resuming when ProcessWillSuspendImminently() IPC was sent. Currently, we only send ProcessDidResume() to the WebProcess if PrepareToSuspend() was sent, not when the more urgent ProcessWillSuspendImminently() IPC was sent. This mismatch has lead to bugs because the WebProcess does not know it got resumed and failed to unfreeze the layers it froze upon suspension. 1513215 1 cdumez 2019-03-06 15:04:32 -0800 <rdar://problem/48642739> 1513240 2 363804 cdumez 2019-03-06 15:55:32 -0800 Created attachment 363804 Patch 1513260 3 363804 ggaren 2019-03-06 16:15:44 -0800 Comment on attachment 363804 Patch r=me 1513282 4 363804 commit-queue 2019-03-06 16:43:30 -0800 Comment on attachment 363804 Patch Clearing flags on attachment: 363804 Committed r242580: <https://trac.webkit.org/changeset/242580> 1513283 5 commit-queue 2019-03-06 16:43:32 -0800 All reviewed patches have been landed. Closing bug. 363804 2019-03-06 15:55:32 -0800 2019-03-06 16:43:30 -0800 Patch bug-195382-20190306155526.patch text/plain 10313 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ3NjkyYWFmZjFhNzIxMjU4 NTgwOGIzN2M1YjYzMDAwOTlhOTM5NTkuLjAyZmVlZTU3YWVjNTkxZjQ5YmVmNjAzM2ZhNDQ0NWFh NDgzNGZjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTktMDMtMDYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBQcm9jZXNzRGlkUmVzdW1l KCkgSVBDIHNob3VsZCBiZSBzZW50IHVwb24gcmVzdW1pbmcgd2hlbiBQcm9jZXNzV2lsbFN1c3Bl bmRJbW1pbmVudGx5KCkgSVBDIHdhcyBzZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTUzODIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4NjQy NzM5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBy b2Nlc3NEaWRSZXN1bWUoKSBJUEMgc2hvdWxkIGJlIHNlbnQgdXBvbiByZXN1bWluZyB3aGVuIFBy b2Nlc3NXaWxsU3VzcGVuZEltbWluZW50bHkoKSBJUEMgd2FzIHNlbnQuIFByZXZpb3VzbHksCisg ICAgICAgIHdlIG9ubHkgc2VuZCBQcm9jZXNzRGlkUmVzdW1lKCkgdG8gdGhlIFdlYlByb2Nlc3Mg aWYgUHJlcGFyZVRvU3VzcGVuZCgpIHdhcyBzZW50LCBub3Qgd2hlbiB0aGUgbW9yZSB1cmdlbnQK KyAgICAgICAgUHJvY2Vzc1dpbGxTdXNwZW5kSW1taW5lbnRseSgpIElQQyB3YXMgc2VudC4KKwor ICAgICAgICBUaGlzIG1pc21hdGNoIGhhcyBsZWFkIHRvIGJ1Z3MgYmVjYXVzZSB0aGUgV2ViUHJv Y2VzcyBkb2VzIG5vdCBrbm93IGl0IGdvdCByZXN1bWVkIGFuZCBmYWlsZWQgdG8gdW5mcmVlemUg dGhlCisgICAgICAgIGxheWVycyBpdCBmcm96ZSB1cG9uIHN1c3BlbnNpb24uCisKKyAgICAgICAg KiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNz QXNzZXJ0aW9uQ2xpZW50Ojp+UHJvY2Vzc0Fzc2VydGlvbkNsaWVudCk6CisKKyAgICAgICAgKiBV SVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NU aHJvdHRsZXI6OnVwZGF0ZUFzc2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NUaHJv dHRsZXI6OnVpQXNzZXJ0aW9uV2lsbEV4cGlyZUltbWluZW50bHkpOgorICAgICAgICAoV2ViS2l0 OjpQcm9jZXNzVGhyb3R0bGVyOjphc3NlcnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSk6IERlbGV0 ZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbToKKyAgICAgICAgKC1bV0tQcm9j ZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIF9ub3RpZnlDbGllbnRzT2ZJbW1pbmVu dFN1c3BlbnNpb25dKToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nl c3NBc3NlcnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246On5Q cm9jZXNzQW5kVUlBc3NlcnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3Nl cnRpb246OnNldENsaWVudCk6CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZENvbXBsZXRlUGFnZVRyYW5zaXRp b24pOgorICAgICAgICBSZXZlcnQgY2hhbmdlIHRoYXQgd2FzIGxhbmRlZCBpbiByMjQyMDk4IHRv IHdvcmsgYXJvdW5kIHRoaXMgUHJvY2Vzc1Rocm90dGxlciBidWcuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCk6CisgICAgICAgIFJldmVydCBjaGFu Z2UgdGhhdCB3YXMgbGFuZGVkIGluIHIyNDI1NTQgdG8gd29yayBhcm91bmQgdGhpcyBQcm9jZXNz VGhyb3R0bGVyIGJ1Zy4KKwogMjAxOS0wMy0wNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgW2lPU10gQmFzaWMgaGl0IHRlc3RpbmcgZm9yIGNvbnRlbnQgb3Zl cmxhcHBpbmcgZmFzdC1zY3JvbGxhYmxlIG92ZXJmbG93CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm9jZXNzQXNzZXJ0aW9uLmgKaW5kZXggMWY4NThlNDBlZWM2ZDU3ZmQ3ZDJiZjAwMDM2NGE2 YmIxOGZhZjhhNi4uNTI1OTM1MjYzMTBhNmUwMTEyMDA1NmQ4OGQ5OTkwMjFiOTYwYWJmZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtNTEsOCArNTEs OCBAQCBlbnVtIGNsYXNzIEFzc2VydGlvblN0YXRlIHsKIAogY2xhc3MgUHJvY2Vzc0Fzc2VydGlv bkNsaWVudCB7CiBwdWJsaWM6Ci0gICAgdmlydHVhbCB+UHJvY2Vzc0Fzc2VydGlvbkNsaWVudCgp IHsgfTsKLSAgICB2aXJ0dWFsIHZvaWQgYXNzZXJ0aW9uV2lsbEV4cGlyZUltbWluZW50bHkoKSA9 IDA7CisgICAgdmlydHVhbCB+UHJvY2Vzc0Fzc2VydGlvbkNsaWVudCgpIHsgfQorICAgIHZpcnR1 YWwgdm9pZCB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkgPSAwOwogfTsKIAogY2xh c3MgUHJvY2Vzc0Fzc2VydGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UHJvY2Vzc1Rocm90dGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhy b3R0bGVyLmNwcAppbmRleCAxMjFhYTQ1YTE3NWMwYmM3NzkyNmZmYzllNmMwMzFkYmQxNDg5Njdk Li4xMDg0MzhkYzdmMWUwZDVlN2Y4Y2RlNjE0Njg4MDI4NjZjODk3NDU4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmNwcApAQCAtNjgsMTAgKzY4LDEyIEBA IHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0aW9uTm93KCkKICAgICAKIHZvaWQg UHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0aW9uKCkKIHsKKyAgICBib29sIHNob3VsZEJl UnVubmFibGUgPSBtX2ZvcmVncm91bmRDb3VudGVyLnZhbHVlKCkgfHwgbV9iYWNrZ3JvdW5kQ291 bnRlci52YWx1ZSgpOworCiAgICAgLy8gSWYgdGhlIHByb2Nlc3MgaXMgY3VycmVudGx5IHJ1bm5h YmxlIGJ1dCB3aWxsIGJlIHN1c3BlbmRlZCB0aGVuIGZpcnN0IGdpdmUgaXQgYSBjaGFuY2UgdG8g Y29tcGxldGUgd2hhdCBpdCB3YXMgZG9pbmcKICAgICAvLyBhbmQgY2xlYW4gdXAgLSBtb3ZlIGl0 IHRvIHRoZSBiYWNrZ3JvdW5kIGFuZCBzZW5kIGl0IGEgbWVzc2FnZSB0byBub3RpZnkuIFNjaGVk dWxlIGEgdGltZW91dCBzbyBpdCBjYW4ndCBzdGF5IHJ1bm5pbmcKICAgICAvLyBpbiB0aGUgYmFj a2dyb3VuZCBmb3IgdG9vIGxvbmcuCi0gICAgaWYgKG1fYXNzZXJ0aW9uICYmIG1fYXNzZXJ0aW9u LT5zdGF0ZSgpICE9IEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQgJiYgIW1fZm9yZWdyb3VuZENv dW50ZXIudmFsdWUoKSAmJiAhbV9iYWNrZ3JvdW5kQ291bnRlci52YWx1ZSgpKSB7CisgICAgaWYg KG1fYXNzZXJ0aW9uICYmIG1fYXNzZXJ0aW9uLT5zdGF0ZSgpICE9IEFzc2VydGlvblN0YXRlOjpT dXNwZW5kZWQgJiYgIXNob3VsZEJlUnVubmFibGUpIHsKICAgICAgICAgKyttX3N1c3BlbmRNZXNz YWdlQ291bnQ7CiAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQ cm9jZXNzVGhyb3R0bGVyOjp1cGRhdGVBc3NlcnRpb24oKSBzZW5kaW5nIFByZXBhcmVUb1N1c3Bl bmQgSVBDIiwgdGhpcyk7CiAgICAgICAgIG1fcHJvY2Vzcy5zZW5kUHJlcGFyZVRvU3VzcGVuZCgp OwpAQCAtODEsMTQgKzgzLDE2IEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0 aW9uKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGJvb2wgc2hvdWxkQmVSdW5uYWJs ZSA9IG1fZm9yZWdyb3VuZENvdW50ZXIudmFsdWUoKSB8fCBtX2JhY2tncm91bmRDb3VudGVyLnZh bHVlKCk7CisgICAgaWYgKHNob3VsZEJlUnVubmFibGUpIHsKKyAgICAgICAgLy8gSWYgd2UncmUg Y3VycmVudGx5IHdhaXRpbmcgZm9yIHRoZSBXZWIgcHJvY2VzcyB0byBkbyBzdXNwZW5zaW9uIGNs ZWFudXAsIGJ1dCBubyBsb25nZXIgbmVlZCB0byBiZSBzdXNwZW5kZWQsIHRlbGwgdGhlIFdlYiBw cm9jZXNzIHRvIGNhbmNlbCB0aGUgY2xlYW51cC4KKyAgICAgICAgaWYgKG1fc3VzcGVuZFRpbWVy LmlzQWN0aXZlKCkpCisgICAgICAgICAgICBtX3Byb2Nlc3Muc2VuZENhbmNlbFByZXBhcmVUb1N1 c3BlbmQoKTsKIAotICAgIC8vIElmIHdlJ3JlIGN1cnJlbnRseSB3YWl0aW5nIGZvciB0aGUgV2Vi IHByb2Nlc3MgdG8gZG8gc3VzcGVuc2lvbiBjbGVhbnVwLCBidXQgbm8gbG9uZ2VyIG5lZWQgdG8g YmUgc3VzcGVuZGVkLCB0ZWxsIHRoZSBXZWIgcHJvY2VzcyB0byBjYW5jZWwgdGhlIGNsZWFudXAu Ci0gICAgaWYgKG1fc3VzcGVuZFRpbWVyLmlzQWN0aXZlKCkgJiYgc2hvdWxkQmVSdW5uYWJsZSkK LSAgICAgICAgbV9wcm9jZXNzLnNlbmRDYW5jZWxQcmVwYXJlVG9TdXNwZW5kKCk7Ci0gICAgCi0g ICAgaWYgKG1fYXNzZXJ0aW9uICYmIG1fYXNzZXJ0aW9uLT5zdGF0ZSgpID09IEFzc2VydGlvblN0 YXRlOjpTdXNwZW5kZWQgJiYgc2hvdWxkQmVSdW5uYWJsZSkKLSAgICAgICAgbV9wcm9jZXNzLnNl bmRQcm9jZXNzRGlkUmVzdW1lKCk7CisgICAgICAgIGlmICgobV9hc3NlcnRpb24gJiYgbV9hc3Nl cnRpb24tPnN0YXRlKCkgPT0gQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZCkgfHwgbV91aUFzc2Vy dGlvbkV4cGlyZWQpIHsKKyAgICAgICAgICAgIG1fcHJvY2Vzcy5zZW5kUHJvY2Vzc0RpZFJlc3Vt ZSgpOworICAgICAgICAgICAgbV91aUFzc2VydGlvbkV4cGlyZWQgPSBmYWxzZTsKKyAgICAgICAg fQorICAgIH0KIAogICAgIHVwZGF0ZUFzc2VydGlvbk5vdygpOwogfQpAQCAtMTI1LDkgKzEyOSwx MCBAQCB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OmRpZENhbmNlbFByb2Nlc3NTdXNwZW5zaW9uKCkK ICAgICBBU1NFUlQobV9zdXNwZW5kTWVzc2FnZUNvdW50ID49IDApOwogfQogCi12b2lkIFByb2Nl c3NUaHJvdHRsZXI6OmFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkKK3ZvaWQgUHJvY2Vz c1Rocm90dGxlcjo6dWlBc3NlcnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSgpCiB7CiAgICAgbV9w cm9jZXNzLnNlbmRQcm9jZXNzV2lsbFN1c3BlbmRJbW1pbmVudGx5KCk7CisgICAgbV91aUFzc2Vy dGlvbkV4cGlyZWQgPSB0cnVlOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9j ZXNzVGhyb3R0bGVyLmgKaW5kZXggN2Q5MGRiNjY0M2YyZWQwYWY3NjQ1YTgyNTgzOGI4NTdmYmMy YTc3Zi4uNWI0NDRkOTExZmI0ZjkzMTM1OGYwODRiOGYxNDg2ZTNiODFhNTdjMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaApAQCAtNjgsNyArNjgsNyBAQCBw cml2YXRlOgogICAgIHZvaWQgc3VzcGVuZFRpbWVyRmlyZWQoKTsKIAogICAgIC8vIFByb2Nlc3NB c3NlcnRpb25DbGllbnQKLSAgICB2b2lkIGFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkg b3ZlcnJpZGU7CisgICAgdm9pZCB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkgb3Zl cnJpZGU7CiAKICAgICBQcm9jZXNzVGhyb3R0bGVyQ2xpZW50JiBtX3Byb2Nlc3M7CiAgICAgc3Rk Ojp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRpb24+IG1fYXNzZXJ0aW9uOwpAQCAtNzcsNiArNzcs NyBAQCBwcml2YXRlOgogICAgIEJhY2tncm91bmRBY3Rpdml0eUNvdW50ZXIgbV9iYWNrZ3JvdW5k Q291bnRlcjsKICAgICBpbnQgbV9zdXNwZW5kTWVzc2FnZUNvdW50IHsgMCB9OwogICAgIGJvb2wg bV9zaG91bGRUYWtlVUlCYWNrZ3JvdW5kQXNzZXJ0aW9uOworICAgIGJvb2wgbV91aUFzc2VydGlv bkV4cGlyZWQgeyBmYWxzZSB9OwogfTsKIAogaW5saW5lIFByb2Nlc3NUaHJvdHRsZXI6OkZvcmVn cm91bmRBY3Rpdml0eVRva2VuIFByb2Nlc3NUaHJvdHRsZXI6OmZvcmVncm91bmRBY3Rpdml0eVRv a2VuKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9j ZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0KaW5kZXggZGM4NmQ0MmU2NWY3MmRmM2NiMWQzNmY5ZjQ1YjQwODg5OGEz M2I5My4uOTk0MmI2NjQ5YzU2NTcwNjdlZWI5Zjk0ODU2OTk5YjJkMWE3NjFlYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KQEAg LTk4LDcgKzk4LDcgQEAgLSAodm9pZClfbm90aWZ5Q2xpZW50c09mSW1taW5lbnRTdXNwZW5zaW9u CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIGZvciAoYXV0byogY2xpZW50 IDogY29weVRvVmVjdG9yKF9jbGllbnRzKSkKLSAgICAgICAgY2xpZW50LT5hc3NlcnRpb25XaWxs RXhwaXJlSW1taW5lbnRseSgpOworICAgICAgICBjbGllbnQtPnVpQXNzZXJ0aW9uV2lsbEV4cGly ZUltbWluZW50bHkoKTsKIH0KIAogLSAodm9pZClfdXBkYXRlQmFja2dyb3VuZFRhc2sKQEAgLTIw OCw5ICsyMDgsNiBAQCBQcm9jZXNzQXNzZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbigpCiB7CiAg ICAgbV9hc3NlcnRpb24uZ2V0KCkuaW52YWxpZGF0aW9uSGFuZGxlciA9IG5pbDsKIAotICAgIGlm IChQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50KiBjbGllbnQgPSB0aGlzLT5jbGllbnQoKSkKLSAgICAg ICAgW1tXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgc2hhcmVkXSByZW1v dmVDbGllbnQ6KmNsaWVudF07Ci0KICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg IiVwIC0gflByb2Nlc3NBc3NlcnRpb24oKSBSZWxlYXNpbmcgcHJvY2VzcyBhc3NlcnRpb24iLCB0 aGlzKTsKICAgICBbbV9hc3NlcnRpb24gaW52YWxpZGF0ZV07CiB9CkBAIC0yNTksNiArMjU2LDkg QEAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjp+UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKCkKIHsKICAg ICBpZiAobV9pc0hvbGRpbmdCYWNrZ3JvdW5kQXNzZXJ0aW9uKQogICAgICAgICBbW1dLUHJvY2Vz c0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBzaGFyZWRdIGRlY3JlbWVudE5lZWRzVG9S dW5JbkJhY2tncm91bmRDb3VudF07CisKKyAgICBpZiAoYXV0byogY2xpZW50ID0gdGhpcy0+Y2xp ZW50KCkpCisgICAgICAgIFtbV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2Vy IHNoYXJlZF0gcmVtb3ZlQ2xpZW50OipjbGllbnRdOwogfQogCiB2b2lkIFByb2Nlc3NBbmRVSUFz c2VydGlvbjo6c2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCkBAIC0yNzAs NyArMjcwLDcgQEAgdm9pZCBQcm9jZXNzQW5kVUlBc3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlv blN0YXRlIGFzc2VydGlvblN0YXRlKQogdm9pZCBQcm9jZXNzQW5kVUlBc3NlcnRpb246OnNldENs aWVudChQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50JiBuZXdDbGllbnQpCiB7CiAgICAgW1tXS1Byb2Nl c3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgc2hhcmVkXSBhZGRDbGllbnQ6bmV3Q2xp ZW50XTsKLSAgICBpZiAoUHJvY2Vzc0Fzc2VydGlvbkNsaWVudCogb2xkQ2xpZW50ID0gdGhpcy0+ Y2xpZW50KCkpCisgICAgaWYgKGF1dG8qIG9sZENsaWVudCA9IHRoaXMtPmNsaWVudCgpKQogICAg ICAgICBbW1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBzaGFyZWRdIHJl bW92ZUNsaWVudDoqb2xkQ2xpZW50XTsKICAgICBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRDbGllbnQo bmV3Q2xpZW50KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKaW5kZXggNTBlMzMyN2QwY2U3NDA1ODVlNTMyZjA2NzQ2MWVlOWNkNzE5OTFkNS4uYzY0 ZWNkZDBiYjRlNjUxMTFmNzZmMWY3NDk0YTA2NTc0MjkzM2NhMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTMxNDcsMTAgKzMxNDcsOSBAQCB2 b2lkIFdlYlBhZ2U6OmRpZENvbXBsZXRlUGFnZVRyYW5zaXRpb24oKQogICAgIGlmIChtX0xheWVy VHJlZUZyZWV6ZVJlYXNvbnMuY29udGFpbnMoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNz U3VzcGVuZGVkKSkgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lv biwgIiVwIC0gV2ViUGFnZSAoUGFnZUlEPSUiIFBSSXU2NCAiKSAtIExheWVyVHJlZUZyZWV6ZVJl YXNvbjo6UHJvY2Vzc1N1c3BlbmRlZCB3YXMgc2V0IHdoZW4gcmVtb3ZpbmcgTGF5ZXJUcmVlRnJl ZXplUmVhc29uOjpQYWdlVHJhbnNpdGlvbjsgY3VycmVudCByZWFzb25zIGFyZSAlZCIsCiAgICAg ICAgICAgICB0aGlzLCBtX3BhZ2VJRCwgbV9MYXllclRyZWVGcmVlemVSZWFzb25zLnRvUmF3KCkp OworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAKLSAgICAvLyBGSVhNRTog SW4gaU9TLCB3ZSBzb21ldGltZXMgbmV2ZXIgdW5zZXQgUHJvY2Vzc1N1c3BlbmRlZC4gU2VlIDxy ZGFyOi8vcHJvYmxlbS80ODE1NDUwOD4uCi0gICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVl RnJlZXplUmVhc29uOjpQcm9jZXNzU3VzcGVuZGVkKTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKCIlcCAtIFdlYlBhZ2UgLSBEaWQgY29tcGxldGUgcGFnZSB0cmFuc2l0aW9uIiwgdGhpcyk7 CiAKICAgICBib29sIGlzSW5pdGlhbEVtcHR5RG9jdW1lbnQgPSAhbV9tYWluRnJhbWU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmlu ZGV4IDE2NjYwNGNhYzk1Mzk1ZjcyYjdjOGNlOWJjNjk4OTgzM2FkNTYyY2QuLjA3YTIxZTAwNjFj MTNiYWQ1ZTdjMzk3NjZlM2UzMzFmNjU3NTk5YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0zMDEwLDggKzMwMTAsNiBA QCB2b2lkIFdlYlBhZ2U6OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZChib29sIGlzU3Vz cGVuZGVkVW5kZXJMb2NrKQogICAgIG1faXNTdXNwZW5kZWRVbmRlckxvY2sgPSBmYWxzZTsKICAg ICBjYW5jZWxNYXJrTGF5ZXJzVm9sYXRpbGUoKTsKIAotICAgIC8vIEZJWE1FOiBJbiBpT1MsIHdl IHNvbWV0aW1lcyBuZXZlciB1bnNldCBQcm9jZXNzU3VzcGVuZGVkLiBTZWUgPHJkYXI6Ly9wcm9i bGVtLzQ4NTM4ODM3Pi4KLSAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVlemVSZWFz b246OlByb2Nlc3NTdXNwZW5kZWQpOwogICAgIHVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZy ZWV6ZVJlYXNvbjo6QmFja2dyb3VuZEFwcGxpY2F0aW9uKTsKIAogICAgIFtbTlNOb3RpZmljYXRp b25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6V2ViVUlBcHBsaWNh dGlvbldpbGxFbnRlckZvcmVncm91bmROb3RpZmljYXRpb24gb2JqZWN0Om5pbCB1c2VySW5mbzpA e0AiaXNTdXNwZW5kZWRVbmRlckxvY2siOiBAKGlzU3VzcGVuZGVkVW5kZXJMb2NrKX1dOwo=