85507 2012-05-03 09:43:54 -0700 Web Inspector: move canonical mime type calculation to Resource 2012-05-03 09:47:59 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 615352 0 pfeldman 2012-05-03 09:43:54 -0700 Drive-by: small refactoring that prepares code for formatter extraction. 615353 1 140037 pfeldman 2012-05-03 09:45:23 -0700 Created attachment 140037 Patch 615355 2 pfeldman 2012-05-03 09:47:59 -0700 Committed r115984: <http://trac.webkit.org/changeset/115984> 140037 2012-05-03 09:45:23 -0700 2012-05-03 09:46:32 -0700 Patch bug-85507-20120503204522.patch text/plain 9418 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM4OGExMTZlODZiZWNm ZWY3ZDNhZGNmNDhkZTJmNTdhOTAzNWI3Ni4uZjRlYmY4MzIzMWE3M2U4YTNiZTVhOTVlMWExNDZi MGRmMTE1ZjExMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEyLTA1LTAzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgY2Fub25pY2FsIG1pbWUgdHlwZSBjYWxjdWxhdGlvbiB0byBSZXNvdXJjZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODU1MDcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcml2ZS1ieTogc21h bGwgcmVmYWN0b3JpbmcgdGhhdCBwcmVwYXJlcyBjb2RlIGZvciBmb3JtYXR0ZXIgZXh0cmFjdGlv bi4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFu ZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUuY3JlYXRlTGl2ZUxv Y2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlck1vZGVsLnByb3RvdHlwZS5y YXdMb2NhdGlvblRvVUlMb2NhdGlvbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWxSZXNvdXJjZUJpbmRpbmcucHJvdG90eXBlLl91aVNvdXJjZUNv ZGVGb3JSZXNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFu YWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5 cGUuX2NyZWF0ZU5ldHdvcmtSZXF1ZXN0KToKKyAgICAgICAgKGdldCBXZWJJbnNwZWN0b3IpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuY2Fub25pY2FsTWltZVR5cGUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5faW5uZXJSZXF1ZXN0Q29udGVudC5j YWxsYmFjayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLl9pbm5l clJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3Rv dHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3Vy Y2VGcmFtZS5wcm90b3R5cGUuX2NvbnRlbnRDaGFuZ2VkKToKKworMjAxMi0wNS0wMyAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9y OiBtYWtlIFNjcmlwdCBhIENvbnRlbnRQcm92aWRlci4KICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NDg2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcwpp bmRleCA2OWVjNmZlOGY2MDlkZmNjNjJkNzVlODZlY2ZhYWY3M2MwNjIyNDc4Li5lNTNlZjVlMjFh MmM5ZjJkZDVmNzVlZTY5MDRhMDI4NWY1NTBhYTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRzU2lkZWJhclBhbmUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50c1NpZGViYXJQYW5lLmpz CkBAIC0xNDcsMTYgKzE0Nyw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0QnJlYWtwb2ludHNT aWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgLyoqCi0g ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQnJlYWtwb2ludE1hbmFnZXIuQnJlYWtwb2ludH0g YnJlYWtwb2ludAotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJTG9jYXRpb259IHVpTG9j YXRpb24KLSAgICAgKi8KLSAgICBfY3JlYXRlQnJlYWtwb2ludEl0ZW1JZDogZnVuY3Rpb24oYnJl YWtwb2ludCwgdWlMb2NhdGlvbikKLSAgICB7Ci0gICAgICAgIHZhciBwcmltYXJ5TG9jYXRpb24g PSBicmVha3BvaW50LnByaW1hcnlVSUxvY2F0aW9uKCk7Ci0gICAgICAgIHJldHVybiBwcmltYXJ5 TG9jYXRpb24udWlTb3VyY2VDb2RlLmlkICsgIjoiICsgcHJpbWFyeUxvY2F0aW9uLmxpbmVOdW1i ZXIgKyAiQCIgKyB1aUxvY2F0aW9uLnVpU291cmNlQ29kZS5pZCArICI6IiArIHVpTG9jYXRpb24u bGluZU51bWJlcjsKLSAgICB9LAotCiAgICAgX2JyZWFrcG9pbnRDbGlja2VkOiBmdW5jdGlvbih1 aUxvY2F0aW9uLCBldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3Nob3dTb3VyY2VMaW5lRGVs ZWdhdGUodWlMb2NhdGlvbi51aVNvdXJjZUNvZGUsIHVpTG9jYXRpb24ubGluZU51bWJlcik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9k ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyTW9kZWwu anMKaW5kZXggZjY4ZmJjNjM5ZTk5OWI2ZjM0ODgyNTg2MmNiYjhlZGI3ODczYTFjZS4uYTI0MGQw NWY2ODExMDMyYTUyMTBmNzM0YjA1OTc2ZTQxMjQ0M2U2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlck1vZGVsLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcwpAQCAtNTAxLDYgKzUw MSwxOCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgewog ICAgICAgICB2YXIgc2NyaXB0ID0gdGhpcy5fc2NyaXB0c1tsb2NhdGlvbi5zY3JpcHRJZF07CiAg ICAgICAgIHJldHVybiBzY3JpcHQuY3JlYXRlTGl2ZUxvY2F0aW9uKGxvY2F0aW9uLCB1cGRhdGVE ZWxlZ2F0ZSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7RGVidWdnZXJBZ2Vu dC5Mb2NhdGlvbn0gcmF3TG9jYXRpb24KKyAgICAgKiBAcmV0dXJuIHs/V2ViSW5zcGVjdG9yLlVJ TG9jYXRpb259CisgICAgICovCisgICAgcmF3TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1bmN0aW9u KHJhd0xvY2F0aW9uKQorICAgIHsKKyAgICAgICAgdmFyIHNjcmlwdCA9IHRoaXMuX3NjcmlwdHNb cmF3TG9jYXRpb24uc2NyaXB0SWRdOworICAgICAgICBpZiAoIXNjcmlwdCkKKyAgICAgICAgICAg IHJldHVybiBudWxsOworICAgICAgICByZXR1cm4gc2NyaXB0LnJhd0xvY2F0aW9uVG9VSUxvY2F0 aW9uKHJhd0xvY2F0aW9uKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5q cwppbmRleCAzMjE2ZGZhYzkyYWVhMDQ5NGI1ZmM3NjZmMzJkMjZkOGIwMjE1YTBmLi5iMTg5ZjE2 NzllMDNmYmE5OGM1NGMxOWFlOWQxM2E4NmU2YjdlODA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLmpzCkBAIC0zNjQsMTEgKzM2NCwxMiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVz ZW50YXRpb25Nb2RlbFJlc291cmNlQmluZGluZy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAg X3VpU291cmNlQ29kZUZvclJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7Ci0gICAg ICAgIHZhciByYXdMb2NhdGlvbiA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1vZGVsLmNyZWF0ZVJh d0xvY2F0aW9uQnlVUkwocmVzb3VyY2UudXJsLCAwLCAwKTsKLSAgICAgICAgaWYgKCFyYXdMb2Nh dGlvbikKLSAgICAgICAgICAgIHJldHVybiBudWxsOwotICAgICAgICB2YXIgdWlMb2NhdGlvbiA9 IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnJhd0xvY2F0aW9uVG9VSUxvY2F0aW9uKHJhd0xvY2F0 aW9uKTsKLSAgICAgICAgcmV0dXJuIHVpTG9jYXRpb24gPyB1aUxvY2F0aW9uLnVpU291cmNlQ29k ZSA6IG51bGw7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGVzID0gdGhpcy5fcHJlc2VudGF0aW9u TW9kZWwudWlTb3VyY2VDb2RlcygpOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291 cmNlQ29kZXMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIGlmICh1aVNvdXJjZUNvZGVzW2ld LnVybCA9PT0gcmVzb3VyY2UudXJsKQorICAgICAgICAgICAgICAgIHJldHVybiB1aVNvdXJjZUNv ZGVzW2ldOworICAgICAgICB9CisgICAgICAgIHJldHVybiBudWxsOwogICAgIH0sCiAKICAgICAv KioKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a01hbmFnZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtN YW5hZ2VyLmpzCmluZGV4IDQwZDNiOWJlZDJhNWRhODc2YzNhZDFjNGJlNGMxNTNkODVmMmU3ZDEu LjRjMzkxNWYxMjJjOTU2ZGFjZTY4YWUwYjJhOWQxYTI2ZGI2Y2U1MmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAt NTg0LDkgKzU4NCw4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUg PSB7CiAgICAgICogQHBhcmFtIHtzdHJpbmd9IHVybAogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBk b2N1bWVudFVSTAogICAgICAqIEBwYXJhbSB7TmV0d29ya0FnZW50LkluaXRpYXRvcn0gaW5pdGlh dG9yCi0gICAgICogQHBhcmFtIHtDb25zb2xlQWdlbnQuU3RhY2tUcmFjZT19IHN0YWNrVHJhY2UK ICAgICAgKi8KLSAgICBfY3JlYXRlTmV0d29ya1JlcXVlc3Q6IGZ1bmN0aW9uKHJlcXVlc3RJZCwg ZnJhbWVJZCwgbG9hZGVySWQsIHVybCwgZG9jdW1lbnRVUkwsIGluaXRpYXRvciwgc3RhY2tUcmFj ZSkKKyAgICBfY3JlYXRlTmV0d29ya1JlcXVlc3Q6IGZ1bmN0aW9uKHJlcXVlc3RJZCwgZnJhbWVJ ZCwgbG9hZGVySWQsIHVybCwgZG9jdW1lbnRVUkwsIGluaXRpYXRvcikKICAgICB7CiAgICAgICAg IHZhciBuZXR3b3JrUmVxdWVzdCA9IG5ldyBXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QocmVx dWVzdElkLCB1cmwsIGRvY3VtZW50VVJMLCBmcmFtZUlkLCBsb2FkZXJJZCk7CiAgICAgICAgIG5l dHdvcmtSZXF1ZXN0LmluaXRpYXRvciA9IGluaXRpYXRvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IDA1NmNhZGFkYzIwMmIwZjM4NzNl ZDk0ZDEyMjk1NGE1YjJlZDIyZWUuLjJhOWQ5Y2FhYTA3MWE5ZGUwMmQwYzMxNzk5MWRjMmMzOTk3 YTBkOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZS5qcwpAQCAtMzczLDcgKzM3Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUg PSB7CiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKICAgICAg ICAgaWYgKHR5cGVvZiB0aGlzLl9jb250ZW50ICE9PSAidW5kZWZpbmVkIikgewotICAgICAgICAg ICAgY2FsbGJhY2sodGhpcy5fY29udGVudCwgISF0aGlzLl9jb250ZW50RW5jb2RlZCwgdGhpcy5t aW1lVHlwZSk7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9jb250ZW50LCAhIXRoaXMuX2Nv bnRlbnRFbmNvZGVkLCB0aGlzLmNhbm9uaWNhbE1pbWVUeXBlKCkpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAKQEAgLTM4MSw2ICszODEsMTcgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5faW5uZXJSZXF1ZXN0Q29udGVudCgpOwog ICAgIH0sCiAKKyAgICBjYW5vbmljYWxNaW1lVHlwZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgaWYgKHRoaXMudHlwZSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuRG9jdW1lbnQp CisgICAgICAgICAgICByZXR1cm4gInRleHQvaHRtbCI7CisgICAgICAgIGlmICh0aGlzLnR5cGUg PT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdCkKKyAgICAgICAgICAgIHJldHVy biAidGV4dC9qYXZhc2NyaXB0IjsKKyAgICAgICAgaWYgKHRoaXMudHlwZSA9PT0gV2ViSW5zcGVj dG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVldCkKKyAgICAgICAgICAgIHJldHVybiAidGV4dC9j c3MiOworICAgICAgICByZXR1cm4gdGhpcy5taW1lVHlwZTsKKyAgICB9LAorCiAgICAgLyoqCiAg ICAgICogQHBhcmFtIHtzdHJpbmd9IHF1ZXJ5CiAgICAgICogQHBhcmFtIHtib29sZWFufSBjYXNl U2Vuc2l0aXZlCkBAIC00NDgsNyArNDU5LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3Rv dHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX29yaWdpbmFsQ29udGVudCA9IGNvbnRlbnQ7CiAg ICAgICAgICAgICB2YXIgY2FsbGJhY2tzID0gdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFja3Mu c2xpY2UoKTsKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2FsbGJhY2tzLmxlbmd0 aDsgKytpKQotICAgICAgICAgICAgICAgIGNhbGxiYWNrc1tpXSh0aGlzLl9jb250ZW50LCB0aGlz Ll9jb250ZW50RW5jb2RlZCwgdGhpcy5taW1lVHlwZSk7CisgICAgICAgICAgICAgICAgY2FsbGJh Y2tzW2ldKHRoaXMuX2NvbnRlbnQsIHRoaXMuX2NvbnRlbnRFbmNvZGVkLCB0aGlzLmNhbm9uaWNh bE1pbWVUeXBlKCkpOwogICAgICAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFja3Mu bGVuZ3RoID0gMDsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9jb250ZW50UmVxdWVzdGVkOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VWaWV3LmpzCmluZGV4IDMwNWRmZjgzMzlkODg0MWVjYTYxYjAyY2YxMGE5NWI0ZTQ4ZGNi OTguLjA3ZWNjNTQxM2NjNzUxNDFkNGEzZDdiOGEyMWRjOGJlMzNjODc1YzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCkBAIC04 NywyMiArODcsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZSA9IGZ1bmN0aW9u KHJlc291cmNlKQogICAgIHRoaXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVj dG9yLlJlc291cmNlLkV2ZW50cy5SZXZpc2lvbkFkZGVkLCB0aGlzLl9jb250ZW50Q2hhbmdlZCwg dGhpcyk7CiB9CiAKLVdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLl9jYW5vbmljYWxN SU1FVHlwZSA9IGZ1bmN0aW9uKHJlc291cmNlKQotewotICAgIHZhciB0eXBlID0gcmVzb3VyY2Uu dHlwZTsKLSAgICBpZiAodHlwZSA9PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuRG9jdW1l bnQpCi0gICAgICAgIHJldHVybiAidGV4dC9odG1sIjsKLSAgICBpZiAodHlwZSA9PT0gV2ViSW5z cGVjdG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVldCkKLSAgICAgICAgcmV0dXJuICJ0ZXh0L2Nz cyI7Ci0gICAgaWYgKHR5cGUgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdCkK LSAgICAgICAgcmV0dXJuICJ0ZXh0L2phdmFzY3JpcHQiOwotfQotCi1XZWJJbnNwZWN0b3IuUmVz b3VyY2VTb3VyY2VGcmFtZS5fbWltZVR5cGVGb3JSZXNvdXJjZSA9IGZ1bmN0aW9uKHJlc291cmNl KQotewotICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5fY2Fub25p Y2FsTUlNRVR5cGUocmVzb3VyY2UpIHx8IHJlc291cmNlLm1pbWVUeXBlOwotfQotCiBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHJlc291cmNl KCkKICAgICB7CkBAIC0xMjEsMTUgKzEwNSwxNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAqLwogICAgICAgICBmdW5jdGlvbiBjYWxs YmFja1dyYXBwZXIoY29udGVudCwgY29udGVudEVuY29kZWQsIG1pbWVUeXBlKQogICAgICAgICB7 Ci0gICAgICAgICAgICAvLyBDYW5vbmljYWxpemUgbWltZVR5cGUuCi0gICAgICAgICAgICBjYWxs YmFjayhjb250ZW50LCBjb250ZW50RW5jb2RlZCwgV2ViSW5zcGVjdG9yLlJlc291cmNlU291cmNl RnJhbWUuX21pbWVUeXBlRm9yUmVzb3VyY2UodGhpcy5fcmVzb3VyY2UpKTsKKyAgICAgICAgICAg IGNhbGxiYWNrKGNvbnRlbnQsIGNvbnRlbnRFbmNvZGVkLCBtaW1lVHlwZSk7CiAgICAgICAgIH0K ICAgICAgICAgdGhpcy5yZXNvdXJjZS5yZXF1ZXN0Q29udGVudChjYWxsYmFja1dyYXBwZXIuYmlu ZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9jb250ZW50Q2hhbmdlZDogZnVuY3Rpb24oZXZlbnQp CiAgICAgewotICAgICAgICB0aGlzLnNldENvbnRlbnQodGhpcy5fcmVzb3VyY2UuY29udGVudCwg ZmFsc2UsIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLl9taW1lVHlwZUZvclJlc291 cmNlKHRoaXMuX3Jlc291cmNlKSk7CisgICAgICAgIHRoaXMuc2V0Q29udGVudCh0aGlzLl9yZXNv dXJjZS5jb250ZW50LCBmYWxzZSwgdGhpcy5fcmVzb3VyY2UuY2Fub25pY2FsTWltZVR5cGUoKSk7 CiAgICAgfQogfQogCg==