67838 2011-09-09 03:53:29 -0700 Web Inspector: introduce JavaScriptSourceFrame class. 2011-09-09 08:20:50 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 464716 0 podivilov 2011-09-09 03:53:29 -0700 Web Inspector: introduce JavaScriptSourceFrame class. SourceFrame should not deal with JavaScript debugging since it is a base class for all source frame implementations. 464717 1 106857 podivilov 2011-09-09 03:54:37 -0700 Created attachment 106857 Patch 464719 2 pfeldman 2011-09-09 03:59:06 -0700 You should probably move SourceFrameDelegateForScriptsPanel implementation into the new class right away. 464728 3 106861 podivilov 2011-09-09 04:21:42 -0700 Created attachment 106861 Patch 464730 4 podivilov 2011-09-09 04:22:14 -0700 (In reply to comment #2) > You should probably move SourceFrameDelegateForScriptsPanel implementation into the new class right away. Good point! 464802 5 podivilov 2011-09-09 08:20:50 -0700 Committed r94855: <http://trac.webkit.org/changeset/94855> 106857 2011-09-09 03:54:37 -0700 2011-09-09 04:21:34 -0700 Patch bug-67838-20110909145435.patch text/plain 7068 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ3NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxMjBmNWYwM2VjMzgyNTYz ZDExYzJjNjVkYjVlMzA4YjI4M2UzNzNhLi5iM2QxY2UyOTY1NTg1M2VmN2UxMjQyNjgwMmNkYTE4 YTg4OTQ3OTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDktMDkgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogaW50cm9kdWNlIEphdmFTY3JpcHRTb3VyY2VGcmFtZSBjbGFzcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3ODM4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAg ICAgICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2o6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanM6IEFkZGVkLgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5fY3JlYXRlU291cmNlRnJhbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvV2ViS2l0LnFyYzoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5odG1sOgorCiAyMDExLTA5LTA3ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGdldCByaWQgb2YgUmF3U291cmNl Q29kZS5jcmVhdGVTb3VyY2VNYXBwaW5nSWZOZWVkZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggMDM5 ODY0YmJhOWY4MzU4ZDY0Njc5NjQyMzc2OTlhMDkzODk4YmZjYy4uMGZlNDY5YjJjZjhjZmNjYmEz ZDY5ODdlOWMxZjNmZjExYzVhM2MzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNjM2NSw2ICs2MzY1 LDcgQEAKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0luamVjdGVkRmFrZVdvcmtl ci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMnLAog ICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdEZvcm1hdHRlci5qcycs CisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUu anMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5q cycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9NZXRyaWNzU2lkZWJhclBhbmUu anMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya0l0ZW1WaWV3Lmpz JywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNw cm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXgg NmI2ODBiYWNmM2JlMTQxZGRhZGFiMTg1MjgwOGEwN2JlNWFjZDMxOS4uNTVjNmUyZTE2N2JlZmVl NTFmODAwODZhYTJkZTkyMmUyMmNlOWY1NCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3Byb2ovV2ViQ29yZS52Y3Byb2oKQEAgLTY5MDI1LDYgKzY5MDI1LDEwIEBACiAJCQkJCT4KIAkJ CQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJv bnQtZW5kXEphdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyIKKwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJ CQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcSmF2YVNj cmlwdEZvcm1hdHRlci5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUu anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uNGZlMTllYTIwNzBmNDFmNjlhMzllZDNhMDFmNDc4ZGMwMzg4ZTFiMAot LS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2 YVNjcmlwdFNvdXJjZUZyYW1lLmpzCkBAIC0wLDAgKzEsMzkgQEAKKy8qCisgKiBDb3B5cmlnaHQg KEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlv bnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNl IHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgor ICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9m IGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBw cm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBw cmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBB TkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QK KyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQu IElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lID0gZnVuY3Rpb24obW9kZWwsIHVpU291cmNlQ29kZSkKK3sKKyAgICAv LyBGSVhNRTogbW92ZSBhbGwgU291cmNlRnJhbWUgbWV0aG9kcyByZWxhdGVkIHRvIEphdmFTY3Jp cHQgZGVidWdnaW5nIGhlcmUgYW5kCisgICAgLy8gZ2V0IHJpZCBvZiBTb3VyY2VGcmFtZS5fZGVs ZWdhdGUuCisgICAgdmFyIGRlbGVnYXRlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yU2NyaXB0c1BhbmVsKG1vZGVsLCB1aVNvdXJjZUNvZGUpOworICAgIFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5jYWxsKHRoaXMsIGRlbGVnYXRlLCB1aVNvdXJjZUNvZGUudXJsKTsK K30KKworV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX19wcm90 b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggY2Q2ZGQw YjFmMDJjNTk4MmI5MzA1ZGEzMTI0YWQ0NGIzYzNlMTcyZS4uY2FkNWY1ZWQ5YjdmN2M0MGE0ZWEw MmM3OGU4NDNkNDIwNmVlNmUzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTY1MCw4ICs2NTAsNyBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9jcmVhdGVTb3VyY2VGcmFtZTog ZnVuY3Rpb24odWlTb3VyY2VDb2RlKQogICAgIHsKLSAgICAgICAgdmFyIGRlbGVnYXRlID0gbmV3 IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsKHRoaXMuX3By ZXNlbnRhdGlvbk1vZGVsLCB1aVNvdXJjZUNvZGUpOwotICAgICAgICB2YXIgc291cmNlRnJhbWUg PSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKGRlbGVnYXRlLCB1aVNvdXJjZUNvZGUudXJs KTsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 U291cmNlRnJhbWUodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHVpU291cmNlQ29kZSk7CiAgICAg ICAgIHRoaXMuYWRkQ2hpbGRWaWV3KHNvdXJjZUZyYW1lKTsKICAgICAgICAgc291cmNlRnJhbWUu X3VpU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKICAgICAgICAgc291cmNlRnJhbWUuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUuRXZlbnRzLkxvYWRlZCwgdGhpcy5f c291cmNlRnJhbWVMb2FkZWQsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjCmluZGV4IDA3YWM3YzRhNjE1ZDg4MDZmZDQ0MGQyMjQ2ZTg0NjY3 OTI5YTg2YTcuLmU4NWUxZjMxNjIxMDExYzYxNjViYTNlNmUxZDM2MTZmM2NjNTcyYTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKQEAgLTY3LDYg KzY3LDcgQEAKICAgICA8ZmlsZT5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzPC9maWxlPgog ICAgIDxmaWxlPkphdmFTY3JpcHRDb250ZXh0TWFuYWdlci5qczwvZmlsZT4KICAgICA8ZmlsZT5K YXZhU2NyaXB0Rm9ybWF0dGVyLmpzPC9maWxlPgorICAgIDxmaWxlPkphdmFTY3JpcHRTb3VyY2VG cmFtZS5qczwvZmlsZT4KICAgICA8ZmlsZT5LZXlib2FyZFNob3J0Y3V0LmpzPC9maWxlPgogICAg IDxmaWxlPk1ldHJpY3NTaWRlYmFyUGFuZS5qczwvZmlsZT4KICAgICA8ZmlsZT5OZXR3b3JrSXRl bVZpZXcuanM8L2ZpbGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5odG1sIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuaHRtbAppbmRleCBkMmMyMTY3YTJhYTQ5MzFmNTZlZjE2ZmU5NmJkYWRmYjc1 MmIwODYwLi5iZTk1OTg0M2VkMTVmNGIyNWRjMTNjOTE5MzRhZDFjZTdkZTk5ZWE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAg LTExMSw2ICsxMTEsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9IlNvdXJjZUZyYW1lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZVZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdHNQYW5lbC5qcyI+PC9zY3JpcHQ+ CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJSZXNvdXJjZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIHNyYz0iUHJvZmlsZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQ29uc29sZVBhbmVsLmpzIj48L3NjcmlwdD4K 106861 2011-09-09 04:21:42 -0700 2011-09-09 04:23:46 -0700 Patch bug-67838-20110909152140.patch text/plain 13791 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ3NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxMjBmNWYwM2VjMzgyNTYz ZDExYzJjNjVkYjVlMzA4YjI4M2UzNzNhLi5iZGM4OTU5NTcyNDYzNDRlZTA3ZTJiYzE4MmU3YTIz NzdlOGYwMjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDktMDkgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogaW50cm9kdWNlIEphdmFTY3JpcHRTb3VyY2VGcmFtZSBjbGFzcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3ODM4CisKKyAgICAgICAgU291 cmNlRnJhbWUgc2hvdWxkIG5vdCBkZWFsIHdpdGggSmF2YVNjcmlwdCBkZWJ1Z2dpbmcgc2luY2Ug aXQgaXMgYSBiYXNlIGNsYXNzIGZvciBhbGwgc291cmNlIGZyYW1lIGltcGxlbWVudGF0aW9ucy4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNv cmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qczogQWRkZWQu CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsKTogbW92ZWQg ZnJvbSBTY3JpcHRzUGFuZWwuanMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5 cGUuZGVidWdnaW5nU3VwcG9ydGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zZXRCcmVha3BvaW50KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3Rv dHlwZS51cGRhdGVCcmVha3BvaW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5yZW1vdmVCcmVha3BvaW50KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnBy b3RvdHlwZS5maW5kQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJh bWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuY29udGludWVUb0xpbmUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJv dG90eXBlLmNhbkVkaXRTY3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLnNldFNjcmlwdFNvdXJjZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5l bC5wcm90b3R5cGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUuZGVi dWdnZXJQYXVzZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVG b3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLmV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5w cm90b3R5cGUucmVsZWFzZUV2YWx1YXRpb25SZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwucHJvdG90eXBlLnN1Z2dlc3RlZEZp bGVOYW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jcmVhdGVTb3Vy Y2VGcmFtZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisKIDIwMTEtMDktMDcg IFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogZ2V0IHJpZCBvZiBSYXdTb3VyY2VDb2RlLmNyZWF0ZVNvdXJjZU1hcHBpbmdJ Zk5lZWRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCAwMzk4NjRiYmE5ZjgzNThkNjQ2Nzk2NDIzNzY5 OWEwOTM4OThiZmNjLi4wZmU0NjliMmNmOGNmY2NiYTNkNjk4N2U5YzFmM2ZmMTFjNWEzYzM3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpCkBAIC02MzY1LDYgKzYzNjUsNyBAQAogICAgICAgICAgICAgJ2luc3Bl Y3Rvci9mcm9udC1lbmQvSW5qZWN0ZWRGYWtlV29ya2VyLmpzJywKICAgICAgICAgICAgICdpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zy b250LWVuZC9KYXZhU2NyaXB0Rm9ybWF0dGVyLmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcycsCiAgICAgICAgICAgICAnaW5zcGVj dG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0 b3IvZnJvbnQtZW5kL01ldHJpY3NTaWRlYmFyUGFuZS5qcycsCiAgICAgICAgICAgICAnaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrSXRlbVZpZXcuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagppbmRleCA2YjY4MGJhY2YzYmUxNDFkZGFkYWIxODUy ODA4YTA3YmU1YWNkMzE5Li41NWM2ZTJlMTY3YmVmZWU1MWY4MDA4NmFhMmRlOTIyZTIyY2U5ZjU0 IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJv agorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAt NjkwMjUsNiArNjkwMjUsMTAgQEAKIAkJCQkJPgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJ CQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcSmF2YVNjcmlwdFNvdXJjZUZy YW1lLmpzIgorCQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZlUGF0 aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxKYXZhU2NyaXB0Rm9ybWF0dGVyLmpzIgogCQkJCQk+ CiAJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZWQyYjRjMjlk NzAwMmYwYjQ4NDAyOTg0ZDQ2ZWIxOWIzZGJmMTMyCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKQEAg LTAsMCArMSwxMjUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAq IG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0 IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFt ZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1h eSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAq IHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24u CisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERF UlMgQU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBM SUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQ QVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBD T1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisg KiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCitXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lID0gZnVuY3Rp b24obW9kZWwsIHVpU291cmNlQ29kZSkKK3sKKyAgICAvLyBGSVhNRTogbW92ZSBhbGwgU291cmNl RnJhbWUgbWV0aG9kcyByZWxhdGVkIHRvIEphdmFTY3JpcHQgZGVidWdnaW5nIGhlcmUgYW5kCisg ICAgLy8gZ2V0IHJpZCBvZiBTb3VyY2VGcmFtZS5fZGVsZWdhdGUuCisgICAgdmFyIGRlbGVnYXRl ID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsKG1v ZGVsLCB1aVNvdXJjZUNvZGUpOworICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5jYWxsKHRo aXMsIGRlbGVnYXRlLCB1aVNvdXJjZUNvZGUudXJsKTsKK30KKworV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lLnByb3RvdHlwZTsKKworV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JT Y3JpcHRzUGFuZWwgPSBmdW5jdGlvbihtb2RlbCwgdWlTb3VyY2VDb2RlKQoreworICAgIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLmNhbGwodGhpcyk7CisgICAgdGhpcy5fbW9kZWwg PSBtb2RlbDsKKyAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGU7CisgICAgdGhp cy5fcG9wb3Zlck9iamVjdEdyb3VwID0gInBvcG92ZXIiOworfQorCitXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CisgICAgcmVxdWVz dENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAgdGhpcy5fdWlTb3Vy Y2VDb2RlLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrKTsKKyAgICB9LAorCisgICAgZGVidWdnaW5n U3VwcG9ydGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9 LAorCisgICAgc2V0QnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBl bmFibGVkKQorICAgIHsKKyAgICAgICAgdGhpcy5fbW9kZWwuc2V0QnJlYWtwb2ludCh0aGlzLl91 aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7CisKKyAgICAgICAg aWYgKCFXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuYnJlYWtwb2ludHNBY3RpdmF0ZWQpCisg ICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudG9nZ2xlQnJlYWtwb2ludHND bGlja2VkKCk7CisgICAgfSwKKworICAgIHVwZGF0ZUJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVO dW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKKyAgICB7CisgICAgICAgIHRoaXMuX21vZGVsLnVw ZGF0ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb25kaXRpb24s IGVuYWJsZWQpOworICAgIH0sCisKKyAgICByZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5l TnVtYmVyKQorICAgIHsKKyAgICAgICAgdGhpcy5fbW9kZWwucmVtb3ZlQnJlYWtwb2ludCh0aGlz Ll91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOworICAgIH0sCisKKyAgICBmaW5kQnJlYWtwb2lu dDogZnVuY3Rpb24obGluZU51bWJlcikKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9tb2Rl bC5maW5kQnJlYWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOworICAgIH0s CisKKyAgICBjb250aW51ZVRvTGluZTogZnVuY3Rpb24obGluZU51bWJlcikKKyAgICB7CisgICAg ICAgIHRoaXMuX21vZGVsLmNvbnRpbnVlVG9MaW5lKHRoaXMuX3VpU291cmNlQ29kZSwgbGluZU51 bWJlcik7CisgICAgfSwKKworICAgIGNhbkVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHJldHVybiB0aGlzLl9tb2RlbC5jYW5FZGl0U2NyaXB0U291cmNlKHRoaXMu X3VpU291cmNlQ29kZSk7CisgICAgfSwKKworICAgIHNldFNjcmlwdFNvdXJjZTogZnVuY3Rpb24o dGV4dCwgY2FsbGJhY2spCisgICAgeworICAgICAgICB0aGlzLl9tb2RlbC5zZXRTY3JpcHRTb3Vy Y2UodGhpcy5fdWlTb3VyY2VDb2RlLCB0ZXh0LCBjYWxsYmFjayk7CisgICAgfSwKKworICAgIHNl dFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKGluRWRpdE1vZGUpCisgICAgewor ICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuc2V0U2NyaXB0U291cmNlSXNCZWlu Z0VkaXRlZCh0aGlzLl91aVNvdXJjZUNvZGUsIGluRWRpdE1vZGUpOworICAgIH0sCisKKyAgICBk ZWJ1Z2dlclBhdXNlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQ7CisgICAgfSwKKworICAgIGV2YWx1YXRlSW5TZWxl Y3RlZENhbGxGcmFtZTogZnVuY3Rpb24oc3RyaW5nLCBjYWxsYmFjaykKKyAgICB7CisgICAgICAg IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUo c3RyaW5nLCB0aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXAsIGZhbHNlLCBmYWxzZSwgY2FsbGJhY2sp OworICAgIH0sCisKKyAgICByZWxlYXNlRXZhbHVhdGlvblJlc3VsdDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgUnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RHcm91cCh0aGlzLl9wb3BvdmVy T2JqZWN0R3JvdXApOworICAgIH0sCisKKyAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgdmFyIG5hbWVzID0gV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRz Ll9mb2xkZXJBbmREaXNwbGF5TmFtZUZvclNjcmlwdFVSTCh0aGlzLl91aVNvdXJjZUNvZGUudXJs KTsKKyAgICAgICAgcmV0dXJuIG5hbWVzLmRpc3BsYXlOYW1lIHx8ICJ1bnRpdGxlZC5qcyI7Cisg ICAgfQorfQorCitXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5l bC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUu cHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcwppbmRleCBjZDZkZDBiMWYwMmM1OTgyYjkzMDVkYTMxMjRhZDQ0YjNjM2Ux NzJlLi44OTIzY2M0OTA3ZTc2YjJmMzA4YjQyMTEwNTYxZDAyZTA5NWQyMWQxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAt NjUwLDggKzY1MCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewog CiAgICAgX2NyZWF0ZVNvdXJjZUZyYW1lOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewot ICAgICAgICB2YXIgZGVsZWdhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdh dGVGb3JTY3JpcHRzUGFuZWwodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHVpU291cmNlQ29kZSk7 Ci0gICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUo ZGVsZWdhdGUsIHVpU291cmNlQ29kZS51cmwpOworICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBu ZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSh0aGlzLl9wcmVzZW50YXRpb25N b2RlbCwgdWlTb3VyY2VDb2RlKTsKICAgICAgICAgdGhpcy5hZGRDaGlsZFZpZXcoc291cmNlRnJh bWUpOwogICAgICAgICBzb3VyY2VGcmFtZS5fdWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwog ICAgICAgICBzb3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Tb3VyY2VG cmFtZS5FdmVudHMuTG9hZGVkLCB0aGlzLl9zb3VyY2VGcmFtZUxvYWRlZCwgdGhpcyk7CkBAIC0x MTY0LDkwICsxMTYzLDMgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiB9CiAKIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGU7Ci0KLQotV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l RGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihtb2RlbCwgdWlTb3VyY2VDb2RlKQot ewotICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLmNhbGwodGhpcyk7Ci0gICAg dGhpcy5fbW9kZWwgPSBtb2RlbDsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNv ZGU7Ci0gICAgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwID0gInBvcG92ZXIiOwotfQotCi1XZWJJ bnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 Ci0gICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAg dGhpcy5fdWlTb3VyY2VDb2RlLnJlcXVlc3RDb250ZW50KGNhbGxiYWNrKTsKLSAgICB9LAotCi0g ICAgZGVidWdnaW5nU3VwcG9ydGVkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICB9LAotCi0gICAgc2V0QnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlciwg Y29uZGl0aW9uLCBlbmFibGVkKQotICAgIHsKLSAgICAgICAgdGhpcy5fbW9kZWwuc2V0QnJlYWtw b2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCk7 Ci0KLSAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuYnJlYWtwb2ludHNB Y3RpdmF0ZWQpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMudG9nZ2xl QnJlYWtwb2ludHNDbGlja2VkKCk7Ci0gICAgfSwKLQotICAgIHVwZGF0ZUJyZWFrcG9pbnQ6IGZ1 bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKLSAgICB7Ci0gICAgICAgIHRo aXMuX21vZGVsLnVwZGF0ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVy LCBjb25kaXRpb24sIGVuYWJsZWQpOwotICAgIH0sCi0KLSAgICByZW1vdmVCcmVha3BvaW50OiBm dW5jdGlvbihsaW5lTnVtYmVyKQotICAgIHsKLSAgICAgICAgdGhpcy5fbW9kZWwucmVtb3ZlQnJl YWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOwotICAgIH0sCi0KLSAgICBm aW5kQnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlcikKLSAgICB7Ci0gICAgICAgIHJldHVy biB0aGlzLl9tb2RlbC5maW5kQnJlYWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1i ZXIpOwotICAgIH0sCi0KLSAgICBjb250aW51ZVRvTGluZTogZnVuY3Rpb24obGluZU51bWJlcikK LSAgICB7Ci0gICAgICAgIHRoaXMuX21vZGVsLmNvbnRpbnVlVG9MaW5lKHRoaXMuX3VpU291cmNl Q29kZSwgbGluZU51bWJlcik7Ci0gICAgfSwKLQotICAgIGNhbkVkaXRTY3JpcHRTb3VyY2U6IGZ1 bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9tb2RlbC5jYW5FZGl0U2NyaXB0 U291cmNlKHRoaXMuX3VpU291cmNlQ29kZSk7Ci0gICAgfSwKLQotICAgIHNldFNjcmlwdFNvdXJj ZTogZnVuY3Rpb24odGV4dCwgY2FsbGJhY2spCi0gICAgewotICAgICAgICB0aGlzLl9tb2RlbC5z ZXRTY3JpcHRTb3VyY2UodGhpcy5fdWlTb3VyY2VDb2RlLCB0ZXh0LCBjYWxsYmFjayk7Ci0gICAg fSwKLQotICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKGluRWRpdE1v ZGUpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuc2V0U2NyaXB0 U291cmNlSXNCZWluZ0VkaXRlZCh0aGlzLl91aVNvdXJjZUNvZGUsIGluRWRpdE1vZGUpOwotICAg IH0sCi0KLSAgICBkZWJ1Z2dlclBhdXNlZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5wYXVzZWQ7Ci0gICAgfSwKLQotICAgIGV2 YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24oc3RyaW5nLCBjYWxsYmFjaykKLSAg ICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0 ZWRDYWxsRnJhbWUoc3RyaW5nLCB0aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXAsIGZhbHNlLCBmYWxz ZSwgY2FsbGJhY2spOwotICAgIH0sCi0KLSAgICByZWxlYXNlRXZhbHVhdGlvblJlc3VsdDogZnVu Y3Rpb24oKQotICAgIHsKLSAgICAgICAgUnVudGltZUFnZW50LnJlbGVhc2VPYmplY3RHcm91cCh0 aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXApOwotICAgIH0sCi0KLSAgICBzdWdnZXN0ZWRGaWxlTmFt ZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdmFyIG5hbWVzID0gV2ViSW5zcGVjdG9yLnBh bmVscy5zY3JpcHRzLl9mb2xkZXJBbmREaXNwbGF5TmFtZUZvclNjcmlwdFVSTCh0aGlzLl91aVNv dXJjZUNvZGUudXJsKTsKLSAgICAgICAgcmV0dXJuIG5hbWVzLmRpc3BsYXlOYW1lIHx8ICJ1bnRp dGxlZC5qcyI7Ci0gICAgfQotfQotCi1XZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZv clNjcmlwdHNQYW5lbC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lRGVsZWdhdGUucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9XZWJLaXQucXJjIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9XZWJLaXQucXJjCmluZGV4IDA3YWM3YzRhNjE1ZDg4MDZmZDQ0MGQyMjQ2ZTg0NjY3OTI5 YTg2YTcuLmU4NWUxZjMxNjIxMDExYzYxNjViYTNlNmUxZDM2MTZmM2NjNTcyYTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKQEAgLTY3LDYgKzY3 LDcgQEAKICAgICA8ZmlsZT5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzPC9maWxlPgogICAg IDxmaWxlPkphdmFTY3JpcHRDb250ZXh0TWFuYWdlci5qczwvZmlsZT4KICAgICA8ZmlsZT5KYXZh U2NyaXB0Rm9ybWF0dGVyLmpzPC9maWxlPgorICAgIDxmaWxlPkphdmFTY3JpcHRTb3VyY2VGcmFt ZS5qczwvZmlsZT4KICAgICA8ZmlsZT5LZXlib2FyZFNob3J0Y3V0LmpzPC9maWxlPgogICAgIDxm aWxlPk1ldHJpY3NTaWRlYmFyUGFuZS5qczwvZmlsZT4KICAgICA8ZmlsZT5OZXR3b3JrSXRlbVZp ZXcuanM8L2ZpbGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5odG1sIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuaHRtbAppbmRleCBkMmMyMTY3YTJhYTQ5MzFmNTZlZjE2ZmU5NmJkYWRmYjc1MmIw ODYwLi5iZTk1OTg0M2VkMTVmNGIyNWRjMTNjOTE5MzRhZDFjZTdkZTk5ZWE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAgLTEx MSw2ICsxMTEsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0 IiBzcmM9IlNvdXJjZUZyYW1lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCIgc3JjPSJSZXNvdXJjZVZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNjcmlwdHNQYW5lbC5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iSmF2YVNjcmlwdFNvdXJjZUZy YW1lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3Jj PSJSZXNvdXJjZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiIHNyYz0iUHJvZmlsZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQ29uc29sZVBhbmVsLmpzIj48L3NjcmlwdD4K