96783 2012-09-14 07:27:30 -0700 [GTK] Don't use the C API internally in WebKitWebResource 2012-10-18 05:35:24 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96782 96766 96784 99705 1 cgarcia webkit-unassigned mario oldest_to_newest 720745 0 cgarcia 2012-09-14 07:27:30 -0700 Use the C++ classes instead. 720747 1 164146 cgarcia 2012-09-14 07:28:43 -0700 Created attachment 164146 Patch 733453 2 164146 mario 2012-10-03 01:50:09 -0700 Comment on attachment 164146 Patch Looks good to me 745174 3 164146 xan.lopez 2012-10-18 05:16:54 -0700 Comment on attachment 164146 Patch OK. 745184 4 cgarcia 2012-10-18 05:35:24 -0700 Committed r131733: <http://trac.webkit.org/changeset/131733> 164146 2012-09-14 07:28:43 -0700 2012-10-18 05:16:53 -0700 Patch wk2-no-c-api-web-resource.diff text/plain 7895 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi5iNzcxMjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRXZWJSZXNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTY3ODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2luZyB0aGUgQysrIGNsYXNzZXMgZGlyZWN0bHkgaW5zdGVhZCBvZiB0aGUgQyBBUEkg d3JhcHBlcnMgd2UKKyAgICAgICAgYXZvaWQgYSBsb3Qgb2YgdG9JbXBsL3RvQVBJIGNhc3RzLCBz dHJpbmcgY29udmVyc2lvbnMgYW5kCisgICAgICAgIGFsbG9jYXRpb25zLiBUaGUgY29kZSBpcyBh bHNvIGEgbG90IHNpbXBsZXIgYW5kIGVhc2llciB0byByZWFkLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuY3BwOgorICAgICAgICAoX1dlYktpdFdlYlJl c291cmNlUHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRXZWJSZXNvdXJjZUNyZWF0ZSk6CisgICAg ICAgICh3ZWJraXRXZWJSZXNvdXJjZUdldEZyYW1lKToKKyAgICAgICAgKFJlc291cmNlR2V0RGF0 YUFzeW5jRGF0YSk6CisgICAgICAgIChyZXNvdXJjZURhdGFDYWxsYmFjayk6CisgICAgICAgICh3 ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhKToKKyAgICAgICAgKHdlYmtpdF93ZWJfcmVzb3Vy Y2VfZ2V0X2RhdGFfZmluaXNoKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJSZXNvdXJjZVByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3LmNwcDoKKyAgICAgICAgKHNldENlcnRpZmljYXRlVG9NYWluUmVzb3VyY2UpOgorICAg ICAgICAod2Via2l0V2ViVmlld1Jlc291cmNlTG9hZFN0YXJ0ZWQpOgorCiAyMDEyLTA5LTEyICBT aGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByMTI3ODc2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuY3BwCmluZGV4IDVjYTVlOTguLjhk ZGMwNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlJlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJSZXNvdXJjZS5jcHAKQEAgLTIwLDYgKzIwLDggQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJXZWJLaXRXZWJSZXNvdXJjZS5oIgogCisjaW5jbHVkZSAiV2ViRGF0YS5o IgorI2luY2x1ZGUgIldlYkZyYW1lUHJveHkuaCIKICNpbmNsdWRlICJXZWJLaXRNYXJzaGFsLmgi CiAjaW5jbHVkZSAiV2ViS2l0VVJJUmVxdWVzdC5oIgogI2luY2x1ZGUgIldlYktpdFdlYlJlc291 cmNlUHJpdmF0ZS5oIgpAQCAtMjcsOCArMjksNiBAQAogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dS ZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKLXVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7Ci0KIGVudW0gewogICAgIFNFTlRfUkVRVUVTVCwKICAgICBSRUNFSVZFRF9EQVRB LApAQCAtNDcsNyArNDcsNyBAQCBlbnVtIHsKIAogCiBzdHJ1Y3QgX1dlYktpdFdlYlJlc291cmNl UHJpdmF0ZSB7Ci0gICAgV0tSZXRhaW5QdHI8V0tGcmFtZVJlZj4gd2tGcmFtZTsKKyAgICBSZWZQ dHI8V2ViRnJhbWVQcm94eT4gZnJhbWU7CiAgICAgQ1N0cmluZyB1cmk7CiAgICAgR1JlZlB0cjxX ZWJLaXRVUklSZXNwb25zZT4gcmVzcG9uc2U7CiAgICAgYm9vbCBpc01haW5SZXNvdXJjZTsKQEAg LTIwNSwxMSArMjA1LDExIEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlJlc291cmNlVXBkYXRlVVJJ KFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSwgY29uc3QgQ1N0cmluCiAgICAgZ19vYmplY3Rf bm90aWZ5KEdfT0JKRUNUKHJlc291cmNlKSwgInVyaSIpOwogfQogCi1XZWJLaXRXZWJSZXNvdXJj ZSogd2Via2l0V2ViUmVzb3VyY2VDcmVhdGUoV0tGcmFtZVJlZiB3a0ZyYW1lLCBXZWJLaXRVUklS ZXF1ZXN0KiByZXF1ZXN0LCBib29sIGlzTWFpblJlc291cmNlKQorV2ViS2l0V2ViUmVzb3VyY2Uq IHdlYmtpdFdlYlJlc291cmNlQ3JlYXRlKFdlYkZyYW1lUHJveHkqIGZyYW1lLCBXZWJLaXRVUklS ZXF1ZXN0KiByZXF1ZXN0LCBib29sIGlzTWFpblJlc291cmNlKQogewogICAgIEFTU0VSVCh3a0Zy YW1lKTsKICAgICBXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UgPSBXRUJLSVRfV0VCX1JFU09V UkNFKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfUkVTT1VSQ0UsIE5VTEwpKTsKLSAgICBy ZXNvdXJjZS0+cHJpdi0+d2tGcmFtZSA9IHdrRnJhbWU7CisgICAgcmVzb3VyY2UtPnByaXYtPmZy YW1lID0gZnJhbWU7CiAgICAgcmVzb3VyY2UtPnByaXYtPnVyaSA9IHdlYmtpdF91cmlfcmVxdWVz dF9nZXRfdXJpKHJlcXVlc3QpOwogICAgIHJlc291cmNlLT5wcml2LT5pc01haW5SZXNvdXJjZSA9 IGlzTWFpblJlc291cmNlOwogICAgIHJldHVybiByZXNvdXJjZTsKQEAgLTI0Myw5ICsyNDMsOSBA QCB2b2lkIHdlYmtpdFdlYlJlc291cmNlRmFpbGVkKFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJj ZSwgR0Vycm9yKiBlcnJvcikKICAgICBnX3NpZ25hbF9lbWl0KHJlc291cmNlLCBzaWduYWxzW0ZJ TklTSEVEXSwgMCwgTlVMTCk7CiB9CiAKLVdLRnJhbWVSZWYgd2Via2l0V2ViUmVzb3VyY2VHZXRG cmFtZShXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UpCitXZWJGcmFtZVByb3h5KiB3ZWJraXRX ZWJSZXNvdXJjZUdldEZyYW1lKFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSkKIHsKLSAgICBy ZXR1cm4gcmVzb3VyY2UtPnByaXYtPndrRnJhbWUuZ2V0KCk7CisgICAgcmV0dXJuIHJlc291cmNl LT5wcml2LT5mcmFtZS5nZXQoKTsKIH0KIAogLyoqCkBAIC0zMDcsNyArMzA3LDcgQEAgV2ViS2l0 VVJJUmVzcG9uc2UqIHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3Jlc3BvbnNlKFdlYktpdFdlYlJl c291cmNlKiByZXNvdXJjZSkKIH0KIAogc3RydWN0IFJlc291cmNlR2V0RGF0YUFzeW5jRGF0YSB7 Ci0gICAgV0tEYXRhUmVmIHdrRGF0YTsKKyAgICBSZWZQdHI8V2ViRGF0YT4gd2ViRGF0YTsKICAg ICBHUmVmUHRyPEdDYW5jZWxsYWJsZT4gY2FuY2VsbGFibGU7CiB9OwogV0VCS0lUX0RFRklORV9B U1lOQ19EQVRBX1NUUlVDVChSZXNvdXJjZUdldERhdGFBc3luY0RhdGEpCkBAIC0zMjAsNyArMzIw LDcgQEAgc3RhdGljIHZvaWQgcmVzb3VyY2VEYXRhQ2FsbGJhY2soV0tEYXRhUmVmIHdrRGF0YSwg V0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKICAgICBpZiAoZ19jYW5jZWxsYWJsZV9zZXRfZXJy b3JfaWZfY2FuY2VsbGVkKGRhdGEtPmNhbmNlbGxhYmxlLmdldCgpLCAmZXJyb3IpKQogICAgICAg ICBnX3NpbXBsZV9hc3luY19yZXN1bHRfdGFrZV9lcnJvcihyZXN1bHQuZ2V0KCksIGVycm9yKTsK ICAgICBlbHNlCi0gICAgICAgIGRhdGEtPndrRGF0YSA9IHdrRGF0YTsKKyAgICAgICAgZGF0YS0+ d2ViRGF0YSA9IHRvSW1wbCh3a0RhdGEpOwogICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9jb21w bGV0ZShyZXN1bHQuZ2V0KCkpOwogfQogCkBAIC0zNDYsMTAgKzM0NiwxMCBAQCB2b2lkIHdlYmtp dF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEoV2ViS2l0V2ViUmVzb3VyY2UqIHJlc291cmNlLCBHQ2Fu Y2VsbGFibGUqIGNhbgogICAgIGRhdGEtPmNhbmNlbGxhYmxlID0gY2FuY2VsbGFibGU7CiAgICAg Z19zaW1wbGVfYXN5bmNfcmVzdWx0X3NldF9vcF9yZXNfZ3BvaW50ZXIocmVzdWx0LCBkYXRhLCBy ZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihkZXN0cm95UmVzb3VyY2VHZXREYXRhQXN5 bmNEYXRhKSk7CiAgICAgaWYgKHJlc291cmNlLT5wcml2LT5pc01haW5SZXNvdXJjZSkKLSAgICAg ICAgV0tGcmFtZUdldE1haW5SZXNvdXJjZURhdGEocmVzb3VyY2UtPnByaXYtPndrRnJhbWUuZ2V0 KCksIHJlc291cmNlRGF0YUNhbGxiYWNrLCByZXN1bHQpOworICAgICAgICByZXNvdXJjZS0+cHJp di0+ZnJhbWUtPmdldE1haW5SZXNvdXJjZURhdGEoRGF0YUNhbGxiYWNrOjpjcmVhdGUocmVzdWx0 LCByZXNvdXJjZURhdGFDYWxsYmFjaykpOwogICAgIGVsc2UgewotICAgICAgICBXS1JldGFpblB0 cjxXS1VSTFJlZj4gdXJsKEFkb3B0V0ssIFdLVVJMQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHJlc291 cmNlLT5wcml2LT51cmkuZGF0YSgpKSk7Ci0gICAgICAgIFdLRnJhbWVHZXRSZXNvdXJjZURhdGEo cmVzb3VyY2UtPnByaXYtPndrRnJhbWUuZ2V0KCksIHVybC5nZXQoKSwgcmVzb3VyY2VEYXRhQ2Fs bGJhY2ssIHJlc3VsdCk7CisgICAgICAgIFN0cmluZyB1cmwgPSBTdHJpbmc6OmZyb21VVEY4KHJl c291cmNlLT5wcml2LT51cmkuZGF0YSgpKTsKKyAgICAgICAgcmVzb3VyY2UtPnByaXYtPmZyYW1l LT5nZXRSZXNvdXJjZURhdGEoV2ViVVJMOjpjcmVhdGUodXJsKS5nZXQoKSwgRGF0YUNhbGxiYWNr OjpjcmVhdGUocmVzdWx0LCByZXNvdXJjZURhdGFDYWxsYmFjaykpOwogICAgIH0KIH0KIApAQCAt Mzc4LDYgKzM3OCw2IEBAIGd1Y2hhciogd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfZGF0YV9maW5p c2goV2ViS2l0V2ViUmVzb3VyY2UqIHJlc291cmNlLCBHQXN5bmNSCiAKICAgICBSZXNvdXJjZUdl dERhdGFBc3luY0RhdGEqIGRhdGEgPSBzdGF0aWNfY2FzdDxSZXNvdXJjZUdldERhdGFBc3luY0Rh dGEqPihnX3NpbXBsZV9hc3luY19yZXN1bHRfZ2V0X29wX3Jlc19ncG9pbnRlcihzaW1wbGUpKTsK ICAgICBpZiAobGVuZ3RoKQotICAgICAgICAqbGVuZ3RoID0gV0tEYXRhR2V0U2l6ZShkYXRhLT53 a0RhdGEpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxndWNoYXIqPihnX21lbWR1cChXS0RhdGFH ZXRCeXRlcyhkYXRhLT53a0RhdGEpLCBXS0RhdGFHZXRTaXplKGRhdGEtPndrRGF0YSkpKTsKKyAg ICAgICAgKmxlbmd0aCA9IGRhdGEtPndlYkRhdGEtPnNpemUoKTsKKyAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8Z3VjaGFyKj4oZ19tZW1kdXAoZGF0YS0+d2ViRGF0YS0+Ynl0ZXMoKSwgZGF0YS0+d2Vi RGF0YS0+c2l6ZSgpKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJSZXNvdXJjZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlJlc291cmNlUHJpdmF0ZS5oCmluZGV4IGVkMWZlMDIuLmE4 ZjA5NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlJlc291cmNlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFdlYlJlc291cmNlUHJpdmF0ZS5oCkBAIC0yMywxMyArMjMsMTUgQEAKICNpbmNs dWRlICJXZWJLaXRQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViUmVzb3VyY2UuaCIKIAot V2ViS2l0V2ViUmVzb3VyY2UqIHdlYmtpdFdlYlJlc291cmNlQ3JlYXRlKFdLRnJhbWVSZWYsIFdl YktpdFVSSVJlcXVlc3QqLCBib29sIGlzTWFpblJlc291cmNlKTsKK3VzaW5nIG5hbWVzcGFjZSBX ZWJLaXQ7CisKK1dlYktpdFdlYlJlc291cmNlKiB3ZWJraXRXZWJSZXNvdXJjZUNyZWF0ZShXZWJG cmFtZVByb3h5KiwgV2ViS2l0VVJJUmVxdWVzdCosIGJvb2wgaXNNYWluUmVzb3VyY2UpOwogdm9p ZCB3ZWJraXRXZWJSZXNvdXJjZVNlbnRSZXF1ZXN0KFdlYktpdFdlYlJlc291cmNlKiwgV2ViS2l0 VVJJUmVxdWVzdCosIFdlYktpdFVSSVJlc3BvbnNlKik7CiB2b2lkIHdlYmtpdFdlYlJlc291cmNl U2V0UmVzcG9uc2UoV2ViS2l0V2ViUmVzb3VyY2UqLCBXZWJLaXRVUklSZXNwb25zZSopOwogdm9p ZCB3ZWJraXRXZWJSZXNvdXJjZU5vdGlmeVByb2dyZXNzKFdlYktpdFdlYlJlc291cmNlKiwgZ3Vp bnQ2NCBieXRlc1JlY2VpdmVkKTsKIHZvaWQgd2Via2l0V2ViUmVzb3VyY2VGaW5pc2hlZChXZWJL aXRXZWJSZXNvdXJjZSopOwogdm9pZCB3ZWJraXRXZWJSZXNvdXJjZUZhaWxlZChXZWJLaXRXZWJS ZXNvdXJjZSosIEdFcnJvciopOwotV0tGcmFtZVJlZiB3ZWJraXRXZWJSZXNvdXJjZUdldEZyYW1l KFdlYktpdFdlYlJlc291cmNlKik7CitXZWJGcmFtZVByb3h5KiB3ZWJraXRXZWJSZXNvdXJjZUdl dEZyYW1lKFdlYktpdFdlYlJlc291cmNlKik7CiAKIAogI2VuZGlmIC8vIFdlYktpdFdlYlJlc291 cmNlUHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXcuY3BwCmluZGV4IGIwZTg1ZmQuLmJiMWQ1MDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC0xMTA2LDcg KzExMDYsNyBAQCBzdGF0aWMgdm9pZCBzZXRDZXJ0aWZpY2F0ZVRvTWFpblJlc291cmNlKFdlYktp dFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgQVNTRVJUKHByaXYtPm1haW5SZXNvdXJjZS5nZXQoKSk7 CiAKICAgICB3ZWJraXRVUklSZXNwb25zZVNldENlcnRpZmljYXRlSW5mbyh3ZWJraXRfd2ViX3Jl c291cmNlX2dldF9yZXNwb25zZShwcml2LT5tYWluUmVzb3VyY2UuZ2V0KCkpLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRvSW1wbChXS0ZyYW1lR2V0Q2VydGlmaWNh dGVJbmZvKHdlYmtpdFdlYlJlc291cmNlR2V0RnJhbWUocHJpdi0+bWFpblJlc291cmNlLmdldCgp KSkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3ZWJraXRXZWJS ZXNvdXJjZUdldEZyYW1lKHByaXYtPm1haW5SZXNvdXJjZS5nZXQoKSktPmNlcnRpZmljYXRlSW5m bygpKTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0VtaXRMb2FkQ2hhbmdlZChXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW50KQpAQCAtMTMxMiw3 ICsxMzEyLDcgQEAgdm9pZCB3ZWJraXRXZWJWaWV3UmVzb3VyY2VMb2FkU3RhcnRlZChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3LCBXZWJGcmFtZVByb3h5KiBmcmEKIHsKICAgICBXZWJLaXRXZWJWaWV3 UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXctPnByaXY7CiAgICAgYm9vbCBpc01haW5SZXNvdXJjZSA9 IGZyYW1lLT5pc01haW5GcmFtZSgpICYmICFwcml2LT5tYWluUmVzb3VyY2U7Ci0gICAgV2ViS2l0 V2ViUmVzb3VyY2UqIHJlc291cmNlID0gd2Via2l0V2ViUmVzb3VyY2VDcmVhdGUodG9BUEkoZnJh bWUpLCByZXF1ZXN0LCBpc01haW5SZXNvdXJjZSk7CisgICAgV2ViS2l0V2ViUmVzb3VyY2UqIHJl c291cmNlID0gd2Via2l0V2ViUmVzb3VyY2VDcmVhdGUoZnJhbWUsIHJlcXVlc3QsIGlzTWFpblJl c291cmNlKTsKICAgICBpZiAoaXNNYWluUmVzb3VyY2UpIHsKICAgICAgICAgcHJpdi0+bWFpblJl c291cmNlID0gcmVzb3VyY2U7CiAgICAgICAgIHdhaXRGb3JNYWluUmVzb3VyY2VSZXNwb25zZUlm V2FpdGluZ0ZvclJlc291cmNlKHdlYlZpZXcpOwo=