86997 2012-05-21 02:10:46 -0700 Web Inspector: move sources panel out of experimental. 2012-05-21 04:48:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87005 0 pfeldman pfeldman apavlov bweinstein jbadics joepeck keishi loislo ossy pfeldman pmuellr rik timothy yurys oldest_to_newest 628892 0 pfeldman 2012-05-21 02:10:46 -0700 This change moves sources panel out of experimental, removes revision support from the resources panel. 628893 1 142971 pfeldman 2012-05-21 02:12:01 -0700 Created attachment 142971 Patch 628901 2 pfeldman 2012-05-21 02:29:17 -0700 Committed r117751: <http://trac.webkit.org/changeset/117751> 628941 3 jbadics 2012-05-21 03:55:17 -0700 Unfortunately this patch made the 32 bit Qt5-wk1, 32 bit NRWT, 64 bit Qt Linux Release and Qt Lion Intel Release bots fail. Could you have a look at is please? 628945 4 ossy 2012-05-21 04:08:25 -0700 (In reply to comment #3) > Unfortunately this patch made the 32 bit Qt5-wk1, 32 bit NRWT, 64 bit Qt Linux Release and Qt Lion Intel Release bots fail. > Could you have a look at is please? Could you be more precise in the future? :) This patch made inspector/styles/css-live-edit.html fail on Qt and on Lion too with the following diff: --- /ramdisk/qt-linux-64-release/build/layout-test-results/inspector/styles/css-live-edit-expected.txt +++ /ramdisk/qt-linux-64-release/build/layout-test-results/inspector/styles/css-live-edit-actual.txt @@ -1,15 +1,6 @@ +FAIL: Timed out waiting for notifyDone to be called Tests that styles are updated when live-editing css resource. Running: testLiveEdit -[expanded] -display: block; - div - block user agent stylesheet -font-size: 20px; - body - 20px get-set-stylesheet-text.css:1 -[expanded] -element.style { () - - - 628968 5 ossy 2012-05-21 04:48:45 -0700 new bug report to track this regression - https://bugs.webkit.org/show_bug.cgi?id=87005 142971 2012-05-21 02:12:01 -0700 2012-05-21 02:22:51 -0700 Patch bug-86997-20120521131200.patch text/plain 27041 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTI2Nzc1YWMxNGE0ZDdk YzMwMGZmMGY5NzYyMmVjOTFlNjlhM2UyZi4uNDliN2RlMmNkOTNhYTVkOTUwMmFjMjkzNTViOTAz ZTEyZGU3YmE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDEyLTA1LTIxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgc291cmNlcyBwYW5lbCBvdXQgb2YgZXhwZXJpbWVudGFsLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY5OTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtb3ZlcyBzb3Vy Y2VzIHBhbmVsIG91dCBvZiBleHBlcmltZW50YWwsIHJlbW92ZXMgcmV2aXNpb24gc3VwcG9ydCBm cm9tIHRoZSByZXNvdXJjZXMgcGFuZWwuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0 U291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZy YW1lLnByb3RvdHlwZS5fb25Db250ZW50Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY29udGludWVUb0xpbmUpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu UmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9zaG93UmVzb3VyY2VWaWV3KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZS5hcHBlbmRSZXNvdXJjZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLnNvdXJjZVZp ZXcpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlLmdldCB0b29sYmFySXRlbUxhYmVsKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmFwcGVuZEFwcGxpY2FibGVJdGVtcyk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5FeHBlcmltZW50c1NldHRpbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l LnByb3RvdHlwZS5fc2V0VGV4dFZpZXdlckRlY29yYXRpb25zKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvdXRpbGl0aWVzLmpzOgorCisyMDEyLTA1LTIxICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Y2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGltcGxlbWVudCByZXZpc2lv biBoaXN0b3J5IHZpZXcuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Njk2NgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9q L2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2Fs aXplZFN0cmluZ3MuanMKaW5kZXggOWNmNTk1MTNhOWU2YjAzODM5YTJjMThkY2Q3Zjg1M2Q1NTU5 YjljYy4uYTlmODNmMGRhNWNjYjU2MGIwMGI0NWFhNmFkMDgzZjkxYWY1NzhlYiAxMDA2NDQKR0lU IGJpbmFyeSBwYXRjaApkZWx0YSA0Mwp6Y21kbG1wTE8zbikodT1zQ05FZ2JHa0w8MmZYVEMzMXQj ayg1ZCtjfGxSMXt+T2psRTU2eGJaSkc7UzNEcmxKeGYKCmRlbHRhIDcwCnpjbWRsdGs5RVUqKSh1 PXNDZFZ3e1ZwbXtyWDJAcXFuZl82bFFGP08yNSp8KmQwN0w1Smk7SmdEY0d4TzBgTjB5ZApXJHde enlmWGFFTXBZdmhsK3glY2orJHNRZCZLbUNrCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwppbmRleCBj MTFhNDhjNTA0ODcwYmZmOTBiMDQyZWIxZGRhNTU5OGU1ZjA5YjA3Li43Y2U4ZDE1NzRkMzc1ZDdj ZTU5NThkMDI1MjgwN2Q5OTBmYWYxMGIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwpAQCAtMTE1 LDcgKzExNSw2IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBicmVha3BvaW50TG9jYXRpb25z Lmxlbmd0aDsgKytpKQogICAgICAgICAgICAgICAgIGJyZWFrcG9pbnRMb2NhdGlvbnNbaV0uYnJl YWtwb2ludC5yZW1vdmUoKTsKICAgICAgICAgICAgIHRoaXMuc2V0Q29udGVudChjb250ZW50LCBm YWxzZSwgdGhpcy5fdWlTb3VyY2VDb2RlLm1pbWVUeXBlKCkpOwotICAgICAgICAgICAgdGhpcy5f dXBkYXRlQnJlYWtwb2ludHNBZnRlckxpdmVFZGl0KG9sZENvbnRlbnQsIGNvbnRlbnQsIGJyZWFr cG9pbnRMb2NhdGlvbnMpOwogICAgICAgICB9CiAgICAgfSwKIApAQCAtNTUwLDM4ICs1NDksNiBA QCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICB7 CiAgICAgICAgIHZhciByYXdMb2NhdGlvbiA9IHRoaXMuX3VpU291cmNlQ29kZS51aUxvY2F0aW9u VG9SYXdMb2NhdGlvbihsaW5lTnVtYmVyLCAwKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLmRlYnVn Z2VyTW9kZWwuY29udGludWVUb0xvY2F0aW9uKHJhd0xvY2F0aW9uKTsKLSAgICB9LAotCi0gICAg LyoqCi0gICAgICogQHBhcmFtIHtzdHJpbmd9IG9sZFNvdXJjZQotICAgICAqIEBwYXJhbSB7c3Ry aW5nfSBuZXdTb3VyY2UKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxPYmplY3Q+fSBicmVha3BvaW50 TG9jYXRpb25zCi0gICAgICovCi0gICAgX3VwZGF0ZUJyZWFrcG9pbnRzQWZ0ZXJMaXZlRWRpdDog ZnVuY3Rpb24ob2xkU291cmNlLCBuZXdTb3VyY2UsIGJyZWFrcG9pbnRMb2NhdGlvbnMpCi0gICAg ewotICAgICAgICAvLyBDbGVhciBhbmQgcmUtY3JlYXRlIGJyZWFrcG9pbnRzIGFjY29yZGluZyB0 byB0ZXh0IGRpZmYuCi0gICAgICAgIHZhciBkaWZmID0gQXJyYXkuZGlmZihvbGRTb3VyY2Uuc3Bs aXQoIlxuIiksIG5ld1NvdXJjZS5zcGxpdCgiXG4iKSk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgYnJlYWtwb2ludExvY2F0aW9ucy5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgdmFy IGxpbmVOdW1iZXIgPSBicmVha3BvaW50TG9jYXRpb25zW2ldLnVpTG9jYXRpb24ubGluZU51bWJl cjsKLSAgICAgICAgICAgIHZhciBuZXdMaW5lTnVtYmVyID0gZGlmZi5sZWZ0W2xpbmVOdW1iZXJd LnJvdzsKLSAgICAgICAgICAgIGlmIChuZXdMaW5lTnVtYmVyID09PSB1bmRlZmluZWQpIHsKLSAg ICAgICAgICAgICAgICBmb3IgKHZhciBpID0gbGluZU51bWJlciAtIDE7IGkgPj0gMDsgLS1pKSB7 Ci0gICAgICAgICAgICAgICAgICAgIGlmIChkaWZmLmxlZnRbaV0ucm93ID09PSB1bmRlZmluZWQp Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICAgICAg dmFyIHNoaWZ0ZWRMaW5lTnVtYmVyID0gZGlmZi5sZWZ0W2ldLnJvdyArIGxpbmVOdW1iZXIgLSBp OwotICAgICAgICAgICAgICAgICAgICBpZiAoc2hpZnRlZExpbmVOdW1iZXIgPCBkaWZmLnJpZ2h0 Lmxlbmd0aCkgewotICAgICAgICAgICAgICAgICAgICAgICAgdmFyIG9yaWdpbmFsTGluZU51bWJl ciA9IGRpZmYucmlnaHRbc2hpZnRlZExpbmVOdW1iZXJdLnJvdzsKLSAgICAgICAgICAgICAgICAg ICAgICAgIGlmIChvcmlnaW5hbExpbmVOdW1iZXIgPT09IGxpbmVOdW1iZXIgfHwgb3JpZ2luYWxM aW5lTnVtYmVyID09PSB1bmRlZmluZWQpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV3 TGluZU51bWJlciA9IHNoaWZ0ZWRMaW5lTnVtYmVyOwotICAgICAgICAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IH0KLSAgICAgICAgICAgIGlmIChuZXdMaW5lTnVtYmVyICE9PSB1bmRlZmluZWQpIHsKLSAgICAg ICAgICAgICAgICB2YXIgYnJlYWtwb2ludCA9IGJyZWFrcG9pbnRMb2NhdGlvbnNbaV0uYnJlYWtw b2ludDsKLSAgICAgICAgICAgICAgICB0aGlzLl9zZXRCcmVha3BvaW50KG5ld0xpbmVOdW1iZXIs IGJyZWFrcG9pbnQuY29uZGl0aW9uKCksIGJyZWFrcG9pbnQuZW5hYmxlZCgpKTsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgfQogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwppbmRleCA0NzQ5Nzk0MDZhMTQ5ZTc1ZDY2 OTI2OTQ1MmQyNzdhMzE1ODI4ZGNkLi43M2RjZThmNzVjMTlkNjcyZGJiOWM2ZWJjZWVmMzVlZWVk YmFkY2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVmlldy5qcwpAQCAtMTAwLDc1ICsxMDAsMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VT b3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiB9CiAKIFdlYkluc3BlY3Rvci5SZXNvdXJjZVNvdXJj ZUZyYW1lLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlOwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGV4dGVuZHMge1dlYkluc3BlY3Rv ci5SZXNvdXJjZVNvdXJjZUZyYW1lfQotICovCi1XZWJJbnNwZWN0b3IuRWRpdGFibGVSZXNvdXJj ZVNvdXJjZUZyYW1lID0gZnVuY3Rpb24ocmVzb3VyY2UpCi17Ci0gICAgV2ViSW5zcGVjdG9yLlJl c291cmNlU291cmNlRnJhbWUuY2FsbCh0aGlzLCByZXNvdXJjZSk7Ci19Ci0KLVdlYkluc3BlY3Rv ci5FZGl0YWJsZVJlc291cmNlU291cmNlRnJhbWUuRXZlbnRzID0gewotICAgIFRleHRFZGl0ZWQ6 ICJUZXh0RWRpdGVkIgotfQotCi1XZWJJbnNwZWN0b3IuRWRpdGFibGVSZXNvdXJjZVNvdXJjZUZy YW1lLnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAgICAgKiBAcmV0dXJuIHtib29sZWFufQotICAg ICAqLwotICAgIGNhbkVkaXRTb3VyY2U6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIC8vRklY TUU6IG1ha2UgbGl2ZSBlZGl0IHN0b3AgdXNpbmcgcmVzb3VyY2UgY29udGVudCBiaW5kaW5nLgot ICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2UuaXNFZGl0YWJsZSgpICYmIHRoaXMuX3Jlc291 cmNlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlN0eWxlc2hlZXQ7Ci0gICAg fSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7c3RyaW5nfSB0ZXh0Ci0gICAgICovCi0gICAg Y29tbWl0RWRpdGluZzogZnVuY3Rpb24odGV4dCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2NsZWFy SW5jcmVtZW50YWxVcGRhdGVUaW1lcigpOwotICAgICAgICB2YXIgbWFqb3JDaGFuZ2UgPSB0cnVl OwotICAgICAgICB0aGlzLl9zZXR0aW5nQ29udGVudCA9IHRydWU7Ci0gICAgICAgIGZ1bmN0aW9u IGNhbGxiYWNrV3JhcHBlcih0ZXh0KQotICAgICAgICB7Ci0gICAgICAgICAgICBkZWxldGUgdGhp cy5fc2V0dGluZ0NvbnRlbnQ7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRWRpdGFibGVSZXNvdXJjZVNvdXJjZUZyYW1lLkV2ZW50cy5UZXh0 RWRpdGVkLCB0aGlzKTsKLSAgICAgICAgfQotICAgICAgICB0aGlzLnJlc291cmNlLnNldENvbnRl bnQodGV4dCwgbWFqb3JDaGFuZ2UsIGNhbGxiYWNrV3JhcHBlci5iaW5kKHRoaXMpKTsKLSAgICB9 LAotICAgIAotICAgIGFmdGVyVGV4dENoYW5nZWQ6IGZ1bmN0aW9uKG9sZFJhbmdlLCBuZXdSYW5n ZSkKLSAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIGNvbW1pdEluY3JlbWVudGFsRWRpdCgpCi0gICAg ICAgIHsKLSAgICAgICAgICAgIHZhciBtYWpvckNoYW5nZSA9IGZhbHNlOwotICAgICAgICAgICAg dGhpcy5yZXNvdXJjZS5zZXRDb250ZW50KHRoaXMuX3RleHRNb2RlbC50ZXh0LCBtYWpvckNoYW5n ZSwgZnVuY3Rpb24oKSB7fSk7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRWRpdGFibGVSZXNvdXJjZVNvdXJjZUZyYW1lLkV2ZW50cy5UZXh0 RWRpdGVkLCB0aGlzKTsKLSAgICAgICAgfQotICAgICAgICBjb25zdCB1cGRhdGVUaW1lb3V0ID0g MjAwOwotICAgICAgICB0aGlzLl9pbmNyZW1lbnRhbFVwZGF0ZVRpbWVyID0gc2V0VGltZW91dChj b21taXRJbmNyZW1lbnRhbEVkaXQuYmluZCh0aGlzKSwgdXBkYXRlVGltZW91dCk7Ci0gICAgfSwK LQotICAgIF9jbGVhckluY3JlbWVudGFsVXBkYXRlVGltZXI6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIGlmICh0aGlzLl9pbmNyZW1lbnRhbFVwZGF0ZVRpbWVyKQotICAgICAgICAgICAgY2xl YXJUaW1lb3V0KHRoaXMuX2luY3JlbWVudGFsVXBkYXRlVGltZXIpOwotICAgICAgICBkZWxldGUg dGhpcy5faW5jcmVtZW50YWxVcGRhdGVUaW1lcjsKLSAgICB9LAotCi0gICAgX2NvbnRlbnRDaGFu Z2VkOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fc2V0dGluZ0Nv bnRlbnQpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90 b3R5cGUuX2NvbnRlbnRDaGFuZ2VkLmNhbGwodGhpcywgZXZlbnQpOwotICAgIH0sCi0KLSAgICBp c0RpcnR5OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2Uu Y29udGVudCAhPT0gdGhpcy50ZXh0TW9kZWwudGV4dDsKLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rv ci5FZGl0YWJsZVJlc291cmNlU291cmNlRnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYklu c3BlY3Rvci5SZXNvdXJjZVNvdXJjZUZyYW1lLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDBiODM1 MWJhMjIzMzcxMDM1ODViMjE5ZWRhMjBkYzhiYjg0ZjQ1N2UuLmM3MTE5MDMzMDEwMmU1MjQ0MDVj M2Q0MWY2M2M0YmM0NWNjOTQ5MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMzcyLDcgKzM3Miw2IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAg aWYgKHZpZXcuc2VhcmNoQ2FuY2VsZWQpCiAgICAgICAgICAgICB2aWV3LnNlYXJjaENhbmNlbGVk KCk7Ci0gICAgICAgIHRoaXMuX2ZldGNoQW5kQXBwbHlEaWZmTWFya3VwKHZpZXcsIHJlc291cmNl KTsKICAgICAgICAgdGhpcy5faW5uZXJTaG93Vmlldyh2aWV3KTsKICAgICB9LAogCkBAIC0zODcs NDkgKzM4Niw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3Lm5vblNvdXJjZVZpZXdGb3JS ZXNvdXJjZShyZXNvdXJjZSk7CiAgICAgfSwKIAotICAgIF9zaG93UmV2aXNpb25WaWV3OiBmdW5j dGlvbihyZXZpc2lvbikKLSAgICB7Ci0gICAgICAgIHZhciB2aWV3ID0gdGhpcy5fc291cmNlVmll d0ZvclJldmlzaW9uKHJldmlzaW9uKTsKLSAgICAgICAgdGhpcy5fZmV0Y2hBbmRBcHBseURpZmZN YXJrdXAodmlldywgcmV2aXNpb24ucmVzb3VyY2UsIHJldmlzaW9uKTsKLSAgICAgICAgdGhpcy5f aW5uZXJTaG93Vmlldyh2aWV3KTsKLSAgICB9LAotCi0gICAgX3NvdXJjZVZpZXdGb3JSZXZpc2lv bjogZnVuY3Rpb24ocmV2aXNpb24pCi0gICAgewotICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0 aGlzLl9maW5kVHJlZUVsZW1lbnRGb3JSZXZpc2lvbihyZXZpc2lvbik7Ci0gICAgICAgIHJldHVy biB0cmVlRWxlbWVudC5zb3VyY2VWaWV3KCk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb249fSByZXZpc2lvbgotICAgICAqLwot ICAgIF9mZXRjaEFuZEFwcGx5RGlmZk1hcmt1cDogZnVuY3Rpb24odmlldywgcmVzb3VyY2UsIHJl dmlzaW9uKQotICAgIHsKLSAgICAgICAgdmFyIGJhc2VSZXZpc2lvbiA9IHJlc291cmNlLmhpc3Rv cnlbMF07Ci0gICAgICAgIGlmICghYmFzZVJldmlzaW9uKQotICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICBpZiAoISh2aWV3IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKSkK LSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBiYXNlUmV2aXNpb24ucmVxdWVzdENvbnRl bnQoc3RlcDEuYmluZCh0aGlzKSk7Ci0KLSAgICAgICAgZnVuY3Rpb24gc3RlcDEoYmFzZUNvbnRl bnQpCi0gICAgICAgIHsKLSAgICAgICAgICAgIChyZXZpc2lvbiA/IHJldmlzaW9uIDogcmVzb3Vy Y2UpLnJlcXVlc3RDb250ZW50KHN0ZXAyLmJpbmQodGhpcywgYmFzZUNvbnRlbnQpKTsKLSAgICAg ICAgfQotCi0gICAgICAgIGZ1bmN0aW9uIHN0ZXAyKGJhc2VDb250ZW50LCByZXZpc2lvbkNvbnRl bnQpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuX2FwcGx5RGlmZk1hcmt1cCh2aWV3LCBi YXNlQ29udGVudCwgcmV2aXNpb25Db250ZW50KTsKLSAgICAgICAgfQotICAgIH0sCi0KLSAgICBf YXBwbHlEaWZmTWFya3VwOiBmdW5jdGlvbih2aWV3LCBiYXNlQ29udGVudCwgbmV3Q29udGVudCkK LSAgICB7Ci0gICAgICAgIHZhciBkaWZmRGF0YSA9IFRleHREaWZmLmNvbXB1dGUoYmFzZUNvbnRl bnQsIG5ld0NvbnRlbnQpOwotICAgICAgICB2aWV3Lm1hcmtEaWZmKGRpZmZEYXRhKTsKLSAgICB9 LAotCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmc9fSB0YWJsZU5hbWUKICAgICAgKi8K QEAgLTgzMywyMSArNzg5LDYgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuc2lkZWJhclRyZWUuZmluZFRyZWVFbGVtZW50KHJl c291cmNlLCBpc0FuY2VzdG9yLCBnZXRQYXJlbnQpOwogICAgIH0sCiAKLSAgICBfZmluZFRyZWVF bGVtZW50Rm9yUmV2aXNpb246IGZ1bmN0aW9uKHJldmlzaW9uKQotICAgIHsKLSAgICAgICAgZnVu Y3Rpb24gaXNBbmNlc3RvcihhbmNlc3Rvciwgb2JqZWN0KQotICAgICAgICB7Ci0gICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLQotICAgICAgICBmdW5jdGlvbiBnZXRQYXJlbnQo b2JqZWN0KQotICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgfQot Ci0gICAgICAgIHJldHVybiB0aGlzLnNpZGViYXJUcmVlLmZpbmRUcmVlRWxlbWVudChyZXZpc2lv biwgaXNBbmNlc3RvciwgZ2V0UGFyZW50KTsKLSAgICB9LAotCiAgICAgc2hvd1ZpZXc6IGZ1bmN0 aW9uKHZpZXcpCiAgICAgewogICAgICAgICBpZiAodmlldykKQEAgLTExMjUsOCArMTA2Niw2IEBA IFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQog ICAgICAgICB2YXIgcmVzb3VyY2VUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3IuRnJhbWVS ZXNvdXJjZVRyZWVFbGVtZW50KHRoaXMuX3N0b3JhZ2VQYW5lbCwgcmVzb3VyY2UpOwogICAgICAg ICB0aGlzLl9pbnNlcnRJblByZXNlbnRhdGlvbk9yZGVyKGNhdGVnb3J5RWxlbWVudCwgcmVzb3Vy Y2VUcmVlRWxlbWVudCk7Ci0gICAgICAgIHJlc291cmNlVHJlZUVsZW1lbnQuX3BvcHVsYXRlUmV2 aXNpb25zKCk7Ci0KICAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRGb3JSZXNvdXJjZVtyZXNvdXJj ZS51cmxdID0gcmVzb3VyY2VUcmVlRWxlbWVudDsKICAgICB9LAogCkBAIC0xMTkzLDcgKzExMzIs NiBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50ID0gZnVuY3Rpb24oc3Rv cmFnZVBhbmVsLCByZXNvdXJjZSkKICAgICB0aGlzLl9yZXNvdXJjZSA9IHJlc291cmNlOwogICAg IHRoaXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2 ZW50cy5NZXNzYWdlQWRkZWQsIHRoaXMuX2NvbnNvbGVNZXNzYWdlQWRkZWQsIHRoaXMpOwogICAg IHRoaXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlLkV2 ZW50cy5NZXNzYWdlc0NsZWFyZWQsIHRoaXMuX2NvbnNvbGVNZXNzYWdlc0NsZWFyZWQsIHRoaXMp OwotICAgIHRoaXMuX3Jlc291cmNlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291 cmNlLkV2ZW50cy5SZXZpc2lvbkFkZGVkLCB0aGlzLl9yZXZpc2lvbkFkZGVkLCB0aGlzKTsKICAg ICB0aGlzLnRvb2x0aXAgPSByZXNvdXJjZS51cmw7CiB9CiAKQEAgLTEzNzQsNDIgKzEzMTIsMTYg QEAgV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHRoaXMuX3VwZGF0ZUVycm9yc0FuZFdhcm5pbmdzQnViYmxlcygpOwogICAgIH0sCiAK LSAgICBfcG9wdWxhdGVSZXZpc2lvbnM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgdGhpcy5fcmVzb3VyY2UuaGlzdG9yeS5sZW5ndGg7ICsraSkKLSAgICAg ICAgICAgIHRoaXMuX2FwcGVuZFJldmlzaW9uKHRoaXMuX3Jlc291cmNlLmhpc3RvcnlbaV0pOwot ICAgIH0sCi0KLSAgICBfcmV2aXNpb25BZGRlZDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAg ICAgICB0aGlzLl9hcHBlbmRSZXZpc2lvbihldmVudC5kYXRhKTsKLSAgICB9LAotCi0gICAgX2Fw cGVuZFJldmlzaW9uOiBmdW5jdGlvbihyZXZpc2lvbikKLSAgICB7Ci0gICAgICAgIHRoaXMuc3Vi dGl0bGVUZXh0ID0gIiI7Ci0gICAgICAgIHRoaXMuaW5zZXJ0Q2hpbGQobmV3IFdlYkluc3BlY3Rv ci5SZXNvdXJjZVJldmlzaW9uVHJlZUVsZW1lbnQodGhpcy5fc3RvcmFnZVBhbmVsLCByZXZpc2lv biksIDApOwotICAgICAgICBpZiAodGhpcy5fc291cmNlVmlldyA9PT0gdGhpcy5fc3RvcmFnZVBh bmVsLnZpc2libGVWaWV3KQotICAgICAgICAgICAgdGhpcy5fc3RvcmFnZVBhbmVsLl9zaG93UmVz b3VyY2VWaWV3KHRoaXMuX3Jlc291cmNlKTsKLSAgICB9LAotCiAgICAgc291cmNlVmlldzogZnVu Y3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9zb3VyY2VWaWV3KSB7Ci0gICAgICAg ICAgICB0aGlzLl9zb3VyY2VWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5FZGl0YWJsZVJlc291cmNl U291cmNlRnJhbWUodGhpcy5fcmVzb3VyY2UpOworICAgICAgICAgICAgdGhpcy5fc291cmNlVmll dyA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZSh0aGlzLl9yZXNvdXJjZSk7 CiAgICAgICAgICAgICBpZiAodGhpcy5fcmVzb3VyY2UubWVzc2FnZXMpIHsKICAgICAgICAgICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jlc291cmNlLm1lc3NhZ2VzLmxlbmd0aDsg aSsrKQogICAgICAgICAgICAgICAgICAgICB0aGlzLl9zb3VyY2VWaWV3LmFkZE1lc3NhZ2UodGhp cy5fcmVzb3VyY2UubWVzc2FnZXNbaV0pOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgdGhp cy5fc291cmNlVmlldy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5FZGl0YWJsZVJlc291 cmNlU291cmNlRnJhbWUuRXZlbnRzLlRleHRFZGl0ZWQsIHRoaXMuX3NvdXJjZVZpZXdUZXh0RWRp dGVkLCB0aGlzKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlVmlldzsK LSAgICB9LAotCi0gICAgX3NvdXJjZVZpZXdUZXh0RWRpdGVkOiBmdW5jdGlvbihldmVudCkKLSAg ICB7Ci0gICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IGV2ZW50LmRhdGE7Ci0gICAgICAgIHRoaXMu c3VidGl0bGVUZXh0ID0gc291cmNlRnJhbWUuaXNEaXJ0eSgpID8gIioiIDogIiI7CiAgICAgfQog fQogCkBAIC0yMDAxLDgyICsxOTEzLDYgQEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVG cmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IKIAogLyoq CiAgKiBAY29uc3RydWN0b3IKLSAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VU cmVlRWxlbWVudH0KLSAqLwotV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVu dCA9IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgcmV2aXNpb24pCi17Ci0gICAgdmFyIHRpdGxlID0g cmV2aXNpb24udGltZXN0YW1wID8gcmV2aXNpb24udGltZXN0YW1wLnRvTG9jYWxlVGltZVN0cmlu ZygpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIob3JpZ2luYWwpIik7Ci0gICAgV2ViSW5zcGVj dG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdlUGFuZWwsIHJldmlz aW9uLCB0aXRsZSwgWyJyZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbSIsICJyZXNvdXJjZXMtdHlw ZS0iICsgcmV2aXNpb24ucmVzb3VyY2UudHlwZS5uYW1lKCldKTsKLSAgICBpZiAocmV2aXNpb24u dGltZXN0YW1wKQotICAgICAgICB0aGlzLnRvb2x0aXAgPSByZXZpc2lvbi50aW1lc3RhbXAudG9M b2NhbGVTdHJpbmcoKTsKLSAgICB0aGlzLl9yZXZpc2lvbiA9IHJldmlzaW9uOwotfQotCi1XZWJJ bnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvblRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKLSAgICBn ZXQgaXRlbVVSTCgpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmV2aXNpb24ucmVzb3Vy Y2UudXJsOwotICAgIH0sCi0KLSAgICBvbmF0dGFjaDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNo LmNhbGwodGhpcyk7Ci0gICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmRyYWdnYWJsZSA9IHRy dWU7Ci0gICAgICAgIHRoaXMubGlzdEl0ZW1FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdz dGFydCIsIHRoaXMuX29uZHJhZ3N0YXJ0LmJpbmQodGhpcyksIGZhbHNlKTsKLSAgICAgICAgdGhp cy5saXN0SXRlbUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9o YW5kbGVDb250ZXh0TWVudUV2ZW50LmJpbmQodGhpcyksIHRydWUpOwotICAgIH0sCi0KLSAgICBv bnNlbGVjdDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9y YWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcyk7Ci0gICAgICAgIHRo aXMuX3N0b3JhZ2VQYW5lbC5fc2hvd1JldmlzaW9uVmlldyh0aGlzLl9yZXZpc2lvbik7Ci0gICAg fSwKLQotICAgIF9vbmRyYWdzdGFydDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICBp ZiAodGhpcy5fcmV2aXNpb24uY29udGVudCkgewotICAgICAgICAgICAgZXZlbnQuZGF0YVRyYW5z ZmVyLnNldERhdGEoInRleHQvcGxhaW4iLCB0aGlzLl9yZXZpc2lvbi5jb250ZW50KTsKLSAgICAg ICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5lZmZlY3RBbGxvd2VkID0gImNvcHkiOwotICAgICAg ICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9LAotCi0gICAgX2hhbmRsZUNvbnRl eHRNZW51RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdmFyIGNvbnRleHRN ZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOwotICAgICAgICBjb250ZXh0TWVu dS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmV2ZXJ0IHRvIHRoaXMgcmV2aXNp b24iKSwgdGhpcy5fcmV2aXNpb24ucmV2ZXJ0VG9UaGlzLmJpbmQodGhpcy5fcmV2aXNpb24pKTsK LQotICAgICAgICBpZiAoSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNhblNhdmUoKSkgewotICAgICAg ICAgICAgZnVuY3Rpb24gZG9TYXZlKGZvcmNlU2F2ZUFzLCBjb250ZW50KQotICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5maWxlTWFuYWdlci5zYXZlKHRoaXMuX3Jl dmlzaW9uLnJlc291cmNlLnVybCwgY29udGVudCwgZm9yY2VTYXZlQXMpOwotICAgICAgICAgICAg fQotCi0gICAgICAgICAgICBmdW5jdGlvbiBzYXZlKGZvcmNlU2F2ZUFzKQotICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgIHRoaXMuX3JldmlzaW9uLnJlcXVlc3RDb250ZW50KGRvU2F2ZS5i aW5kKHRoaXMsIGZvcmNlU2F2ZUFzKSk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGNv bnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwotICAgICAgICAgICAgY29udGV4dE1lbnUuYXBw ZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNhdmUiKSwgc2F2ZS5iaW5kKHRoaXMsIGZh bHNlKSk7Ci0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5V SVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlNhdmUgYXMu Li4iIDogIlNhdmUgQXMuLi4iKSwgc2F2ZS5iaW5kKHRoaXMsIHRydWUpKTsKLSAgICAgICAgfQot Ci0gICAgICAgIGNvbnRleHRNZW51LnNob3coZXZlbnQpOwotICAgIH0sCi0KLSAgICBzb3VyY2VW aWV3OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX3NvdXJjZVZpZXcpCi0g ICAgICAgICAgICB0aGlzLl9zb3VyY2VWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZSh0aGlzLl9yZXZpc2lvbik7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VWaWV3OwotICAg IH0KLX0KLQotV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVudC5wcm90b3R5 cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90 eXBlOwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5W aWV3fQogICovCiBXZWJJbnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5VmlldyA9IGZ1bmN0aW9uKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05h dmlnYXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05h dmlnYXRvci5qcwppbmRleCAyMzYzZjJkMTQ3NDhjZmFjYzlhZjdhMTM3MjViNjg3NjRjODg0Mzg1 Li5hNmRlYTU5YzJlNThmZGUxMDRjMTM1NzY3NTIwYTlkNjg0ZmFjYzBhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpz CkBAIC00OSw4ICs0OSw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yID0gZnVuY3Rp b24oKQogICAgIHRoaXMuX3NuaXBwZXRzVmlldy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5OYXZpZ2F0b3JWaWV3LkV2ZW50cy5GaWxlUmVuYW1lZCwgdGhpcy5fZmlsZVJlbmFtZWQsIHRo aXMpOwogICAgIHRoaXMuX3NuaXBwZXRzVmlldy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5TbmlwcGV0c05hdmlnYXRvclZpZXcuRXZlbnRzLlNuaXBwZXRDcmVhdGlvblJlcXVlc3RlZCwg dGhpcy5fc25pcHBldENyZWF0aW9uUmVxdWVzdGVkLCB0aGlzKTsKIAotICAgIHZhciBzb3VyY2Vz VGl0bGUgPSBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zb3VyY2VDb2RlUGFuZWwu aXNFbmFibGVkKCkgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvdXJjZXMiKSA6IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiU2NyaXB0cyIpOwotICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFi KFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLlNjcmlwdHNUYWIsIHNvdXJjZXNUaXRsZSwg dGhpcy5fc2NyaXB0c1ZpZXcpOworICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYklu c3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yLlNjcmlwdHNUYWIsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU291cmNlcyIpLCB0aGlzLl9zY3JpcHRzVmlldyk7CiAgICAgdGhpcy5fdGFiYmVkUGFuZS5z ZWxlY3RUYWIoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuU2NyaXB0c1RhYik7CiAgICAg dGhpcy5fdGFiYmVkUGFuZS5hcHBlbmRUYWIoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3Iu Q29udGVudFNjcmlwdHNUYWIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29udGVudCBzY3JpcHRz IiksIHRoaXMuX2NvbnRlbnRTY3JpcHRzVmlldyk7CiAgICAgaWYgKFdlYkluc3BlY3Rvci5leHBl cmltZW50c1NldHRpbmdzLnNuaXBwZXRzU3VwcG9ydC5pc0VuYWJsZWQoKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggNmFk NzM2NGEzM2I0ZTVlOTkxODFjNWY4ZGJmMjRkMGFkZDAzM2FmMS4uMWY3YjFhYzE3Yjc3NWY3ZWZl MjMxZGIzNmJkMTQyZjJmMjc1ODg3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTQyLDggKzQyLDcgQEAgV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHVpU291cmNlQ29kZVByb3ZpZGVyRm9yVGVzdCkK IAogICAgIHZhciBzY3JpcHRNYXBwaW5nID0gbmV3IFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNjcmlw dE1hcHBpbmcoKTsKICAgICB2YXIgcHJvdmlkZXJzID0gc2NyaXB0TWFwcGluZy51aVNvdXJjZUNv ZGVQcm92aWRlcnMoKTsKLSAgICBpZiAoV2ViSW5zcGVjdG9yLmV4cGVyaW1lbnRzU2V0dGluZ3Mu c291cmNlQ29kZVBhbmVsLmlzRW5hYmxlZCgpKQotICAgICAgICBwcm92aWRlcnMgPSBwcm92aWRl cnMuY29uY2F0KG5ldyBXZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIoKSk7 CisgICAgcHJvdmlkZXJzID0gcHJvdmlkZXJzLmNvbmNhdChuZXcgV2ViSW5zcGVjdG9yLlN0eWxl c1VJU291cmNlQ29kZVByb3ZpZGVyKCkpOwogICAgIHRoaXMuX3VpU291cmNlQ29kZVByb3ZpZGVy ID0gdWlTb3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0IHx8IG5ldyBXZWJJbnNwZWN0b3IuQ29tcG9z aXRlVUlTb3VyY2VDb2RlUHJvdmlkZXIocHJvdmlkZXJzKTsKIAogICAgIG5ldyBXZWJJbnNwZWN0 b3IuUHJlc2VudGF0aW9uQ29uc29sZU1lc3NhZ2VIZWxwZXIodGhpcy5fdWlTb3VyY2VDb2RlUHJv dmlkZXIpOwpAQCAtNTUsNyArNTQsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVu Y3Rpb24odWlTb3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0KQogICAgIH0KICAgICBXZWJJbnNwZWN0 b3IuR29Ub0xpbmVEaWFsb2cuaW5zdGFsbCh0aGlzLCB2aWV3R2V0dGVyLmJpbmQodGhpcykpOwog Ci0gICAgdmFyIGhlbHBTZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0Y3V0c1NjcmVlbi5zZWN0 aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5n cy5zb3VyY2VDb2RlUGFuZWwuaXNFbmFibGVkKCkgPyAiU291cmNlIENvZGUgUGFuZWwiIDogIlNj cmlwdHMgUGFuZWwiKSk7CisgICAgdmFyIGhlbHBTZWN0aW9uID0gV2ViSW5zcGVjdG9yLnNob3J0 Y3V0c1NjcmVlbi5zZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU291cmNlcyBQYW5lbCIp KTsKICAgICB0aGlzLmRlYnVnVG9vbGJhciA9IHRoaXMuX2NyZWF0ZURlYnVnVG9vbGJhcihoZWxw U2VjdGlvbik7CiAKICAgICBjb25zdCBpbml0aWFsRGVidWdTaWRlYmFyV2lkdGggPSAyMjU7CkBA IC0yMDAsOSArMTk5LDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5QYXVzZU9uRXhjZXB0 aW9uc1N0YXRlID0gewogV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgZ2V0IHRvb2xiYXJJdGVtTGFiZWwoKQogICAgIHsKLSAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5leHBlcmltZW50c1NldHRpbmdzLnNvdXJjZUNvZGVQYW5lbC5pc0VuYWJsZWQoKSkKLSAgICAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvdXJjZSBDb2RlIik7Ci0gICAg ICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdHMiKTsKKyAgICAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU291cmNlcyIpOwogICAgIH0sCiAKICAgICBnZXQg c3RhdHVzQmFySXRlbXMoKQpAQCAtMTA2NSw3ICsxMDYyLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgYXBwZW5kQXBwbGljYWJsZUl0ZW1z OiBmdW5jdGlvbihjb250ZXh0TWVudSwgdGFyZ2V0KQogICAgIHsKLSAgICAgICAgaWYgKFdlYklu c3BlY3Rvci5leHBlcmltZW50c1NldHRpbmdzLnNvdXJjZUNvZGVQYW5lbC5pc0VuYWJsZWQoKSAm JiB0YXJnZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKSB7CisgICAgICAg IGlmICh0YXJnZXQgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlKSB7CiAgICAg ICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKICAgICAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXZpc2lvbiBoaXN0b3J5 Li4uIiksIHRoaXMuX3Nob3dMb2NhbEhpc3RvcnkuYmluZCh0aGlzLCAvKiogQHR5cGUge1dlYklu c3BlY3Rvci5VSVNvdXJjZUNvZGV9ICovIHRhcmdldCkpOwogICAgICAgICAgICAgY29udGV4dE1l bnUuYXBwZW5kU2VwYXJhdG9yKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TZXR0aW5ncy5qcwppbmRleCA4MzZmYmEwYmI3MjMwZDVmODI1ZjYxZmU2N2QxNTc2ZmM3 ZGU2ODg2Li40ZTNhMjI3MzFkMDk4MmE2Nzg2OTg4Y2ZlZTgzOTAxNjAzNTg0MDAxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKQEAgLTE4Miw3 ICsxODIsNiBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyA9IGZ1bmN0aW9uKCkK ICAgICAvLyBBZGQgY3VycmVudGx5IHJ1bm5pbmcgZXhwZXJpbWVudHMgaGVyZS4KICAgICB0aGlz LnNob3dTaGFkb3dET00gPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzaG93U2hhZG93RE9NIiwg IlNob3cgc2hhZG93IERPTSIpOwogICAgIHRoaXMuc25pcHBldHNTdXBwb3J0ID0gdGhpcy5fY3Jl YXRlRXhwZXJpbWVudCgic25pcHBldHNTdXBwb3J0IiwgIlNuaXBwZXRzIHN1cHBvcnQiKTsKLSAg ICB0aGlzLnNvdXJjZUNvZGVQYW5lbCA9IHRoaXMuX2NyZWF0ZUV4cGVyaW1lbnQoInNvdXJjZUNv ZGVQYW5lbCIsICJTb3VyY2UgQ29kZSBwYW5lbCIpOwogCiAgICAgdGhpcy5fY2xlYW5VcFNldHRp bmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzCmluZGV4IGI2ZGY3NWYyODlkOWQyNzFmNzE3NDk3ZDY1ZmM1NjJjYWM4ZDAyNzYu LjhlZGMzZjRiOTJjOThkOTdlZWY5YTFkYjZmZDFkOTA5M2NiMzUxNmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMTIwLDE5 ICsxMjAsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAg ICB9CiAgICAgfSwKIAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7VGV4dERpZmZ9IGRpZmZEYXRh Ci0gICAgICovCi0gICAgbWFya0RpZmY6IGZ1bmN0aW9uKGRpZmZEYXRhKQotICAgIHsKLSAgICAg ICAgaWYgKHRoaXMuX2RpZmZMaW5lcyAmJiB0aGlzLmxvYWRlZCkKLSAgICAgICAgICAgIHRoaXMu X3JlbW92ZURpZmZEZWNvcmF0aW9ucygpOwotCi0gICAgICAgIHRoaXMuX2RpZmZMaW5lcyA9IGRp ZmZEYXRhOwotICAgICAgICBpZiAodGhpcy5sb2FkZWQpCi0gICAgICAgICAgICB0aGlzLl91cGRh dGVEaWZmRGVjb3JhdGlvbnMoKTsKLSAgICB9LAotCiAgICAgYWRkTWVzc2FnZTogZnVuY3Rpb24o bXNnKQogICAgIHsKICAgICAgICAgdGhpcy5fbWVzc2FnZXMucHVzaChtc2cpOwpAQCAtMjUxLDcg KzIzOCw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX3RleHRWaWV3ZXIuYmVnaW5VcGRhdGVzKCk7CiAKICAgICAgICAgdGhpcy5fYWRkRXhp c3RpbmdNZXNzYWdlc1RvU291cmNlKCk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZURpZmZEZWNvcmF0 aW9ucygpOwogCiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuZG9SZXNpemUoKTsKIApAQCAtMzYw LDMzICszNDYsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICByZXR1cm4gcmFuZ2VzOwogICAgIH0sCiAKLSAgICBfdXBkYXRlRGlmZkRlY29yYXRpb25z OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX2RpZmZMaW5lcykKLSAgICAg ICAgICAgIHJldHVybjsKLQotICAgICAgICBmdW5jdGlvbiBhZGREZWNvcmF0aW9ucyh0ZXh0Vmll d2VyLCBsaW5lcywgY2xhc3NOYW1lKQotICAgICAgICB7Ci0gICAgICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGxpbmVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgICAgIHRleHRWaWV3ZXIu YWRkRGVjb3JhdGlvbihsaW5lc1tpXSwgY2xhc3NOYW1lKTsKLSAgICAgICAgfQotICAgICAgICBh ZGREZWNvcmF0aW9ucyh0aGlzLl90ZXh0Vmlld2VyLCB0aGlzLl9kaWZmTGluZXMuYWRkZWQsICJ3 ZWJraXQtYWRkZWQtbGluZSIpOwotICAgICAgICBhZGREZWNvcmF0aW9ucyh0aGlzLl90ZXh0Vmll d2VyLCB0aGlzLl9kaWZmTGluZXMucmVtb3ZlZCwgIndlYmtpdC1yZW1vdmVkLWxpbmUiKTsKLSAg ICAgICAgYWRkRGVjb3JhdGlvbnModGhpcy5fdGV4dFZpZXdlciwgdGhpcy5fZGlmZkxpbmVzLmNo YW5nZWQsICJ3ZWJraXQtY2hhbmdlZC1saW5lIik7Ci0gICAgfSwKLQotICAgIF9yZW1vdmVEaWZm RGVjb3JhdGlvbnM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGZ1bmN0aW9uIHJlbW92ZURl Y29yYXRpb25zKHRleHRWaWV3ZXIsIGxpbmVzLCBjbGFzc05hbWUpCi0gICAgICAgIHsKLSAgICAg ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGluZXMubGVuZ3RoOyArK2kpCi0gICAgICAgICAg ICAgICAgdGV4dFZpZXdlci5yZW1vdmVEZWNvcmF0aW9uKGxpbmVzW2ldLCBjbGFzc05hbWUpOwot ICAgICAgICB9Ci0gICAgICAgIHJlbW92ZURlY29yYXRpb25zKHRoaXMuX3RleHRWaWV3ZXIsIHRo aXMuX2RpZmZMaW5lcy5hZGRlZCwgIndlYmtpdC1hZGRlZC1saW5lIik7Ci0gICAgICAgIHJlbW92 ZURlY29yYXRpb25zKHRoaXMuX3RleHRWaWV3ZXIsIHRoaXMuX2RpZmZMaW5lcy5yZW1vdmVkLCAi d2Via2l0LXJlbW92ZWQtbGluZSIpOwotICAgICAgICByZW1vdmVEZWNvcmF0aW9ucyh0aGlzLl90 ZXh0Vmlld2VyLCB0aGlzLl9kaWZmTGluZXMuY2hhbmdlZCwgIndlYmtpdC1jaGFuZ2VkLWxpbmUi KTsKLSAgICB9LAotCiAgICAgX2FkZEV4aXN0aW5nTWVzc2FnZXNUb1NvdXJjZTogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgdmFyIGxlbmd0aCA9IHRoaXMuX21lc3NhZ2VzLmxlbmd0aDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5j c3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RleHRWaWV3ZXIuY3NzCmlu ZGV4IDczNDYzYjIzMmRjYmU5MjIxYmFjMzdkMWMzNWMzM2M0ZWE2MDYyMDMuLmUxMGQ3MTEwZGU5 NmM2MGUwZjQ5ZTNmOWZiYjBmYWE4ZjVhZTNlYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvdGV4dFZpZXdlci5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC90ZXh0Vmlld2VyLmNzcwpAQCAtMTc1LDIxICsxNzUsNiBAQAog ICAgIG91dGxpbmU6IDFweCBzb2xpZCByZ2IoNjQsIDExNSwgMjQ0KTsKIH0KIAotLndlYmtpdC1h ZGRlZC1saW5lLndlYmtpdC1saW5lLW51bWJlciB7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmdi KDE3MCwgMjU1LCAxNzApOwotICAgIGNvbG9yOiAjMzMzOwotfQotCi0ud2Via2l0LXJlbW92ZWQt bGluZS53ZWJraXQtbGluZS1udW1iZXIgewotICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyNTUs IDIyMCwgMjIwKTsKLSAgICB0ZXh0LWRlY29yYXRpb246IGxpbmUtdGhyb3VnaDsKLX0KLQotLndl YmtpdC1jaGFuZ2VkLWxpbmUud2Via2l0LWxpbmUtbnVtYmVyIHsKLSAgICBiYWNrZ3JvdW5kLWNv bG9yOiByZ2IoMTcwLCAxNzAsIDI1NSk7Ci0gICAgY29sb3I6ICMzMzM7Ci19Ci0KIC53ZWJraXQt aGlnaGxpZ2h0ZWQtbGluZS53ZWJraXQtbGluZS1jb250ZW50IHsKICAgICAtd2Via2l0LWFuaW1h dGlvbjogImZhZGVvdXQiIDJzIDBzOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL3V0aWxpdGllcy5qcwppbmRleCBlNTIwZWJkYWZjZjVhMzNhZDY0YmU4NTU1MmY0 MTI3YjljNzg5MmIyLi4xZDcyMjViMjZmOGJlYmUzYzkwZGM5ZTRmNWU4NWJkMDBiZWU4ZGY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5qcwpA QCAtMjUsOSArMjUsNiBAQAogICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKICAqIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RgogICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KLSAqCi0gKiBDb250YWlucyBkaWZmIG1ldGhvZCBiYXNlZCBvbiBKYXZh c2NyaXB0IERpZmYgQWxnb3JpdGhtIEJ5IEpvaG4gUmVzaWcKLSAqIGh0dHA6Ly9lam9obi5vcmcv ZmlsZXMvanNkaWZmLmpzIChyZWxlYXNlZCB1bmRlciB0aGUgTUlUIGxpY2Vuc2UpLgogICovCiAK IFN0cmluZy5wcm90b3R5cGUuaGFzU3Vic3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nLCBjYXNlSW5z ZW5zaXRpdmUpCkBAIC0zNzMsNTEgKzM3MCw2IEBAIGZ1bmN0aW9uIGluc2VydGlvbkluZGV4Rm9y T2JqZWN0SW5MaXN0U29ydGVkQnlGdW5jdGlvbihhbk9iamVjdCwgYUxpc3QsIGFGdW5jdGlvCiAg ICAgfQogfQogCi1BcnJheS5kaWZmID0gZnVuY3Rpb24obGVmdCwgcmlnaHQpCi17Ci0gICAgdmFy IG8gPSBsZWZ0OwotICAgIHZhciBuID0gcmlnaHQ7Ci0KLSAgICB2YXIgbnMgPSB7fTsKLSAgICB2 YXIgb3MgPSB7fTsKLQotICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbi5sZW5ndGg7IGkrKykgewot ICAgICAgICBpZiAobnNbbltpXV0gPT0gbnVsbCkKLSAgICAgICAgICAgIG5zW25baV1dID0geyBy b3dzOiBbXSwgbzogbnVsbCB9OwotICAgICAgICBuc1tuW2ldXS5yb3dzLnB1c2goaSk7Ci0gICAg fQotCi0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCBvLmxlbmd0aDsgaSsrKSB7Ci0gICAgICAgIGlm IChvc1tvW2ldXSA9PSBudWxsKQotICAgICAgICAgICAgb3Nbb1tpXV0gPSB7IHJvd3M6IFtdLCBu OiBudWxsIH07Ci0gICAgICAgIG9zW29baV1dLnJvd3MucHVzaChpKTsKLSAgICB9Ci0KLSAgICBm b3IgKHZhciBpIGluIG5zKSB7Ci0gICAgICAgIGlmIChuc1tpXS5yb3dzLmxlbmd0aCA9PSAxICYm IHR5cGVvZihvc1tpXSkgIT0gInVuZGVmaW5lZCIgJiYgb3NbaV0ucm93cy5sZW5ndGggPT0gMSkg ewotICAgICAgICAgICAgbltuc1tpXS5yb3dzWzBdXSA9IHsgdGV4dDogbltuc1tpXS5yb3dzWzBd XSwgcm93OiBvc1tpXS5yb3dzWzBdIH07Ci0gICAgICAgICAgICBvW29zW2ldLnJvd3NbMF1dID0g eyB0ZXh0OiBvW29zW2ldLnJvd3NbMF1dLCByb3c6IG5zW2ldLnJvd3NbMF0gfTsKLSAgICAgICAg fQotICAgIH0KLQotICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbi5sZW5ndGggLSAxOyBpKyspIHsK LSAgICAgICAgaWYgKG5baV0udGV4dCAhPSBudWxsICYmIG5baSArIDFdLnRleHQgPT0gbnVsbCAm JiBuW2ldLnJvdyArIDEgPCBvLmxlbmd0aCAmJiBvW25baV0ucm93ICsgMV0udGV4dCA9PSBudWxs ICYmIG5baSArIDFdID09IG9bbltpXS5yb3cgKyAxXSkgewotICAgICAgICAgICAgbltpICsgMV0g PSB7IHRleHQ6IG5baSArIDFdLCByb3c6IG5baV0ucm93ICsgMSB9OwotICAgICAgICAgICAgb1tu W2ldLnJvdyArIDFdID0geyB0ZXh0OiBvW25baV0ucm93ICsgMV0sIHJvdzogaSArIDEgfTsKLSAg ICAgICAgfQotICAgIH0KLQotICAgIGZvciAodmFyIGkgPSBuLmxlbmd0aCAtIDE7IGkgPiAwOyBp LS0pIHsKLSAgICAgICAgaWYgKG5baV0udGV4dCAhPSBudWxsICYmIG5baSAtIDFdLnRleHQgPT0g bnVsbCAmJiBuW2ldLnJvdyA+IDAgJiYgb1tuW2ldLnJvdyAtIDFdLnRleHQgPT0gbnVsbCAmJgot ICAgICAgICAgICAgbltpIC0gMV0gPT0gb1tuW2ldLnJvdyAtIDFdKSB7Ci0gICAgICAgICAgICBu W2kgLSAxXSA9IHsgdGV4dDogbltpIC0gMV0sIHJvdzogbltpXS5yb3cgLSAxIH07Ci0gICAgICAg ICAgICBvW25baV0ucm93IC0gMV0gPSB7IHRleHQ6IG9bbltpXS5yb3cgLSAxXSwgcm93OiBpIC0g MSB9OwotICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIHsgbGVmdDogbywgcmlnaHQ6IG4g fTsKLX0KLQogQXJyYXkuY29udmVydCA9IGZ1bmN0aW9uKGxpc3QpCiB7CiAgICAgLy8gQ2FzdCBh cnJheS1saWtlIG9iamVjdCB0byBhbiBhcnJheS4KQEAgLTY3MSw0NiArNjIzLDYgQEAgZnVuY3Rp b24gbnVtYmVyVG9TdHJpbmdXaXRoU3BhY2VzUGFkZGluZyh2YWx1ZSwgc3ltYm9sc0NvdW50KQog LyoqCiAgKiBAY29uc3RydWN0b3IKICAqLwotZnVuY3Rpb24gVGV4dERpZmYoKQotewotICAgIHRo aXMuYWRkZWQgPSBbXTsKLSAgICB0aGlzLnJlbW92ZWQgPSBbXTsKLSAgICB0aGlzLmNoYW5nZWQg PSBbXTsKLX0gCi0KLS8qKgotICogQHBhcmFtIHtzdHJpbmd9IGJhc2VDb250ZW50Ci0gKiBAcGFy YW0ge3N0cmluZ30gbmV3Q29udGVudAotICogQHJldHVybiB7VGV4dERpZmZ9Ci0gKi8KLVRleHRE aWZmLmNvbXB1dGUgPSBmdW5jdGlvbihiYXNlQ29udGVudCwgbmV3Q29udGVudCkKLXsKLSAgICB2 YXIgb2xkTGluZXMgPSBiYXNlQ29udGVudC5zcGxpdCgvXHI/XG4vKTsKLSAgICB2YXIgbmV3TGlu ZXMgPSBuZXdDb250ZW50LnNwbGl0KC9ccj9cbi8pOwotCi0gICAgdmFyIGRpZmYgPSBBcnJheS5k aWZmKG9sZExpbmVzLCBuZXdMaW5lcyk7Ci0KLSAgICB2YXIgZGlmZkRhdGEgPSBuZXcgVGV4dERp ZmYoKTsKLQotICAgIHZhciBvZmZzZXQgPSAwOwotICAgIHZhciByaWdodCA9IGRpZmYucmlnaHQ7 Ci0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCByaWdodC5sZW5ndGg7ICsraSkgewotICAgICAgICBp ZiAodHlwZW9mIHJpZ2h0W2ldID09PSAic3RyaW5nIikgewotICAgICAgICAgICAgaWYgKHJpZ2h0 Lmxlbmd0aCA+IGkgKyAxICYmIHJpZ2h0W2kgKyAxXS5yb3cgPT09IGkgKyAxIC0gb2Zmc2V0KQot ICAgICAgICAgICAgICAgIGRpZmZEYXRhLmNoYW5nZWQucHVzaChpKTsKLSAgICAgICAgICAgIGVs c2UgewotICAgICAgICAgICAgICAgIGRpZmZEYXRhLmFkZGVkLnB1c2goaSk7Ci0gICAgICAgICAg ICAgICAgb2Zmc2V0Kys7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAg ICAgb2Zmc2V0ID0gaSAtIHJpZ2h0W2ldLnJvdzsKLSAgICB9Ci0gICAgcmV0dXJuIGRpZmZEYXRh OwotfQotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICovCiB2YXIgTWFwID0gZnVuY3Rpb24oKQog ewogICAgIHRoaXMuX21hcCA9IHt9Owo=