108933 2013-02-05 05:27:26 -0800 Web Inspector: file selector list jumps as I type or move Up/Down 2013-02-06 02:13:32 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 825402 0 pfeldman 2013-02-05 05:27:26 -0800 Fix to follow. 825406 1 186608 pfeldman 2013-02-05 05:35:54 -0800 Created attachment 186608 Patch 825471 2 186608 buildbot 2013-02-05 07:33:15 -0800 Comment on attachment 186608 Patch Attachment 186608 did not pass win-ews (win): Output: http://queues.webkit.org/results/16379608 826165 3 186608 vsevik 2013-02-06 00:26:02 -0800 Comment on attachment 186608 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186608&action=review > Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js:288 > + this._updateSelection(this._selectedIndexInFiltered, false); Should we check this._selectedIndexInFiltered for null? > Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js:301 > + event.consume(); Wouldn't it be better to do event.consume(true) instead? > Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js:302 > + return; These "return; break;" pairs look really weird. I would move _scheduleFilter call to default section of this switch instead. 826219 4 186788 pfeldman 2013-02-06 01:35:53 -0800 Created attachment 186788 Patch 826246 5 pfeldman 2013-02-06 02:13:32 -0800 Committed r141979: <http://trac.webkit.org/changeset/141979> 186608 2013-02-05 05:35:54 -0800 2013-02-06 01:35:50 -0800 Patch bug-108933-20130205173232.patch text/plain 6816 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQxYzMxZjBjODFmOGJk ODQ5ZTQ4MTZmNTAzZWFjY2ZjMzE0ZWYxMC4uYmEyNThkYjVkNWVlNDY3N2VhYzA3ZjIxNzUzY2Jm ZjE1ZDQ3YTQ2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTA1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZpbGUgc2VsZWN0b3IgbGlzdCBqdW1wcyBhcyBJIHR5cGUgb3IgbW92ZSBVcC9Eb3duCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg5MzMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNaXNzaW5nIHJl dHVybiB3YXMgc2NoZWR1bGluZyBleHRyYSB1cGRhdGVzLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlLl9maWx0ZXJJdGVtcyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLnByb3Rv dHlwZS5fb25LZXlEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxl Y3Rpb25EaWFsb2cucHJvdG90eXBlLl91cGRhdGVTZWxlY3Rpb24pOgorCiAyMDEzLTAyLTA1ICBL ZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJTlBVVF9NVUxUSVBM RV9GSUVMRFNfVUk6IFNob3VsZCBub3QgbW92ZSBmb2N1cyBpZiB0aGUgZWxlbWVudCBhbHJlYWR5 IGhhcyBmb2N1cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qcwppbmRleCAzY2VkODgy MzA0M2U4OWU0ZDZkMzVmYTM2NTZlY2NjNjlkZDNjYjZkLi4xMmU0ZjA1MTY1OTYxZTMxNmEwNzRl OTQ4NThiMGZmYzM4ZTY1OWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qcwpA QCAtNjAsNyArNjAsNiBAQCBXZWJJbnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9n ID0gZnVuY3Rpb24oZGVsZWdhdGUpCiAgICAgdGhpcy5faXRlbUVsZW1lbnRzQ29udGFpbmVyID0g dGhpcy5fdmlld3BvcnRDb250cm9sLmVsZW1lbnQ7CiAgICAgdGhpcy5faXRlbUVsZW1lbnRzQ29u dGFpbmVyLmFkZFN0eWxlQ2xhc3MoImNvbnRhaW5lciIpOwogICAgIHRoaXMuX2l0ZW1FbGVtZW50 c0NvbnRhaW5lci5hZGRTdHlsZUNsYXNzKCJtb25vc3BhY2UiKTsKLSAgICB0aGlzLl9pdGVtRWxl bWVudHNDb250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fb25Nb3Vz ZU1vdmUuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuX2l0ZW1FbGVtZW50c0NvbnRhaW5l ci5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX29uQ2xpY2suYmluZCh0aGlzKSwgZmFs c2UpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9pdGVtRWxlbWVudHNDb250 YWluZXIpOwogCkBAIC0yMjUsNyArMjI0LDcgQEAgV2ViSW5zcGVjdG9yLkZpbHRlcmVkSXRlbVNl bGVjdGlvbkRpYWxvZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjYW1lbENhc2VTY29yaW5n UmVnZXggPSBxdWVyeSA/IHRoaXMuX2NyZWF0ZVNjb3JpbmdSZWdleChxdWVyeSwgaWdub3JlQ2Fz ZSwgdHJ1ZSkgOiBudWxsOwogICAgICAgICB2YXIgdW5kZXJzY29yZVNjb3JpbmdSZWdleCA9IHF1 ZXJ5ID8gdGhpcy5fY3JlYXRlU2NvcmluZ1JlZ2V4KHF1ZXJ5LCBpZ25vcmVDYXNlLCBmYWxzZSkg OiBudWxsOwogCi0gICAgICAgIHZhciBvbGRTZWxlY3RlZEFic29sdXRlSW5kZXggPSB0aGlzLl9m aWx0ZXJlZEl0ZW1zW3RoaXMuX3NlbGVjdGVkSW5kZXhJbkZpbHRlcmVkXTsKKyAgICAgICAgdmFy IG9sZFNlbGVjdGVkQWJzb2x1dGVJbmRleCA9IHRoaXMuX3NlbGVjdGVkSW5kZXhJbkZpbHRlcmVk ID8gdGhpcy5fZmlsdGVyZWRJdGVtc1t0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZF0gOiBu dWxsOwogICAgICAgICB0aGlzLl9maWx0ZXJlZEl0ZW1zID0gW107CiAgICAgICAgIHRoaXMuX3Nl bGVjdGVkSW5kZXhJbkZpbHRlcmVkID0gMDsKIApAQCAtMjg2LDcgKzI4NSw3IEBAIFdlYkluc3Bl Y3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlID0gewogICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3ZpZXdwb3J0Q29udHJvbC5yZWZyZXNoKCk7 Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbih0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0 ZXJlZCk7CisgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbih0aGlzLl9zZWxlY3RlZEluZGV4 SW5GaWx0ZXJlZCwgZmFsc2UpOwogICAgIH0sCiAKICAgICBfb25LZXlEb3duOiBmdW5jdGlvbihl dmVudCkKQEAgLTI5NCwzMSArMjkzLDQyIEBAIFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxl Y3Rpb25EaWFsb2cucHJvdG90eXBlID0gewogICAgICAgICBpZiAodHlwZW9mIHRoaXMuX3NlbGVj dGVkSW5kZXhJbkZpbHRlcmVkID09PSAibnVtYmVyIikgewogICAgICAgICAgICAgdmFyIG5ld1Nl bGVjdGVkSW5kZXggPSB0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZDsKIAotICAgICAgICAg ICAgZnVuY3Rpb24gdXBkYXRlU2VsZWN0aW9uKG1ha2VMYXN0KQotICAgICAgICAgICAgewotICAg ICAgICAgICAgICAgIHRoaXMuX3ZpZXdwb3J0Q29udHJvbC5zY3JvbGxJdGVtSW50b1ZpZXcobmV3 U2VsZWN0ZWRJbmRleCwgbWFrZUxhc3QpOyAKLSAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVT ZWxlY3Rpb24obmV3U2VsZWN0ZWRJbmRleCk7Ci0gICAgICAgICAgICAgICAgZXZlbnQuY29uc3Vt ZSh0cnVlKTsKLSAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgc3dpdGNoIChldmVudC5rZXlD b2RlKSB7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lktl eXMuRG93bi5jb2RlOgogICAgICAgICAgICAgICAgIGlmICgrK25ld1NlbGVjdGVkSW5kZXggPj0g dGhpcy5fZmlsdGVyZWRJdGVtcy5sZW5ndGgpCiAgICAgICAgICAgICAgICAgICAgIG5ld1NlbGVj dGVkSW5kZXggPSB0aGlzLl9maWx0ZXJlZEl0ZW1zLmxlbmd0aCAtIDE7Ci0gICAgICAgICAgICAg ICAgdXBkYXRlU2VsZWN0aW9uLmNhbGwodGhpcywgdHJ1ZSk7CisgICAgICAgICAgICAgICAgdGhp cy5fdXBkYXRlU2VsZWN0aW9uKG5ld1NlbGVjdGVkSW5kZXgsIHRydWUpOworICAgICAgICAgICAg ICAgIGV2ZW50LmNvbnN1bWUoKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0LktleXMuVXAuY29kZToKICAgICAgICAgICAgICAgICBpZiAoLS1uZXdTZWxlY3RlZEluZGV4 IDwgMCkKICAgICAgICAgICAgICAgICAgICAgbmV3U2VsZWN0ZWRJbmRleCA9IDA7Ci0gICAgICAg ICAgICAgICAgdXBkYXRlU2VsZWN0aW9uLmNhbGwodGhpcywgZmFsc2UpOworICAgICAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbihuZXdTZWxlY3RlZEluZGV4LCBmYWxzZSk7CisgICAg ICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgpOworICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuS2V5cy5QYWdlRG93bi5jb2RlOgogICAgICAgICAgICAgICAgIG5ld1NlbGVj dGVkSW5kZXggPSBNYXRoLm1pbihuZXdTZWxlY3RlZEluZGV4ICsgdGhpcy5fdmlld3BvcnRDb250 cm9sLnJvd3NQZXJWaWV3cG9ydCgpLCB0aGlzLl9maWx0ZXJlZEl0ZW1zLmxlbmd0aCAtIDEpOwot ICAgICAgICAgICAgICAgIHVwZGF0ZVNlbGVjdGlvbi5jYWxsKHRoaXMsIHRydWUpOworICAgICAg ICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbihuZXdTZWxlY3RlZEluZGV4LCB0cnVlKTsK KyAgICAgICAgICAgICAgICBldmVudC5jb25zdW1lKCk7CisgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlBhZ2VVcC5jb2RlOgogICAgICAgICAgICAgICAgIG5ld1Nl bGVjdGVkSW5kZXggPSBNYXRoLm1heChuZXdTZWxlY3RlZEluZGV4IC0gdGhpcy5fdmlld3BvcnRD b250cm9sLnJvd3NQZXJWaWV3cG9ydCgpLCAwKTsKLSAgICAgICAgICAgICAgICB1cGRhdGVTZWxl Y3Rpb24uY2FsbCh0aGlzLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgdGhpcy5fdXBkYXRlU2Vs ZWN0aW9uKG5ld1NlbGVjdGVkSW5kZXgsIGZhbHNlKTsKKyAgICAgICAgICAgICAgICBldmVudC5j b25zdW1lKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLkhv bWUuY29kZToKKyAgICAgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWxlY3Rpb24oMCwgZmFsc2Up OworICAgICAgICAgICAgICAgIGV2ZW50LmNvbnN1bWUoKTsKKyAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleXMuRW5kLmNvZGU6CisgICAgICAgICAgICAgICAgdGhpcy5f dXBkYXRlU2VsZWN0aW9uKHRoaXMuX2ZpbHRlcmVkSXRlbXMubGVuZ3RoIC0gMSwgdHJ1ZSk7Cisg ICAgICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgpOworICAgICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMzM2 LDE4ICszNDYsMTggQEAgV2ViSW5zcGVjdG9yLkZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5w cm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXggIAor ICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0gbWFrZUxhc3QKICAgICAgKi8KLSAgICBfdXBkYXRlU2Vs ZWN0aW9uOiBmdW5jdGlvbihpbmRleCkKKyAgICBfdXBkYXRlU2VsZWN0aW9uOiBmdW5jdGlvbihp bmRleCwgbWFrZUxhc3QpCiAgICAgeyAKICAgICAgICAgdmFyIGVsZW1lbnQgPSB0aGlzLl92aWV3 cG9ydENvbnRyb2wucmVuZGVyZWRFbGVtZW50QXQodGhpcy5fc2VsZWN0ZWRJbmRleEluRmlsdGVy ZWQpOwogICAgICAgICBpZiAoZWxlbWVudCkKICAgICAgICAgICAgIGVsZW1lbnQucmVtb3ZlU3R5 bGVDbGFzcygic2VsZWN0ZWQiKTsKKyAgICAgICAgdGhpcy5fdmlld3BvcnRDb250cm9sLnNjcm9s bEl0ZW1JbnRvVmlldyhpbmRleCwgbWFrZUxhc3QpOwogICAgICAgICB0aGlzLl9zZWxlY3RlZElu ZGV4SW5GaWx0ZXJlZCA9IGluZGV4OwotICAgICAgICBlbGVtZW50ID0gdGhpcy5fdmlld3BvcnRD b250cm9sLnJlbmRlcmVkRWxlbWVudEF0KGluZGV4KTsgCisgICAgICAgIGVsZW1lbnQgPSB0aGlz Ll92aWV3cG9ydENvbnRyb2wucmVuZGVyZWRFbGVtZW50QXQoaW5kZXgpOwogICAgICAgICBpZiAo ZWxlbWVudCkKICAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVDbGFzcygic2VsZWN0ZWQiKTsK LSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5fdmlld3BvcnRDb250cm9sLnJlZnJlc2go KTsKICAgICB9LAogCiAgICAgX29uQ2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtMzU5LDE4ICsz NjksNiBAQCBXZWJJbnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLnByb3RvdHlw ZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLkRpYWxvZy5oaWRlKCk7CiAgICAgfSwKIAotICAg IF9vbk1vdXNlTW92ZTogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICBpZiAoZXZlbnQu cGFnZVggPT09IHRoaXMuX2xhc3RNb3VzZVggJiYgZXZlbnQucGFnZVkgPT09IHRoaXMuX2xhc3RN b3VzZVkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX2xhc3RNb3VzZVggPSBl dmVudC5wYWdlWDsKLSAgICAgICAgdGhpcy5fbGFzdE1vdXNlWSA9IGV2ZW50LnBhZ2VZOwotICAg ICAgICB2YXIgaXRlbUVsZW1lbnQgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldp dGhDbGFzcygiZmlsdGVyZWQtaXRlbS1saXN0LWRpYWxvZy1pdGVtIik7Ci0gICAgICAgIGlmICgh aXRlbUVsZW1lbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVNl bGVjdGlvbihpdGVtRWxlbWVudC5fZmlsdGVyZWRJbmRleCk7Ci0gICAgfSwKLQogICAgIC8qKgog ICAgICAqIEByZXR1cm4ge251bWJlcn0KICAgICAgKi8K 186788 2013-02-06 01:35:53 -0800 2013-02-06 01:42:37 -0800 Patch bug-108933-20130206133229.patch text/plain 7949 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxOTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFkNmI5YmNjNGE0MDQy ZGZiYmU4YzFmYTdiZDk1ZTlkOTQ5MzVkZC4uMjUzMmJlYTcxYWRjYTEyZTliZmVlYjJhYTliMGMx ODNlNmUwYmIxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTA2ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZpbGUgc2VsZWN0b3IgbGlzdCBqdW1wcyBhcyBJIHR5cGUgb3IgbW92ZSBVcC9Eb3duCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg5MzMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNaXNzaW5nIHJl dHVybiB3YXMgc2NoZWR1bGluZyBleHRyYSB1cGRhdGVzLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlLl9maWx0ZXJJdGVtcyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLnByb3Rv dHlwZS5fb25LZXlEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxl Y3Rpb25EaWFsb2cucHJvdG90eXBlLl91cGRhdGVTZWxlY3Rpb24pOgorCiAyMDEzLTAyLTA2ICBL ZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIFBhc3Mg YW4gSXNvbGF0ZSB0byByZW1haW5pbmcgR2V0VGVtcGxhdGUoKXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9n LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxl Y3Rpb25EaWFsb2cuanMKaW5kZXggM2NlZDg4MjMwNDNlODllNGQ2ZDM1ZmEzNjU2ZWNjYzY5ZGQz Y2I2ZC4uY2U3YWIyMTUxY2M3YjQzMmQyYzBmNzk0YmVkMDc5ZWU1ZmRlMTA5YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rp b25EaWFsb2cuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWx0 ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cuanMKQEAgLTYwLDcgKzYwLDYgQEAgV2ViSW5zcGVjdG9y LkZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZyA9IGZ1bmN0aW9uKGRlbGVnYXRlKQogICAgIHRo aXMuX2l0ZW1FbGVtZW50c0NvbnRhaW5lciA9IHRoaXMuX3ZpZXdwb3J0Q29udHJvbC5lbGVtZW50 OwogICAgIHRoaXMuX2l0ZW1FbGVtZW50c0NvbnRhaW5lci5hZGRTdHlsZUNsYXNzKCJjb250YWlu ZXIiKTsKICAgICB0aGlzLl9pdGVtRWxlbWVudHNDb250YWluZXIuYWRkU3R5bGVDbGFzcygibW9u b3NwYWNlIik7Ci0gICAgdGhpcy5faXRlbUVsZW1lbnRzQ29udGFpbmVyLmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlbW92ZSIsIHRoaXMuX29uTW91c2VNb3ZlLmJpbmQodGhpcyksIGZhbHNlKTsKICAg ICB0aGlzLl9pdGVtRWxlbWVudHNDb250YWluZXIuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9vbkNsaWNrLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5faXRlbUVsZW1lbnRzQ29udGFpbmVyKTsKIApAQCAtMjI1LDcgKzIyNCw3IEBA IFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlID0gewog ICAgICAgICB2YXIgY2FtZWxDYXNlU2NvcmluZ1JlZ2V4ID0gcXVlcnkgPyB0aGlzLl9jcmVhdGVT Y29yaW5nUmVnZXgocXVlcnksIGlnbm9yZUNhc2UsIHRydWUpIDogbnVsbDsKICAgICAgICAgdmFy IHVuZGVyc2NvcmVTY29yaW5nUmVnZXggPSBxdWVyeSA/IHRoaXMuX2NyZWF0ZVNjb3JpbmdSZWdl eChxdWVyeSwgaWdub3JlQ2FzZSwgZmFsc2UpIDogbnVsbDsKIAotICAgICAgICB2YXIgb2xkU2Vs ZWN0ZWRBYnNvbHV0ZUluZGV4ID0gdGhpcy5fZmlsdGVyZWRJdGVtc1t0aGlzLl9zZWxlY3RlZElu ZGV4SW5GaWx0ZXJlZF07CisgICAgICAgIHZhciBvbGRTZWxlY3RlZEFic29sdXRlSW5kZXggPSB0 aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZCA/IHRoaXMuX2ZpbHRlcmVkSXRlbXNbdGhpcy5f c2VsZWN0ZWRJbmRleEluRmlsdGVyZWRdIDogbnVsbDsKICAgICAgICAgdGhpcy5fZmlsdGVyZWRJ dGVtcyA9IFtdOwogICAgICAgICB0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZCA9IDA7CiAK QEAgLTI4Niw0NSArMjg1LDQ4IEBAIFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25E aWFsb2cucHJvdG90eXBlID0gewogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHRo aXMuX3ZpZXdwb3J0Q29udHJvbC5yZWZyZXNoKCk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVj dGlvbih0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZCk7CisgICAgICAgIHRoaXMuX3VwZGF0 ZVNlbGVjdGlvbih0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZCwgZmFsc2UpOwogICAgIH0s CiAKICAgICBfb25LZXlEb3duOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmICh0 eXBlb2YgdGhpcy5fc2VsZWN0ZWRJbmRleEluRmlsdGVyZWQgPT09ICJudW1iZXIiKSB7Ci0gICAg ICAgICAgICB2YXIgbmV3U2VsZWN0ZWRJbmRleCA9IHRoaXMuX3NlbGVjdGVkSW5kZXhJbkZpbHRl cmVkOwotCi0gICAgICAgICAgICBmdW5jdGlvbiB1cGRhdGVTZWxlY3Rpb24obWFrZUxhc3QpCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgdGhpcy5fdmlld3BvcnRDb250cm9sLnNjcm9s bEl0ZW1JbnRvVmlldyhuZXdTZWxlY3RlZEluZGV4LCBtYWtlTGFzdCk7IAotICAgICAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbihuZXdTZWxlY3RlZEluZGV4KTsKLSAgICAgICAgICAg ICAgICBldmVudC5jb25zdW1lKHRydWUpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBz d2l0Y2ggKGV2ZW50LmtleUNvZGUpIHsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuS2V5cy5Eb3duLmNvZGU6Ci0gICAgICAgICAgICAgICAgaWYgKCsrbmV3 U2VsZWN0ZWRJbmRleCA+PSB0aGlzLl9maWx0ZXJlZEl0ZW1zLmxlbmd0aCkKLSAgICAgICAgICAg ICAgICAgICAgbmV3U2VsZWN0ZWRJbmRleCA9IHRoaXMuX2ZpbHRlcmVkSXRlbXMubGVuZ3RoIC0g MTsKLSAgICAgICAgICAgICAgICB1cGRhdGVTZWxlY3Rpb24uY2FsbCh0aGlzLCB0cnVlKTsKLSAg ICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuS2V5cy5VcC5jb2RlOgotICAgICAgICAgICAgICAgIGlmICgtLW5ld1NlbGVj dGVkSW5kZXggPCAwKQotICAgICAgICAgICAgICAgICAgICBuZXdTZWxlY3RlZEluZGV4ID0gMDsK LSAgICAgICAgICAgICAgICB1cGRhdGVTZWxlY3Rpb24uY2FsbCh0aGlzLCBmYWxzZSk7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0LktleXMuUGFnZURvd24uY29kZToKLSAgICAgICAgICAgICAgICBuZXdTZWxlY3Rl ZEluZGV4ID0gTWF0aC5taW4obmV3U2VsZWN0ZWRJbmRleCArIHRoaXMuX3ZpZXdwb3J0Q29udHJv bC5yb3dzUGVyVmlld3BvcnQoKSwgdGhpcy5fZmlsdGVyZWRJdGVtcy5sZW5ndGggLSAxKTsKLSAg ICAgICAgICAgICAgICB1cGRhdGVTZWxlY3Rpb24uY2FsbCh0aGlzLCB0cnVlKTsKLSAgICAgICAg ICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5cy5QYWdlVXAuY29kZToKLSAgICAgICAgICAgICAgICBuZXdTZWxlY3RlZEluZGV4 ID0gTWF0aC5tYXgobmV3U2VsZWN0ZWRJbmRleCAtIHRoaXMuX3ZpZXdwb3J0Q29udHJvbC5yb3dz UGVyVmlld3BvcnQoKSwgMCk7Ci0gICAgICAgICAgICAgICAgdXBkYXRlU2VsZWN0aW9uLmNhbGwo dGhpcywgZmFsc2UpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQorICAg ICAgICB2YXIgbmV3U2VsZWN0ZWRJbmRleCA9IHR5cGVvZiB0aGlzLl9zZWxlY3RlZEluZGV4SW5G aWx0ZXJlZCA9PT0gIm51bWJlciIgPyB0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZCA6IDA7 CisKKyAgICAgICAgc3dpdGNoIChldmVudC5rZXlDb2RlKSB7CisgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5Eb3duLmNvZGU6CisgICAgICAgICAgICBpZiAo KytuZXdTZWxlY3RlZEluZGV4ID49IHRoaXMuX2ZpbHRlcmVkSXRlbXMubGVuZ3RoKQorICAgICAg ICAgICAgICAgIG5ld1NlbGVjdGVkSW5kZXggPSB0aGlzLl9maWx0ZXJlZEl0ZW1zLmxlbmd0aCAt IDE7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVTZWxlY3Rpb24obmV3U2VsZWN0ZWRJbmRleCwg dHJ1ZSk7CisgICAgICAgICAgICBldmVudC5jb25zdW1lKCk7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzLlVwLmNvZGU6 CisgICAgICAgICAgICBpZiAoLS1uZXdTZWxlY3RlZEluZGV4IDwgMCkKKyAgICAgICAgICAgICAg ICBuZXdTZWxlY3RlZEluZGV4ID0gMDsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlv bihuZXdTZWxlY3RlZEluZGV4LCBmYWxzZSk7CisgICAgICAgICAgICBldmVudC5jb25zdW1lKCk7 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5LZXlzLlBhZ2VEb3duLmNvZGU6CisgICAgICAgICAgICBuZXdTZWxlY3RlZEluZGV4 ID0gTWF0aC5taW4obmV3U2VsZWN0ZWRJbmRleCArIHRoaXMuX3ZpZXdwb3J0Q29udHJvbC5yb3dz UGVyVmlld3BvcnQoKSwgdGhpcy5fZmlsdGVyZWRJdGVtcy5sZW5ndGggLSAxKTsKKyAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbihuZXdTZWxlY3RlZEluZGV4LCB0cnVlKTsKKyAgICAg ICAgICAgIGV2ZW50LmNvbnN1bWUoKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuUGFnZVVwLmNvZGU6CisgICAgICAg ICAgICBuZXdTZWxlY3RlZEluZGV4ID0gTWF0aC5tYXgobmV3U2VsZWN0ZWRJbmRleCAtIHRoaXMu X3ZpZXdwb3J0Q29udHJvbC5yb3dzUGVyVmlld3BvcnQoKSwgMCk7CisgICAgICAgICAgICB0aGlz Ll91cGRhdGVTZWxlY3Rpb24obmV3U2VsZWN0ZWRJbmRleCwgZmFsc2UpOworICAgICAgICAgICAg ZXZlbnQuY29uc3VtZSgpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5Ib21lLmNvZGU6CisgICAgICAgICAgICB0aGlz Ll91cGRhdGVTZWxlY3Rpb24oMCwgZmFsc2UpOworICAgICAgICAgICAgZXZlbnQuY29uc3VtZSgp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQuS2V5cy5FbmQuY29kZToKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlv bih0aGlzLl9maWx0ZXJlZEl0ZW1zLmxlbmd0aCAtIDEsIHRydWUpOworICAgICAgICAgICAgZXZl bnQuY29uc3VtZSgpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICBpZiAoZXZlbnQua2V5SWRlbnRpZmllciAhPT0gIlNoaWZ0IiAmJiBldmVudC5rZXlJ ZGVudGlmaWVyICE9PSAiQ3RybCIgJiYgZXZlbnQua2V5SWRlbnRpZmllciAhPT0gIk1ldGEiICYm IGV2ZW50LmtleUlkZW50aWZpZXIgIT09ICJMZWZ0IiAmJiBldmVudC5rZXlJZGVudGlmaWVyICE9 PSAiUmlnaHQiKQorICAgICAgICAgICAgICAgIHRoaXMuX3NjaGVkdWxlRmlsdGVyKCk7CiAgICAg ICAgIH0KLQotICAgICAgICBpZiAoZXZlbnQua2V5SWRlbnRpZmllciAhPT0gIlNoaWZ0IiAmJiBl dmVudC5rZXlJZGVudGlmaWVyICE9PSAiQ3RybCIgJiYgZXZlbnQua2V5SWRlbnRpZmllciAhPT0g Ik1ldGEiICYmIGV2ZW50LmtleUlkZW50aWZpZXIgIT09ICJMZWZ0IiAmJiBldmVudC5rZXlJZGVu dGlmaWVyICE9PSAiUmlnaHQiKQotICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVGaWx0ZXIoKTsK ICAgICB9LAogCiAgICAgX3NjaGVkdWxlRmlsdGVyOiBmdW5jdGlvbigpCkBAIC0zMzYsMTggKzMz OCwxOCBAQCBXZWJJbnNwZWN0b3IuRmlsdGVyZWRJdGVtU2VsZWN0aW9uRGlhbG9nLnByb3RvdHlw ZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBpbmRleCAgCisgICAgICog QHBhcmFtIHtib29sZWFufSBtYWtlTGFzdAogICAgICAqLwotICAgIF91cGRhdGVTZWxlY3Rpb246 IGZ1bmN0aW9uKGluZGV4KQorICAgIF91cGRhdGVTZWxlY3Rpb246IGZ1bmN0aW9uKGluZGV4LCBt YWtlTGFzdCkKICAgICB7IAogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX3ZpZXdwb3J0Q29u dHJvbC5yZW5kZXJlZEVsZW1lbnRBdCh0aGlzLl9zZWxlY3RlZEluZGV4SW5GaWx0ZXJlZCk7CiAg ICAgICAgIGlmIChlbGVtZW50KQogICAgICAgICAgICAgZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNz KCJzZWxlY3RlZCIpOworICAgICAgICB0aGlzLl92aWV3cG9ydENvbnRyb2wuc2Nyb2xsSXRlbUlu dG9WaWV3KGluZGV4LCBtYWtlTGFzdCk7CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkSW5kZXhJbkZp bHRlcmVkID0gaW5kZXg7Ci0gICAgICAgIGVsZW1lbnQgPSB0aGlzLl92aWV3cG9ydENvbnRyb2wu cmVuZGVyZWRFbGVtZW50QXQoaW5kZXgpOyAKKyAgICAgICAgZWxlbWVudCA9IHRoaXMuX3ZpZXdw b3J0Q29udHJvbC5yZW5kZXJlZEVsZW1lbnRBdChpbmRleCk7CiAgICAgICAgIGlmIChlbGVtZW50 KQogICAgICAgICAgICAgZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzZWxlY3RlZCIpOwotICAgICAg ICBlbHNlCi0gICAgICAgICAgICB0aGlzLl92aWV3cG9ydENvbnRyb2wucmVmcmVzaCgpOwogICAg IH0sCiAKICAgICBfb25DbGljazogZnVuY3Rpb24oZXZlbnQpCkBAIC0zNTksMTggKzM2MSw2IEBA IFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cucHJvdG90eXBlID0gewog ICAgICAgICBXZWJJbnNwZWN0b3IuRGlhbG9nLmhpZGUoKTsKICAgICB9LAogCi0gICAgX29uTW91 c2VNb3ZlOiBmdW5jdGlvbihldmVudCkKLSAgICB7Ci0gICAgICAgIGlmIChldmVudC5wYWdlWCA9 PT0gdGhpcy5fbGFzdE1vdXNlWCAmJiBldmVudC5wYWdlWSA9PT0gdGhpcy5fbGFzdE1vdXNlWSkK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fbGFzdE1vdXNlWCA9IGV2ZW50LnBh Z2VYOwotICAgICAgICB0aGlzLl9sYXN0TW91c2VZID0gZXZlbnQucGFnZVk7Ci0gICAgICAgIHZh ciBpdGVtRWxlbWVudCA9IGV2ZW50LnRhcmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNz KCJmaWx0ZXJlZC1pdGVtLWxpc3QtZGlhbG9nLWl0ZW0iKTsKLSAgICAgICAgaWYgKCFpdGVtRWxl bWVudCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fdXBkYXRlU2VsZWN0aW9u KGl0ZW1FbGVtZW50Ll9maWx0ZXJlZEluZGV4KTsKLSAgICB9LAotCiAgICAgLyoqCiAgICAgICog QHJldHVybiB7bnVtYmVyfQogICAgICAqLwo=