210273 2020-04-09 06:59:13 -0700 [GTK] Clean-up use of deprecated GtkAction 2020-04-09 07:49:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210100 1 csaavedra csaavedra berto cgarcia ews-watchlist gustavo webkit-bug-importer oldest_to_newest 1639615 0 csaavedra 2020-04-09 06:59:13 -0700 [GTK] Clean-up use of deprecated GtkAction 1639617 1 395946 csaavedra 2020-04-09 07:04:33 -0700 Created attachment 395946 Patch 1639619 2 ews-watchlist 2020-04-09 07:05:11 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1639621 3 csaavedra 2020-04-09 07:06:20 -0700 Note that MiniBrowser is still using GtkAction and other APIs that are gone in GTK4. I didn't include that in this patch as it will require more work to redo the UI and we probably want to refresh it anyway a bit. 1639636 4 ews-feeder 2020-04-09 07:48:36 -0700 Committed r259799: <https://trac.webkit.org/changeset/259799> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395946. 1639638 5 webkit-bug-importer 2020-04-09 07:49:13 -0700 <rdar://problem/61517516> 395946 2020-04-09 07:04:33 -0700 2020-04-09 07:48:36 -0700 Patch bug-210273-20200409170432.patch text/plain 9339 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI5Njc1MzY4M2U3YzI3ODMx NTE5MWI4YjY5NTAxNzVhYjhjOTQ0ZTcuLjkzNTU3NzZjNTA0NTBkMmEzZGM5NWRiNjBmOThlNzUz ODFiOTFhZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDQtMDkgIENsYXVkaW8g U2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBDbGVhbi11 cCB1c2Ugb2YgZGVwcmVjYXRlZCBHdGtBY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDI3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEd0a0FjdGlvbiBpcyBkZXByZWNhdGVkLCBob3dldmVyIHdl IHVzZSBpdCBiZWNhdXNlIGl0J3MgZXhwb3NlZAorICAgICAgICBpbiB0aGUgcHVibGljIEFQSS4g R3VhcmQgZGVwcmVjYXRlZCBBUEkgdXNhZ2UgdG8gcmVtb3ZlIHdhcm5pbmdzIGFuZAorICAgICAg ICB1cGRhdGUgZG9jcyB0byBub3Qgc3VnZ2VzdCB1c2luZyB0aGUgZGVwcmVjYXRlZCBBUEkuCisK KyAgICAgICAgKiBTaGFyZWQvQVBJL2dsaWIvV2ViS2l0Q29udGV4dE1lbnVJdGVtLmNwcDoKKyAg ICAgICAgKiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6YnVpbGRBY3Rpb25OYW1lIGNvbnN0KToK KyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6Y3JlYXRlQWN0aW9uSWZO ZWVkZWQpOgorCiAyMDIwLTA0LTA4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+ CiAKICAgICAgICAgV1RGOjpQZXJzaXN0ZW5jZTo6VmVjdG9yQ29kZXIgYW5kIElQQzo6VmVjdG9y QXJndW1lbnRDb2RlciBzaG91bGQgdXNlIGNoZWNrZWQgYXJpdGhtZXRpYwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TaGFyZWQvQVBJL2dsaWIvV2ViS2l0Q29udGV4dE1lbnVJdGVtLmNwcCBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0FQSS9nbGliL1dlYktpdENvbnRleHRNZW51SXRlbS5jcHAK aW5kZXggZmFlZmVkMmRjYzgzOGVlOTU3MzkwNjVkYWM2M2YxMzU2M2YwZDNiMC4uZTVkMmUyOWUy M2IzNWQ3OGZhNmEwNTc4Yjk1MWJhNTQ3NjVmOTc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TaGFyZWQvQVBJL2dsaWIvV2ViS2l0Q29udGV4dE1lbnVJdGVtLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9BUEkvZ2xpYi9XZWJLaXRDb250ZXh0TWVudUl0ZW0uY3BwCkBAIC0xODAs MTAgKzE4MCwxMCBAQCBXZWJLaXRDb250ZXh0TWVudUl0ZW0qIHdlYmtpdF9jb250ZXh0X21lbnVf aXRlbV9uZXdfZnJvbV9nYWN0aW9uKEdBY3Rpb24qIGFjdGlvbgogICogU3RvY2sgYWN0aW9ucyBh cmUgaGFuZGxlZCBhdXRvbWF0aWNhbGx5IGJ5IFdlYktpdCBzbyB0aGF0LCBmb3IgZXhhbXBsZSwK ICAqIHdoZW4gYSBtZW51IGl0ZW0gY3JlYXRlZCB3aXRoIGEgJVdFQktJVF9DT05URVhUX01FTlVf QUNUSU9OX1NUT1AgaXMKICAqIGFjdGl2YXRlZCB0aGUgYWN0aW9uIGFzc29jaWF0ZWQgd2lsbCBi ZSBoYW5kbGVkIGJ5IFdlYktpdCBhbmQgdGhlIGN1cnJlbnQKLSAqIGxvYWQgb3BlcmF0aW9uIHdp bGwgYmUgc3RvcHBlZC4gWW91IGNhbiBnZXQgdGhlICNHdGtBY3Rpb24gb2YgYQorICogbG9hZCBv cGVyYXRpb24gd2lsbCBiZSBzdG9wcGVkLiBZb3UgY2FuIGdldCB0aGUgI0dBY3Rpb24gb2YgYQog ICogI1dlYktpdENvbnRleHRNZW51SXRlbSBjcmVhdGVkIHdpdGggYSAjV2ViS2l0Q29udGV4dE1l bnVBY3Rpb24gd2l0aAotICogd2Via2l0X2NvbnRleHRfbWVudV9pdGVtX2dldF9hY3Rpb24oKSBh bmQgY29ubmVjdCB0byAjR3RrQWN0aW9uOjphY3RpdmF0ZSBzaWduYWwKLSAqIHRvIGJlIG5vdGlm aWVkIHdoZW4gdGhlIGl0ZW0gaXMgYWN0aXZhdGVkLiBCdXQgeW91IGNhbid0IHByZXZlbnQgdGhl IGFzc29jaWF0ZWQKKyAqIHdlYmtpdF9jb250ZXh0X21lbnVfaXRlbV9nZXRfZ2FjdGlvbigpIGFu ZCBjb25uZWN0IHRvIHRoZSAjR1NpbXBsZUFjdGlvbjo6YWN0aXZhdGUgc2lnbmFsCisgKiB0byBi ZSBub3RpZmllZCB3aGVuIHRoZSBpdGVtIGlzIGFjdGl2YXRlZCwgYnV0IHlvdSBjYW4ndCBwcmV2 ZW50IHRoZSBhc3NvY2lhdGVkCiAgKiBhY3Rpb24gZnJvbSBiZWluZyBwZXJmb3JtZWQuCiAgKgog ICogUmV0dXJuczogdGhlIG5ld2x5IGNyZWF0ZWQgI1dlYktpdENvbnRleHRNZW51SXRlbSBvYmpl Y3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9nbGliL1dlYkNvbnRleHRNZW51 SXRlbUdsaWIuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0 ZW1HbGliLmNwcAppbmRleCA3Zjc1YTYwNmM3MjIyYzMwOWVlNTNmNTc4N2IwYjg4ZmRjMTdkNjgx Li4yMzU3NGU3NDZmODU2NmNlZmRhNWVkYTBjNWM5OWZjOGRjYWRkZjg5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9nbGliL1dlYkNvbnRleHRNZW51SXRlbUdsaWIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL2dsaWIvV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5jcHAKQEAg LTc4LDYgKzc4LDcgQEAgV2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6V2ViQ29udGV4dE1lbnVJdGVt R2xpYihHQWN0aW9uKiBhY3Rpb24sIGNvbnN0IFN0cmluZyYgdGkKIH0KIAogI2lmIFBMQVRGT1JN KEdUSykKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiBXZWJDb250ZXh0TWVu dUl0ZW1HbGliOjpXZWJDb250ZXh0TWVudUl0ZW1HbGliKEd0a0FjdGlvbiogYWN0aW9uKQogICAg IDogV2ViQ29udGV4dE1lbnVJdGVtRGF0YShHVEtfSVNfVE9HR0xFX0FDVElPTihhY3Rpb24pID8g Q2hlY2thYmxlQWN0aW9uVHlwZSA6IEFjdGlvblR5cGUsIENvbnRleHRNZW51SXRlbUJhc2VBcHBs aWNhdGlvblRhZywgU3RyaW5nOjpmcm9tVVRGOChndGtfYWN0aW9uX2dldF9sYWJlbChhY3Rpb24p KSwgZ3RrX2FjdGlvbl9nZXRfc2Vuc2l0aXZlKGFjdGlvbiksIEdUS19JU19UT0dHTEVfQUNUSU9O KGFjdGlvbikgPyBndGtfdG9nZ2xlX2FjdGlvbl9nZXRfYWN0aXZlKEdUS19UT0dHTEVfQUNUSU9O KGFjdGlvbikpIDogZmFsc2UpCiB7CkBAIC04NSw2ICs4Niw3IEBAIFdlYkNvbnRleHRNZW51SXRl bUdsaWI6OldlYkNvbnRleHRNZW51SXRlbUdsaWIoR3RrQWN0aW9uKiBhY3Rpb24pCiAgICAgY3Jl YXRlQWN0aW9uSWZOZWVkZWQoKTsKICAgICBnX29iamVjdF9zZXRfZGF0YV9mdWxsKEdfT0JKRUNU KG1fZ0FjdGlvbi5nZXQoKSksICJ3ZWJraXQtZ3RrLWFjdGlvbiIsIGdfb2JqZWN0X3JlZihtX2d0 a0FjdGlvbiksIGdfb2JqZWN0X3VucmVmKTsKIH0KK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJ T05TX0VORAogI2VuZGlmCiAKIFdlYkNvbnRleHRNZW51SXRlbUdsaWI6On5XZWJDb250ZXh0TWVu dUl0ZW1HbGliKCkKQEAgLTk0LDggKzk2LDEwIEBAIFdlYkNvbnRleHRNZW51SXRlbUdsaWI6On5X ZWJDb250ZXh0TWVudUl0ZW1HbGliKCkKIEdVbmlxdWVQdHI8Y2hhcj4gV2ViQ29udGV4dE1lbnVJ dGVtR2xpYjo6YnVpbGRBY3Rpb25OYW1lKCkgY29uc3QKIHsKICNpZiBQTEFURk9STShHVEspCitB TExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgIGlmIChtX2d0a0FjdGlvbikK ICAgICAgICAgcmV0dXJuIEdVbmlxdWVQdHI8Y2hhcj4oZ19zdHJkdXAoZ3RrX2FjdGlvbl9nZXRf bmFtZShtX2d0a0FjdGlvbikpKTsKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAog I2VuZGlmCiAKICAgICBzdGF0aWMgdWludDY0X3QgYWN0aW9uSUQgPSAwOwpAQCAtMTE3LDYgKzEy MSw3IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6Y3JlYXRlQWN0aW9uSWZOZWVkZWQo KQogICAgIH0KIAogI2lmIFBMQVRGT1JNKEdUSykKK0FMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJ T05TX0JFR0lOCiAgICAgLy8gQ3JlYXRlIHRoZSBHdGtBY3Rpb24gZm9yIGJhY2t3YXJkcyBjb21w YXRpYmlsaXR5IG9ubHkuCiAgICAgaWYgKCFtX2d0a0FjdGlvbikgewogICAgICAgICBpZiAodHlw ZSgpID09IENoZWNrYWJsZUFjdGlvblR5cGUpIHsKQEAgLTEyOSw2ICsxMzQsNyBAQCB2b2lkIFdl YkNvbnRleHRNZW51SXRlbUdsaWI6OmNyZWF0ZUFjdGlvbklmTmVlZGVkKCkKICAgICB9CiAKICAg ICBnX3NpZ25hbF9jb25uZWN0X29iamVjdChtX2dBY3Rpb24uZ2V0KCksICJhY3RpdmF0ZSIsIEdf Q0FMTEJBQ0soZ3RrX2FjdGlvbl9hY3RpdmF0ZSksIG1fZ3RrQWN0aW9uLCBHX0NPTk5FQ1RfU1dB UFBFRCk7CitBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICNlbmRpZgogfQogCmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDY4ZWU0 NWIyYzliMGUwZmIxZTM3MWNjOWE1ODY5YTY5MzkzODhhYy4uMzU1ZWQzNjc5ZDFjY2FmZjE0MWIy N2NmMTZiN2U0YTY3YWE0M2Y1YiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA0LTA5ICBDbGF1ZGlvIFNhYXZl ZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQ2xlYW4tdXAgdXNl IG9mIGRlcHJlY2F0ZWQgR3RrQWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTAyNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBHdGtBY3Rpb24gaXMgZGVwcmVjYXRlZCBzbyByZW1vdmUgdXNhZ2Ug b2YgaXQgaW4gdGhlCisgICAgICAgIGNvbnRleHQgbWVudSBBUEkgdGVzdHMgYW5kIGd1YXJkIGl0 cyBBUEkgdXNhZ2Ugd2hlbgorICAgICAgICB3ZSBzdGlsbCBuZWVkIHRvIHVzZSBpdCB0byB0ZXN0 IHRoZSBkZXByZWNhdGVkIFdlYktpdEdUSysgQVBJCisgICAgICAgIGV4cG9zaW5nIEd0a0FjdGlv bi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RDb250ZXh0 TWVudS5jcHA6CisgICAgICAgICh0ZXN0Q29udGV4dE1lbnVQb3B1bGF0ZU1lbnUpOgorCiAyMDIw LTA0LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgX2NvcnNEaXNhYmxpbmdQYXR0ZXJucyBzaG91bGQgYWxsb3cgc2VjdXJpdHkgcG9saWN5 IGFjY2VzcyB0byB0aG9zZSBwYXR0ZXJucwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRHdGsvVGVzdENvbnRleHRNZW51LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RDb250ZXh0TWVudS5jcHAKaW5kZXggMmI4MmZmYTJkMGQw MTlmNWZkM2Q3NDZiYzc0ZTZmOWVlNzNjYjkwYS4uYzM5ZTFkZjMzZTAwNmVmYjNhZGRiYjM5MjA3 OTkwZjZmOGE0YWFiZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRHdGsvVGVzdENvbnRleHRNZW51LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdEd0ay9UZXN0Q29udGV4dE1lbnUuY3BwCkBAIC0xMTIsMjMgKzExMiwyMCBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHZvaWQgY2hlY2tBY3Rpb25TdGF0 ZShHdGtBY3Rpb24qIGFjdGlvbiwgdW5zaWduZWQgc3RhdGUpCisgICAgdm9pZCBjaGVja0FjdGlv blN0YXRlKEdBY3Rpb24qIGFjdGlvbiwgdW5zaWduZWQgc3RhdGUpCiAgICAgewotICAgICAgICBp ZiAoc3RhdGUgJiBWaXNpYmxlKQotICAgICAgICAgICAgZ19hc3NlcnRfdHJ1ZShndGtfYWN0aW9u X2dldF92aXNpYmxlKGFjdGlvbikpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBnX2Fzc2Vy dF9mYWxzZShndGtfYWN0aW9uX2dldF92aXNpYmxlKGFjdGlvbikpOwotCiAgICAgICAgIGlmIChz dGF0ZSAmIEVuYWJsZWQpCi0gICAgICAgICAgICBnX2Fzc2VydF90cnVlKGd0a19hY3Rpb25fZ2V0 X3NlbnNpdGl2ZShhY3Rpb24pKTsKKyAgICAgICAgICAgIGdfYXNzZXJ0X3RydWUoZ19hY3Rpb25f Z2V0X2VuYWJsZWQoYWN0aW9uKSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGdfYXNzZXJ0 X2ZhbHNlKGd0a19hY3Rpb25fZ2V0X3NlbnNpdGl2ZShhY3Rpb24pKTsKKyAgICAgICAgICAgIGdf YXNzZXJ0X2ZhbHNlKGdfYWN0aW9uX2dldF9lbmFibGVkKGFjdGlvbikpOwogCi0gICAgICAgIGlm IChHVEtfSVNfVE9HR0xFX0FDVElPTihhY3Rpb24pKSB7CisgICAgICAgIGNvbnN0IEdWYXJpYW50 VHlwZSogdHlwZSA9IGdfYWN0aW9uX2dldF9zdGF0ZV90eXBlKGFjdGlvbik7CisgICAgICAgIGlm ICh0eXBlICYmIGdfdmFyaWFudF90eXBlX2VxdWFsKHR5cGUsIEdfVkFSSUFOVF9UWVBFX0JPT0xF QU4pKSB7CisgICAgICAgICAgICBHUmVmUHRyPEdWYXJpYW50PiBhY3Rpb25TdGF0ZSA9IGFkb3B0 R1JlZihnX2FjdGlvbl9nZXRfc3RhdGUoYWN0aW9uKSk7CiAgICAgICAgICAgICBpZiAoc3RhdGUg JiBDaGVja2VkKQotICAgICAgICAgICAgICAgIGdfYXNzZXJ0X3RydWUoZ3RrX3RvZ2dsZV9hY3Rp b25fZ2V0X2FjdGl2ZShHVEtfVE9HR0xFX0FDVElPTihhY3Rpb24pKSk7CisgICAgICAgICAgICAg ICAgZ19hc3NlcnRfdHJ1ZShnX3ZhcmlhbnRfZ2V0X2Jvb2xlYW4oYWN0aW9uU3RhdGUuZ2V0KCkp KTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBnX2Fzc2VydF9mYWxzZShndGtf dG9nZ2xlX2FjdGlvbl9nZXRfYWN0aXZlKEdUS19UT0dHTEVfQUNUSU9OKGFjdGlvbikpKTsKKyAg ICAgICAgICAgICAgICBnX2Fzc2VydF9mYWxzZShnX3ZhcmlhbnRfZ2V0X2Jvb2xlYW4oYWN0aW9u U3RhdGUuZ2V0KCkpKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTUwLDcgKzE0Nyw3IEBAIHB1 YmxpYzoKIAogICAgICAgICBnX2Fzc2VydF9jbXBpbnQod2Via2l0X2NvbnRleHRfbWVudV9pdGVt X2dldF9zdG9ja19hY3Rpb24oaXRlbSksID09LCBzdG9ja0FjdGlvbik7CiAKLSAgICAgICAgY2hl Y2tBY3Rpb25TdGF0ZShhY3Rpb24sIHN0YXRlKTsKKyAgICAgICAgY2hlY2tBY3Rpb25TdGF0ZShn QWN0aW9uLCBzdGF0ZSk7CiAKICAgICAgICAgcmV0dXJuIGdfbGlzdF9uZXh0KGl0ZW1zKTsKICAg ICB9CkBAIC0xNjYsNyArMTYzLDYgQEAgcHVibGljOgogICAgICAgICBHX0dOVUNfQkVHSU5fSUdO T1JFX0RFUFJFQ0FUSU9OUzsKICAgICAgICAgR3RrQWN0aW9uKiBhY3Rpb24gPSB3ZWJraXRfY29u dGV4dF9tZW51X2l0ZW1fZ2V0X2FjdGlvbihpdGVtKTsKICAgICAgICAgZ19hc3NlcnRfdHJ1ZShH VEtfSVNfQUNUSU9OKGFjdGlvbikpOwotICAgICAgICBHX0dOVUNfRU5EX0lHTk9SRV9ERVBSRUNB VElPTlM7CiAKICAgICAgICAgR0FjdGlvbiogZ0FjdGlvbiA9IHdlYmtpdF9jb250ZXh0X21lbnVf aXRlbV9nZXRfZ2FjdGlvbihpdGVtKTsKICAgICAgICAgZ19hc3NlcnRfdHJ1ZShHX0lTX0FDVElP TihnQWN0aW9uKSk7CkBAIC0xODEsOCArMTc3LDkgQEAgcHVibGljOgogCiAgICAgICAgIGdfYXNz ZXJ0X2NtcGludCh3ZWJraXRfY29udGV4dF9tZW51X2l0ZW1fZ2V0X3N0b2NrX2FjdGlvbihpdGVt KSwgPT0sIFdFQktJVF9DT05URVhUX01FTlVfQUNUSU9OX0NVU1RPTSk7CiAgICAgICAgIGdfYXNz ZXJ0X2NtcHN0cihndGtfYWN0aW9uX2dldF9sYWJlbChhY3Rpb24pLCA9PSwgbGFiZWwpOworICAg ICAgICBHX0dOVUNfRU5EX0lHTk9SRV9ERVBSRUNBVElPTlM7CiAKLSAgICAgICAgY2hlY2tBY3Rp b25TdGF0ZShhY3Rpb24sIHN0YXRlKTsKKyAgICAgICAgY2hlY2tBY3Rpb25TdGF0ZShnQWN0aW9u LCBzdGF0ZSk7CiAKICAgICAgICAgcmV0dXJuIGdfbGlzdF9uZXh0KGl0ZW1zKTsKICAgICB9CkBA IC0yMDQsNyArMjAxLDcgQEAgcHVibGljOgogICAgICAgICBHQWN0aW9uKiBnQWN0aW9uID0gd2Vi a2l0X2NvbnRleHRfbWVudV9pdGVtX2dldF9nYWN0aW9uKGl0ZW0pOwogICAgICAgICBnX2Fzc2Vy dF90cnVlKEdfSVNfQUNUSU9OKGdBY3Rpb24pKTsKIAotICAgICAgICBjaGVja0FjdGlvblN0YXRl KGFjdGlvbiwgc3RhdGUpOworICAgICAgICBjaGVja0FjdGlvblN0YXRlKGdBY3Rpb24sIHN0YXRl KTsKIAogICAgICAgICBXZWJLaXRDb250ZXh0TWVudSogc3ViTWVudSA9IHdlYmtpdF9jb250ZXh0 X21lbnVfaXRlbV9nZXRfc3VibWVudShpdGVtKTsKICAgICAgICAgZ19hc3NlcnRfdHJ1ZShXRUJL SVRfSVNfQ09OVEVYVF9NRU5VKHN1Yk1lbnUpKTsKQEAgLTY1NSw2ICs2NTIsNyBAQCBzdGF0aWMg dm9pZCB0ZXN0Q29udGV4dE1lbnVQb3B1bGF0ZU1lbnUoQ29udGV4dE1lbnVDdXN0b21UZXN0KiB0 ZXN0LCBnY29uc3Rwb2ludAogICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbD48Ym9keT5XZWJLaXRH VEsgQ29udGV4dCBtZW51IHRlc3RzPC9ib2R5PjwvaHRtbD4iLCAiZmlsZTovLy8iKTsKICAgICB0 ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAorICAgIEdfR05VQ19CRUdJTl9JR05PUkVf REVQUkVDQVRJT05TOwogICAgIC8vIENyZWF0ZSBhIGN1c3RvbSBtZW51IGl0ZW0uCiAgICAgR1Jl ZlB0cjxHdGtBY3Rpb24+IGFjdGlvbiA9IGFkb3B0R1JlZihndGtfYWN0aW9uX25ldygiV2ViS2l0 R1RLQ3VzdG9tQWN0aW9uIiwgIkN1c3RvbSBfQWN0aW9uIiwgbnVsbHB0ciwgbnVsbHB0cikpOwog ICAgIHRlc3QtPnNldEFjdGlvbihhY3Rpb24uZ2V0KCkpOwpAQCAtNjcwLDYgKzY2OCw3IEBAIHN0 YXRpYyB2b2lkIHRlc3RDb250ZXh0TWVudVBvcHVsYXRlTWVudShDb250ZXh0TWVudUN1c3RvbVRl c3QqIHRlc3QsIGdjb25zdHBvaW50CiAgICAgdGVzdC0+dG9nZ2xlQ3VzdG9tTWVudUl0ZW1BbmRX YWl0VW50aWxUb2dnbGVkKGd0a19hY3Rpb25fZ2V0X2xhYmVsKHRvZ2dsZUFjdGlvbi5nZXQoKSkp OwogICAgIGdfYXNzZXJ0X2ZhbHNlKHRlc3QtPm1fYWN0aXZhdGVkKTsKICAgICBnX2Fzc2VydF90 cnVlKHRlc3QtPm1fdG9nZ2xlZCk7CisgICAgR19HTlVDX0VORF9JR05PUkVfREVQUkVDQVRJT05T OwogCiAgICAgLy8gQ3JlYXRlIGEgY3VzdG9tIG1lbnUgaXRlbSB1c2luZyBHQWN0aW9uLgogICAg IEdSZWZQdHI8R0FjdGlvbj4gZ0FjdGlvbiA9IGFkb3B0R1JlZihHX0FDVElPTihnX3NpbXBsZV9h Y3Rpb25fbmV3KCJXZWJLaXRHVEtDdXN0b21HQWN0aW9uIiwgbnVsbHB0cikpKTsK