134622 2014-07-03 17:55:06 -0700 Should not take background task assertion for NetworkProcess 2014-07-03 18:13:15 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1020421 0 barraclough 2014-07-03 17:55:06 -0700 When the WebContent wants to complete a task in the background we take a process assertion on the child process, and also need to prevent the UI process from suspending. (see: https://bugs.webkit.org/show_bug.cgi?id=134563 ) However for the NetworkProcess we always just hold a process assertion, and don't want this to interfere with UIApp suspension. 1020423 1 234385 barraclough 2014-07-03 17:59:27 -0700 Created attachment 234385 Fix 1020425 2 barraclough 2014-07-03 18:13:15 -0700 Transmitting file data ....... Committed revision 170785. 234385 2014-07-03 17:59:27 -0700 2014-07-03 18:03:19 -0700 Fix 134662.1.patch text/plain 8982 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MDc4MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA3LTAzICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFNob3VsZCBub3Qg dGFrZSBiYWNrZ3JvdW5kIHRhc2sgYXNzZXJ0aW9uIGZvciBOZXR3b3JrUHJvY2VzcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB0aGUgV2ViQ29u dGVudCB3YW50cyB0byBjb21wbGV0ZSBhIHRhc2sgaW4gdGhlIGJhY2tncm91bmQgd2UgdGFrZSBh IHByb2Nlc3MgYXNzZXJ0aW9uIG9uIHRoZSBjaGlsZCBwcm9jZXNzLCBhbmQgYWxzbyBuZWVkIHRv IHByZXZlbnQgdGhlIFVJIHByb2Nlc3MgZnJvbSBzdXNwZW5kaW5nLgorICAgICAgICBIb3dldmVy IGZvciB0aGUgTmV0d29ya1Byb2Nlc3Mgd2UgYWx3YXlzIGp1c3QgaG9sZCBhIHByb2Nlc3MgYXNz ZXJ0aW9uLCBhbmQgZG9uJ3Qgd2FudCB0aGlzIHRvIGludGVyZmVyZSB3aXRoIFVJQXBwIHN1c3Bl bnNpb24uCisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvbWFjL0Nvbm5lY3Rpb25NYWMubW06Cisg ICAgICAgIChJUEM6OkNvbm5lY3Rpb25UZXJtaW5hdGlvbldhdGNoZG9nOjpDb25uZWN0aW9uVGVy bWluYXRpb25XYXRjaGRvZyk6CisgICAgICAgICAgICAtIFByb2Nlc3NBc3NlcnRpb24gLT4gUHJv Y2Vzc0FuZFVJQXNzZXJ0aW9uCisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24u Y3BwOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9u KToKKyAgICAgICAgICAgIC0gYXNzaWdubWVudCAtPiBpbml0aWFsaXplciBsaXN0LgorICAgICAg ICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NBbmRVSUFzc2VydGlvbik6 CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBbmRVSUFzc2VydGlvbjo6flByb2Nlc3NBbmRVSUFz c2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBbmRVSUFzc2VydGlvbjo6c2V0U3Rh dGUpOgorICAgICAgICAgICAgLSBhZGRlZCBuby1vcCBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAg KFdlYktpdDo6UHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24pOiBEZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmg6CisgICAgICAgICAgICAtIHJl bW92ZWQgflByb2Nlc3NBc3NlcnRpb24sIGFkZGVkIFByb2Nlc3NBbmRVSUFzc2VydGlvbiBjbGFz cy4KKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlByb2Nlc3NUaHJvdHRsZXI6OmRpZENvbm5uZWN0VG9Qcm9jZXNzKToKKyAgICAgICAg ICAgIC0gUHJvY2Vzc0Fzc2VydGlvbiAtPiBQcm9jZXNzQW5kVUlBc3NlcnRpb24KKyAgICAgICAg KiBVSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oOgorICAgICAgICAgICAgLSBQcm9jZXNzQXNz ZXJ0aW9uIC0+IFByb2Nlc3NBbmRVSUFzc2VydGlvbgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv UHJvY2Vzc0Fzc2VydGlvbklPUy5tbToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0Fzc2VydGlv bjo6UHJvY2Vzc0Fzc2VydGlvbik6CisgICAgICAgICAgICAtIGFzc2lnbm1lbnQgLT4gaW5pdGlh bGl6ZXIgbGlzdC4KKyAgICAgICAgICAgIC0gbW92ZWQgY29kZSB0byBtYW5hZ2UgV0tQcm9jZXNz QXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyCisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NB c3NlcnRpb246OnNldFN0YXRlKToKKyAgICAgICAgICAgIC0gbW92ZWQgY29kZSB0byBtYW5hZ2Ug V0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyCisgICAgICAgIChXZWJLaXQ6 OlByb2Nlc3NBbmRVSUFzc2VydGlvbjo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKToKKyAgICAgICAg KFdlYktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjp+UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKToK KyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpzZXRTdGF0ZSk6CisgICAg ICAgICAgICAtIG1vdmVkIGNvZGUgdG8gbWFuYWdlIFdLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91 bmRUYXNrTWFuYWdlciBmcm9tIFByb2Nlc3NBc3NlcnRpb24uCisgICAgICAgIChXZWJLaXQ6OlBy b2Nlc3NBc3NlcnRpb246On5Qcm9jZXNzQXNzZXJ0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgICAg IC0gZGVsZXRlIC0gbW92ZWQgY29kZSB0byBtYW5hZ2UgV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dy b3VuZFRhc2tNYW5hZ2VyCisKIDIwMTQtMDctMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBXSzJdIENvbXBvc2l0aW5nIGxheWVycyBkcmF3 IG91dHNpZGUgcGFnZSBib3VuZHMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9j ZXNzQXNzZXJ0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UHJvY2Vzc0Fzc2VydGlvbi5jcHAJKHJldmlzaW9uIDE3MDczOCkKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsMTEg KzMxLDcgQEAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNz QXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKLXsKLSAgICBt X2Fzc2VydGlvblN0YXRlID0gYXNzZXJ0aW9uU3RhdGU7Ci19Ci0KLVByb2Nlc3NBc3NlcnRpb246 On5Qcm9jZXNzQXNzZXJ0aW9uKCkKKyAgICA6IG1fYXNzZXJ0aW9uU3RhdGUoYXNzZXJ0aW9uU3Rh dGUpCiB7CiB9CiAKQEAgLTQ3LDYgKzQzLDIwIEBAIHZvaWQgUHJvY2Vzc0Fzc2VydGlvbjo6c2V0 U3RhdGUoQXNzZXJ0aW8KICAgICBtX2Fzc2VydGlvblN0YXRlID0gYXNzZXJ0aW9uU3RhdGU7CiB9 CiAgICAgCitQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NBbmRVSUFzc2VydGlvbihwaWRf dCBwaWQsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQorICAgIDogUHJvY2Vzc0Fzc2Vy dGlvbihwaWQsIGFzc2VydGlvblN0YXRlKQoreworfQorCitQcm9jZXNzQW5kVUlBc3NlcnRpb246 On5Qcm9jZXNzQW5kVUlBc3NlcnRpb24oKQoreworfQorCit2b2lkIFByb2Nlc3NBbmRVSUFzc2Vy dGlvbjo6c2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCit7CisgICAgUHJv Y2Vzc0Fzc2VydGlvbjo6c2V0U3RhdGUoYXNzZXJ0aW9uU3RhdGUpOworfQorICAgIAogfQogCiAj ZW5kaWYgLy8gIVBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q cm9jZXNzQXNzZXJ0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1Byb2Nlc3NBc3NlcnRpb24uaAkocmV2aXNpb24gMTcwNzM4KQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIs NiBAQCBlbnVtIGNsYXNzIEFzc2VydGlvblN0YXRlIHsKIGNsYXNzIFByb2Nlc3NBc3NlcnRpb24g ewogcHVibGljOgogICAgIFByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlvblN0YXRlKTsK LSAgICB+UHJvY2Vzc0Fzc2VydGlvbigpOwogICAgIAogICAgIEFzc2VydGlvblN0YXRlIHN0YXRl KCkgY29uc3QgeyByZXR1cm4gbV9hc3NlcnRpb25TdGF0ZTsgfQogICAgIApAQCAtNTUsNiArNTQs MTQgQEAgcHJpdmF0ZToKICAgICBBc3NlcnRpb25TdGF0ZSBtX2Fzc2VydGlvblN0YXRlOwogfTsK ICAgICAKK2NsYXNzIFByb2Nlc3NBbmRVSUFzc2VydGlvbiA6IHB1YmxpYyBQcm9jZXNzQXNzZXJ0 aW9uIHsKK3B1YmxpYzoKKyAgICBQcm9jZXNzQW5kVUlBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlv blN0YXRlKTsKKyAgICB+UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKCk7CisgICAgCisgICAgdm9pZCBz ZXRTdGF0ZShBc3NlcnRpb25TdGF0ZSk7Cit9OworICAgIAogfQogCiAjZW5kaWYgLy8gUHJvY2Vz c0Fzc2VydGlvbl9oCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90 dGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCShyZXZpc2lvbiAxNzA3MzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUHJvY2Vzc1Rocm90dGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMyw3ICsxMTMsNyBA QCB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OnVwZGF0ZUFzc2VydGlvbigpCiB2b2lkIFByb2Nlc3NU aHJvdHRsZXI6OmRpZENvbm5uZWN0VG9Qcm9jZXNzKHBpZF90IHBpZCkKIHsKICAgICBtX3N1c3Bl bmRUaW1lci5zdG9wKCk7Ci0gICAgbV9hc3NlcnRpb24gPSBzdGQ6Om1ha2VfdW5pcXVlPFByb2Nl c3NBc3NlcnRpb24+KHBpZCwgYXNzZXJ0aW9uU3RhdGUoKSk7CisgICAgbV9hc3NlcnRpb24gPSBz dGQ6Om1ha2VfdW5pcXVlPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4ocGlkLCBhc3NlcnRpb25TdGF0 ZSgpKTsKIH0KICAgICAKIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6c3VzcGVuZFRpbWVyRmlyZWQo V2ViQ29yZTo6VGltZXI8UHJvY2Vzc1Rocm90dGxlcj4qKQpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCShyZXZpc2lvbiAxNzA3MzgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oCSh3b3JraW5nIGNvcHkpCkBA IC03Myw3ICs3Myw3IEBAIHByaXZhdGU6CiAgICAgCiAgICAgV2ViUHJvY2Vzc1Byb3h5KiBtX3By b2Nlc3M7CiAgICAgV2Vha1B0ckZhY3Rvcnk8UHJvY2Vzc1Rocm90dGxlcj4gbV93ZWFrUHRyRmFj dG9yeTsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vzc0Fzc2VydGlvbj4gbV9hc3NlcnRpb247 CisgICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4gbV9hc3NlcnRpb247 CiAgICAgV2ViQ29yZTo6VGltZXI8UHJvY2Vzc1Rocm90dGxlcj4gbV9zdXNwZW5kVGltZXI7CiAg ICAgdW5zaWduZWQgbV9mb3JlZ3JvdW5kQ291bnQ7CiAgICAgdW5zaWduZWQgbV9iYWNrZ3JvdW5k Q291bnQ7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRp b25JT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9j ZXNzQXNzZXJ0aW9uSU9TLm1tCShyZXZpc2lvbiAxNzA3ODEpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTE1 MCwyOSArMTUwLDM4IEBAIFByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QK ICAgICAgICAgfQogICAgIH07CiAgICAgbV9hc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vz c0Fzc2VydGlvbiBhbGxvY10gaW5pdFdpdGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNz ZXJ0aW9uU3RhdGUpIHJlYXNvbjpCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uIG5h bWU6QCJXZWIgY29udGVudCB2aXNpYmxlIiB3aXRoSGFuZGxlcjpoYW5kbGVyXSk7Cit9CisKK3Zv aWQgUHJvY2Vzc0Fzc2VydGlvbjo6c2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3Rh dGUpCit7CisgICAgaWYgKG1fYXNzZXJ0aW9uU3RhdGUgPT0gYXNzZXJ0aW9uU3RhdGUpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fYXNzZXJ0aW9uU3RhdGUgPSBhc3NlcnRpb25TdGF0ZTsKKyAg ICBbbV9hc3NlcnRpb24gc2V0RmxhZ3M6ZmxhZ3NGb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSldOwor fQogCi0gICAgaWYgKG1fYXNzZXJ0aW9uU3RhdGUgIT0gQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRl ZCkKK1Byb2Nlc3NBbmRVSUFzc2VydGlvbjo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKHBpZF90IHBp ZCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCisgICAgOiBQcm9jZXNzQXNzZXJ0aW9u KHBpZCwgYXNzZXJ0aW9uU3RhdGUpCit7CisgICAgaWYgKGFzc2VydGlvblN0YXRlICE9IEFzc2Vy dGlvblN0YXRlOjpTdXNwZW5kZWQpCiAgICAgICAgIFtbV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dy b3VuZFRhc2tNYW5hZ2VyIHNoYXJlZF0gaW5jcmVtZW50TmVlZHNUb1J1bkluQmFja2dyb3VuZENv dW50XTsKIH0KIAotUHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQorUHJvY2Vz c0FuZFVJQXNzZXJ0aW9uOjp+UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKCkKIHsKLSAgICBpZiAobV9h c3NlcnRpb25TdGF0ZSAhPSBBc3NlcnRpb25TdGF0ZTo6U3VzcGVuZGVkKQorICAgIGlmIChzdGF0 ZSgpICE9IEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQpCiAgICAgICAgIFtbV0tQcm9jZXNzQXNz ZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIHNoYXJlZF0gZGVjcmVtZW50TmVlZHNUb1J1bklu QmFja2dyb3VuZENvdW50XTsKIH0KIAotdm9pZCBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRTdGF0ZShB c3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK3ZvaWQgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9u OjpzZXRTdGF0ZShBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKIHsKLSAgICBpZiAobV9h c3NlcnRpb25TdGF0ZSA9PSBhc3NlcnRpb25TdGF0ZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg aWYgKChtX2Fzc2VydGlvblN0YXRlICE9IEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQpICYmIChh c3NlcnRpb25TdGF0ZSA9PSBBc3NlcnRpb25TdGF0ZTo6U3VzcGVuZGVkKSkKLSAgICAgICAgW1tX S1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIgc2hhcmVkXSBkZWNyZW1lbnRO ZWVkc1RvUnVuSW5CYWNrZ3JvdW5kQ291bnRdOwotICAgIGlmICgobV9hc3NlcnRpb25TdGF0ZSA9 PSBBc3NlcnRpb25TdGF0ZTo6U3VzcGVuZGVkKSAmJiAoYXNzZXJ0aW9uU3RhdGUgIT0gQXNzZXJ0 aW9uU3RhdGU6OlN1c3BlbmRlZCkpCisgICAgaWYgKChzdGF0ZSgpID09IEFzc2VydGlvblN0YXRl OjpTdXNwZW5kZWQpICYmIChhc3NlcnRpb25TdGF0ZSAhPSBBc3NlcnRpb25TdGF0ZTo6U3VzcGVu ZGVkKSkKICAgICAgICAgW1tXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIg c2hhcmVkXSBpbmNyZW1lbnROZWVkc1RvUnVuSW5CYWNrZ3JvdW5kQ291bnRdOworICAgIGlmICgo c3RhdGUoKSAhPSBBc3NlcnRpb25TdGF0ZTo6U3VzcGVuZGVkKSAmJiAoYXNzZXJ0aW9uU3RhdGUg PT0gQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZCkpCisgICAgICAgIFtbV0tQcm9jZXNzQXNzZXJ0 aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIHNoYXJlZF0gZGVjcmVtZW50TmVlZHNUb1J1bkluQmFj a2dyb3VuZENvdW50XTsKIAotICAgIG1fYXNzZXJ0aW9uU3RhdGUgPSBhc3NlcnRpb25TdGF0ZTsK LSAgICBbbV9hc3NlcnRpb24gc2V0RmxhZ3M6ZmxhZ3NGb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSld OworICAgIFByb2Nlc3NBc3NlcnRpb246OnNldFN0YXRlKGFzc2VydGlvblN0YXRlKTsKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CkBAIC0xODIsMTcgKzE5MSwyNyBAQCB2b2lkIFByb2Nlc3NB c3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlvCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogUHJvY2Vz c0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0 aW9uU3RhdGUpCisgICAgOiBtX2Fzc2VydGlvblN0YXRlKGFzc2VydGlvblN0YXRlKQoreworfQor Cit2b2lkIFByb2Nlc3NBc3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlv blN0YXRlKQogewogICAgIG1fYXNzZXJ0aW9uU3RhdGUgPSBhc3NlcnRpb25TdGF0ZTsKIH0KIAot UHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQorUHJvY2Vzc0FuZFVJQXNzZXJ0 aW9uOjpQcm9jZXNzQW5kVUlBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3Nl cnRpb25TdGF0ZSkKKyAgICA6IFByb2Nlc3NBc3NlcnRpb24ocGlkLCBhc3NlcnRpb25TdGF0ZSkK IHsKIH0KIAotdm9pZCBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRTdGF0ZShBc3NlcnRpb25TdGF0ZSBh c3NlcnRpb25TdGF0ZSkKK1Byb2Nlc3NBbmRVSUFzc2VydGlvbjo6flByb2Nlc3NBbmRVSUFzc2Vy dGlvbigpCiB7Ci0gICAgbV9hc3NlcnRpb25TdGF0ZSA9IGFzc2VydGlvblN0YXRlOworfQorCit2 b2lkIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6c2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0 aW9uU3RhdGUpCit7CisgICAgUHJvY2Vzc0Fzc2VydGlvbjo6c2V0U3RhdGUoYXNzZXJ0aW9uU3Rh dGUpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK