86833 2012-05-18 02:33:03 -0700 Web Inspector: add ContentProvider::contentType and use it when rendering navigator tree. 2012-05-18 03:10:07 -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 627513 0 pfeldman 2012-05-18 02:33:03 -0700 Added ContentProvider::contentType, regactored NavigatorView to use the icon defined by the content type. 627518 1 142674 pfeldman 2012-05-18 02:46:15 -0700 Created attachment 142674 Patch 627529 2 pfeldman 2012-05-18 03:10:07 -0700 Committed r117571: <http://trac.webkit.org/changeset/117571> 142674 2012-05-18 02:46:15 -0700 2012-05-18 02:53:27 -0700 Patch bug-86833-20120518134613.patch text/plain 20672 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNlZGY3NWNiZmQwMzBh MjdkOTcyYzBlNDM3MzY1N2MzMjcxNjNkZi4uMmYzZDVhMjNkNmYwOTVjZGNhOTJjNTk4ZjkxYjI0 ZjA1MDc3YjA3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTA1LTE4ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBDb250ZW50UHJvdmlkZXI6OmNvbnRlbnRUeXBlIGFuZCB1c2UgaXQgd2hlbiByZW5k ZXJpbmcgbmF2aWdhdG9yIHRyZWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NjgzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGVkIENvbnRlbnRQcm92aWRlcjo6Y29udGVudFR5cGUsIHJlZ2FjdG9y ZWQgTmF2aWdhdG9yVmlldyB0byB1c2UgdGhlIGljb24gZGVmaW5lZCBieSB0aGUgY29udGVudCB0 eXBlLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBp bmcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZS5jb250ZW50 VHlwZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXJzLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlk ZXIucHJvdG90eXBlLmNvbnRlbnRUeXBlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21waWxl clNvdXJjZU1hcHBpbmdDb250ZW50UHJvdmlkZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNv bXBpbGVyU291cmNlTWFwcGluZ0NvbnRlbnRQcm92aWRlci5wcm90b3R5cGUuY29udGVudFR5cGUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbXBpbGVyU291cmNlTWFwcGluZ0NvbnRlbnRQcm92 aWRlci5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 YXRpY0NvbnRlbnRQcm92aWRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3RhdGljQ29udGVu dFByb3ZpZGVyLnByb3RvdHlwZS5jb250ZW50VHlwZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3RhdGljQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5hdmlnYXRvclRyZWVPdXRsaW5lLnByb3RvdHlwZS5zY3JpcHRUcmVlRWxlbWVudHMp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNvdXJjZVRyZWVFbGVtZW50KToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZS5jb250ZW50VHlwZSk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuY29udGVudFR5cGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZS5jYW5vbmljYWxNaW1lVHlwZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvbi5wcm90b3R5cGUuY29udGVudFR5cGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUeXBlLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlVHlwZS5wcm90b3R5cGUudG9TdHJpbmcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlVHlwZS5wcm90b3R5cGUuY2Fub25pY2FsTWltZVR5cGUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNjcmlwdC5wcm90b3R5cGUuY29udGVudFR5cGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNuaXBw ZXRDb250ZW50UHJvdmlkZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz UGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5jb250ZW50VHlw ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9uYXZpZ2F0b3JWaWV3LmNzczoKKyAg ICAgICAgKC5uYXZpZ2F0b3Itc3R5bGVzaGVldC10cmVlLWl0ZW0gLmljb24pOgorICAgICAgICAo Lm5hdmlnYXRvci1kb2N1bWVudC10cmVlLWl0ZW0gLmljb24pOgorCiAyMDEyLTA1LTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSBGaWxlIGFic3RyYWN0aW9uIGZyb20gdGhlIEFkdmFuY2VkU2VhcmNoQ29udHJv bGxlciwgbWlncmF0ZSBpdCB0byBVSVNvdXJjZUNvZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCmlu ZGV4IDk4ZDMwZmZhNjliZmY0YWRlYmU4ZDVlOTdiYzRhZDFjZmFkNmQ3NjAuLjI1NzFjZGYyNjQz NTc1ZDA2YTFhODQ0ODA5M2EyMzY0MTc3NDFlMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCkBA IC0xMTUsNyArMTE1LDcgQEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90 b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIgc291cmNlQ29udGVudCA9IHNvdXJjZU1hcC5zb3Vy Y2VDb250ZW50KHNvdXJjZVVSTCk7CiAgICAgICAgICAgICB2YXIgY29udGVudFByb3ZpZGVyOwog ICAgICAgICAgICAgaWYgKHNvdXJjZUNvbnRlbnQpCi0gICAgICAgICAgICAgICAgY29udGVudFBy b3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0aWNDb250ZW50UHJvdmlkZXIoInRleHQvamF2 YXNjcmlwdCIsIHNvdXJjZUNvbnRlbnQpOworICAgICAgICAgICAgICAgIGNvbnRlbnRQcm92aWRl ciA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdGljQ29udGVudFByb3ZpZGVyKFdlYkluc3BlY3Rvci5y ZXNvdXJjZVR5cGVzLlNjcmlwdCwgc291cmNlQ29udGVudCk7CiAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICAgICAgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5Db21waWxl clNvdXJjZU1hcHBpbmdDb250ZW50UHJvdmlkZXIoc291cmNlVVJMKTsKICAgICAgICAgICAgIHZh ciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2Uoc291cmNl VVJMLCBjb250ZW50UHJvdmlkZXIsIHRoaXMsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVyLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXIuanMKaW5kZXggZDBjYjZj ZTUwY2Q3ZTZhOWUxMGU5NTViZTdiYmU3MGY2YzdhNWVlMi4uMmM2ZjUxOThjMzhhMjc3NGQyY2M2 MzA2MTFlZTNkOGRmYTFkZWVlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db250ZW50UHJvdmlkZXIuanMKQEAgLTQwLDYgKzQwLDExIEBAIFdlYklu c3BlY3Rvci5Db250ZW50UHJvdmlkZXIucHJvdG90eXBlID0gewogICAgIGNvbnRlbnRVUkw6IGZ1 bmN0aW9uKCkgeyB9LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJl c291cmNlVHlwZX0KKyAgICAgKi8KKyAgICBjb250ZW50VHlwZTogZnVuY3Rpb24oKSB7IH0sCisK KyAgICAvKioKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcsYm9vbGVhbixzdHJpbmcp fSBjYWxsYmFjawogICAgICAqLwogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFj aykgeyB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b250ZW50UHJvdmlkZXJzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b250ZW50UHJvdmlkZXJzLmpzCmluZGV4IGU1ZmZiZTVhMWRmZjNlNDg1ZGZkNTI5ZGZiZmZhYWZm OGU3MTU3YzUuLjlkYTcyN2M4MTVjMDUxOWM1OTZjNGM3OTVhNDE2NjFhZmJjNzJmZGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVy cy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRlbnRQcm92 aWRlcnMuanMKQEAgLTgxLDYgKzgxLDE0IEBAIFdlYkluc3BlY3Rvci5Db25jYXRlbmF0ZWRTY3Jp cHRzQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCisgICAg ICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZX0KKyAgICAgKi8KKyAgICBjb250 ZW50VHlwZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5y ZXNvdXJjZVR5cGVzLkRvY3VtZW50OworICAgIH0sCisgICAgCisgICAgLyoqCiAgICAgICogQHBh cmFtIHtmdW5jdGlvbig/c3RyaW5nLGJvb2xlYW4sc3RyaW5nKX0gY2FsbGJhY2sKICAgICAgKi8K ICAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCkBAIC0xODAsNyArMTg4LDYg QEAgV2ViSW5zcGVjdG9yLkNvbmNhdGVuYXRlZFNjcmlwdHNDb250ZW50UHJvdmlkZXIucHJvdG90 eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3QKICAqLwogV2ViSW5zcGVjdG9yLkNvbXBpbGVyU291 cmNlTWFwcGluZ0NvbnRlbnRQcm92aWRlciA9IGZ1bmN0aW9uKHNvdXJjZVVSTCkKIHsKLSAgICB0 aGlzLl9taW1lVHlwZSA9ICJ0ZXh0L2phdmFzY3JpcHQiOwogICAgIHRoaXMuX3NvdXJjZVVSTCA9 IHNvdXJjZVVSTDsKIH0KIApAQCAtMTk0LDYgKzIwMSwxNCBAQCBXZWJJbnNwZWN0b3IuQ29tcGls ZXJTb3VyY2VNYXBwaW5nQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAg ICAgLyoqCisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJlc291cmNlVHlwZX0KKyAgICAg Ki8KKyAgICBjb250ZW50VHlwZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdDsKKyAgICB9LAorICAgIAorICAgIC8qKgog ICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFuLHN0cmluZyl9IGNhbGxiYWNr CiAgICAgICovCiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQpAQCAtMjA1 LDcgKzIyMCw3IEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmdDb250ZW50UHJv dmlkZXIucHJvdG90eXBlID0gewogICAgICAgICB9IGNhdGNoKGUpIHsKICAgICAgICAgICAgIGNv bnNvbGUuZXJyb3IoZS5tZXNzYWdlKTsKICAgICAgICAgfQotICAgICAgICBjYWxsYmFjayhzb3Vy Y2VDb2RlLCBmYWxzZSwgdGhpcy5fbWltZVR5cGUpOworICAgICAgICBjYWxsYmFjayhzb3VyY2VD b2RlLCBmYWxzZSwgInRleHQvamF2YXNjcmlwdCIpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTIy NSwxMSArMjQwLDEzIEBAIFdlYkluc3BlY3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmdDb250ZW50 UHJvdmlkZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlCiAvKioKICAqIEBjb25zdHJ1 Y3RvcgogICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlkZXJ9CisgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGV9IGNvbnRlbnRUeXBlIAorICogQHBhcmFt IHtzdHJpbmd9IGNvbnRlbnQgCiAgKi8KLVdlYkluc3BlY3Rvci5TdGF0aWNDb250ZW50UHJvdmlk ZXIgPSBmdW5jdGlvbihtaW1lVHlwZSwgY29udGVudCkKK1dlYkluc3BlY3Rvci5TdGF0aWNDb250 ZW50UHJvdmlkZXIgPSBmdW5jdGlvbihjb250ZW50VHlwZSwgY29udGVudCkKIHsKLSAgICB0aGlz Ll9taW1lVHlwZSA9IG1pbWVUeXBlOwogICAgIHRoaXMuX2NvbnRlbnQgPSBjb250ZW50OworICAg IHRoaXMuX2NvbnRlbnRUeXBlID0gY29udGVudFR5cGU7CiB9CiAKIFdlYkluc3BlY3Rvci5TdGF0 aWNDb250ZW50UHJvdmlkZXIucHJvdG90eXBlID0gewpAQCAtMjQyLDExICsyNTksMTkgQEAgV2Vi SW5zcGVjdG9yLlN0YXRpY0NvbnRlbnRQcm92aWRlci5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAog ICAgIC8qKgorICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGV9CisgICAg ICovCisgICAgY29udGVudFR5cGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBX ZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQ7CisgICAgfSwKKworICAgIC8qKgogICAg ICAqIEBwYXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFuLHN0cmluZyl9IGNhbGxiYWNrCiAg ICAgICovCiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAg ICAgICAgY2FsbGJhY2sodGhpcy5fY29udGVudCwgZmFsc2UsIHRoaXMuX21pbWVUeXBlKTsKKyAg ICAgICAgY2FsbGJhY2sodGhpcy5fY29udGVudCwgZmFsc2UsIHRoaXMuX2NvbnRlbnRUeXBlLmNh bm9uaWNhbE1pbWVUeXBlKCkpOwogICAgIH0sCiAKICAgICAvKioKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmF2aWdhdG9yVmlldy5qcwppbmRleCAwYjhhN2Uw OTlkOWY0ODYxNGRmYzJkODExZDM4MjAxYmRlNjVhMWM2Li5kMzAzNzlhZGIzOWQ4NTA0MWRhYjY1 NTVkOTNmNWUzNWRjNTVjNjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05hdmlnYXRvclZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzCkBAIC03Myw3ICs3Myw3IEBAIFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3NjcmlwdFRy ZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlLmdldCh1aVNvdXJjZUNvZGUpKQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIHZhciBzY3JpcHRUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0 b3IuTmF2aWdhdG9yU2NyaXB0VHJlZUVsZW1lbnQodGhpcywgdWlTb3VyY2VDb2RlLCAiIik7Cisg ICAgICAgIHZhciBzY3JpcHRUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdhdG9y U291cmNlVHJlZUVsZW1lbnQodGhpcywgdWlTb3VyY2VDb2RlLCAiIik7CiAgICAgICAgIHRoaXMu X3NjcmlwdFRyZWVFbGVtZW50c0J5VUlTb3VyY2VDb2RlLnB1dCh1aVNvdXJjZUNvZGUsIHNjcmlw dFRyZWVFbGVtZW50KTsKICAgICAgICAgdGhpcy5fdXBkYXRlU2NyaXB0VGl0bGUodWlTb3VyY2VD b2RlKTsKICAgICAgICAgdGhpcy5fYWRkVUlTb3VyY2VDb2RlTGlzdGVuZXJzKHVpU291cmNlQ29k ZSk7CkBAIC00MDcsNyArNDA3LDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRvclRyZWVPdXRsaW5l LnByb3RvdHlwZSA9IHsKICAgICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgICAgaWYgKHRoaXMu Y2hpbGRyZW4ubGVuZ3RoKSB7CiAgICAgICAgICAgIGZvciAodmFyIHRyZWVFbGVtZW50ID0gdGhp cy5jaGlsZHJlblswXTsgdHJlZUVsZW1lbnQ7IHRyZWVFbGVtZW50ID0gdHJlZUVsZW1lbnQudHJh dmVyc2VOZXh0VHJlZUVsZW1lbnQoZmFsc2UsIHRoaXMsIHRydWUpKSB7Ci0gICAgICAgICAgICAg ICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0 VHJlZUVsZW1lbnQpCisgICAgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yU291cmNlVHJlZUVsZW1lbnQpCiAgICAgICAgICAgICAgICAg ICAgcmVzdWx0LnB1c2godHJlZUVsZW1lbnQudWlTb3VyY2VDb2RlKTsKICAgICAgICAgICAgfQog ICAgICAgIH0KQEAgLTU2MSwxNSArNTYxLDE1IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JGb2xk ZXJUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkJhc2VOCiAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICogQHBh cmFtIHtzdHJpbmd9IHRpdGxlCiAgKi8KLVdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVl RWxlbWVudCA9IGZ1bmN0aW9uKG5hdmlnYXRvclZpZXcsIHVpU291cmNlQ29kZSwgdGl0bGUpCitX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yU291cmNlVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihuYXZpZ2F0 b3JWaWV3LCB1aVNvdXJjZUNvZGUsIHRpdGxlKQogewotICAgIFdlYkluc3BlY3Rvci5CYXNlTmF2 aWdhdG9yVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCB0aXRsZSwgWyJuYXZpZ2F0b3Itc2NyaXB0LXRy ZWUtaXRlbSJdLCBmYWxzZSk7CisgICAgV2ViSW5zcGVjdG9yLkJhc2VOYXZpZ2F0b3JUcmVlRWxl bWVudC5jYWxsKHRoaXMsIHRpdGxlLCBbIm5hdmlnYXRvci0iICsgdWlTb3VyY2VDb2RlLmNvbnRl bnRUeXBlKCkubmFtZSgpICsgIi10cmVlLWl0ZW0iXSwgZmFsc2UpOwogICAgIHRoaXMuX25hdmln YXRvclZpZXcgPSBuYXZpZ2F0b3JWaWV3OwogICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHVpU291 cmNlQ29kZTsKICAgICB0aGlzLnRvb2x0aXAgPSB1aVNvdXJjZUNvZGUudXJsOwogfQogCi1XZWJJ bnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0VHJlZUVsZW1lbnQucHJvdG90eXBlID0geworV2ViSW5z cGVjdG9yLk5hdmlnYXRvclNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAvKioK ICAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfQogICAgICAqLwpAQCAt NjE5LDQgKzYxOSw0IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0b3JTY3JpcHRUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgfQogfQogCi1XZWJJbnNwZWN0b3IuTmF2aWdhdG9yU2NyaXB0VHJl ZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5CYXNlTmF2aWdhdG9y VHJlZUVsZW1lbnQucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLk5hdmlnYXRvclNvdXJjZVRyZWVF bGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZU5hdmlnYXRvclRy ZWVFbGVtZW50LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCmluZGV4IDQ3NmMwZjFlNmI4NzczYmIxNDllYjgw NDRkZmZmNjk5MDEyYjVhNzQuLjc4NjI4NTA3ZjkyZTFhNmRlNWEyZjkxMGVlMjE2MmYwY2ZkYmI4 YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29y a1JlcXVlc3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUmVxdWVzdC5qcwpAQCAtNjg0LDYgKzY4NCwxNCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1Jl cXVlc3QucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtX ZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlfQorICAgICAqLworICAgIGNvbnRlbnRUeXBlOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdHlwZTsKKyAgICB9LAorCisgICAg LyoqCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLCBib29sZWFuLCBzdHJpbmcpfSBj YWxsYmFjawogICAgICAqLwogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4 IDJhOWQ5Y2FhYTA3MWE5ZGUwMmQwYzMxNzk5MWRjMmMzOTk3YTBkOTUuLjI4NjY0NWRhNWRlMDIw ZmE5ZWZkMGI4ODhlNWQyYmFjODNlZTQyMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAtMzY4LDYgKzM2OCwxNCBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcmV0 dXJuIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlfQorICAgICAqLworICAgIGNvbnRlbnRUeXBl OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy50eXBlOworICAgIH0sCisK KyAgICAvKioKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9zdHJpbmcsIGJvb2xlYW4sIHN0cmlu Zyl9IGNhbGxiYWNrCiAgICAgICovCiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxi YWNrKQpAQCAtMzgzLDEzICszOTEsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBl ID0gewogCiAgICAgY2Fub25pY2FsTWltZVR5cGU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAg IGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLkRvY3VtZW50KQot ICAgICAgICAgICAgcmV0dXJuICJ0ZXh0L2h0bWwiOwotICAgICAgICBpZiAodGhpcy50eXBlID09 PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQpCi0gICAgICAgICAgICByZXR1cm4g InRleHQvamF2YXNjcmlwdCI7Ci0gICAgICAgIGlmICh0aGlzLnR5cGUgPT09IFdlYkluc3BlY3Rv ci5yZXNvdXJjZVR5cGVzLlN0eWxlc2hlZXQpCi0gICAgICAgICAgICByZXR1cm4gInRleHQvY3Nz IjsKLSAgICAgICAgcmV0dXJuIHRoaXMubWltZVR5cGU7CisgICAgICAgIHJldHVybiB0aGlzLnR5 cGUuY2Fub25pY2FsTWltZVR5cGUoKSB8fCB0aGlzLm1pbWVUeXBlOwogICAgIH0sCiAKICAgICAv KioKQEAgLTUyNiw2ICs1MjgsMTQgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb24ucHJv dG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0 b3IuUmVzb3VyY2VUeXBlfQorICAgICAqLworICAgIGNvbnRlbnRUeXBlOiBmdW5jdGlvbigpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2UuY29udGVudFR5cGUoKTsKKyAgICB9 LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLCBib29sZWFuLCBz dHJpbmcpfSBjYWxsYmFjawogICAgICAqLwogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihj YWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VUeXBlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZVR5cGUuanMKaW5kZXggMTMyOWZkYzI2NzQwMjVlOTcwZjE5Y2Y0ZGUzYzAwODdmNDc3ZmI2 OC4uMmY4OGE2YmJiYjU2ZGFjZGQxYzBkNzQ2YzFmOGEwNGQ0NWE2Y2Q1YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVR5cGUuanMKQEAgLTkx LDYgKzkxLDIwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGUucHJvdG90eXBlID0gewogICAg IHRvU3RyaW5nOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fbmFtZTsK KyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAgICAqLworICAg IGNhbm9uaWNhbE1pbWVUeXBlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcyA9 PT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuRG9jdW1lbnQpCisgICAgICAgICAgICByZXR1 cm4gInRleHQvaHRtbCI7CisgICAgICAgIGlmICh0aGlzID09PSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VUeXBlcy5TY3JpcHQpCisgICAgICAgICAgICByZXR1cm4gInRleHQvamF2YXNjcmlwdCI7Cisg ICAgICAgIGlmICh0aGlzID09PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TdHlsZXNoZWV0 KQorICAgICAgICAgICAgcmV0dXJuICJ0ZXh0L2NzcyI7CisgICAgICAgIHJldHVybiAiIjsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMK aW5kZXggZGU5ZDkzM2Q5M2U2MzkxYWI5Y2U2YzIzZWQxZWVlYjQyZmQxMmQ1Zi4uMjI1ZTgzNDA3 ZGJiMTEwMzI4MGE1ZmI2Mzk5ZDhhYjMyMzg1N2QzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanMKQEAgLTU4LDYgKzU4LDE0IEBAIFdlYkluc3BlY3Rv ci5TY3JpcHQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcmV0dXJu IHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VUeXBlfQorICAgICAqLworICAgIGNvbnRlbnRUeXBlOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlw ZXMuU2NyaXB0OworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKD9z dHJpbmcsYm9vbGVhbixzdHJpbmcpfSBjYWxsYmFjawogICAgICAqLwogICAgIHJlcXVlc3RDb250 ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKaW5kZXggZDA5ZTVkMDY5MTQ4 MTdlOGE3YmZkZGQyYWNhNTE3YTY2MzFjZGQ4ZC4uOWIyMzcxNzIzYWExOTA0MzEwZTcyYThmYWFm YmYzNmNmMTYwNGUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanMKQEAgLTQyMiw3ICs0MjIsNyBAQCBXZWJJ bnNwZWN0b3IuU25pcHBldFNjcmlwdE1hcHBpbmcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5PYmplY3QucHJvdAogICovCiBXZWJJbnNwZWN0b3IuU25pcHBldENvbnRlbnRQcm92 aWRlciA9IGZ1bmN0aW9uKHNuaXBwZXQpCiB7Ci0gICAgV2ViSW5zcGVjdG9yLlN0YXRpY0NvbnRl bnRQcm92aWRlci5jYWxsKHRoaXMsICJ0ZXh0L2phdmFzY3JpcHQiLCBzbmlwcGV0LmNvbnRlbnQp OworICAgIFdlYkluc3BlY3Rvci5TdGF0aWNDb250ZW50UHJvdmlkZXIuY2FsbCh0aGlzLCBXZWJJ bnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQsIHNuaXBwZXQuY29udGVudCk7CiB9CiAKIFdl Ykluc3BlY3Rvci5TbmlwcGV0Q29udGVudFByb3ZpZGVyLnByb3RvdHlwZS5fX3Byb3RvX18gPSBX ZWJJbnNwZWN0b3IuU3RhdGljQ29udGVudFByb3ZpZGVyLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzCmluZGV4IDVmYzM0 OTcwNzMzNjM3MGNhYjkyOTg4Mzg1NTg3YmQzY2RmZjdlNTQuLmVjOTc1YjI5OTc5NWI5YWYwZmU3 OWY3ZTc0OTQ1NGE5MDQ5YzY1NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwpAQCAtOTksNyArOTksNiBAQCBXZWJJbnNwZWN0b3Iu U3R5bGVTb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZSkKIH0KIAogV2ViSW5zcGVjdG9yLlN0eWxl U291cmNlLnByb3RvdHlwZSA9IHsKLSAgICAKIH0KIAogV2ViSW5zcGVjdG9yLlN0eWxlU291cmNl LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlw ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3Vy Y2VDb2RlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNv ZGUuanMKaW5kZXggMmVlNzkwZDFlN2IyY2M2M2I4YTRhMTgzNTdmNmMwZjNiZjkzYjk5NS4uZjJj ODM4ZmVlZGMyNTRiYjNkZDBmZWU3MTZjOWMzNTgzMzY3MDhhYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKQEAgLTEwMCw2ICsx MDAsMTQgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgfSwK IAogICAgIC8qKgorICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5SZXNvdXJjZVR5cGV9Cisg ICAgICovCisgICAgY29udGVudFR5cGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVy biB0aGlzLl9jb250ZW50UHJvdmlkZXIuY29udGVudFR5cGUoKTsKKyAgICB9LAorCisgICAgLyoq CiAgICAgICogQHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLGJvb2xlYW4sc3RyaW5nKX0gY2FsbGJh Y2sKICAgICAgKi8KICAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25hdmlnYXRvclZpZXcu Y3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uYXZpZ2F0b3JWaWV3LmNz cwppbmRleCAwZTk5ZWE5M2JiYTMyZGY3NTI5YmExOGVhMzA2Y2Q1Y2E0YzQyYWU0Li5mYmMwZmFl NTE1MDNlMzE5NmM4YTdjZDJkMTRmMjU1NmRjZjIxMzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25hdmlnYXRvclZpZXcuY3NzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvbmF2aWdhdG9yVmlldy5jc3MKQEAgLTQwLDYgKzQw LDE0IEBACiAgICAgY29udGVudDogdXJsKEltYWdlcy9yZXNvdXJjZUpTSWNvbi5wbmcpOwogfQog CisubmF2aWdhdG9yLXN0eWxlc2hlZXQtdHJlZS1pdGVtIC5pY29uIHsKKyAgICBjb250ZW50OiB1 cmwoSW1hZ2VzL3Jlc291cmNlQ1NTSWNvbi5wbmcpOworfQorCisubmF2aWdhdG9yLWRvY3VtZW50 LXRyZWUtaXRlbSAuaWNvbiB7CisgICAgY29udGVudDogdXJsKEltYWdlcy9yZXNvdXJjZURvY3Vt ZW50SWNvbi5wbmcpOworfQorCiAubmF2aWdhdG9yIGxpIHsKICAgICBoZWlnaHQ6IDE3cHg7CiAg ICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkY2ZkNjZjYzEwYWVmNTJlMWY4ZjI0YjRk NWM5ZTVkNDJiMWVmNGExLi4wZjhkMjVhMmU4YTIxM2QyNWIyOGVkMTRhYjE1ZDA5Mjc4Zjk4NzQy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDUtMTggIFBhdmVsIEZlbGRtYW4gIDxwZmVs ZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIENvbnRlbnRQ cm92aWRlcjo6Y29udGVudFR5cGUgYW5kIHVzZSBpdCB3aGVuIHJlbmRlcmluZyBuYXZpZ2F0b3Ig dHJlZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2 ODMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXN0YXRpYy5odG1sOgorICAgICAg ICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLWZpbGUtc2VsZWN0b3IuaHRtbDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sOgorICAgICAgICAqIGlu c3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRtbDoKKwogMjAxMi0wNS0xOCAgU3Vk YXJzYW5hIE5hZ2luZW5pICA8c3VkYXJzYW5hLm5hZ2luZW5pQGxpbnV4LmludGVsLmNvbT4KIAog ICAgICAgICBbRUZMXSBEUlQgbmVlZHMgYW4gaW1wbGVtZW50YXRpb24gb2YgbGF5b3V0VGVzdENv bnRyb2xsZXIuc2V0U2VyaWFsaXplSFRUUExvYWRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXN0YXRpYy5odG1sIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1zdGF0aWMuaHRtbApp bmRleCBjN2JiNjY5MmRiZDZmMTdjZjNlZTY2NTMyZDgwZTYxMDAxOTE2MzU2Li40NDFhZGRjZTEx MWJiZjJjOThjMDQ4YjIzYmNhMjlmMjlkYTA5M2JjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXN0YXRpYy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tc3RhdGljLmh0 bWwKQEAgLTE4LDcgKzE4LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICBmdW5jdGlvbiBzdGVw MygpCiAgICAgewotICAgICAgICBzdGF0aWNDb250ZW50UHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVj dG9yLlN0YXRpY0NvbnRlbnRQcm92aWRlcigidGV4dC9wbGFpbiIsIHJlc291cmNlLmNvbnRlbnQp OworICAgICAgICBzdGF0aWNDb250ZW50UHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXRp Y0NvbnRlbnRQcm92aWRlcihXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TY3JpcHQsIHJlc291 cmNlLmNvbnRlbnQpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdChyZXNvdXJjZS51 cmwpOwogCiAgICAgICAgIHZhciB0ZXh0ID0gInNlYXJjaFRlc3RVbmlxdWVTdHJpbmciOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1zZWxl Y3Rvci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1z ZWxlY3Rvci5odG1sCmluZGV4IDdlNjRmZTE4MDk2NDYyYzI3OTdlMmViOTkzNGI0ZGFjNjc0ZTAz OWYuLjU2YTA3NjRmNjUyNmFiNTQ4NzEzMzdhZmRiNTI3MWUzZGIyZmJhZGYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLWZpbGUtc2VsZWN0b3IuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVj dG9yLmh0bWwKQEAgLTExLDkgKzExLDE2IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgdmFyIG5h dmlnYXRvckZpbGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvcigp OwogCisgICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IHsKKyAgICAgICAgY29udGVudFR5cGU6IGZ1 bmN0aW9uKCkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5yZXNv dXJjZVR5cGVzLlNjcmlwdDsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGZ1bmN0aW9uIGFkZFVJ U291cmNlQ29kZSh1cmwsIGlzQ29udGVudFNjcmlwdCkKICAgICB7Ci0gICAgICAgIHZhciB1aVNv dXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSh1cmwsIG51bGwsIG51bGwp OworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGUodXJsLCBjb250ZW50UHJvdmlkZXIsIG51bGwpOwogICAgICAgICB1aVNvdXJjZUNvZGUuaXND b250ZW50U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0OwogICAgICAgICBuYXZpZ2F0b3JGaWxlU2Vs ZWN0b3IuYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5kZXggMDlkOWFk YzQxZDBjOGZhN2YxYWVmYmQyOWNjMDlmM2E5ZjgyN2Q3NS4uNTUzNzg4YjM0YTY0ZTlkYTc1YWEz NTMxNWUyN2VlZmNjMzY2ZTY5NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sCkBAIC0xOCw2ICsxOCwxMyBAQCBmdW5jdGlvbiB0ZXN0 KCkKICAgICAgICAgc2V0OiBmdW5jdGlvbihicmVha3BvaW50cykgeyBwZXJzaXN0ZW50QnJlYWtw b2ludHMgPSBicmVha3BvaW50czsgfQogICAgIH07CiAKKyAgICB2YXIgY29udGVudFByb3ZpZGVy ID0geworICAgICAgICBjb250ZW50VHlwZTogZnVuY3Rpb24oKQorICAgICAgICB7CisgICAgICAg ICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU2NyaXB0OworICAgICAgICB9 CisgICAgfQorICAgIAogICAgIGZ1bmN0aW9uIGNyZWF0ZVVJU291cmNlQ29kZVByb3ZpZGVyTW9j aygpCiAgICAgewogICAgICAgICB2YXIgcHJvdmlkZXIgPSBuZXcgV2ViSW5zcGVjdG9yLk9iamVj dCgpOwpAQCAtNDQsNyArNTEsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICB9CiAgICAgZnVuY3Rp b24gY3JlYXRlVUlTb3VjZUNvZGUodXJsKQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29k ZSA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZSh1cmwsIG51bGwsIG51bGwsIGZh bHNlKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZSh1cmwsIGNvbnRlbnRQcm92aWRlciwgbnVsbCwgZmFsc2UpOwogICAgICAgICB1 aVNvdXJjZUNvZGUucmVxdWVzdENvbnRlbnQgPSBmdW5jdGlvbihjYWxsYmFjaykKICAgICAgICAg ewogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlNvdXJjZSByZXF1ZXN0ZWQg Zm9yICIgKyB1cmwpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdHMtc29ydGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3Nj cmlwdHMtc29ydGluZy5odG1sCmluZGV4IGM4MDcwZTVjOGYzYWQwMjU2MGNjYzQ5OWUzMjhmZjk3 ZmMwMDlhYTguLjRkOGJlYmI0M2NmZWE3M2Y2NDFlNTA5YmFjNTlkNGU2NTE3MTI3OGUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLmh0 bWwKQEAgLTExLDkgKzExLDE2IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgdmFyIG5hdmlnYXRv ckZpbGVTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvcigpOwogCisg ICAgdmFyIGNvbnRlbnRQcm92aWRlciA9IHsKKyAgICAgICAgY29udGVudFR5cGU6IGZ1bmN0aW9u KCkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5 cGVzLlNjcmlwdDsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGZ1bmN0aW9uIGFkZFVJU291cmNl Q29kZSh1cmwsIGlzQ29udGVudFNjcmlwdCkKICAgICB7Ci0gICAgICAgIHZhciB1aVNvdXJjZUNv ZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSh1cmwsIG51bGwsIG51bGwpOworICAg ICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUodXJs LCBjb250ZW50UHJvdmlkZXIsIG51bGwpOwogICAgICAgICB1aVNvdXJjZUNvZGUuaXNDb250ZW50 U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0OwogICAgICAgICBuYXZpZ2F0b3JGaWxlU2VsZWN0b3Iu YWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7CiAgICAgfQo=