86853 2012-05-18 06:58:26 -0700 Web Inspector: Add resource to UISourceCode constructor. 2012-05-18 09:09:51 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 627662 0 vsevik 2012-05-18 06:58:26 -0700 This is a first step of merging resource revision support into UISourceCode. 627687 1 142717 vsevik 2012-05-18 07:37:58 -0700 Created attachment 142717 Patch 627746 2 vsevik 2012-05-18 09:09:51 -0700 Committed r117600: <http://trac.webkit.org/changeset/117600> 142717 2012-05-18 07:37:58 -0700 2012-05-18 08:25:09 -0700 Patch bug-86853-20120518183756.patch text/plain 21835 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAzZDU2Y2IwYjEwNzQ3 YjBmZDVkMzNjMWQ2OWU5NjliNDc2M2E0ZC4uY2M3NzA3YTU0MzA0ZDYyN2Q0NThlMThiMTExOTk2 NWU5OTY5M2IxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA1LTE4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCByZXNvdXJjZSB0byBVSVNvdXJjZUNvZGUgY29uc3RydWN0b3IuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njg1MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBmaXJzdCBzdGVw IG9mIG1lcmdpbmcgcmVzb3VyY2UgcmV2aXNpb24gc3VwcG9ydCBpbnRvIFVJU291cmNlQ29kZS4K KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpz OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcuc2V0U2Ny aXB0U291cmNlLmRpZEVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRl YnVnZ2VyUmVzb3VyY2VCaW5kaW5nLnNldFNjcmlwdFNvdXJjZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5fZGVidWdnZXJSZXNldCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SYXdTb3VyY2VDb2RlLnByb3RvdHlwZS5fY3JlYXRlVUlTb3VyY2VDb2RlKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlLmFkZFNj cmlwdCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0LnByb3RvdHlwZS5pc0Fub255bW91c1NjcmlwdCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRTbmlwcGV0TW9kZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0U25pcHBldE1vZGVsLnByb3RvdHlwZS5fY3JlYXRlVUlTb3Vy Y2VDb2RlRm9yU2NyaXB0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlw dFNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3R5bGVTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2VG cmFtZS5wcm90b3R5cGUuY29tbWl0RWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5 bGVTb3VyY2VGcmFtZS5wcm90b3R5cGUuYWZ0ZXJUZXh0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3R5bGVTb3VyY2VGcmFtZS5wcm90b3R5cGUuX2NvbnRlbnRDaGFuZ2VkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZS5wcm90b3R5cGUucmVzb3VyY2UpOgorCiAyMDEyLTA1LTE4ICBBbGV4YW5kZXIgUGF2bG92 ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogZW1wdHkg Q1NTIERlY2xhcmF0aW9uIGlzIGdlbmVyYXRlZCBieSBjbGlja2luZyB0aGUgbGVmdCBzcGFjZSBv ZiAndXNlciBhZ2VudCBzdHlsZXNoZWV0JyBvbiBTdHlsZXMgc2lkZWJhciBvZiBFbGVtZW50cyBw YW5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21w aWxlclNjcmlwdE1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcwppbmRleCAyNTcxY2RmMjY0MzU3NWQwNmExYTg0NDgw OTNhMjM2NDE3NzQxZTI1Li5mNmU5OGQwZGNiMzllNGU4YTFhNDM0NzkzMWExOGJiYzZjMzIwOWNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVy U2NyaXB0TWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcwpAQCAtMTE4LDcgKzExOCw3IEBAIFdlYkluc3BlY3Rv ci5Db21waWxlclNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGNv bnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdGljQ29udGVudFByb3ZpZGVyKFdl Ykluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlNjcmlwdCwgc291cmNlQ29udGVudCk7CiAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3Bl Y3Rvci5Db21waWxlclNvdXJjZU1hcHBpbmdDb250ZW50UHJvdmlkZXIoc291cmNlVVJMKTsKLSAg ICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRT b3VyY2Uoc291cmNlVVJMLCBjb250ZW50UHJvdmlkZXIsIHRoaXMsIGZhbHNlKTsKKyAgICAgICAg ICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2Uo c291cmNlVVJMLCBudWxsLCBjb250ZW50UHJvdmlkZXIsIHRoaXMsIGZhbHNlKTsKICAgICAgICAg ICAgIHVpU291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQgPSBzY3JpcHQuaXNDb250ZW50U2NyaXB0 OwogICAgICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlQnlVUkxbc291cmNlVVJMXSA9IHVpU291 cmNlQ29kZTsKICAgICAgICAgICAgIHRoaXMuX3NvdXJjZU1hcEZvclVJU291cmNlQ29kZS5wdXQo dWlTb3VyY2VDb2RlLCBzb3VyY2VNYXApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclJlc291cmNlQmluZGluZy5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcuanMKaW5kZXgg YjE5MDhkZDdmYTc1N2M3MDI1MGM1ZTY2YTQ3YjAyZThiMjk1ODA4MS4uZTMyMTBkNTI5ZmJkNzE1 NDk5M2ViYTE1YWM1M2RmMzE0MDU0ZmUyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclJlc291cmNlQmluZGluZy5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nLmpzCkBA IC02MCw3ICs2MCw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclJlc291cmNlQmluZGluZy5zZXRT Y3JpcHRTb3VyY2UgPSBmdW5jdGlvbih1aVNvdXJjZUNvZGUsIG5lCiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIAotICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVz b3VyY2VGb3JVUkwoc2NyaXB0LnNvdXJjZVVSTCk7CisgICAgICAgIHZhciByZXNvdXJjZSA9IHVp U291cmNlQ29kZS5yZXNvdXJjZSgpOwogICAgICAgICBpZiAocmVzb3VyY2UpCiAgICAgICAgICAg ICByZXNvdXJjZS5hZGRSZXZpc2lvbihuZXdTb3VyY2UpOwogCkBAIC03Nyw3ICs3Nyw3IEBAIFdl Ykluc3BlY3Rvci5EZWJ1Z2dlclJlc291cmNlQmluZGluZy5wcm90b3R5cGUgPSB7CiAgICAgICov CiAgICAgY2FuU2V0Q29udGVudDogZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAgewotICAgICAgICB2 YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlRm9yUmVzb3VyY2UocmVzb3VyY2Up OworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2UuamF2YVNjcmlwdFNvdXJjZUZvclJlc291cmNlLmdldChyZXNvdXJjZSk7CiAgICAgICAgIHJl dHVybiAhIXVpU291cmNlQ29kZSAmJiB1aVNvdXJjZUNvZGUuaXNFZGl0YWJsZSgpOwogICAgIH0s CiAKQEAgLTkyLDcgKzkyLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUmVzb3VyY2VCaW5kaW5n LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFtYWpvckNoYW5nZSkKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlRm9y UmVzb3VyY2UocmVzb3VyY2UpOworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRTb3VyY2UuamF2YVNjcmlwdFNvdXJjZUZvclJlc291cmNlLmdldChyZXNv dXJjZSk7CiAgICAgICAgIGlmICghdWlTb3VyY2VDb2RlKSB7CiAgICAgICAgICAgICB1c2VyQ2Fs bGJhY2soIlJlc291cmNlIGlzIG5vdCBlZGl0YWJsZSIpOwogICAgICAgICAgICAgcmV0dXJuOwpA QCAtMTAyLDIwICsxMDIsNiBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcu cHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5SZXNvdXJjZX0gcmVzb3VyY2UKLSAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlfQotICAgICAqLwotICAgIF91aVNvdXJjZUNvZGVGb3JSZXNvdXJjZTogZnVuY3Rp b24ocmVzb3VyY2UpCi0gICAgewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlcyA9IHRoaXMuX3Vp U291cmNlQ29kZVByb3ZpZGVyLnVpU291cmNlQ29kZXMoKTsKLSAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCB1aVNvdXJjZUNvZGVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICBpZiAodWlT b3VyY2VDb2Rlc1tpXS51cmwgPT09IHJlc291cmNlLnVybCkKLSAgICAgICAgICAgICAgICByZXR1 cm4gdWlTb3VyY2VDb2Rlc1tpXTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gbnVsbDsKLSAg ICB9LAotCi0gICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl fSB1aVNvdXJjZUNvZGUKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gY29udGVudAogICAgICAqIEBw YXJhbSB7ZnVuY3Rpb24oP3N0cmluZyl9IHVzZXJDYWxsYmFjawpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclNjcmlwdE1hcHBpbmcuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyU2NyaXB0TWFwcGluZy5q cwppbmRleCAxZTViYzA2ZWE3NTg1NmM1MDBjMzM3NjA5ZjViY2FiMTNhMjE1M2M3Li5jMjc3YTNh YjU0NzBmMmM2ZGNlZWI2Y2M5MmI0YWM5ZTI1ZWY4MTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyU2NyaXB0TWFwcGluZy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyU2NyaXB0TWFwcGluZy5q cwpAQCAtODcsNiArODcsNyBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRNYXBwaW5nLnBy b3RvdHlwZSA9IHsKIAogICAgIF9kZWJ1Z2dlclJlc2V0OiBmdW5jdGlvbigpCiAgICAgeworICAg ICAgICBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZS5qYXZhU2NyaXB0U291cmNlRm9yUmVz b3VyY2UuY2xlYXIoKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9tYXBwaW5n cy5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMuX21hcHBpbmdzW2ldLnJlc2V0KCk7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZh U2NyaXB0U291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZh U2NyaXB0U291cmNlLmpzCmluZGV4IGMwZWYyNTIwM2MxODgxMTU1MDkyNmUxMzhhNWM3NmJmNTY0 ZTFmYTIuLjQxMGVlMzE4NjgyZGQzN2RjOTdmNDkzNDNhNDQyN2YzNDFjZWRlMzkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3Vy Y2UuanMKQEAgLTMyLDEyICszMiwxMyBAQAogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7 V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0KICAqIEBwYXJhbSB7c3RyaW5nfSB1cmwKKyAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlJlc291cmNlfSByZXNvdXJjZQogICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuQ29udGVudFByb3ZpZGVyfSBjb250ZW50UHJvdmlkZXIKICAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlNvdXJjZU1hcHBpbmd9IHNvdXJjZU1hcHBpbmcKICAqLwotV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbih1cmwsIGNvbnRlbnRQcm92aWRlciwgc291cmNlTWFw cGluZywgaXNFZGl0YWJsZSkKK1dlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlID0gZnVuY3Rp b24odXJsLCByZXNvdXJjZSwgY29udGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5nLCBpc0VkaXRh YmxlKQogewotICAgIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuY2FsbCh0aGlzLCB1cmwsIGNv bnRlbnRQcm92aWRlciwgc291cmNlTWFwcGluZyk7CisgICAgV2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZS5jYWxsKHRoaXMsIHVybCwgcmVzb3VyY2UsIGNvbnRlbnRQcm92aWRlciwgc291cmNlTWFw cGluZyk7CiAgICAgdGhpcy5faXNFZGl0YWJsZSA9IGlzRWRpdGFibGU7CiAKICAgICB0aGlzLl9m b3JtYXR0ZXJNYXBwaW5nID0gbmV3IFdlYkluc3BlY3Rvci5JZGVudGl0eUZvcm1hdHRlclNvdXJj ZU1hcHBpbmcoKTsKQEAgLTQ2LDggKzQ3LDEyIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlID0gZnVuY3Rpb24odXJsLCBjb250ZW50UHJvdmlkZXIsIHNvdXJjZU1hcHBpbmcsIGlzCiAg ICAgICAgIGlmICghdGhpcy5fZm9ybWF0dGVkKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmJy ZWFrcG9pbnRNYW5hZ2VyLnJlc3RvcmVCcmVha3BvaW50cyh0aGlzKTsKICAgICB9LmJpbmQodGhp cyksIDApOworICAgIGlmIChyZXNvdXJjZSkKKyAgICAgICAgV2ViSW5zcGVjdG9yLkphdmFTY3Jp cHRTb3VyY2UuamF2YVNjcmlwdFNvdXJjZUZvclJlc291cmNlLnB1dChyZXNvdXJjZSwgdGhpcyk7 CiB9CiAKK1dlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlLmphdmFTY3JpcHRTb3VyY2VGb3JS ZXNvdXJjZSA9IG5ldyBNYXAoKTsKKwogV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UucHJv dG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7P3N0cmluZ30gY29udGVudApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2Rl LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2RlLmpz CmluZGV4IDQzOGM3ODE2MTk1MjRjNzdkYTkyYWVjNTRjMjUzZWVmODI3OTBhNmQuLjZiNjU0YTUz MTYwNjkyNmMwNTFjZDg0OTVhMTZlYTVjOWE5MWJjY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanMKQEAgLTEwMCw3ICsxMDAs NyBAQCBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGVs c2UKICAgICAgICAgICAgIGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29uY2F0 ZW5hdGVkU2NyaXB0c0NvbnRlbnRQcm92aWRlcih0aGlzLl9zY3JpcHRzKTsKIAotICAgICAgICB2 YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHRoaXMu dXJsLCBjb250ZW50UHJvdmlkZXIsIHRoaXMuX3NvdXJjZU1hcHBpbmcsIGlzU3RhbmRhbG9uZVNj cmlwdCk7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRTb3VyY2UodGhpcy51cmwsIHRoaXMuX3Jlc291cmNlLCBjb250ZW50UHJvdmlkZXIsIHRo aXMuX3NvdXJjZU1hcHBpbmcsIGlzU3RhbmRhbG9uZVNjcmlwdCk7CiAgICAgICAgIHVpU291cmNl Q29kZS5pc0NvbnRlbnRTY3JpcHQgPSB0aGlzLmlzQ29udGVudFNjcmlwdDsKICAgICAgICAgcmV0 dXJuIHVpU291cmNlQ29kZTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVNjcmlwdE1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5qcwppbmRleCA4ZTFm ZjU5NDQwNzkyYjZkMGQyM2U4NTU5ZjAxMzE2NmVjMDcyMjYzLi4xZTRkY2Q2YWE1ZWM3YWMwZTc0 ODRjNzY4MThjOGJhZDhmZDQ1OTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlU2NyaXB0TWFwcGluZy5qcwpAQCAtODcsMzAg Kzg3LDI3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNjcmlwdE1hcHBpbmcucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlID0gbnVsbDsKICAgICAgICAgdmFyIHJlcXVl c3QgPSBudWxsOwotICAgICAgICB2YXIgaXNJbmxpbmVTY3JpcHQgPSBmYWxzZTsKLSAgICAgICAg aWYgKHNjcmlwdC5pc0lubGluZVNjcmlwdCgpKSB7Ci0gICAgICAgICAgICAvLyBGaXJzdCBsb29r dXAgdGhlIHJlc291cmNlIHRoYXQgaGFzIGFscmVhZHkgYmVlbiBsb2FkZWQuIFdlIGFyZSBvbmx5 IGludGVyZXN0ZWQgaW4gRG9jdW1lbnQgcmVzb3VyY2VzLgorICAgICAgICBpZiAoIXNjcmlwdC5p c0Fub255bW91c1NjcmlwdCgpKSB7CisgICAgICAgICAgICAvLyBGaXJzdCBsb29rdXAgdGhlIHJl c291cmNlIHRoYXQgaGFzIGFscmVhZHkgYmVlbiBsb2FkZWQuCiAgICAgICAgICAgICByZXNvdXJj ZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChzY3JpcHQuc291cmNlVVJMKTsKLSAgICAg ICAgICAgIGlmIChyZXNvdXJjZSAmJiByZXNvdXJjZS50eXBlICE9PSBXZWJJbnNwZWN0b3IucmVz b3VyY2VUeXBlcy5Eb2N1bWVudCkKLSAgICAgICAgICAgICAgICByZXNvdXJjZSA9IG51bGw7CiAg ICAgICAgICAgICAvLyBJZ25vcmUgcmVzb3VyY2UgaW4gY2FzZSBpdCBoYXMgbm90IHlldCBmaW5p c2hlZCBsb2FkaW5nLgogICAgICAgICAgICAgaWYgKHJlc291cmNlICYmIHJlc291cmNlLnJlcXVl c3QgJiYgIXJlc291cmNlLnJlcXVlc3QuZmluaXNoZWQpCiAgICAgICAgICAgICAgICAgcmVzb3Vy Y2UgPSBudWxsOwogICAgICAgICAgICAgaWYgKCFyZXNvdXJjZSkgewotICAgICAgICAgICAgICAg IC8vIFdoZW4gdGhlcmUgaXMgbm8gcmVzb3VyY2UsIGxvb2t1cCBpbi1mbGlnaHQgcmVxdWVzdHMg b2YgdHlwZSBEb2N1bWVudC4KKyAgICAgICAgICAgICAgICAvLyBXaGVuIHRoZXJlIGlzIG5vIHJl c291cmNlLCBsb29rdXAgaW4tZmxpZ2h0IHJlcXVlc3RzLgogICAgICAgICAgICAgICAgIHJlcXVl c3QgPSBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIuaW5mbGlnaHRSZXF1ZXN0Rm9yVVJMKHNj cmlwdC5zb3VyY2VVUkwpOwotICAgICAgICAgICAgICAgIGlmIChyZXF1ZXN0ICYmIHJlcXVlc3Qu dHlwZSAhPT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuRG9jdW1lbnQpCi0gICAgICAgICAg ICAgICAgICAgIHJlcXVlc3QgPSBudWxsOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgLy8g SWYgZWl0aGVyIG9mIHRoZXNlIGV4aXN0cywgd2UgYmluZCBzY3JpcHQgdG8gdGhlIHJlc291cmNl LgotICAgICAgICAgICAgaWYgKHJlcXVlc3QgfHwgcmVzb3VyY2UpIHsKLSAgICAgICAgICAgICAg ICBpc0lubGluZVNjcmlwdCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNv ZGUgPSB0aGlzLl9yYXdTb3VyY2VDb2RlRm9yRG9jdW1lbnRVUkxbc2NyaXB0LnNvdXJjZVVSTF07 Ci0gICAgICAgICAgICAgICAgaWYgKHJhd1NvdXJjZUNvZGUpIHsKLSAgICAgICAgICAgICAgICAg ICAgcmF3U291cmNlQ29kZS5hZGRTY3JpcHQoc2NyaXB0KTsKLSAgICAgICAgICAgICAgICAgICAg dGhpcy5fYmluZFNjcmlwdFRvUmF3U291cmNlQ29kZShzY3JpcHQsIHJhd1NvdXJjZUNvZGUpOwot ICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICB9 CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCFyZXNvdXJjZSB8fCAhcmVxdWVzdCk7CisKKyAgICAg ICAgdmFyIGlzSW5saW5lU2NyaXB0ID0gc2NyaXB0LmlzSW5saW5lU2NyaXB0KCkgJiYgKHJlcXVl c3QgfHwgcmVzb3VyY2UpOworICAgICAgICAvLyBJZiBlaXRoZXIgb2YgdGhlc2UgZXhpc3RzLCB3 ZSBiaW5kIHNjcmlwdCB0byB0aGUgcmVzb3VyY2UuCisgICAgICAgIGlmIChpc0lubGluZVNjcmlw dCkgeworICAgICAgICAgICAgdmFyIHJhd1NvdXJjZUNvZGUgPSB0aGlzLl9yYXdTb3VyY2VDb2Rl Rm9yRG9jdW1lbnRVUkxbc2NyaXB0LnNvdXJjZVVSTF07CisgICAgICAgICAgICBpZiAocmF3U291 cmNlQ29kZSkgeworICAgICAgICAgICAgICAgIHJhd1NvdXJjZUNvZGUuYWRkU2NyaXB0KHNjcmlw dCk7CisgICAgICAgICAgICAgICAgdGhpcy5fYmluZFNjcmlwdFRvUmF3U291cmNlQ29kZShzY3Jp cHQsIHJhd1NvdXJjZUNvZGUpOworICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg IH0KICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0LmpzCmluZGV4IDIyNWU4MzQwN2RiYjExMDMyODBhNWZiNjM5OWQ4YWIzMjM4NTdkMzEuLmY4 YmE0ZDVhMjdjODlhMTc3OGFlMTM2MDI2OWNiZGQyYTRiYzk3MzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0LmpzCkBAIC0xNTksNiArMTU5LDE0IEBAIFdl Ykluc3BlY3Rvci5TY3JpcHQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAg KiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLworICAgIGlzQW5vbnltb3VzU2NyaXB0OiBmdW5j dGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gIXRoaXMuc291cmNlVVJMOworICAgIH0sCisK KyAgICAvKioKICAgICAgKiBAcGFyYW0ge0RlYnVnZ2VyQWdlbnQuTG9jYXRpb259IHJhd0xvY2F0 aW9uCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlVJTG9jYXRpb259CiAgICAgICovCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFNuaXBw ZXRNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25p cHBldE1vZGVsLmpzCmluZGV4IDliMjM3MTcyM2FhMTkwNDMxMGU3MmE4ZmFhZmJmMzZjZjE2MDRl MzAuLmQwNTNiYTlhODczYWY5YzRiNzg1MGI3YTEwYTk1OGExNjgxNDlhODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1vZGVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0U25pcHBldE1v ZGVsLmpzCkBAIC0yMTUsNyArMjE1LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFNuaXBwZXRNb2Rl bC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2NyZWF0ZVVJU291cmNlQ29kZUZvclNjcmlw dDogZnVuY3Rpb24oc2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5l dyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZShzY3JpcHQuc291cmNlVVJMLCBzY3JpcHQs IHRoaXMuX3NuaXBwZXRTY3JpcHRNYXBwaW5nLCBmYWxzZSk7CisgICAgICAgIHZhciB1aVNvdXJj ZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2Uoc2NyaXB0LnNvdXJjZVVS TCwgbnVsbCwgc2NyaXB0LCB0aGlzLl9zbmlwcGV0U2NyaXB0TWFwcGluZywgZmFsc2UpOwogICAg ICAgICB1aVNvdXJjZUNvZGUuaXNTbmlwcGV0RXZhbHVhdGlvbiA9IHRydWU7CiAgICAgICAgIHRo aXMuX3VpU291cmNlQ29kZUZvclNjcmlwdElkW3NjcmlwdC5zY3JpcHRJZF0gPSB1aVNvdXJjZUNv ZGU7CiAgICAgICAgIHRoaXMuX3NjcmlwdEZvclVJU291cmNlQ29kZS5wdXQodWlTb3VyY2VDb2Rl LCBzY3JpcHQpOwpAQCAtMzAxLDcgKzMwMSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRTbmlwcGV0 TW9kZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90CiAg Ki8KIFdlYkluc3BlY3Rvci5TbmlwcGV0SmF2YVNjcmlwdFNvdXJjZSA9IGZ1bmN0aW9uKHNuaXBw ZXRJZCwgc25pcHBldE5hbWUsIGNvbnRlbnRQcm92aWRlciwgc2NyaXB0U25pcHBldE1vZGVsKQog ewotICAgIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlLmNhbGwodGhpcywgc25pcHBldE5h bWUsIGNvbnRlbnRQcm92aWRlciwgc2NyaXB0U25pcHBldE1vZGVsLnNjcmlwdE1hcHBpbmcsIHRy dWUpOworICAgIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlLmNhbGwodGhpcywgc25pcHBl dE5hbWUsIG51bGwsIGNvbnRlbnRQcm92aWRlciwgc2NyaXB0U25pcHBldE1vZGVsLnNjcmlwdE1h cHBpbmcsIHRydWUpOwogICAgIHRoaXMuX3NuaXBwZXRJZCA9IHNuaXBwZXRJZDsKICAgICB0aGlz Ll9zY3JpcHRTbmlwcGV0TW9kZWwgPSBzY3JpcHRTbmlwcGV0TW9kZWw7CiAgICAgdGhpcy5pc1Nu aXBwZXQgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TdHlsZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVzUGFuZWwuanMKaW5kZXggZWM5NzViMjk5Nzk1YjlhZjBmZTc5ZjdlNzQ5NDU0YTkwNDlj NjU1Ni4uNTVhMDlmOTMyM2E2ODAyMmJmMmFhMDczMWJkNDZiOWNmYmU2Yjc2ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzCkBAIC05 NCw4ICs5NCw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90 b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjCiAgKi8KIFdlYkluc3BlY3Rvci5T dHlsZVNvdXJjZSA9IGZ1bmN0aW9uKHJlc291cmNlKQogewotICAgIFdlYkluc3BlY3Rvci5VSVNv dXJjZUNvZGUuY2FsbCh0aGlzLCByZXNvdXJjZS51cmwsIHJlc291cmNlKTsKLSAgICB0aGlzLl9y ZXNvdXJjZSA9IHJlc291cmNlOworICAgIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuY2FsbCh0 aGlzLCByZXNvdXJjZS51cmwsIHJlc291cmNlLCByZXNvdXJjZSk7CiB9CiAKIFdlYkluc3BlY3Rv ci5TdHlsZVNvdXJjZS5wcm90b3R5cGUgPSB7CkBAIC0xMTAsMTAgKzEwOSw5IEBAIFdlYkluc3Bl Y3Rvci5TdHlsZVNvdXJjZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZS5wcm90b3R5CiAgKi8KIFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lID0gZnVu Y3Rpb24oc3R5bGVTb3VyY2UpCiB7Ci0gICAgdGhpcy5fcmVzb3VyY2UgPSBzdHlsZVNvdXJjZS5f cmVzb3VyY2U7CiAgICAgdGhpcy5fc3R5bGVTb3VyY2UgPSBzdHlsZVNvdXJjZTsKICAgICBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUuY2FsbCh0aGlzLCB0aGlzLl9zdHlsZVNvdXJjZSk7Ci0gICAg dGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZl bnRzLlJldmlzaW9uQWRkZWQsIHRoaXMuX2NvbnRlbnRDaGFuZ2VkLCB0aGlzKTsKKyAgICB0aGlz Ll9zdHlsZVNvdXJjZS5yZXNvdXJjZSgpLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJl c291cmNlLkV2ZW50cy5SZXZpc2lvbkFkZGVkLCB0aGlzLl9jb250ZW50Q2hhbmdlZCwgdGhpcyk7 CiB9CiAKIFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKQEAgLTEz MCw3ICsxMjgsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7 CiAgICAgICovCiAgICAgY29tbWl0RWRpdGluZzogZnVuY3Rpb24odGV4dCkKICAgICB7Ci0gICAg ICAgIHRoaXMuX3Jlc291cmNlLnNldENvbnRlbnQodGV4dCwgdHJ1ZSwgZnVuY3Rpb24oKSB7fSk7 CisgICAgICAgIHRoaXMuX3N0eWxlU291cmNlLnJlc291cmNlKCkuc2V0Q29udGVudCh0ZXh0LCB0 cnVlLCBmdW5jdGlvbigpIHt9KTsKICAgICB9LAogCiAgICAgYWZ0ZXJUZXh0Q2hhbmdlZDogZnVu Y3Rpb24ob2xkUmFuZ2UsIG5ld1JhbmdlKQpAQCAtMTM5LDcgKzEzNyw3IEBAIFdlYkluc3BlY3Rv ci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAgICAg dmFyIHRleHQgPSB0aGlzLl90ZXh0TW9kZWwudGV4dDsKICAgICAgICAgICAgIHRoaXMuX3N0eWxl U291cmNlLnNldFdvcmtpbmdDb3B5KHRleHQpOwotICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2Uu c2V0Q29udGVudCh0ZXh0LCBmYWxzZSwgZnVuY3Rpb24oKSB7fSk7CisgICAgICAgICAgICB0aGlz Ll9zdHlsZVNvdXJjZS5yZXNvdXJjZSgpLnNldENvbnRlbnQodGV4dCwgZmFsc2UsIGZ1bmN0aW9u KCkge30pOwogICAgICAgICB9CiAgICAgICAgIGNvbnN0IHVwZGF0ZVRpbWVvdXQgPSAyMDA7CiAg ICAgICAgIHRoaXMuX2luY3JlbWVudGFsVXBkYXRlVGltZXIgPSBzZXRUaW1lb3V0KGNvbW1pdElu Y3JlbWVudGFsRWRpdC5iaW5kKHRoaXMpLCB1cGRhdGVUaW1lb3V0KTsKQEAgLTE1NCw4ICsxNTIs OCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICBf Y29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fc3R5 bGVTb3VyY2UuY29udGVudENoYW5nZWQodGhpcy5fcmVzb3VyY2UuY29udGVudCB8fCAiIik7Ci0g ICAgICAgIHRoaXMuc2V0Q29udGVudCh0aGlzLl9yZXNvdXJjZS5jb250ZW50LCBmYWxzZSwgInRl eHQvc3R5bGVzaGVldCIpOworICAgICAgICB0aGlzLl9zdHlsZVNvdXJjZS5jb250ZW50Q2hhbmdl ZCh0aGlzLl9zdHlsZVNvdXJjZS5yZXNvdXJjZSgpLmNvbnRlbnQgfHwgIiIpOworICAgICAgICB0 aGlzLnNldENvbnRlbnQodGhpcy5fc3R5bGVTb3VyY2UucmVzb3VyY2UoKS5jb250ZW50LCBmYWxz ZSwgInRleHQvc3R5bGVzaGVldCIpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcwppbmRleCBmMmM4MzhmZWVkYzI1 NGJiM2RkMGZlZTcxNmM5YzM1ODMzNjcwOGFiLi5jODM3YTczMDgzMTdlYWQ0MDFkNWRjYTMxODll NTkxOGE2NzZlNjk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1VJU291cmNlQ29kZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1VJU291cmNlQ29kZS5qcwpAQCAtMzQsMTIgKzM0LDE0IEBACiAgKiBAZXh0ZW5kcyB7V2Vi SW5zcGVjdG9yLk9iamVjdH0KICAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuQ29udGVudFBy b3ZpZGVyfQogICogQHBhcmFtIHtzdHJpbmd9IHVybAorICogQHBhcmFtIHtXZWJJbnNwZWN0b3Iu UmVzb3VyY2V9IHJlc291cmNlCiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Db250ZW50UHJvdmlk ZXJ9IGNvbnRlbnRQcm92aWRlcgogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU291cmNlTWFwcGlu Zz19IHNvdXJjZU1hcHBpbmcKICAqLwotV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSA9IGZ1bmN0 aW9uKHVybCwgY29udGVudFByb3ZpZGVyLCBzb3VyY2VNYXBwaW5nKQorV2ViSW5zcGVjdG9yLlVJ U291cmNlQ29kZSA9IGZ1bmN0aW9uKHVybCwgcmVzb3VyY2UsIGNvbnRlbnRQcm92aWRlciwgc291 cmNlTWFwcGluZykKIHsKICAgICB0aGlzLl91cmwgPSB1cmw7CisgICAgdGhpcy5fcmVzb3VyY2Ug PSByZXNvdXJjZTsKICAgICB0aGlzLl9wYXJzZWRVUkwgPSBuZXcgV2ViSW5zcGVjdG9yLlBhcnNl ZFVSTCh1cmwpOwogICAgIHRoaXMuX2NvbnRlbnRQcm92aWRlciA9IGNvbnRlbnRQcm92aWRlcjsK ICAgICB0aGlzLl9zb3VyY2VNYXBwaW5nID0gc291cmNlTWFwcGluZzsKQEAgLTg0LDYgKzg2LDE0 IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgIH0sCiAKICAg ICAvKioKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V9CisgICAgICovCisg ICAgcmVzb3VyY2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9yZXNv dXJjZTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlBh cnNlZFVSTH0KICAgICAgKi8KICAgICBnZXQgcGFyc2VkVVJMKCkKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5ZjE1ZDk0MDEw NzZiMTI4Y2JjZjMyNDU4YzM2MTQ3OTQwNTRmZDk0Li43NjYyOWZlNDEzOTU2ZjllYWMzMzA3MTY5 NWJhN2FlNmMzODg3YzZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDUtMTggIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogQWRkIHJlc291cmNlIHRvIFVJU291cmNlQ29kZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2ODUzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIv YnJlYWtwb2ludC1tYW5hZ2VyLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3Nj cmlwdHMtZmlsZS1zZWxlY3Rvci5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9z Y3JpcHRzLXBhbmVsLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMt c29ydGluZy5odG1sOgorICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29k ZS5odG1sOgorCiAyMDEyLTA1LTE4ICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgRGVmbGFraW5nIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s aWN5L3NjcmlwdC1zcmMtcmVkaXJlY3QuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9pbnQtbWFuYWdlci5odG1sCmluZGV4IDI2NmFiZDE5Yjlk ZDljODA2YWYwMTgyZTYyNDBkZDBmODY1ZGRjMGIuLmE0MzI2NGNmOGMwNjFlYzI2ZDUxYjcxNGUz ODY5NDUyYjQ0Yjg2YzggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9icmVha3BvaW50LW1hbmFnZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVi dWdnZXIvYnJlYWtwb2ludC1tYW5hZ2VyLmh0bWwKQEAgLTEzNiw3ICsxMzYsNyBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICB7CiAgICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLl9kZWJ1Z2dlck1vZGVs Ll9hZGRTY3JpcHQodXJsLCB1cmwpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgi ICBBZGRpbmcgVUlTb3VyY2VDb2RlOiAiICsgdXJsICsgIikiKTsKLSAgICAgICAgdmFyIHVpU291 cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZSh1cmwsIG51bGwsIGRl ZmF1bHRNYXBwaW5nLCBmYWxzZSk7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UodXJsLCBudWxsLCBudWxsLCBkZWZhdWx0TWFwcGlu ZywgZmFsc2UpOwogICAgICAgICB1aVNvdXJjZUNvZGVzW3VybF0gPSB1aVNvdXJjZUNvZGU7CiAg ICAgICAgIGJyZWFrcG9pbnRNYW5hZ2VyLnJlc3RvcmVCcmVha3BvaW50cyh1aVNvdXJjZUNvZGUp OwogICAgICAgICByZXR1cm4gdWlTb3VyY2VDb2RlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1zZWxlY3Rvci5odG1sIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtZmlsZS1zZWxlY3Rvci5odG1sCmluZGV4IDU2 YTA3NjRmNjUyNmFiNTQ4NzEzMzdhZmRiNTI3MWUzZGIyZmJhZGYuLmMxODc1NGZiY2U2M2UyZjBl ZGEzY2Q1ODg5OTY5Yjk3NDcyY2MzNWMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9zY3JpcHRzLWZpbGUtc2VsZWN0b3IuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1maWxlLXNlbGVjdG9yLmh0bWwKQEAgLTIwLDcgKzIw LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICBmdW5jdGlvbiBhZGRVSVNvdXJjZUNvZGUodXJs LCBpc0NvbnRlbnRTY3JpcHQpCiAgICAgewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3 IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUodXJsLCBjb250ZW50UHJvdmlkZXIsIG51bGwpOwor ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUo dXJsLCBudWxsLCBjb250ZW50UHJvdmlkZXIsIG51bGwpOwogICAgICAgICB1aVNvdXJjZUNvZGUu aXNDb250ZW50U2NyaXB0ID0gaXNDb250ZW50U2NyaXB0OwogICAgICAgICBuYXZpZ2F0b3JGaWxl U2VsZWN0b3IuYWRkVUlTb3VyY2VDb2RlKHVpU291cmNlQ29kZSk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXBhbmVsLmh0bWwKaW5kZXggNTUz Nzg4YjM0YTY0ZTlkYTc1YWEzNTMxNWUyN2VlZmNjMzY2ZTY5Ni4uMDNmZDM3MmZmMzRlODE5MzZh ZWUxYjYzZmUxMjU3YzQyOTMyY2MyYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv ZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sCkBAIC01MSw3ICs1MSw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgIH0KICAgICBmdW5jdGlvbiBjcmVhdGVVSVNvdWNlQ29kZSh1cmwpCiAgICAgewot ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlKHVybCwgY29udGVudFByb3ZpZGVyLCBudWxsLCBmYWxzZSk7CisgICAgICAgIHZhciB1aVNv dXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UodXJsLCBudWxsLCBj b250ZW50UHJvdmlkZXIsIG51bGwsIGZhbHNlKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLnJlcXVl c3RDb250ZW50ID0gZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgICAgIHsKICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KCJTb3VyY2UgcmVxdWVzdGVkIGZvciAiICsgdXJsKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcu aHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3JpcHRzLXNvcnRpbmcuaHRt bAppbmRleCA0ZDhiZWJiNDNjZmVhNzNmNjQxZTUwOWJhYzU5ZDRlNjUxNzEyNzhlLi43ZmY0YmVi MzQ4YTU1OTczOWU4NDJjM2I0YjFjMjNjMWM0N2U4MDFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1zb3J0aW5nLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtc29ydGluZy5odG1sCkBAIC0yMCw3ICsyMCw3 IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgZnVuY3Rpb24gYWRkVUlTb3VyY2VDb2RlKHVybCwg aXNDb250ZW50U2NyaXB0KQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKHVybCwgY29udGVudFByb3ZpZGVyLCBudWxsKTsKKyAg ICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKHVy bCwgbnVsbCwgY29udGVudFByb3ZpZGVyLCBudWxsKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLmlz Q29udGVudFNjcmlwdCA9IGlzQ29udGVudFNjcmlwdDsKICAgICAgICAgbmF2aWdhdG9yRmlsZVNl bGVjdG9yLmFkZFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwogICAgIH0KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2RlLmh0bWwKaW5kZXggMGU5 MjkzZDE4MDYyMjIyZjMwY2Y3ZjY2ZWU5OWMxMTdiNWY4OGI4Ny4uNDhlMjQ0MGMzZWQxNWRlNWJj OTg2OWI0YjYwZDJjYzc5MDk1YTc3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2RlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2RlLmh0bWwKQEAgLTE3LDcgKzE3LDcgQEAgZnVuY3Rpb24g dGVzdCgpCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3VpdGUoWwogICAgICAgICBmdW5jdGlv biB0ZXN0VUlTb3VyY2VDb2RlKG5leHQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZhciB1aVNv dXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSgidXJsIiwgY29udGVudFBy b3ZpZGVyKTsKKyAgICAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9y LlVJU291cmNlQ29kZSgidXJsIiwgbnVsbCwgY29udGVudFByb3ZpZGVyKTsKICAgICAgICAgICAg IGZ1bmN0aW9uIGRpZFJlcXVlc3RDb250ZW50KGNhbGxOdW1iZXIsIGNvbnRlbnQsIGNvbnRlbnRF bmNvZGVkLCBtaW1lVHlwZSkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmFkZFJlc3VsdCgiQ2FsbGJhY2sgIiArIGNhbGxOdW1iZXIgKyAiIGlzIGludm9rZWQu Iik7Cg==