97902 2012-09-28 06:01:57 -0700 Web Inspector: split ProgressBar.js into Progress.js and ProgressIndicator.js 2012-09-28 06:29:48 -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 webkit.review.bot yurys oldest_to_newest 730560 0 pfeldman 2012-09-28 06:01:57 -0700 One is model, the other is UI component. 730564 1 166231 pfeldman 2012-09-28 06:04:06 -0700 Created attachment 166231 Patch 730591 2 166231 webkit.review.bot 2012-09-28 06:29:45 -0700 Comment on attachment 166231 Patch Clearing flags on attachment: 166231 Committed r129884: <http://trac.webkit.org/changeset/129884> 730592 3 webkit.review.bot 2012-09-28 06:29:48 -0700 All reviewed patches have been landed. Closing bug. 166231 2012-09-28 06:04:06 -0700 2012-09-28 06:29:45 -0700 Patch bug-97902-20120928170322.patch text/plain 22695 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5ODc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmIyYjhmZmFmOTA3ODYz ZmU4NjFiYTU4ZDI0YjI1NTU0ZGI5ZmYwMy4uOTQ0MDY4NmI1YmYwZDZkYzVkNzk3M2ZlMjMyMzFi YmM0ZGYyZmQxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA5LTI4ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNwbGl0IFByb2dyZXNzQmFyLmpzIGludG8gUHJvZ3Jlc3MuanMgYW5kIFByb2dyZXNzSW5k aWNhdG9yLmpzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05NzkwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE9uZSBpcyBtb2RlbCwgdGhlIG90aGVyIGlzIFVJIGNvbXBvbmVudC4KKworICAgICAgICAqIFdl YkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAg ICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9Qcm9ncmVzcy5qczogQ29waWVkIGZyb20gU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9ncmVzc0Jhci5qcy4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2dyZXNzSW5kaWNhdG9yLmpzOiBSZW5hbWVkIGZyb20gU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9ncmVzc0Jhci5qcy4KKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1VzZXJBZ2VudFN1cHBvcnQuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5q czoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgorCiAyMDEy LTA5LTI4ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyOTg2My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCA2 MDQwM2MxMDFhMWIwZDEwNGUxMjk3ZTA5ODZjMGIwZWNjNTJhNDNhLi4wYjdiMTE4OGU5MWYyYTRj NjMyZmU5Yjc3ZjllMzE0YzdkOTA0ZWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC02NDEyLDcgKzY0 MTIsOCBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvUGxhY2FyZC5qcycsCiAg ICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzJywKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL1ByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdlSGVscGVyLmpz JywKLSAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2dyZXNzQmFyLmpzJywKKyAg ICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2dyZXNzLmpzJywKKyAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2dyZXNzSW5kaWNhdG9yLmpzJywKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTZWN0aW9uLmpzJywKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL1JlbW90ZU9iamVjdC5qcycsCiAgICAgICAgICAgICAnaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcycsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu dmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IDkwOGE3MDVkNWI1NzQ3Y2I5Y2NhNTMxZGVjN2Q3 ODg1NDBkZDcwMTMuLjhlNjM0OGY2NmRiYTI4NzEyNTg3OWFlMzdhNTg5N2U3NzUzZTVjYmMgMTAw NzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCisr KyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCkBAIC03NjUx OCw3ICs3NjUxOCwxMSBAQAogCQkJCQk+CiAJCQkJPC9GaWxlPgogCQkJCTxGaWxlCi0JCQkJCVJl bGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxQcm9ncmVzc0Jhci5qcyIKKwkJCQkJ UmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXFByb2dyZXNzLmpzIgorCQkJCQk+ CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9y XGZyb250LWVuZFxQcm9ncmVzc0luZGljYXRvci5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KIAkJ CQk8RmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJv bnQtZW5kLnB5IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5 CmluZGV4IDc2ZGNhZWYzNDUxOTRhYTU5YWNhODNiZDBiNDkxZGYyM2NmY2U0Y2IuLmQ0YWM1ZGNm OTUwNjY4OTUxNTU3ODk0MjM0N2I1OGJjN2I2ZDFhNmUgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weQorKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKQEAgLTQ4LDYgKzQ4LDcgQEAgbW9kdWxlcyA9 IFsKICAgICAgICAgICAgICJDb2xvci5qcyIsCiAgICAgICAgICAgICAiT2JqZWN0LmpzIiwKICAg ICAgICAgICAgICJQYXJzZWRVUkwuanMiLAorICAgICAgICAgICAgIlByb2dyZXNzLmpzIiwKICAg ICAgICAgICAgICJTZXR0aW5ncy5qcyIsCiAgICAgICAgICAgICAiVUlTdHJpbmcuanMiLAogICAg ICAgICAgICAgIlVzZXJNZXRyaWNzLmpzIiwKQEAgLTEyOCw3ICsxMjksNyBAQCBtb2R1bGVzID0g WwogICAgICAgICAgICAgIlBhbmVsRW5hYmxlclZpZXcuanMiLAogICAgICAgICAgICAgIlBsYWNh cmQuanMiLAogICAgICAgICAgICAgIlBvcG92ZXIuanMiLAotICAgICAgICAgICAgIlByb2dyZXNz QmFyLmpzIiwKKyAgICAgICAgICAgICJQcm9ncmVzc0luZGljYXRvci5qcyIsCiAgICAgICAgICAg ICAiUHJvcGVydGllc1NlY3Rpb24uanMiLAogICAgICAgICAgICAgIlNlYXJjaENvbnRyb2xsZXIu anMiLAogICAgICAgICAgICAgIlNlY3Rpb24uanMiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9ncmVzcy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZ3Jlc3MuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGNkMDUwODkxZGYyOGNkMmFm MzQ0MmQzMmU0OGRmMjY1YTIxY2JlOAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZ3Jlc3MuanMKQEAgLTAsMCArMSwxNzcgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlz dHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3Ig dGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ug b3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91 dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwor ICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9S IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisvKioKKyAq IEBpbnRlcmZhY2UKKyAqLworV2ViSW5zcGVjdG9yLlByb2dyZXNzID0gZnVuY3Rpb24oKQorewor fQorCitXZWJJbnNwZWN0b3IuUHJvZ3Jlc3MucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAq IEBwYXJhbSB7bnVtYmVyfSB0b3RhbFdvcmsKKyAgICAgKi8KKyAgICBzZXRUb3RhbFdvcms6IGZ1 bmN0aW9uKHRvdGFsV29yaykgeyB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmd9 IHRpdGxlCisgICAgICovCisgICAgc2V0VGl0bGU6IGZ1bmN0aW9uKHRpdGxlKSB7IH0sCisKKyAg ICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gd29ya2VkCisgICAgICogQHBhcmFtIHtzdHJp bmc9fSB0aXRsZQorICAgICAqLworICAgIHNldFdvcmtlZDogZnVuY3Rpb24od29ya2VkLCB0aXRs ZSkgeyB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtudW1iZXI9fSB3b3JrZWQKKyAgICAg Ki8KKyAgICB3b3JrZWQ6IGZ1bmN0aW9uKHdvcmtlZCkgeyB9LAorCisgICAgZG9uZTogZnVuY3Rp b24oKSB7IH0sCisKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLwor ICAgIGlzQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkgeyByZXR1cm4gZmFsc2U7IH0KK30KKworLyoqCisg KiBAY29uc3RydWN0b3IKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlByb2dyZXNzfSBwYXJlbnQK KyAqLworV2ViSW5zcGVjdG9yLkNvbXBvc2l0ZVByb2dyZXNzID0gZnVuY3Rpb24ocGFyZW50KQor eworICAgIHRoaXMuX3BhcmVudCA9IHBhcmVudDsKKyAgICB0aGlzLl9jaGlsZHJlbiA9IFtdOwor ICAgIHRoaXMuX2NoaWxkcmVuRG9uZSA9IDA7CisgICAgdGhpcy5fcGFyZW50LnNldFRvdGFsV29y aygxKTsKKyAgICB0aGlzLl9wYXJlbnQuc2V0V29ya2VkKDApOworfQorCitXZWJJbnNwZWN0b3Iu Q29tcG9zaXRlUHJvZ3Jlc3MucHJvdG90eXBlID0geworICAgIF9jaGlsZERvbmU6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIGlmICgrK3RoaXMuX2NoaWxkcmVuRG9uZSA9PT0gdGhpcy5fY2hp bGRyZW4ubGVuZ3RoKQorICAgICAgICAgICAgdGhpcy5fcGFyZW50LmRvbmUoKTsKKyAgICB9LAor CisgICAgLyoqCisgICAgICogQHBhcmFtIHtudW1iZXI9fSB3ZWlnaHQKKyAgICAgKi8KKyAgICBj cmVhdGVTdWJQcm9ncmVzczogZnVuY3Rpb24od2VpZ2h0KQorICAgIHsKKyAgICAgICAgdmFyIGNo aWxkID0gbmV3IFdlYkluc3BlY3Rvci5TdWJQcm9ncmVzcyh0aGlzLCB3ZWlnaHQpOworICAgICAg ICB0aGlzLl9jaGlsZHJlbi5wdXNoKGNoaWxkKTsKKyAgICAgICAgcmV0dXJuIGNoaWxkOworICAg IH0sCisKKyAgICBfdXBkYXRlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgdG90YWxX ZWlnaHRzID0gMDsKKyAgICAgICAgdmFyIGRvbmUgPSAwOworCisgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgdGhpcy5fY2hpbGRyZW4ubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIHZhciBj aGlsZCA9IHRoaXMuX2NoaWxkcmVuW2ldOworICAgICAgICAgICAgaWYgKGNoaWxkLl90b3RhbFdv cmspCisgICAgICAgICAgICAgICAgZG9uZSArPSBjaGlsZC5fd2VpZ2h0ICogY2hpbGQuX3dvcmtl ZCAvIGNoaWxkLl90b3RhbFdvcms7CisgICAgICAgICAgICB0b3RhbFdlaWdodHMgKz0gY2hpbGQu X3dlaWdodDsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9wYXJlbnQuc2V0V29ya2VkKGRvbmUg LyB0b3RhbFdlaWdodHMpOworICAgIH0KK30KKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBp bXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5Db21wb3NpdGVQcm9ncmVzc30gY29tcG9zaXRlCisgKiBAcGFyYW0ge251bWJlcj19IHdlaWdo dAorICovCitXZWJJbnNwZWN0b3IuU3ViUHJvZ3Jlc3MgPSBmdW5jdGlvbihjb21wb3NpdGUsIHdl aWdodCkKK3sKKyAgICB0aGlzLl9jb21wb3NpdGUgPSBjb21wb3NpdGU7CisgICAgdGhpcy5fd2Vp Z2h0ID0gd2VpZ2h0IHx8IDE7CisgICAgdGhpcy5fd29ya2VkID0gMDsKK30KKworV2ViSW5zcGVj dG9yLlN1YlByb2dyZXNzLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHti b29sZWFufQorICAgICAqLworICAgIGlzQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHJldHVybiB0aGlzLl9jb21wb3NpdGUuX3BhcmVudC5pc0NhbmNlbGVkKCk7CisgICAgfSwK KworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQorICAgICAqLworICAgIHNl dFRpdGxlOiBmdW5jdGlvbih0aXRsZSkKKyAgICB7CisgICAgICAgIHRoaXMuX2NvbXBvc2l0ZS5f cGFyZW50LnNldFRpdGxlKHRpdGxlKTsKKyAgICB9LAorCisgICAgZG9uZTogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgdGhpcy5zZXRXb3JrZWQodGhpcy5fdG90YWxXb3JrKTsKKyAgICAgICAg dGhpcy5fY29tcG9zaXRlLl9jaGlsZERvbmUoKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICog QHBhcmFtIHtudW1iZXJ9IHRvdGFsV29yaworICAgICAqLworICAgIHNldFRvdGFsV29yazogZnVu Y3Rpb24odG90YWxXb3JrKQorICAgIHsKKyAgICAgICAgdGhpcy5fdG90YWxXb3JrID0gdG90YWxX b3JrOworICAgICAgICB0aGlzLl9jb21wb3NpdGUuX3VwZGF0ZSgpOworICAgIH0sCisKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gd29ya2VkCisgICAgICogQHBhcmFtIHtzdHJpbmc9 fSB0aXRsZQorICAgICAqLworICAgIHNldFdvcmtlZDogZnVuY3Rpb24od29ya2VkLCB0aXRsZSkK KyAgICB7CisgICAgICAgIHRoaXMuX3dvcmtlZCA9IHdvcmtlZDsKKyAgICAgICAgaWYgKHR5cGVv ZiB0aXRsZSAhPT0gInVuZGVmaW5lZCIpCisgICAgICAgICAgICB0aGlzLnNldFRpdGxlKHRpdGxl KTsKKyAgICAgICAgdGhpcy5fY29tcG9zaXRlLl91cGRhdGUoKTsKKyAgICB9LAorCisgICAgLyoq CisgICAgICogQHBhcmFtIHtudW1iZXI9fSB3b3JrZWQKKyAgICAgKi8KKyAgICB3b3JrZWQ6IGZ1 bmN0aW9uKHdvcmtlZCkKKyAgICB7CisgICAgICAgIHRoaXMuc2V0V29ya2VkKHRoaXMuX3dvcmtl ZCArICh3b3JrZWQgfHwgMSkpOworICAgIH0KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZ3Jlc3NCYXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2dyZXNzQmFyLmpzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAyMmE0NTEzZjJhZDdhZjQ1ZjkyOWEwMTNhOTM3ODFmZTc3MDkwMWI1Li4wMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZ3Jlc3NCYXIuanMKKysrIC9kZXYvbnVsbApAQCAtMSwyNzMgKzAs MCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQotICogbWV0OgotICoK LSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0Ci0gKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCi0gKiBjb3B5cmlnaHQgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCi0gKiBp biB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlCi0gKiBkaXN0cmlidXRpb24uCi0gKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2ds ZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0gKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQg dG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQotICogdGhpcyBzb2Z0 d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KLSAqCi0gKiBU SElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09O VFJJQlVUT1JTCi0gKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVAotICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0gKiBBIFBBUlRJQ1VMQVIg UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAot ICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJF Q1QsIElOQ0lERU5UQUwsCi0gKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwg REFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKLSAqIERBVEEsIE9S IFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWQotICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNU IExJQUJJTElUWSwgT1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICov Ci0KLS8qKgotICogQGludGVyZmFjZQotICovCi1XZWJJbnNwZWN0b3IuUHJvZ3Jlc3MgPSBmdW5j dGlvbigpCi17Ci19Ci0KLVdlYkluc3BlY3Rvci5Qcm9ncmVzcy5wcm90b3R5cGUgPSB7Ci0gICAg LyoqCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IHRvdGFsV29yawotICAgICAqLwotICAgIHNldFRv dGFsV29yazogZnVuY3Rpb24odG90YWxXb3JrKSB7IH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFy YW0ge3N0cmluZ30gdGl0bGUKLSAgICAgKi8KLSAgICBzZXRUaXRsZTogZnVuY3Rpb24odGl0bGUp IHsgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7bnVtYmVyfSB3b3JrZWQKLSAgICAgKiBA cGFyYW0ge3N0cmluZz19IHRpdGxlCi0gICAgICovCi0gICAgc2V0V29ya2VkOiBmdW5jdGlvbih3 b3JrZWQsIHRpdGxlKSB7IH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge251bWJlcj19IHdv cmtlZAotICAgICAqLwotICAgIHdvcmtlZDogZnVuY3Rpb24od29ya2VkKSB7IH0sCi0KLSAgICBk b25lOiBmdW5jdGlvbigpIHsgfSwKLQotICAgIC8qKgotICAgICAqIEByZXR1cm4ge2Jvb2xlYW59 Ci0gICAgICovCi0gICAgaXNDYW5jZWxlZDogZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfQot fQotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5Q cm9ncmVzc30KLSAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQotICovCi1XZWJJbnNw ZWN0b3IuUHJvZ3Jlc3NJbmRpY2F0b3IgPSBmdW5jdGlvbigpCi17Ci0gICAgdGhpcy5lbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgdGhpcy5lbGVtZW50LmNsYXNz TmFtZSA9ICJwcm9ncmVzcy1iYXItY29udGFpbmVyIjsKLSAgICB0aGlzLl9sYWJlbEVsZW1lbnQg PSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoInNwYW4iKTsKLSAgICB0aGlzLl9wcm9ncmVzc0Vs ZW1lbnQgPSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoInByb2dyZXNzIik7Ci0gICAgdGhpcy5f c3RvcEJ1dHRvbiA9IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQ2FuY2VsIiksICJwcm9ncmVzcy1iYXItc3RvcC1idXR0b24iKTsKLSAgICB0 aGlzLl9zdG9wQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5jYW5jZWwsIHRo aXMpOwotICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zdG9wQnV0dG9uLmVsZW1l bnQpOwotICAgIHRoaXMuX2lzQ2FuY2VsZWQgPSBmYWxzZTsKLSAgICB0aGlzLl93b3JrZWQgPSAw OwotfQotCi1XZWJJbnNwZWN0b3IuUHJvZ3Jlc3NJbmRpY2F0b3IuRXZlbnRzID0gewotICAgIERv bmU6ICJEb25lIgotfQotCi1XZWJJbnNwZWN0b3IuUHJvZ3Jlc3NJbmRpY2F0b3IucHJvdG90eXBl ID0gewotICAgIC8qKgotICAgICAqIEBwYXJhbSB7RWxlbWVudH0gcGFyZW50Ci0gICAgICovCi0g ICAgc2hvdzogZnVuY3Rpb24ocGFyZW50KQotICAgIHsKLSAgICAgICAgcGFyZW50LmFwcGVuZENo aWxkKHRoaXMuZWxlbWVudCk7Ci0gICAgfSwKLQotICAgIGhpZGU6IGZ1bmN0aW9uKCkKLSAgICB7 Ci0gICAgICAgIHZhciBwYXJlbnQgPSB0aGlzLmVsZW1lbnQucGFyZW50RWxlbWVudDsKLSAgICAg ICAgaWYgKHBhcmVudCkKLSAgICAgICAgICAgIHBhcmVudC5yZW1vdmVDaGlsZCh0aGlzLmVsZW1l bnQpOwotICAgIH0sCi0KLSAgICBkb25lOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAo dGhpcy5faXNEb25lKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB0aGlzLl9pc0RvbmUg PSB0cnVlOwotICAgICAgICB0aGlzLmhpZGUoKTsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlByb2dyZXNzSW5kaWNhdG9yLkV2ZW50cy5Eb25lKTsK LSAgICB9LAotCi0gICAgY2FuY2VsOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLl9p c0NhbmNlbGVkID0gdHJ1ZTsKLSAgICB9LAotCi0gICAgaXNDYW5jZWxlZDogZnVuY3Rpb24oKQot ICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2lzQ2FuY2VsZWQ7Ci0gICAgfSwKLQotICAgIC8q KgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQotICAgICAqLwotICAgIHNldFRpdGxlOiBm dW5jdGlvbih0aXRsZSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2xhYmVsRWxlbWVudC50ZXh0Q29u dGVudCA9IHRpdGxlOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge251bWJlcn0g dG90YWxXb3JrCi0gICAgICovCi0gICAgc2V0VG90YWxXb3JrOiBmdW5jdGlvbih0b3RhbFdvcmsp Ci0gICAgewotICAgICAgICB0aGlzLl9wcm9ncmVzc0VsZW1lbnQubWF4ID0gdG90YWxXb3JrOwot ICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge251bWJlcn0gd29ya2VkCi0gICAgICog QHBhcmFtIHtzdHJpbmc9fSB0aXRsZQotICAgICAqLwotICAgIHNldFdvcmtlZDogZnVuY3Rpb24o d29ya2VkLCB0aXRsZSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3dvcmtlZCA9IHdvcmtlZDsKLSAg ICAgICAgdGhpcy5fcHJvZ3Jlc3NFbGVtZW50LnZhbHVlID0gd29ya2VkOwotICAgICAgICBpZiAo dGl0bGUpCi0gICAgICAgICAgICB0aGlzLnNldFRpdGxlKHRpdGxlKTsKLSAgICB9LAotCi0gICAg LyoqCi0gICAgICogQHBhcmFtIHtudW1iZXI9fSB3b3JrZWQKLSAgICAgKi8KLSAgICB3b3JrZWQ6 IGZ1bmN0aW9uKHdvcmtlZCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc2V0V29ya2VkKHRoaXMuX3dv cmtlZCArICh3b3JrZWQgfHwgMSkpOwotICAgIH0KLX0KLQotV2ViSW5zcGVjdG9yLlByb2dyZXNz SW5kaWNhdG9yLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3Rv dHlwZTsKLQotLyoqCi0gKiBAY29uc3RydWN0b3IKLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlBy b2dyZXNzfSBwYXJlbnQKLSAqLwotV2ViSW5zcGVjdG9yLkNvbXBvc2l0ZVByb2dyZXNzID0gZnVu Y3Rpb24ocGFyZW50KQotewotICAgIHRoaXMuX3BhcmVudCA9IHBhcmVudDsKLSAgICB0aGlzLl9j aGlsZHJlbiA9IFtdOwotICAgIHRoaXMuX2NoaWxkcmVuRG9uZSA9IDA7Ci0gICAgdGhpcy5fcGFy ZW50LnNldFRvdGFsV29yaygxKTsKLSAgICB0aGlzLl9wYXJlbnQuc2V0V29ya2VkKDApOwotfQot Ci1XZWJJbnNwZWN0b3IuQ29tcG9zaXRlUHJvZ3Jlc3MucHJvdG90eXBlID0gewotICAgIF9jaGls ZERvbmU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICgrK3RoaXMuX2NoaWxkcmVuRG9u ZSA9PT0gdGhpcy5fY2hpbGRyZW4ubGVuZ3RoKQotICAgICAgICAgICAgdGhpcy5fcGFyZW50LmRv bmUoKTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtudW1iZXI9fSB3ZWlnaHQK LSAgICAgKi8KLSAgICBjcmVhdGVTdWJQcm9ncmVzczogZnVuY3Rpb24od2VpZ2h0KQotICAgIHsK LSAgICAgICAgdmFyIGNoaWxkID0gbmV3IFdlYkluc3BlY3Rvci5TdWJQcm9ncmVzcyh0aGlzLCB3 ZWlnaHQpOwotICAgICAgICB0aGlzLl9jaGlsZHJlbi5wdXNoKGNoaWxkKTsKLSAgICAgICAgcmV0 dXJuIGNoaWxkOwotICAgIH0sCi0KLSAgICBfdXBkYXRlOiBmdW5jdGlvbigpCi0gICAgewotICAg ICAgICB2YXIgdG90YWxXZWlnaHRzID0gMDsKLSAgICAgICAgdmFyIGRvbmUgPSAwOwotCi0gICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fY2hpbGRyZW4ubGVuZ3RoOyArK2kpIHsKLSAg ICAgICAgICAgIHZhciBjaGlsZCA9IHRoaXMuX2NoaWxkcmVuW2ldOwotICAgICAgICAgICAgaWYg KGNoaWxkLl90b3RhbFdvcmspCi0gICAgICAgICAgICAgICAgZG9uZSArPSBjaGlsZC5fd2VpZ2h0 ICogY2hpbGQuX3dvcmtlZCAvIGNoaWxkLl90b3RhbFdvcms7Ci0gICAgICAgICAgICB0b3RhbFdl aWdodHMgKz0gY2hpbGQuX3dlaWdodDsKLSAgICAgICAgfQotICAgICAgICB0aGlzLl9wYXJlbnQu c2V0V29ya2VkKGRvbmUgLyB0b3RhbFdlaWdodHMpOwotICAgIH0KLX0KLQotLyoqCi0gKiBAY29u c3RydWN0b3IKLSAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9Ci0gKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5Db21wb3NpdGVQcm9ncmVzc30gY29tcG9zaXRlCi0gKiBAcGFyYW0g e251bWJlcj19IHdlaWdodAotICovCi1XZWJJbnNwZWN0b3IuU3ViUHJvZ3Jlc3MgPSBmdW5jdGlv bihjb21wb3NpdGUsIHdlaWdodCkKLXsKLSAgICB0aGlzLl9jb21wb3NpdGUgPSBjb21wb3NpdGU7 Ci0gICAgdGhpcy5fd2VpZ2h0ID0gd2VpZ2h0IHx8IDE7Ci0gICAgdGhpcy5fd29ya2VkID0gMDsK LX0KLQotV2ViSW5zcGVjdG9yLlN1YlByb2dyZXNzLnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAg ICAgKiBAcmV0dXJuIHtib29sZWFufQotICAgICAqLwotICAgIGlzQ2FuY2VsZWQ6IGZ1bmN0aW9u KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9jb21wb3NpdGUuX3BhcmVudC5pc0NhbmNl bGVkKCk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0aXRsZQot ICAgICAqLwotICAgIHNldFRpdGxlOiBmdW5jdGlvbih0aXRsZSkKLSAgICB7Ci0gICAgICAgIHRo aXMuX2NvbXBvc2l0ZS5fcGFyZW50LnNldFRpdGxlKHRpdGxlKTsKLSAgICB9LAotCi0gICAgZG9u ZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5zZXRXb3JrZWQodGhpcy5fdG90YWxX b3JrKTsKLSAgICAgICAgdGhpcy5fY29tcG9zaXRlLl9jaGlsZERvbmUoKTsKLSAgICB9LAotCi0g ICAgLyoqCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IHRvdGFsV29yawotICAgICAqLwotICAgIHNl dFRvdGFsV29yazogZnVuY3Rpb24odG90YWxXb3JrKQotICAgIHsKLSAgICAgICAgdGhpcy5fdG90 YWxXb3JrID0gdG90YWxXb3JrOwotICAgICAgICB0aGlzLl9jb21wb3NpdGUuX3VwZGF0ZSgpOwot ICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge251bWJlcn0gd29ya2VkCi0gICAgICog QHBhcmFtIHtzdHJpbmc9fSB0aXRsZQotICAgICAqLwotICAgIHNldFdvcmtlZDogZnVuY3Rpb24o d29ya2VkLCB0aXRsZSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3dvcmtlZCA9IHdvcmtlZDsKLSAg ICAgICAgaWYgKHR5cGVvZiB0aXRsZSAhPT0gInVuZGVmaW5lZCIpCi0gICAgICAgICAgICB0aGlz LnNldFRpdGxlKHRpdGxlKTsKLSAgICAgICAgdGhpcy5fY29tcG9zaXRlLl91cGRhdGUoKTsKLSAg ICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtudW1iZXI9fSB3b3JrZWQKLSAgICAgKi8K LSAgICB3b3JrZWQ6IGZ1bmN0aW9uKHdvcmtlZCkKLSAgICB7Ci0gICAgICAgIHRoaXMuc2V0V29y a2VkKHRoaXMuX3dvcmtlZCArICh3b3JrZWQgfHwgMSkpOwotICAgIH0KLX0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZ3Jlc3NJbmRpY2F0b3IuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2dyZXNzSW5kaWNhdG9yLmpz Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjYxOWIwOTM3NWQyYTUzMjhmNDM4YzQ4MDEzZjE1MTFmOWM1MDVjZWIKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2dy ZXNzSW5kaWNhdG9yLmpzCkBAIC0wLDAgKzEsMTI1IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cisg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq ICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK KyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVj dHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Ig d3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg VEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QK KyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAq IEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuUHJvZ3Jlc3N9CisgKiBAZXh0ZW5kcyB7V2ViSW5z cGVjdG9yLk9iamVjdH0KKyAqLworV2ViSW5zcGVjdG9yLlByb2dyZXNzSW5kaWNhdG9yID0gZnVu Y3Rpb24oKQoreworICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOworICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAicHJvZ3Jlc3MtYmFyLWNvbnRhaW5l ciI7CisgICAgdGhpcy5fbGFiZWxFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxkKCJz cGFuIik7CisgICAgdGhpcy5fcHJvZ3Jlc3NFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNo aWxkKCJwcm9ncmVzcyIpOworICAgIHRoaXMuX3N0b3BCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9y LlN0YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbmNlbCIpLCAicHJvZ3Jl c3MtYmFyLXN0b3AtYnV0dG9uIik7CisgICAgdGhpcy5fc3RvcEJ1dHRvbi5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuY2FuY2VsLCB0aGlzKTsKKyAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fc3RvcEJ1dHRvbi5lbGVtZW50KTsKKyAgICB0aGlzLl9pc0NhbmNlbGVkID0g ZmFsc2U7CisgICAgdGhpcy5fd29ya2VkID0gMDsKK30KKworV2ViSW5zcGVjdG9yLlByb2dyZXNz SW5kaWNhdG9yLkV2ZW50cyA9IHsKKyAgICBEb25lOiAiRG9uZSIKK30KKworV2ViSW5zcGVjdG9y LlByb2dyZXNzSW5kaWNhdG9yLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e0VsZW1lbnR9IHBhcmVudAorICAgICAqLworICAgIHNob3c6IGZ1bmN0aW9uKHBhcmVudCkKKyAg ICB7CisgICAgICAgIHBhcmVudC5hcHBlbmRDaGlsZCh0aGlzLmVsZW1lbnQpOworICAgIH0sCisK KyAgICBoaWRlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2YXIgcGFyZW50ID0gdGhpcy5l bGVtZW50LnBhcmVudEVsZW1lbnQ7CisgICAgICAgIGlmIChwYXJlbnQpCisgICAgICAgICAgICBw YXJlbnQucmVtb3ZlQ2hpbGQodGhpcy5lbGVtZW50KTsKKyAgICB9LAorCisgICAgZG9uZTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2lzRG9uZSkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgdGhpcy5faXNEb25lID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5oaWRlKCk7 CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Qcm9n cmVzc0luZGljYXRvci5FdmVudHMuRG9uZSk7CisgICAgfSwKKworICAgIGNhbmNlbDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5faXNDYW5jZWxlZCA9IHRydWU7CisgICAgfSwKKwor ICAgIGlzQ2FuY2VsZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9p c0NhbmNlbGVkOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gdGl0 bGUKKyAgICAgKi8KKyAgICBzZXRUaXRsZTogZnVuY3Rpb24odGl0bGUpCisgICAgeworICAgICAg ICB0aGlzLl9sYWJlbEVsZW1lbnQudGV4dENvbnRlbnQgPSB0aXRsZTsKKyAgICB9LAorCisgICAg LyoqCisgICAgICogQHBhcmFtIHtudW1iZXJ9IHRvdGFsV29yaworICAgICAqLworICAgIHNldFRv dGFsV29yazogZnVuY3Rpb24odG90YWxXb3JrKQorICAgIHsKKyAgICAgICAgdGhpcy5fcHJvZ3Jl c3NFbGVtZW50Lm1heCA9IHRvdGFsV29yazsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBh cmFtIHtudW1iZXJ9IHdvcmtlZAorICAgICAqIEBwYXJhbSB7c3RyaW5nPX0gdGl0bGUKKyAgICAg Ki8KKyAgICBzZXRXb3JrZWQ6IGZ1bmN0aW9uKHdvcmtlZCwgdGl0bGUpCisgICAgeworICAgICAg ICB0aGlzLl93b3JrZWQgPSB3b3JrZWQ7CisgICAgICAgIHRoaXMuX3Byb2dyZXNzRWxlbWVudC52 YWx1ZSA9IHdvcmtlZDsKKyAgICAgICAgaWYgKHRpdGxlKQorICAgICAgICAgICAgdGhpcy5zZXRU aXRsZSh0aXRsZSk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7bnVtYmVyPX0g d29ya2VkCisgICAgICovCisgICAgd29ya2VkOiBmdW5jdGlvbih3b3JrZWQpCisgICAgeworICAg ICAgICB0aGlzLnNldFdvcmtlZCh0aGlzLl93b3JrZWQgKyAod29ya2VkIHx8IDEpKTsKKyAgICB9 Cit9CisKK1dlYkluc3BlY3Rvci5Qcm9ncmVzc0luZGljYXRvci5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VzZXJBZ2VudFN1cHBvcnQuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VzZXJBZ2VudFN1cHBvcnQuanMKaW5kZXggZWJlZDgw NzljZTg2NjMwYjNjNzViMWU5Yzg0MjZhMTU4YzlmYmIwMi4uYjNlZGM2Njc3ZWNlNjQwNWYxMWFi ZDUwZDlmMGMxMWE4NGE4ZDZhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Vc2VyQWdlbnRTdXBwb3J0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVXNlckFnZW50U3VwcG9ydC5qcwpAQCAtMzYyLDMgKzM2Miw4IEBAIFdl Ykluc3BlY3Rvci5Vc2VyQWdlbnRTdXBwb3J0LnByb3RvdHlwZSA9IHsKICAgICB9CiB9CiAKKwor LyoqCisgKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1cHBvcnR9IAorICovCitXZWJJ bnNwZWN0b3IudXNlckFnZW50U3VwcG9ydDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCBhYzY0OTQ3YTMxOWIxOTM5MTE1OGYyYzVlZTg0MTUy OWM5NDgwMWNmLi4yNzIzOTcwMjc3MzcwMGFmZTJhOTk5MzljMDIzMjZiM2NkOTYwNjRmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCkBAIC0xMjgs NyArMTI4LDggQEAKICAgICA8ZmlsZT5Qcm9maWxlRGF0YUdyaWRUcmVlLmpzPC9maWxlPgogICAg IDxmaWxlPlByb2ZpbGVMYXVuY2hlclZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+UHJvZmlsZXNQ YW5lbC5qczwvZmlsZT4KLSAgICA8ZmlsZT5Qcm9ncmVzc0Jhci5qczwvZmlsZT4KKyAgICA8Zmls ZT5Qcm9ncmVzcy5qczwvZmlsZT4KKyAgICA8ZmlsZT5Qcm9ncmVzc0luZGljYXRvci5qczwvZmls ZT4KICAgICA8ZmlsZT5Qcm9wZXJ0aWVzU2VjdGlvbi5qczwvZmlsZT4KICAgICA8ZmlsZT5Qcm9w ZXJ0aWVzU2lkZWJhclBhbmUuanM8L2ZpbGU+CiAgICAgPGZpbGU+UmVtb3RlT2JqZWN0LmpzPC9m aWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRl cm5zLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCmlu ZGV4IDIxZDYxYTAwYTM1NjY4M2YwM2E5Mjc2MjE2Y2ZiMDU5OTI1NDU1NDcuLjhjZjUzZDI2YzVm NzU3ZWUxY2NmMjA1ZDExMGZkMjUwOWI5ZDIyYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKQEAgLTI2MiwxMSArMjYyLDYgQEAgV2ViSW5zcGVj dG9yLnNob3dQYW5lbCA9IGZ1bmN0aW9uKHBhbmVsKQogICovCiBXZWJJbnNwZWN0b3IuaW5zcGVj dGVkUGFnZURvbWFpbjsKIAotLyoqCi0gKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVzZXJBZ2VudFN1 cHBvcnR9IAotICovCi1XZWJJbnNwZWN0b3IudXNlckFnZW50U3VwcG9ydDsKLQogV2ViSW5zcGVj dG9yLmlzQ29tcGFjdE1vZGUgPSBmdW5jdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9CiAKIFdlYklu c3BlY3Rvci5Tb3VyY2VKYXZhU2NyaXB0VG9rZW5pemVyID0ge30KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCmluZGV4IGNiOWI4ZTg2YjE3 OTcxODNmYWQ0NDI4NzA0NzcwOWExMDk2MDc3YzguLmEzNzdhYmFiMDkzMjgzZWI3OGI3Njk1MDAz NDEyY2MxYmU3ZTk4NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmh0bWwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtMTU5LDcgKzE1OSw4IEBAIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNj cmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iSGFuZGxlclJlZ2lzdHJ5LmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTbmlwcGV0U3Rv cmFnZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNy Yz0iU2NyaXB0U25pcHBldE1vZGVsLmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHR5cGU9InRl eHQvamF2YXNjcmlwdCIgc3JjPSJQcm9ncmVzc0Jhci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUHJvZ3Jlc3MuanMiPjwvc2NyaXB0PgorICAg IDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlByb2dyZXNzSW5kaWNhdG9yLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTdHls ZXNTb3VyY2VNYXBwaW5nLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCIgc3JjPSJTdHlsZVNvdXJjZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iTmV0d29ya1VJU291cmNlQ29kZVByb3ZpZGVyLmpzIj48 L3NjcmlwdD4K