124073 2013-11-08 14:37:45 -0800 Modernize FrameLoader a bit 2013-11-08 14:40:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 948856 0 sam 2013-11-08 14:37:45 -0800 Modernize FrameLoader a bit 948858 1 216443 sam 2013-11-08 14:38:42 -0800 Created attachment 216443 Patch 948859 2 sam 2013-11-08 14:40:24 -0800 Committed r158958: <http://trac.webkit.org/changeset/158958> 216443 2013-11-08 14:38:42 -0800 2013-11-08 14:39:30 -0800 Patch bug-124073-20131108143841.patch text/plain 8235 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODk1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTExLTA4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW9kZXJuaXplIEZyYW1lTG9hZGVyIGEg Yml0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQw NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxv YWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6Cisg ICAgICAgIFVzZSBzdGQ6OnVuaXF1ZV9wdHJzIHJhdGhlciB0aGFuIE93blB0cnMuCisKKyAgICAg ICAgKiBsb2FkZXIvTWl4ZWRDb250ZW50Q2hlY2tlci5jcHA6CisgICAgICAgICogbG9hZGVyL01p eGVkQ29udGVudENoZWNrZXIuaDoKKyAgICAgICAgU3dpdGNoIHRvIGhvbGQgYSBGcmFtZSYgcmF0 aGVyIHRoYW4gRnJhbWUqLgorCiAyMDEzLTExLTA4ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtA aWdhbGlhLmNvbT4KIAogICAgICAgICBSZW1vdmUgY29kZSBndWFyZGVkIHdpdGggRU5BQkxFKFNU UkVBTSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24g MTU4OTQ1KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTc2LDcgKzE3NiwxMiBAQCBzdGF0aWMgYm9vbCBpc0RvY3VtZW50U2FuZGJv eGVkKEZyYW1lKiBmCiAKIGNsYXNzIEZyYW1lTG9hZGVyOjpGcmFtZVByb2dyZXNzVHJhY2tlciB7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RnJhbWVQcm9ncmVzc1RyYWNrZXI+IGNy ZWF0ZShGcmFtZSYgZnJhbWUpIHsgcmV0dXJuIGFkb3B0UHRyKG5ldyBGcmFtZVByb2dyZXNzVHJh Y2tlcihmcmFtZSkpOyB9CisgICAgZXhwbGljaXQgRnJhbWVQcm9ncmVzc1RyYWNrZXIoRnJhbWUm IGZyYW1lKQorICAgICAgICA6IG1fZnJhbWUoZnJhbWUpCisgICAgICAgICwgbV9pblByb2dyZXNz KGZhbHNlKQorICAgIHsKKyAgICB9CisKICAgICB+RnJhbWVQcm9ncmVzc1RyYWNrZXIoKQogICAg IHsKICAgICAgICAgQVNTRVJUKCFtX2luUHJvZ3Jlc3MgfHwgbV9mcmFtZS5wYWdlKCkpOwpAQCAt MjAxLDEyICsyMDYsNiBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIEZyYW1lUHJv Z3Jlc3NUcmFja2VyKEZyYW1lJiBmcmFtZSkKLSAgICAgICAgOiBtX2ZyYW1lKGZyYW1lKQotICAg ICAgICAsIG1faW5Qcm9ncmVzcyhmYWxzZSkKLSAgICB7Ci0gICAgfQotCiAgICAgRnJhbWUmIG1f ZnJhbWU7CiAgICAgYm9vbCBtX2luUHJvZ3Jlc3M7CiB9OwpAQCAtMjE0LDEyICsyMTMsMTIgQEAg cHJpdmF0ZToKIEZyYW1lTG9hZGVyOjpGcmFtZUxvYWRlcihGcmFtZSYgZnJhbWUsIEZyYW1lTG9h ZGVyQ2xpZW50JiBjbGllbnQpCiAgICAgOiBtX2ZyYW1lKGZyYW1lKQogICAgICwgbV9jbGllbnQo Y2xpZW50KQotICAgICwgbV9wb2xpY3lDaGVja2VyKGFkb3B0UHRyKG5ldyBQb2xpY3lDaGVja2Vy KGZyYW1lKSkpCi0gICAgLCBtX2hpc3RvcnkoYWRvcHRQdHIobmV3IEhpc3RvcnlDb250cm9sbGVy KGZyYW1lKSkpCisgICAgLCBtX3BvbGljeUNoZWNrZXIoc3RkOjptYWtlX3VuaXF1ZTxQb2xpY3lD aGVja2VyPihmcmFtZSkpCisgICAgLCBtX2hpc3Rvcnkoc3RkOjptYWtlX3VuaXF1ZTxIaXN0b3J5 Q29udHJvbGxlcj4oZnJhbWUpKQogICAgICwgbV9ub3RpZmllcihmcmFtZSkKLSAgICAsIG1fc3Vi ZnJhbWVMb2FkZXIoYWRvcHRQdHIobmV3IFN1YmZyYW1lTG9hZGVyKGZyYW1lKSkpCi0gICAgLCBt X2ljb24oYWRvcHRQdHIobmV3IEljb25Db250cm9sbGVyKGZyYW1lKSkpCi0gICAgLCBtX21peGVk Q29udGVudENoZWNrZXIoJmZyYW1lKQorICAgICwgbV9zdWJmcmFtZUxvYWRlcihzdGQ6Om1ha2Vf dW5pcXVlPFN1YmZyYW1lTG9hZGVyPihmcmFtZSkpCisgICAgLCBtX2ljb24oc3RkOjptYWtlX3Vu aXF1ZTxJY29uQ29udHJvbGxlcj4oZnJhbWUpKQorICAgICwgbV9taXhlZENvbnRlbnRDaGVja2Vy KGZyYW1lKQogICAgICwgbV9zdGF0ZShGcmFtZVN0YXRlUHJvdmlzaW9uYWwpCiAgICAgLCBtX2xv YWRUeXBlKEZyYW1lTG9hZFR5cGVTdGFuZGFyZCkKICAgICAsIG1fZGVsZWdhdGVJc0hhbmRsaW5n UHJvdmlzaW9uYWxMb2FkRXJyb3IoZmFsc2UpCkBAIC0yMzUsNyArMjM0LDcgQEAgRnJhbWVMb2Fk ZXI6OkZyYW1lTG9hZGVyKEZyYW1lJiBmcmFtZSwgRgogICAgICwgbV9jaGVja1RpbWVyKHRoaXMs ICZGcmFtZUxvYWRlcjo6Y2hlY2tUaW1lckZpcmVkKQogICAgICwgbV9zaG91bGRDYWxsQ2hlY2tD b21wbGV0ZWQoZmFsc2UpCiAgICAgLCBtX3Nob3VsZENhbGxDaGVja0xvYWRDb21wbGV0ZShmYWxz ZSkKLSAgICAsIG1fb3BlbmVyKDApCisgICAgLCBtX29wZW5lcihudWxscHRyKQogICAgICwgbV9k aWRQZXJmb3JtRmlyc3ROYXZpZ2F0aW9uKGZhbHNlKQogICAgICwgbV9sb2FkaW5nRnJvbUNhY2hl ZFBhZ2UoZmFsc2UpCiAgICAgLCBtX3N1cHByZXNzT3BlbmVySW5OZXdGcmFtZShmYWxzZSkKQEAg LTI0Niw3ICsyNDUsNyBAQCBGcmFtZUxvYWRlcjo6RnJhbWVMb2FkZXIoRnJhbWUmIGZyYW1lLCBG CiAKIEZyYW1lTG9hZGVyOjp+RnJhbWVMb2FkZXIoKQogewotICAgIHNldE9wZW5lcigwKTsKKyAg ICBzZXRPcGVuZXIobnVsbHB0cik7CiAKICAgICBIYXNoU2V0PEZyYW1lKj46Oml0ZXJhdG9yIGVu ZCA9IG1fb3BlbmVkRnJhbWVzLmVuZCgpOwogICAgIGZvciAoSGFzaFNldDxGcmFtZSo+OjppdGVy YXRvciBpdCA9IG1fb3BlbmVkRnJhbWVzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKQEAgLTI2 OCw3ICsyNjcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjppbml0KCkKICAgICBtX3N0YXRlTWFjaGlu ZS5hZHZhbmNlVG8oRnJhbWVMb2FkZXJTdGF0ZU1hY2hpbmU6OkRpc3BsYXlpbmdJbml0aWFsRW1w dHlEb2N1bWVudCk7CiAKICAgICBtX25ldHdvcmtpbmdDb250ZXh0ID0gbV9jbGllbnQuY3JlYXRl TmV0d29ya2luZ0NvbnRleHQoKTsKLSAgICBtX3Byb2dyZXNzVHJhY2tlciA9IEZyYW1lUHJvZ3Jl c3NUcmFja2VyOjpjcmVhdGUobV9mcmFtZSk7CisgICAgbV9wcm9ncmVzc1RyYWNrZXIgPSBzdGQ6 Om1ha2VfdW5pcXVlPEZyYW1lUHJvZ3Jlc3NUcmFja2VyPihtX2ZyYW1lKTsKIH0KIAogdm9pZCBG cmFtZUxvYWRlcjo6c2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVycykKQEAgLTI0MTQsNyArMjQx Myw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmRldGFjaEZyb21QYXJlbnQoKQogCiAgICAgZGV0YWNo Vmlld3NBbmREb2N1bWVudExvYWRlcigpOwogCi0gICAgbV9wcm9ncmVzc1RyYWNrZXIuY2xlYXIo KTsKKyAgICBtX3Byb2dyZXNzVHJhY2tlciA9IG51bGxwdHI7CiAKICAgICBpZiAoRnJhbWUqIHBh cmVudCA9IG1fZnJhbWUudHJlZSgpLnBhcmVudCgpKSB7CiAgICAgICAgIHBhcmVudC0+bG9hZGVy KCkuY2xvc2VBbmRSZW1vdmVDaGlsZCgmbV9mcmFtZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuaAkocmV2aXNpb24gMTU4OTQ1KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4MiwxOSArMzgyLDE2IEBAIHByaXZh dGU6CiAgICAgRnJhbWUmIG1fZnJhbWU7CiAgICAgRnJhbWVMb2FkZXJDbGllbnQmIG1fY2xpZW50 OwogCi0gICAgLy8gRklYTUU6IFRoZXNlIHNob3VsZCBiZSBPd25QdHI8VD4gdG8gcmVkdWNlIGJ1 aWxkIHRpbWVzIGFuZCBzaW1wbGlmeQotICAgIC8vIGhlYWRlciBkZXBlbmRlbmNpZXMgdW5sZXNz IHBlcmZvcm1hbmNlIHRlc3RpbmcgcHJvdmVzIG90aGVyd2lzZS4KLSAgICAvLyBTb21lIG9mIHRo ZXNlIGNvdWxkIGJlIGxhemlseSBjcmVhdGVkIGZvciBtZW1vcnkgc2F2aW5ncyBvbiBkZXZpY2Vz LgotICAgIGNvbnN0IE93blB0cjxQb2xpY3lDaGVja2VyPiBtX3BvbGljeUNoZWNrZXI7Ci0gICAg Y29uc3QgT3duUHRyPEhpc3RvcnlDb250cm9sbGVyPiBtX2hpc3Rvcnk7CisgICAgY29uc3Qgc3Rk Ojp1bmlxdWVfcHRyPFBvbGljeUNoZWNrZXI+IG1fcG9saWN5Q2hlY2tlcjsKKyAgICBjb25zdCBz dGQ6OnVuaXF1ZV9wdHI8SGlzdG9yeUNvbnRyb2xsZXI+IG1faGlzdG9yeTsKICAgICBtdXRhYmxl IFJlc291cmNlTG9hZE5vdGlmaWVyIG1fbm90aWZpZXI7Ci0gICAgY29uc3QgT3duUHRyPFN1YmZy YW1lTG9hZGVyPiBtX3N1YmZyYW1lTG9hZGVyOworICAgIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxT dWJmcmFtZUxvYWRlcj4gbV9zdWJmcmFtZUxvYWRlcjsKICAgICBtdXRhYmxlIEZyYW1lTG9hZGVy U3RhdGVNYWNoaW5lIG1fc3RhdGVNYWNoaW5lOwotICAgIGNvbnN0IE93blB0cjxJY29uQ29udHJv bGxlcj4gbV9pY29uOworICAgIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxJY29uQ29udHJvbGxlcj4g bV9pY29uOwogICAgIG11dGFibGUgTWl4ZWRDb250ZW50Q2hlY2tlciBtX21peGVkQ29udGVudENo ZWNrZXI7CiAKICAgICBjbGFzcyBGcmFtZVByb2dyZXNzVHJhY2tlcjsKLSAgICBPd25QdHI8RnJh bWVQcm9ncmVzc1RyYWNrZXI+IG1fcHJvZ3Jlc3NUcmFja2VyOworICAgIHN0ZDo6dW5pcXVlX3B0 cjxGcmFtZVByb2dyZXNzVHJhY2tlcj4gbV9wcm9ncmVzc1RyYWNrZXI7CiAKICAgICBGcmFtZVN0 YXRlIG1fc3RhdGU7CiAgICAgRnJhbWVMb2FkVHlwZSBtX2xvYWRUeXBlOwpJbmRleDogU291cmNl L1dlYkNvcmUvbG9hZGVyL01peGVkQ29udGVudENoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2xvYWRlci9NaXhlZENvbnRlbnRDaGVja2VyLmNwcAkocmV2aXNpb24gMTU4 OTQ1KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL01peGVkQ29udGVudENoZWNrZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00MywxNCArNDMsMTQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1NaXhlZENvbnRlbnRDaGVja2VyOjpNaXhlZENvbnRlbnRDaGVja2VyKEZyYW1lKiBmcmFtZSkK K01peGVkQ29udGVudENoZWNrZXI6Ok1peGVkQ29udGVudENoZWNrZXIoRnJhbWUmIGZyYW1lKQog ICAgIDogbV9mcmFtZShmcmFtZSkKIHsKIH0KIAogRnJhbWVMb2FkZXJDbGllbnQmIE1peGVkQ29u dGVudENoZWNrZXI6OmNsaWVudCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZnJhbWUtPmxvYWRl cigpLmNsaWVudCgpOworICAgIHJldHVybiBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpOwogfQog CiAvLyBzdGF0aWMKQEAgLTY4LDcgKzY4LDcgQEAgYm9vbCBNaXhlZENvbnRlbnRDaGVja2VyOjpj YW5EaXNwbGF5SW5zZQogICAgIGlmICghaXNNaXhlZENvbnRlbnQoc2VjdXJpdHlPcmlnaW4sIHVy bCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgYm9vbCBhbGxvd2VkID0gY2xpZW50KCku YWxsb3dEaXNwbGF5aW5nSW5zZWN1cmVDb250ZW50KG1fZnJhbWUtPnNldHRpbmdzKCkuYWxsb3dE aXNwbGF5T2ZJbnNlY3VyZUNvbnRlbnQoKSwgc2VjdXJpdHlPcmlnaW4sIHVybCk7CisgICAgYm9v bCBhbGxvd2VkID0gY2xpZW50KCkuYWxsb3dEaXNwbGF5aW5nSW5zZWN1cmVDb250ZW50KG1fZnJh bWUuc2V0dGluZ3MoKS5hbGxvd0Rpc3BsYXlPZkluc2VjdXJlQ29udGVudCgpLCBzZWN1cml0eU9y aWdpbiwgdXJsKTsKICAgICBsb2dXYXJuaW5nKGFsbG93ZWQsICJkaXNwbGF5ZWQiLCB1cmwpOwog CiAgICAgaWYgKGFsbG93ZWQpCkBAIC04Miw3ICs4Miw3IEBAIGJvb2wgTWl4ZWRDb250ZW50Q2hl Y2tlcjo6Y2FuUnVuSW5zZWN1cmUKICAgICBpZiAoIWlzTWl4ZWRDb250ZW50KHNlY3VyaXR5T3Jp Z2luLCB1cmwpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGJvb2wgYWxsb3dlZCA9IGNs aWVudCgpLmFsbG93UnVubmluZ0luc2VjdXJlQ29udGVudChtX2ZyYW1lLT5zZXR0aW5ncygpLmFs bG93UnVubmluZ09mSW5zZWN1cmVDb250ZW50KCksIHNlY3VyaXR5T3JpZ2luLCB1cmwpOworICAg IGJvb2wgYWxsb3dlZCA9IGNsaWVudCgpLmFsbG93UnVubmluZ0luc2VjdXJlQ29udGVudChtX2Zy YW1lLnNldHRpbmdzKCkuYWxsb3dSdW5uaW5nT2ZJbnNlY3VyZUNvbnRlbnQoKSwgc2VjdXJpdHlP cmlnaW4sIHVybCk7CiAgICAgbG9nV2FybmluZyhhbGxvd2VkLCAicmFuIiwgdXJsKTsKIAogICAg IGlmIChhbGxvd2VkKQpAQCAtOTMsOCArOTMsOCBAQCBib29sIE1peGVkQ29udGVudENoZWNrZXI6 OmNhblJ1bkluc2VjdXJlCiAKIHZvaWQgTWl4ZWRDb250ZW50Q2hlY2tlcjo6bG9nV2FybmluZyhi b29sIGFsbG93ZWQsIGNvbnN0IFN0cmluZyYgYWN0aW9uLCBjb25zdCBVUkwmIHRhcmdldCkgY29u c3QKIHsKLSAgICBTdHJpbmcgbWVzc2FnZSA9IG1ha2VTdHJpbmcoKGFsbG93ZWQgPyAiIiA6ICJb YmxvY2tlZF0gIiksICJUaGUgcGFnZSBhdCAiLCBtX2ZyYW1lLT5kb2N1bWVudCgpLT51cmwoKS5z dHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSwgIiAiLCBhY3Rpb24sICIgaW5zZWN1cmUg Y29udGVudCBmcm9tICIsIHRhcmdldC5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSwg Ii5cbiIpOwotICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmFkZENvbnNvbGVNZXNzYWdlKFNlY3Vy aXR5TWVzc2FnZVNvdXJjZSwgV2FybmluZ01lc3NhZ2VMZXZlbCwgbWVzc2FnZSk7CisgICAgU3Ry aW5nIG1lc3NhZ2UgPSBtYWtlU3RyaW5nKChhbGxvd2VkID8gIiIgOiAiW2Jsb2NrZWRdICIpLCAi VGhlIHBhZ2UgYXQgIiwgbV9mcmFtZS5kb2N1bWVudCgpLT51cmwoKS5zdHJpbmdDZW50ZXJFbGxp cHNpemVkVG9MZW5ndGgoKSwgIiAiLCBhY3Rpb24sICIgaW5zZWN1cmUgY29udGVudCBmcm9tICIs IHRhcmdldC5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSwgIi5cbiIpOworICAgIG1f ZnJhbWUuZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoU2VjdXJpdHlNZXNzYWdlU291cmNl LCBXYXJuaW5nTWVzc2FnZUxldmVsLCBtZXNzYWdlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL01peGVkQ29udGVudENoZWNrZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWl4ZWRDb250ZW50Q2hlY2tlci5o CShyZXZpc2lvbiAxNTg5NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWl4ZWRDb250ZW50 Q2hlY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw3ICs0NCw3IEBAIGNsYXNzIFNlY3VyaXR5 T3JpZ2luOwogY2xhc3MgTWl4ZWRDb250ZW50Q2hlY2tlciB7CiAgICAgV1RGX01BS0VfTk9OQ09Q WUFCTEUoTWl4ZWRDb250ZW50Q2hlY2tlcik7CiBwdWJsaWM6Ci0gICAgTWl4ZWRDb250ZW50Q2hl Y2tlcihGcmFtZSopOworICAgIE1peGVkQ29udGVudENoZWNrZXIoRnJhbWUmKTsKIAogICAgIGJv b2wgY2FuRGlzcGxheUluc2VjdXJlQ29udGVudChTZWN1cml0eU9yaWdpbiosIGNvbnN0IFVSTCYp IGNvbnN0OwogICAgIGJvb2wgY2FuUnVuSW5zZWN1cmVDb250ZW50KFNlY3VyaXR5T3JpZ2luKiwg Y29uc3QgVVJMJikgY29uc3Q7CkBAIC01Niw3ICs1Niw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lk IGxvZ1dhcm5pbmcoYm9vbCBhbGxvd2VkLCBjb25zdCBTdHJpbmcmIGFjdGlvbiwgY29uc3QgVVJM JikgY29uc3Q7CiAKLSAgICBGcmFtZSogbV9mcmFtZTsKKyAgICBGcmFtZSYgbV9mcmFtZTsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK