163537 2016-10-17 02:31:32 -0700 [GTK] Switch to use API::DownloadClient instead of the C API client 2016-10-17 03:48:07 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1240904 0 cgarcia 2016-10-17 02:31:32 -0700 Code is simpler and we avoid all the toImpl/toAPI. 1240905 1 291803 cgarcia 2016-10-17 02:33:50 -0700 Created attachment 291803 Patch 1240907 2 commit-queue 2016-10-17 02:36:35 -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 1240908 3 291803 mcatanzaro 2016-10-17 02:50:29 -0700 Comment on attachment 291803 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291803&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp:107 > + auto* processPool = webkitWebContextGetProcessPool(webContext); You don't have to fix it now, but eventually this function ought to return a reference. 1240919 4 cgarcia 2016-10-17 03:48:07 -0700 Committed r207404: <http://trac.webkit.org/changeset/207404> 291803 2016-10-17 02:33:50 -0700 2016-10-17 02:50:29 -0700 Patch wk2-downloads-api-client.diff text/plain 8362 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiYTRkNzIwLi44Zjg0Y2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTYtMTAtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFN3aXRjaCB0byB1c2UgQVBJOjpEb3dubG9hZENsaWVudCBpbnN0 ZWFkIG9mIHRoZSBDIEFQSSBjbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2MzUzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBjb2RlIGlzIHNpbXBsZXIgYW5kIHdlIGF2b2lkIGFsbCB0aGUg dG9JbXBsL3RvQVBJLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RG93bmxv YWRDbGllbnQuY3BwOgorICAgICAgICAoYXR0YWNoRG93bmxvYWRDbGllbnRUb0NvbnRleHQpOgor ICAgICAgICAoZGlkU3RhcnQpOgorICAgICAgICAoZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAg ICAgKGRpZFJlY2VpdmVEYXRhKToKKyAgICAgICAgKGRlY2lkZURlc3RpbmF0aW9uV2l0aFN1Z2dl c3RlZEZpbGVuYW1lKToKKyAgICAgICAgKGRpZENyZWF0ZURlc3RpbmF0aW9uKToKKyAgICAgICAg KGRpZEZhaWwpOgorICAgICAgICAoZGlkQ2FuY2VsKToKKyAgICAgICAgKGRpZEZpbmlzaCk6CisK IDIwMTYtMTAtMTcgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW2Nzcy1ncmlkXSBEaXNhYmxlIENTUyBHcmlkIExheW91dCBydW50aW1lIGZsYWcg YnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0RG93bmxvYWRDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0RG93bmxvYWRDbGllbnQuY3BwCmluZGV4IDAyYWJmNjYuLjZmMGE2MzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdERvd25sb2FkQ2xp ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXREb3du bG9hZENsaWVudC5jcHAKQEAgLTIwLDcgKzIwLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJXZWJLaXREb3dubG9hZENsaWVudC5oIgogCi0jaW5jbHVkZSAiQVBJVVJMUmVzcG9u c2UuaCIKKyNpbmNsdWRlICJBUElEb3dubG9hZENsaWVudC5oIgogI2luY2x1ZGUgIldlYktpdERv d25sb2FkUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFVSSVJlc3BvbnNlUHJpdmF0ZS5oIgog I2luY2x1ZGUgIldlYktpdFdlYkNvbnRleHRQcml2YXRlLmgiCkBAIC0zMiw4NSArMzIsNzggQEAK IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotc3Rh dGljIHZvaWQgZGlkU3RhcnQoV0tDb250ZXh0UmVmLCBXS0Rvd25sb2FkUmVmIHdrRG93bmxvYWQs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCi17Ci0gICAgR1JlZlB0cjxXZWJLaXREb3dubG9hZD4g ZG93bmxvYWQgPSB3ZWJraXRXZWJDb250ZXh0R2V0T3JDcmVhdGVEb3dubG9hZCh0b0ltcGwod2tE b3dubG9hZCkpOwotICAgIHdlYmtpdFdlYkNvbnRleHREb3dubG9hZFN0YXJ0ZWQoV0VCS0lUX1dF Ql9DT05URVhUKGNsaWVudEluZm8pLCBkb3dubG9hZC5nZXQoKSk7Ci19CitjbGFzcyBEb3dubG9h ZENsaWVudCBmaW5hbCA6IHB1YmxpYyBBUEk6OkRvd25sb2FkQ2xpZW50IHsKK3B1YmxpYzoKKyAg ICBleHBsaWNpdCBEb3dubG9hZENsaWVudChXZWJLaXRXZWJDb250ZXh0KiB3ZWJDb250ZXh0KQor ICAgICAgICA6IG1fd2ViQ29udGV4dCh3ZWJDb250ZXh0KQorICAgIHsKKyAgICB9CiAKLXN0YXRp YyB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShXS0NvbnRleHRSZWYsIFdLRG93bmxvYWRSZWYgd2tE b3dubG9hZCwgV0tVUkxSZXNwb25zZVJlZiB3a1Jlc3BvbnNlLCBjb25zdCB2b2lkKiAvKiBjbGll bnRJbmZvICovKQotewotICAgIEdSZWZQdHI8V2ViS2l0RG93bmxvYWQ+IGRvd25sb2FkID0gd2Vi a2l0V2ViQ29udGV4dEdldE9yQ3JlYXRlRG93bmxvYWQodG9JbXBsKHdrRG93bmxvYWQpKTsKLSAg ICBpZiAod2Via2l0RG93bmxvYWRJc0NhbmNlbGxlZChkb3dubG9hZC5nZXQoKSkpCi0gICAgICAg IHJldHVybjsKK3ByaXZhdGU6CisgICAgdm9pZCBkaWRTdGFydChXZWJQcm9jZXNzUG9vbCosIERv d25sb2FkUHJveHkqIGRvd25sb2FkUHJveHkpIG92ZXJyaWRlCisgICAgeworICAgICAgICBHUmVm UHRyPFdlYktpdERvd25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0 ZURvd25sb2FkKGRvd25sb2FkUHJveHkpOworICAgICAgICB3ZWJraXRXZWJDb250ZXh0RG93bmxv YWRTdGFydGVkKG1fd2ViQ29udGV4dCwgZG93bmxvYWQuZ2V0KCkpOworICAgIH0KIAotICAgIEdS ZWZQdHI8V2ViS2l0VVJJUmVzcG9uc2U+IHJlc3BvbnNlID0gYWRvcHRHUmVmKHdlYmtpdFVSSVJl c3BvbnNlQ3JlYXRlRm9yUmVzb3VyY2VSZXNwb25zZSh0b0ltcGwod2tSZXNwb25zZSktPnJlc291 cmNlUmVzcG9uc2UoKSkpOwotICAgIHdlYmtpdERvd25sb2FkU2V0UmVzcG9uc2UoZG93bmxvYWQu Z2V0KCksIHJlc3BvbnNlLmdldCgpKTsKLX0KKyAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShX ZWJQcm9jZXNzUG9vbCosIERvd25sb2FkUHJveHkqIGRvd25sb2FkUHJveHksIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc291cmNlUmVzcG9uc2UpIG92ZXJyaWRlCisgICAgeworICAgICAgICBH UmVmUHRyPFdlYktpdERvd25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRHZXRPckNy ZWF0ZURvd25sb2FkKGRvd25sb2FkUHJveHkpOworICAgICAgICBpZiAod2Via2l0RG93bmxvYWRJ c0NhbmNlbGxlZChkb3dubG9hZC5nZXQoKSkpCisgICAgICAgICAgICByZXR1cm47CiAKLXN0YXRp YyB2b2lkIGRpZFJlY2VpdmVEYXRhKFdLQ29udGV4dFJlZiwgV0tEb3dubG9hZFJlZiB3a0Rvd25s b2FkLCB1aW50NjRfdCBsZW5ndGgsIGNvbnN0IHZvaWQqIC8qIGNsaWVudEluZm8gKi8pCi17Ci0g ICAgR1JlZlB0cjxXZWJLaXREb3dubG9hZD4gZG93bmxvYWQgPSB3ZWJraXRXZWJDb250ZXh0R2V0 T3JDcmVhdGVEb3dubG9hZCh0b0ltcGwod2tEb3dubG9hZCkpOwotICAgIHdlYmtpdERvd25sb2Fk Tm90aWZ5UHJvZ3Jlc3MoZG93bmxvYWQuZ2V0KCksIGxlbmd0aCk7Ci19CisgICAgICAgIEdSZWZQ dHI8V2ViS2l0VVJJUmVzcG9uc2U+IHJlc3BvbnNlID0gYWRvcHRHUmVmKHdlYmtpdFVSSVJlc3Bv bnNlQ3JlYXRlRm9yUmVzb3VyY2VSZXNwb25zZShyZXNvdXJjZVJlc3BvbnNlKSk7CisgICAgICAg IHdlYmtpdERvd25sb2FkU2V0UmVzcG9uc2UoZG93bmxvYWQuZ2V0KCksIHJlc3BvbnNlLmdldCgp KTsKKyAgICB9CiAKLXN0YXRpYyBXS1N0cmluZ1JlZiBkZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdn ZXN0ZWRGaWxlbmFtZShXS0NvbnRleHRSZWYsIFdLRG93bmxvYWRSZWYgd2tEb3dubG9hZCwgV0tT dHJpbmdSZWYgZmlsZW5hbWUsIGJvb2wqIGFsbG93T3ZlcndyaXRlLCBjb25zdCB2b2lkKiAvKiBj bGllbnRJbmZvICovKQotewotICAgIEdSZWZQdHI8V2ViS2l0RG93bmxvYWQ+IGRvd25sb2FkID0g d2Via2l0V2ViQ29udGV4dEdldE9yQ3JlYXRlRG93bmxvYWQodG9JbXBsKHdrRG93bmxvYWQpKTsK LSAgICBDU3RyaW5nIGRlc3RpbmF0aW9uVVJJID0gd2Via2l0RG93bmxvYWREZWNpZGVEZXN0aW5h dGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZShkb3dubG9hZC5nZXQoKSwgdG9JbXBsKGZpbGVuYW1l KS0+c3RyaW5nKCkudXRmOCgpLCAqYWxsb3dPdmVyd3JpdGUpOwotICAgIHJldHVybiBXS1N0cmlu Z0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhkZXN0aW5hdGlvblVSSS5kYXRhKCkpOwotfQorICAgIHZv aWQgZGlkUmVjZWl2ZURhdGEoV2ViUHJvY2Vzc1Bvb2wqLCBEb3dubG9hZFByb3h5KiBkb3dubG9h ZFByb3h5LCB1aW50NjRfdCBsZW5ndGgpIG92ZXJyaWRlCisgICAgeworICAgICAgICBHUmVmUHRy PFdlYktpdERvd25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0ZURv d25sb2FkKGRvd25sb2FkUHJveHkpOworICAgICAgICB3ZWJraXREb3dubG9hZE5vdGlmeVByb2dy ZXNzKGRvd25sb2FkLmdldCgpLCBsZW5ndGgpOworICAgIH0KIAotc3RhdGljIHZvaWQgZGlkQ3Jl YXRlRGVzdGluYXRpb24oV0tDb250ZXh0UmVmLCBXS0Rvd25sb2FkUmVmIHdrRG93bmxvYWQsIFdL U3RyaW5nUmVmIHBhdGgsIGNvbnN0IHZvaWQqIC8qIGNsaWVudEluZm8gKi8pCi17Ci0gICAgR1Jl ZlB0cjxXZWJLaXREb3dubG9hZD4gZG93bmxvYWQgPSB3ZWJraXRXZWJDb250ZXh0R2V0T3JDcmVh dGVEb3dubG9hZCh0b0ltcGwod2tEb3dubG9hZCkpOwotICAgIHdlYmtpdERvd25sb2FkRGVzdGlu YXRpb25DcmVhdGVkKGRvd25sb2FkLmdldCgpLCB0b0ltcGwocGF0aCktPnN0cmluZygpLnV0Zjgo KSk7Ci19CisgICAgU3RyaW5nIGRlY2lkZURlc3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1l KFdlYlByb2Nlc3NQb29sKiwgRG93bmxvYWRQcm94eSogZG93bmxvYWRQcm94eSwgY29uc3QgU3Ry aW5nJiBmaWxlbmFtZSwgYm9vbCYgYWxsb3dPdmVyd3JpdGUpIG92ZXJyaWRlCisgICAgeworICAg ICAgICBHUmVmUHRyPFdlYktpdERvd25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRH ZXRPckNyZWF0ZURvd25sb2FkKGRvd25sb2FkUHJveHkpOworICAgICAgICByZXR1cm4gU3RyaW5n Ojpmcm9tVVRGOCh3ZWJraXREb3dubG9hZERlY2lkZURlc3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZp bGVuYW1lKGRvd25sb2FkLmdldCgpLCBmaWxlbmFtZS51dGY4KCksIGFsbG93T3ZlcndyaXRlKSk7 CisgICAgfQogCi1zdGF0aWMgdm9pZCBkaWRGYWlsKFdLQ29udGV4dFJlZiwgV0tEb3dubG9hZFJl ZiB3a0Rvd25sb2FkLCBXS0Vycm9yUmVmIGVycm9yLCBjb25zdCB2b2lkKiAvKiBjbGllbnRJbmZv ICovKQotewotICAgIEdSZWZQdHI8V2ViS2l0RG93bmxvYWQ+IGRvd25sb2FkID0gd2Via2l0V2Vi Q29udGV4dEdldE9yQ3JlYXRlRG93bmxvYWQodG9JbXBsKHdrRG93bmxvYWQpKTsKLSAgICBpZiAo d2Via2l0RG93bmxvYWRJc0NhbmNlbGxlZChkb3dubG9hZC5nZXQoKSkpIHsKLSAgICAgICAgLy8g Q2FuY2VsbGF0aW9uIHRha2VzIHByZWNlZGVuY2Ugb3ZlciBvdGhlciBlcnJvcnMuCisgICAgdm9p ZCBkaWRDcmVhdGVEZXN0aW5hdGlvbihXZWJQcm9jZXNzUG9vbCosIERvd25sb2FkUHJveHkqIGRv d25sb2FkUHJveHksIGNvbnN0IFN0cmluZyYgcGF0aCkgb3ZlcnJpZGUKKyAgICB7CisgICAgICAg IEdSZWZQdHI8V2ViS2l0RG93bmxvYWQ+IGRvd25sb2FkID0gd2Via2l0V2ViQ29udGV4dEdldE9y Q3JlYXRlRG93bmxvYWQoZG93bmxvYWRQcm94eSk7CisgICAgICAgIHdlYmtpdERvd25sb2FkRGVz dGluYXRpb25DcmVhdGVkKGRvd25sb2FkLmdldCgpLCBwYXRoLnV0ZjgoKSk7CisgICAgfQorCisg ICAgdm9pZCBkaWRGYWlsKFdlYlByb2Nlc3NQb29sKiwgRG93bmxvYWRQcm94eSogZG93bmxvYWRQ cm94eSwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpIG92ZXJyaWRlCisgICAgeworICAgICAg ICBHUmVmUHRyPFdlYktpdERvd25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRHZXRP ckNyZWF0ZURvd25sb2FkKGRvd25sb2FkUHJveHkpOworICAgICAgICBpZiAod2Via2l0RG93bmxv YWRJc0NhbmNlbGxlZChkb3dubG9hZC5nZXQoKSkpIHsKKyAgICAgICAgICAgIC8vIENhbmNlbGxh dGlvbiB0YWtlcyBwcmVjZWRlbmNlIG92ZXIgb3RoZXIgZXJyb3JzLgorICAgICAgICAgICAgd2Vi a2l0RG93bmxvYWRDYW5jZWxsZWQoZG93bmxvYWQuZ2V0KCkpOworICAgICAgICB9IGVsc2UKKyAg ICAgICAgICAgIHdlYmtpdERvd25sb2FkRmFpbGVkKGRvd25sb2FkLmdldCgpLCBlcnJvcik7Cisg ICAgICAgIHdlYmtpdFdlYkNvbnRleHRSZW1vdmVEb3dubG9hZChkb3dubG9hZFByb3h5KTsKKyAg ICB9CisKKyAgICB2b2lkIGRpZENhbmNlbChXZWJQcm9jZXNzUG9vbCosIERvd25sb2FkUHJveHkq IGRvd25sb2FkUHJveHkpIG92ZXJyaWRlCisgICAgeworICAgICAgICBHUmVmUHRyPFdlYktpdERv d25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0ZURvd25sb2FkKGRv d25sb2FkUHJveHkpOwogICAgICAgICB3ZWJraXREb3dubG9hZENhbmNlbGxlZChkb3dubG9hZC5n ZXQoKSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHdlYmtpdERvd25sb2FkRmFpbGVkKGRvd25sb2Fk LmdldCgpLCB0b0ltcGwoZXJyb3IpLT5wbGF0Zm9ybUVycm9yKCkpOwotICAgIHdlYmtpdFdlYkNv bnRleHRSZW1vdmVEb3dubG9hZCh0b0ltcGwod2tEb3dubG9hZCkpOwotfQorICAgICAgICB3ZWJr aXRXZWJDb250ZXh0UmVtb3ZlRG93bmxvYWQoZG93bmxvYWRQcm94eSk7CisgICAgfQogCi1zdGF0 aWMgdm9pZCBkaWRDYW5jZWwoV0tDb250ZXh0UmVmLCBXS0Rvd25sb2FkUmVmIHdrRG93bmxvYWQs IGNvbnN0IHZvaWQqIC8qIGNsaWVudEluZm8gKi8pCi17Ci0gICAgR1JlZlB0cjxXZWJLaXREb3du bG9hZD4gZG93bmxvYWQgPSB3ZWJraXRXZWJDb250ZXh0R2V0T3JDcmVhdGVEb3dubG9hZCh0b0lt cGwod2tEb3dubG9hZCkpOwotICAgIHdlYmtpdERvd25sb2FkQ2FuY2VsbGVkKGRvd25sb2FkLmdl dCgpKTsKLSAgICB3ZWJraXRXZWJDb250ZXh0UmVtb3ZlRG93bmxvYWQodG9JbXBsKHdrRG93bmxv YWQpKTsKLX0KKyAgICB2b2lkIGRpZEZpbmlzaChXZWJQcm9jZXNzUG9vbCosIERvd25sb2FkUHJv eHkqIGRvd25sb2FkUHJveHkpIG92ZXJyaWRlCisgICAgeworICAgICAgICBHUmVmUHRyPFdlYktp dERvd25sb2FkPiBkb3dubG9hZCA9IHdlYmtpdFdlYkNvbnRleHRHZXRPckNyZWF0ZURvd25sb2Fk KGRvd25sb2FkUHJveHkpOworICAgICAgICB3ZWJraXREb3dubG9hZEZpbmlzaGVkKGRvd25sb2Fk LmdldCgpKTsKKyAgICAgICAgd2Via2l0V2ViQ29udGV4dFJlbW92ZURvd25sb2FkKGRvd25sb2Fk UHJveHkpOworICAgIH0KIAotc3RhdGljIHZvaWQgZGlkRmluaXNoKFdLQ29udGV4dFJlZiwgV0tE b3dubG9hZFJlZiB3a0Rvd25sb2FkLCBjb25zdCB2b2lkKiAvKiBjbGllbnRJbmZvICovKQotewot ICAgIEdSZWZQdHI8V2ViS2l0RG93bmxvYWQ+IGRvd25sb2FkID0gd2Via2l0V2ViQ29udGV4dEdl dE9yQ3JlYXRlRG93bmxvYWQodG9JbXBsKHdrRG93bmxvYWQpKTsKLSAgICB3ZWJraXREb3dubG9h ZEZpbmlzaGVkKGRvd25sb2FkLmdldCgpKTsKLSAgICB3ZWJraXRXZWJDb250ZXh0UmVtb3ZlRG93 bmxvYWQodG9JbXBsKHdrRG93bmxvYWQpKTsKLX0KKyAgICBXZWJLaXRXZWJDb250ZXh0KiBtX3dl YkNvbnRleHQ7Cit9OwogCiB2b2lkIGF0dGFjaERvd25sb2FkQ2xpZW50VG9Db250ZXh0KFdlYktp dFdlYkNvbnRleHQqIHdlYkNvbnRleHQpCiB7Ci0gICAgV0tDb250ZXh0RG93bmxvYWRDbGllbnRW MCB3a0Rvd25sb2FkQ2xpZW50ID0gewotICAgICAgICB7Ci0gICAgICAgICAgICAwLCAvLyB2ZXJz aW9uCi0gICAgICAgICAgICB3ZWJDb250ZXh0LCAvLyBDbGllbnRJbmZvCi0gICAgICAgIH0sCi0g ICAgICAgIGRpZFN0YXJ0LAotICAgICAgICAwLCAvLyBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25D aGFsbGVuZ2UKLSAgICAgICAgZGlkUmVjZWl2ZVJlc3BvbnNlLAotICAgICAgICBkaWRSZWNlaXZl RGF0YSwKLSAgICAgICAgMCwgLy8gc2hvdWxkRGVjb2RlU291cmNlRGF0YU9mTUlNRVR5cGUKLSAg ICAgICAgZGVjaWRlRGVzdGluYXRpb25XaXRoU3VnZ2VzdGVkRmlsZW5hbWUsCi0gICAgICAgIGRp ZENyZWF0ZURlc3RpbmF0aW9uLAotICAgICAgICBkaWRGaW5pc2gsCi0gICAgICAgIGRpZEZhaWws Ci0gICAgICAgIGRpZENhbmNlbCwKLSAgICAgICAgMCwgLy8gcHJvY2Vzc0RpZENyYXNoCi0gICAg fTsKLSAgICBXS0NvbnRleHRTZXREb3dubG9hZENsaWVudCh0b0FQSSh3ZWJraXRXZWJDb250ZXh0 R2V0UHJvY2Vzc1Bvb2wod2ViQ29udGV4dCkpLCAmd2tEb3dubG9hZENsaWVudC5iYXNlKTsKKyAg ICBhdXRvKiBwcm9jZXNzUG9vbCA9IHdlYmtpdFdlYkNvbnRleHRHZXRQcm9jZXNzUG9vbCh3ZWJD b250ZXh0KTsKKyAgICBwcm9jZXNzUG9vbC0+c2V0RG93bmxvYWRDbGllbnQoc3RkOjptYWtlX3Vu aXF1ZTxEb3dubG9hZENsaWVudD4od2ViQ29udGV4dCkpOwogfQotCg==