72022 2011-11-10 06:27:31 -0800 Web Inspector: [SuggestBox] Correctly position the box under the first character of the suggestion prefix. 2011-11-10 09:07:19 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 499850 0 apavlov 2011-11-10 06:27:31 -0800 Patch to follow 499919 1 114506 apavlov 2011-11-10 08:15:39 -0800 Created attachment 114506 Patch 499923 2 114506 pfeldman 2011-11-10 08:20:18 -0800 Comment on attachment 114506 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114506&action=review > Source/WebCore/inspector/front-end/TextPrompt.js:869 > + * @param {*=} anchorBox This is not nice. > Source/WebCore/inspector/front-end/TextPrompt.js:884 > + anchorBox = this._anchorBox || this._inputElement.boxInWindow(window, this._parentElement); This is a strange control flow: if given, use, otherwise check if it has been used, otherwise do something. 499966 3 114514 apavlov 2011-11-10 08:59:01 -0800 Created attachment 114514 Patch 499967 4 114514 pfeldman 2011-11-10 09:02:55 -0800 Comment on attachment 114514 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114514&action=review > Source/WebCore/inspector/front-end/TextPrompt.js:383 > + var anchorElement = textRange.startContainer.ownerDocument.createElement("span"); document.createElement 499978 5 apavlov 2011-11-10 09:07:19 -0800 Committed r99867: <http://trac.webkit.org/changeset/99867> 114506 2011-11-10 08:15:39 -0800 2011-11-10 08:58:51 -0800 Patch bug-72022-20111110201537.patch text/plain 7343 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogOTk4NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzZjQ4YTUxYzc0NDg1NzRi M2RlYTRjMGU0ZGI4M2QzMTNmODE4N2U4Li5lZmU0MTdjYTFjZGViZGU4YTBkNjY4NWIzMWU5YjJj NTE4OTgwZDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTEtMTEtMTAgIEFsZXhh bmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVj dG9yOiBbU3VnZ2VzdEJveF0gQ29ycmVjdGx5IHBvc2l0aW9uIHRoZSBib3ggdW5kZXIgdGhlIGZp cnN0IGNoYXJhY3RlciBvZiB0aGUgc3VnZ2VzdGlvbiBwcmVmaXguCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjAyMgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9uIGFueSBzdWdnZXN0IGJveCBwb3NpdGlv biB1cGRhdGUgKHVwZGF0ZVN1Z2dlc3Rpb25zIGludm9jYXRpb24pIGFuIGFuY2hvciBpcyBjcmVh dGVkIGF0IHRoZSBiZWdpbm5pbmcKKyAgICAgICAgb2YgdGhlIHVzZXItZW50ZXJlZCB3b3JkLCBh bmQgaXRzIGJveCBpcyB1bHRpbWF0ZWx5IHBhc3NlZCBpbnRvIF91cGRhdGVCb3hQb3NpdGlvbiB0 byBiZSB1c2VkIGFzIHRoZQorICAgICAgICBhY3R1YWwgYW5jaG9yIGJveCAoaW5zdGVhZCBvZiB0 aGUgaW5wdXQgZWxlbWVudCBib3gpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9U ZXh0UHJvbXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBl Ll9ib3hGb3JBbmNob3JBdFN0YXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0 LnByb3RvdHlwZS5fY29tcGxldGlvbnNSZWFkeSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dFByb21wdC5TdWdnZXN0Qm94LnByb3RvdHlwZS5fdXBkYXRlQm94UG9zaXRpb24pOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3VnZ2VzdEJveC5wcm90b3R5cGUudXBkYXRlU3Vn Z2VzdGlvbnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3VnZ2VzdEJveC5w cm90b3R5cGUuX2NvbXBsZXRpb25zUmVhZHkpOgorCisyMDExLTExLTEwICBBbGV4YW5kZXIgUGF2 bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU2hv dyBtZWRpYSBxdWVyaWVzIGFzc29jaWF0ZWQgd2l0aCBzcGVjaWZpYyBDU1MgcnVsZXMKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1NjI2CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21wdC5qcwppbmRleCBk YjhkMTdiZjgyZjZmMTQyZGMwZjkwNzFmNzZjZTY0YmQ1OGM0OWIzLi44MGEyNDY1Yzg3YjBkN2Q2 N2VjM2ZiMGQ3YjkzMDA1NDllY2ZkYjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzCkBAIC0zNzcsNiArMzc3LDE5IEBAIFdlYkluc3Bl Y3Rvci5UZXh0UHJvbXB0LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbG9hZENvbXBsZXRp b25zKHdvcmRQcmVmaXhSYW5nZSwgZm9yY2UsIHRoaXMuX2NvbXBsZXRpb25zUmVhZHkuYmluZCh0 aGlzLCBzZWxlY3Rpb24sIGF1dG8sIHdvcmRQcmVmaXhSYW5nZSwgcmV2ZXJzZSkpOwogICAgIH0s CiAKKyAgICBfYm94Rm9yQW5jaG9yQXRTdGFydDogZnVuY3Rpb24oc2VsZWN0aW9uLCB0ZXh0UmFu Z2UpCisgICAgeworICAgICAgICB2YXIgcmFuZ2VDb3B5ID0gc2VsZWN0aW9uLmdldFJhbmdlQXQo MCkuY2xvbmVSYW5nZSgpOworICAgICAgICB2YXIgYW5jaG9yRWxlbWVudCA9IHRleHRSYW5nZS5z dGFydENvbnRhaW5lci5vd25lckRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKKyAgICAg ICAgYW5jaG9yRWxlbWVudC50ZXh0Q29udGVudCA9ICJcdTIwMEIiOworICAgICAgICB0ZXh0UmFu Z2UuaW5zZXJ0Tm9kZShhbmNob3JFbGVtZW50KTsKKyAgICAgICAgdmFyIGJveCA9IGFuY2hvckVs ZW1lbnQuYm94SW5XaW5kb3cod2luZG93LCB0aGlzLl9zdWdnZXN0Qm94Ll9wYXJlbnRFbGVtZW50 KTsKKyAgICAgICAgYW5jaG9yRWxlbWVudC5wYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKGFuY2hv ckVsZW1lbnQpOworICAgICAgICBzZWxlY3Rpb24ucmVtb3ZlQWxsUmFuZ2VzKCk7CisgICAgICAg IHNlbGVjdGlvbi5hZGRSYW5nZShyYW5nZUNvcHkpOworICAgICAgICByZXR1cm4gYm94OworICAg IH0sCisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+PX0gY29tcGxldGlv bnMKICAgICAgKi8KQEAgLTQwMSw3ICs0MTQsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dFByb21wdC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VzZXJFbnRlcmVkVGV4dCA9IGZ1bGxXb3JkUmFu Z2UudG9TdHJpbmcoKTsKIAogICAgICAgICBpZiAodGhpcy5fc3VnZ2VzdEJveCkgewotICAgICAg ICAgICAgdGhpcy5fc3VnZ2VzdEJveC51cGRhdGVTdWdnZXN0aW9ucyhjb21wbGV0aW9ucyk7Cisg ICAgICAgICAgICB0aGlzLl9zdWdnZXN0Qm94LnVwZGF0ZVN1Z2dlc3Rpb25zKGNvbXBsZXRpb25z LCB0aGlzLl9ib3hGb3JBbmNob3JBdFN0YXJ0KHNlbGVjdGlvbiwgZnVsbFdvcmRSYW5nZSkpOwog ICAgICAgICAgICAgcmV0dXJuOyAvLyBEbyBub3RoaW5nLCB0aGUgc3VnZ2VzdCBib3ggaXMgZHJp dmluZyB1cy4KICAgICAgICAgfQogCkBAIC04NTIsNyArODY1LDEwIEBAIFdlYkluc3BlY3Rvci5U ZXh0UHJvbXB0LlN1Z2dlc3RCb3gucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVC b3hQb3NpdGlvbigpOwogICAgIH0sCiAKLSAgICBfdXBkYXRlQm94UG9zaXRpb246IGZ1bmN0aW9u KCkKKyAgICAvKioKKyAgICAgKiBAcGFyYW0geyo9fSBhbmNob3JCb3gKKyAgICAgKi8KKyAgICBf dXBkYXRlQm94UG9zaXRpb246IGZ1bmN0aW9uKGFuY2hvckJveCkKICAgICB7CiAgICAgICAgIC8v IE1lYXN1cmUgdGhlIGNvbnRlbnQgZWxlbWVudCBib3guCiAgICAgICAgIHRoaXMuY29udGVudEVs ZW1lbnQuc3R5bGUuZGlzcGxheSA9ICJpbmxpbmUtYmxvY2siOwpAQCAtODY0LDI4ICs4ODAsNDEg QEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3VnZ2VzdEJveC5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMuY29udGFpbmVyRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRlbnRFbGVtZW50 KTsKIAogICAgICAgICAvLyBMYXkgb3V0IHRoZSBzdWdnZXN0LWJveCByZWxhdGl2ZSB0byB0aGUg YW5jaG9yQm94LgotICAgICAgICBjb25zdCBhbmNob3JCb3ggPSB0aGlzLl9pbnB1dEVsZW1lbnQu Ym94SW5XaW5kb3cod2luZG93LCB0aGlzLl9wYXJlbnRFbGVtZW50KTsKKyAgICAgICAgaWYgKCFh bmNob3JCb3gpCisgICAgICAgICAgICBhbmNob3JCb3ggPSB0aGlzLl9hbmNob3JCb3ggfHwgdGhp cy5faW5wdXRFbGVtZW50LmJveEluV2luZG93KHdpbmRvdywgdGhpcy5fcGFyZW50RWxlbWVudCk7 CisgICAgICAgIHRoaXMuX2FuY2hvckJveCA9IGFuY2hvckJveDsKICAgICAgICAgY29uc3Qgc3Vn Z2VzdEJveFBhZGRpbmdYID0gMjE7CiAgICAgICAgIGNvbnN0IHN1Z2dlc3RCb3hQYWRkaW5nWSA9 IDI7CiAgICAgICAgIGNvbnN0IHNwYWNlciA9IDY7CiAgICAgICAgIGNvbnN0IG1pbkhlaWdodCA9 IDI1OwotICAgICAgICBjb25zdCBtYXhXaWR0aCA9IGRvY3VtZW50LmJvZHkub2Zmc2V0V2lkdGgg LSBhbmNob3JCb3gueCAtIHNwYWNlcjsKLSAgICAgICAgY29uc3Qgd2lkdGggPSBNYXRoLm1pbihj b250ZW50V2lkdGgsIG1heFdpZHRoIC0gc3VnZ2VzdEJveFBhZGRpbmdYKSArIHN1Z2dlc3RCb3hQ YWRkaW5nWDsKKyAgICAgICAgdmFyIG1heFdpZHRoID0gZG9jdW1lbnQuYm9keS5vZmZzZXRXaWR0 aCAtIGFuY2hvckJveC54IC0gc3BhY2VyOworICAgICAgICB2YXIgd2lkdGggPSBNYXRoLm1pbihj b250ZW50V2lkdGgsIG1heFdpZHRoIC0gc3VnZ2VzdEJveFBhZGRpbmdYKSArIHN1Z2dlc3RCb3hQ YWRkaW5nWDsKIAogICAgICAgICB2YXIgbWF4SGVpZ2h0ID0gZG9jdW1lbnQuYm9keS5vZmZzZXRI ZWlnaHQgLSBhbmNob3JCb3gueSAtIGFuY2hvckJveC5oZWlnaHQgLSBzcGFjZXI7CisgICAgICAg IHZhciBwYWRkZWRXaWR0aCA9IGNvbnRlbnRXaWR0aCArIHN1Z2dlc3RCb3hQYWRkaW5nWDsKICAg ICAgICAgdmFyIHBhZGRlZEhlaWdodCA9IGNvbnRlbnRIZWlnaHQgKyBzdWdnZXN0Qm94UGFkZGlu Z1k7CiAgICAgICAgIHZhciBoZWlnaHQgPSBNYXRoLm1pbihwYWRkZWRIZWlnaHQsIG1heEhlaWdo dCk7CisgICAgICAgIHZhciBib3hYID0gYW5jaG9yQm94Lng7CisgICAgICAgIHZhciBib3hZOwog ICAgICAgICBpZiAoaGVpZ2h0ID49IG1pbkhlaWdodCB8fCBoZWlnaHQgPT09IHBhZGRlZEhlaWdo dCkgewogICAgICAgICAgICAgLy8gTG9jYXRlIHRoZSBzdWdnZXN0IGJveCB1bmRlciB0aGUgYW5j aG9yQm94LgotICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5wb3NpdGlvbkF0KGFuY2hvckJveC54 LCBhbmNob3JCb3gueSArIGFuY2hvckJveC5oZWlnaHQpOworICAgICAgICAgICAgYm94WSA9IGFu Y2hvckJveC55ICsgYW5jaG9yQm94LmhlaWdodDsKICAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQu cmVtb3ZlU3R5bGVDbGFzcygiYWJvdmUtYW5jaG9yIik7CiAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAvLyBMb2NhdGUgdGhlIHN1Z2dlc3QgYm94IGFib3ZlIHRoZSBhbmNob3JCb3guCiAg ICAgICAgICAgICBtYXhIZWlnaHQgPSBhbmNob3JCb3gueSAtIHNwYWNlcjsKICAgICAgICAgICAg IGhlaWdodCA9IE1hdGgubWluKGNvbnRlbnRIZWlnaHQsIG1heEhlaWdodCAtIHN1Z2dlc3RCb3hQ YWRkaW5nWSkgKyBzdWdnZXN0Qm94UGFkZGluZ1k7Ci0gICAgICAgICAgICB0aGlzLl9lbGVtZW50 LnBvc2l0aW9uQXQoYW5jaG9yQm94LngsIGFuY2hvckJveC55IC0gaGVpZ2h0KTsKKyAgICAgICAg ICAgIGJveFkgPSBhbmNob3JCb3gueSAtIGhlaWdodDsKICAgICAgICAgICAgIHRoaXMuX2VsZW1l bnQuYWRkU3R5bGVDbGFzcygiYWJvdmUtYW5jaG9yIik7CiAgICAgICAgIH0KKworICAgICAgICBp ZiAod2lkdGggPCBwYWRkZWRXaWR0aCkgeworICAgICAgICAgICAgLy8gU2hpZnQgdGhlIHN1Z2dl c3QgYm94IHRvIHRoZSBsZWZ0IHRvIGFjY29tbW9kYXRlIHRoZSBjb250ZW50IHdpdGhvdXQgdHJp bW1pbmcgdG8gdGhlIEJPRFkgZWRnZS4KKyAgICAgICAgICAgIG1heFdpZHRoID0gZG9jdW1lbnQu Ym9keS5vZmZzZXRXaWR0aCAtIHNwYWNlcjsKKyAgICAgICAgICAgIHdpZHRoID0gTWF0aC5taW4o Y29udGVudFdpZHRoLCBtYXhXaWR0aCAtIHN1Z2dlc3RCb3hQYWRkaW5nWCkgKyBzdWdnZXN0Qm94 UGFkZGluZ1g7CisgICAgICAgICAgICBib3hYID0gZG9jdW1lbnQuYm9keS5vZmZzZXRXaWR0aCAt IHdpZHRoOworICAgICAgICB9CisgICAgICAgIHRoaXMuX2VsZW1lbnQucG9zaXRpb25BdChib3hY LCBib3hZKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5zdHlsZS53aWR0aCA9IHdpZHRoICsgInB4 IjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5zdHlsZS5oZWlnaHQgPSBoZWlnaHQgKyAicHgiOwog ICAgIH0sCkBAIC05ODQsMTQgKzEwMTMsMTUgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3Vn Z2VzdEJveC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0FycmF5Ljxz dHJpbmc+PX0gY29tcGxldGlvbnMKKyAgICAgKiBAcGFyYW0geyo9fSBhbmNob3JCb3gKICAgICAg Ki8KLSAgICB1cGRhdGVTdWdnZXN0aW9uczogZnVuY3Rpb24oY29tcGxldGlvbnMpCisgICAgdXBk YXRlU3VnZ2VzdGlvbnM6IGZ1bmN0aW9uKGNvbXBsZXRpb25zLCBhbmNob3JCb3gpCiAgICAgewog ICAgICAgICBpZiAodGhpcy5fc3VnZ2VzdFRpbWVvdXQpIHsKICAgICAgICAgICAgIGNsZWFyVGlt ZW91dCh0aGlzLl9zdWdnZXN0VGltZW91dCk7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fc3Vn Z2VzdFRpbWVvdXQ7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fY29tcGxldGlvbnNSZWFkeShj b21wbGV0aW9ucyk7CisgICAgICAgIHRoaXMuX2NvbXBsZXRpb25zUmVhZHkoY29tcGxldGlvbnMs IGFuY2hvckJveCk7CiAgICAgfSwKIAogICAgIF9vbkl0ZW1Nb3VzZURvd246IGZ1bmN0aW9uKHRl eHQsIGV2ZW50KQpAQCAtMTA1NSw4ICsxMDg1LDkgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQu U3VnZ2VzdEJveC5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0FycmF5 LjxzdHJpbmc+PX0gY29tcGxldGlvbnMKKyAgICAgKiBAcGFyYW0geyo9fSBhbmNob3JCb3gKICAg ICAgKi8KLSAgICBfY29tcGxldGlvbnNSZWFkeTogZnVuY3Rpb24oY29tcGxldGlvbnMpCisgICAg X2NvbXBsZXRpb25zUmVhZHk6IGZ1bmN0aW9uKGNvbXBsZXRpb25zLCBhbmNob3JCb3gpCiAgICAg ewogICAgICAgICBpZiAoIWNvbXBsZXRpb25zIHx8ICFjb21wbGV0aW9ucy5sZW5ndGgpIHsKICAg ICAgICAgICAgIHRoaXMuaGlkZSgpCkBAIC0xMDY0LDcgKzEwOTUsNyBAQCBXZWJJbnNwZWN0b3Iu VGV4dFByb21wdC5TdWdnZXN0Qm94LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAg IHRoaXMuX3VwZGF0ZUl0ZW1zKGNvbXBsZXRpb25zKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlQm94 UG9zaXRpb24oKTsKKyAgICAgICAgdGhpcy5fdXBkYXRlQm94UG9zaXRpb24oYW5jaG9yQm94KTsK ICAgICAgICAgaWYgKHRoaXMuY29udGVudEVsZW1lbnQuY2hpbGRyZW4ubGVuZ3RoICYmICh0aGlz LmNvbnRlbnRFbGVtZW50LmNoaWxkcmVuLmxlbmd0aCA+IDEgfHwgdGhpcy5jb250ZW50RWxlbWVu dC5jaGlsZHJlblswXS50ZXh0Q29udGVudC5sZW5ndGggIT09IHRoaXMuX3RleHRQcm9tcHQuX3Vz ZXJFbnRlcmVkVGV4dC5sZW5ndGgpKSB7CiAgICAgICAgICAgICAvLyBXaWxsIG5vdCBiZSBzaG93 biBpZiBhIHNvbGUgc3VnZ2VzdGlvbiBpcyBlcXVhbCB0byB0aGUgdXNlciBpbnB1dC4KICAgICAg ICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkU3R5bGVDbGFzcygidmlzaWJsZSIpOwo= 114514 2011-11-10 08:59:01 -0800 2011-11-10 09:02:55 -0800 Patch bug-72022-20111110205859.patch text/plain 10565 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogOTk4NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzZjQ4YTUxYzc0NDg1NzRi M2RlYTRjMGU0ZGI4M2QzMTNmODE4N2U4Li4wMmE2MDhhOWRlZmVhNzg4Mjk1MDFjMDliNjI3NmRk Yjc2ZWZhY2RlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjkgQEAKIDIwMTEtMTEtMTAgIEFsZXhh bmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVj dG9yOiBbU3VnZ2VzdEJveF0gQ29ycmVjdGx5IHBvc2l0aW9uIHRoZSBib3ggdW5kZXIgdGhlIGZp cnN0IGNoYXJhY3RlciBvZiB0aGUgc3VnZ2VzdGlvbiBwcmVmaXguCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjAyMgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9uIGFueSBzdWdnZXN0IGJveCBwb3NpdGlv biB1cGRhdGUgKHVwZGF0ZVN1Z2dlc3Rpb25zIGludm9jYXRpb24pIGFuIGFuY2hvciBpcyBjcmVh dGVkIGF0IHRoZSBiZWdpbm5pbmcKKyAgICAgICAgb2YgdGhlIHVzZXItZW50ZXJlZCB3b3JkLCBh bmQgaXRzIGJveCBpcyB1bHRpbWF0ZWx5IHBhc3NlZCBpbnRvIF91cGRhdGVCb3hQb3NpdGlvbiB0 byBiZSB1c2VkIGFzIHRoZQorICAgICAgICBhY3R1YWwgYW5jaG9yIGJveCAoaW5zdGVhZCBvZiB0 aGUgaW5wdXQgZWxlbWVudCBib3gpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9U ZXh0UHJvbXB0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBl Ll9ib3hGb3JBbmNob3JBdFN0YXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0 LnByb3RvdHlwZS5fY29tcGxldGlvbnNSZWFkeSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dFByb21wdC5TdWdnZXN0Qm94KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LlN1 Z2dlc3RCb3gucHJvdG90eXBlLl9vbnNjcm9sbHJlc2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGV4dFByb21wdC5TdWdnZXN0Qm94LnByb3RvdHlwZS5fdXBkYXRlQm94UG9zaXRpb25XaXRo RXhpc3RpbmdBbmNob3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3VnZ2Vz dEJveC5wcm90b3R5cGUuX3VwZGF0ZUJveFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UZXh0UHJvbXB0LlN1Z2dlc3RCb3gucHJvdG90eXBlLnVwZGF0ZVN1Z2dlc3Rpb25zKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LlN1Z2dlc3RCb3gucHJvdG90eXBlLl9jb21w bGV0aW9uc1JlYWR5KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3V0aWxpdGllcy5q czoKKyAgICAgICAgKEFuY2hvckJveCk6CisgICAgICAgIChFbGVtZW50LnByb3RvdHlwZS5vZmZz ZXRSZWxhdGl2ZVRvV2luZG93KToKKworMjAxMS0xMS0xMCAgQWxleGFuZGVyIFBhdmxvdiAgPGFw YXZsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNob3cgbWVkaWEg cXVlcmllcyBhc3NvY2lhdGVkIHdpdGggc3BlY2lmaWMgQ1NTIHJ1bGVzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTYyNgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKaW5kZXggZGI4ZDE3YmY4 MmY2ZjE0MmRjMGY5MDcxZjc2Y2U2NGJkNThjNDliMy4uYzUzYTM1YzZhZDRmNjBhNTc3NzczYzU2 ODIzMDkzMDE5YTA3NTc4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0UHJvbXB0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGV4dFByb21wdC5qcwpAQCAtMzc3LDYgKzM3NywxOSBAQCBXZWJJbnNwZWN0b3IuVGV4 dFByb21wdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2xvYWRDb21wbGV0aW9ucyh3b3Jk UHJlZml4UmFuZ2UsIGZvcmNlLCB0aGlzLl9jb21wbGV0aW9uc1JlYWR5LmJpbmQodGhpcywgc2Vs ZWN0aW9uLCBhdXRvLCB3b3JkUHJlZml4UmFuZ2UsIHJldmVyc2UpKTsKICAgICB9LAogCisgICAg X2JveEZvckFuY2hvckF0U3RhcnQ6IGZ1bmN0aW9uKHNlbGVjdGlvbiwgdGV4dFJhbmdlKQorICAg IHsKKyAgICAgICAgdmFyIHJhbmdlQ29weSA9IHNlbGVjdGlvbi5nZXRSYW5nZUF0KDApLmNsb25l UmFuZ2UoKTsKKyAgICAgICAgdmFyIGFuY2hvckVsZW1lbnQgPSB0ZXh0UmFuZ2Uuc3RhcnRDb250 YWluZXIub3duZXJEb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIGFuY2hv ckVsZW1lbnQudGV4dENvbnRlbnQgPSAiXHUyMDBCIjsKKyAgICAgICAgdGV4dFJhbmdlLmluc2Vy dE5vZGUoYW5jaG9yRWxlbWVudCk7CisgICAgICAgIHZhciBib3ggPSBhbmNob3JFbGVtZW50LmJv eEluV2luZG93KHdpbmRvdywgdGhpcy5fc3VnZ2VzdEJveC5fcGFyZW50RWxlbWVudCk7CisgICAg ICAgIGFuY2hvckVsZW1lbnQucGFyZW50RWxlbWVudC5yZW1vdmVDaGlsZChhbmNob3JFbGVtZW50 KTsKKyAgICAgICAgc2VsZWN0aW9uLnJlbW92ZUFsbFJhbmdlcygpOworICAgICAgICBzZWxlY3Rp b24uYWRkUmFuZ2UocmFuZ2VDb3B5KTsKKyAgICAgICAgcmV0dXJuIGJveDsKKyAgICB9LAorCiAg ICAgLyoqCiAgICAgICogQHBhcmFtIHtBcnJheS48c3RyaW5nPj19IGNvbXBsZXRpb25zCiAgICAg ICovCkBAIC00MDEsNyArNDE0LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBl ID0gewogICAgICAgICB0aGlzLl91c2VyRW50ZXJlZFRleHQgPSBmdWxsV29yZFJhbmdlLnRvU3Ry aW5nKCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3N1Z2dlc3RCb3gpIHsKLSAgICAgICAgICAgIHRo aXMuX3N1Z2dlc3RCb3gudXBkYXRlU3VnZ2VzdGlvbnMoY29tcGxldGlvbnMpOworICAgICAgICAg ICAgdGhpcy5fc3VnZ2VzdEJveC51cGRhdGVTdWdnZXN0aW9ucyh0aGlzLl9ib3hGb3JBbmNob3JB dFN0YXJ0KHNlbGVjdGlvbiwgZnVsbFdvcmRSYW5nZSksIGNvbXBsZXRpb25zKTsKICAgICAgICAg ICAgIHJldHVybjsgLy8gRG8gbm90aGluZywgdGhlIHN1Z2dlc3QgYm94IGlzIGRyaXZpbmcgdXMu CiAgICAgICAgIH0KIApAQCAtODMwLDggKzg0Myw2IEBAIFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0 LlN1Z2dlc3RCb3ggPSBmdW5jdGlvbih0ZXh0UHJvbXB0LCBpbnB1dEVsZW1lbnQsIGNsYXNzTmFt CiAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9v bmJveG1vdXNlZG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB0aGlzLmNvbnRhaW5lckVsZW1l bnQgPSB0aGlzLl9lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAiY29udGFpbmVyIik7CiAgICAg dGhpcy5jb250ZW50RWxlbWVudCA9IHRoaXMuY29udGFpbmVyRWxlbWVudC5jcmVhdGVDaGlsZCgi ZGl2IiwgImNvbnRlbnQiKTsKLQotICAgIHRoaXMuX3VwZGF0ZUJveFBvc2l0aW9uKCk7CiB9CiAK IFdlYkluc3BlY3Rvci5UZXh0UHJvbXB0LlN1Z2dlc3RCb3gucHJvdG90eXBlID0gewpAQCAtODQ3 LDEyICs4NTgsMjAgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3VnZ2VzdEJveC5wcm90b3R5 cGUgPSB7CiAKICAgICBfb25zY3JvbGxyZXNpemU6IGZ1bmN0aW9uKGlzU2Nyb2xsLCBldmVudCkK ICAgICB7Ci0gICAgICAgIGlmIChpc1Njcm9sbCAmJiB0aGlzLl9lbGVtZW50LmlzQW5jZXN0b3Io ZXZlbnQudGFyZ2V0KSkKKyAgICAgICAgaWYgKGlzU2Nyb2xsICYmIHRoaXMuX2VsZW1lbnQuaXNB bmNlc3RvcihldmVudC50YXJnZXQpIHx8ICF0aGlzLnZpc2libGUpCiAgICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIHRoaXMuX3VwZGF0ZUJveFBvc2l0aW9uKCk7CisgICAgICAgIHRoaXMuX3Vw ZGF0ZUJveFBvc2l0aW9uV2l0aEV4aXN0aW5nQW5jaG9yKCk7CiAgICAgfSwKIAotICAgIF91cGRh dGVCb3hQb3NpdGlvbjogZnVuY3Rpb24oKQorICAgIF91cGRhdGVCb3hQb3NpdGlvbldpdGhFeGlz dGluZ0FuY2hvcjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdXBkYXRlQm94UG9z aXRpb24odGhpcy5fYW5jaG9yQm94KTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtBbmNob3JCb3h9IGFuY2hvckJveAorICAgICAqLworICAgIF91cGRhdGVCb3hQb3NpdGlvbjog ZnVuY3Rpb24oYW5jaG9yQm94KQogICAgIHsKICAgICAgICAgLy8gTWVhc3VyZSB0aGUgY29udGVu dCBlbGVtZW50IGJveC4KICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5zdHlsZS5kaXNwbGF5 ID0gImlubGluZS1ibG9jayI7CkBAIC04NjQsMjggKzg4MywzOSBAQCBXZWJJbnNwZWN0b3IuVGV4 dFByb21wdC5TdWdnZXN0Qm94LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5jb250YWluZXJF bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuY29udGVudEVsZW1lbnQpOwogCiAgICAgICAgIC8vIExh eSBvdXQgdGhlIHN1Z2dlc3QtYm94IHJlbGF0aXZlIHRvIHRoZSBhbmNob3JCb3guCi0gICAgICAg IGNvbnN0IGFuY2hvckJveCA9IHRoaXMuX2lucHV0RWxlbWVudC5ib3hJbldpbmRvdyh3aW5kb3cs IHRoaXMuX3BhcmVudEVsZW1lbnQpOworICAgICAgICB0aGlzLl9hbmNob3JCb3ggPSBhbmNob3JC b3g7CiAgICAgICAgIGNvbnN0IHN1Z2dlc3RCb3hQYWRkaW5nWCA9IDIxOwogICAgICAgICBjb25z dCBzdWdnZXN0Qm94UGFkZGluZ1kgPSAyOwogICAgICAgICBjb25zdCBzcGFjZXIgPSA2OwogICAg ICAgICBjb25zdCBtaW5IZWlnaHQgPSAyNTsKLSAgICAgICAgY29uc3QgbWF4V2lkdGggPSBkb2N1 bWVudC5ib2R5Lm9mZnNldFdpZHRoIC0gYW5jaG9yQm94LnggLSBzcGFjZXI7Ci0gICAgICAgIGNv bnN0IHdpZHRoID0gTWF0aC5taW4oY29udGVudFdpZHRoLCBtYXhXaWR0aCAtIHN1Z2dlc3RCb3hQ YWRkaW5nWCkgKyBzdWdnZXN0Qm94UGFkZGluZ1g7CisgICAgICAgIHZhciBtYXhXaWR0aCA9IGRv Y3VtZW50LmJvZHkub2Zmc2V0V2lkdGggLSBhbmNob3JCb3gueCAtIHNwYWNlcjsKKyAgICAgICAg dmFyIHdpZHRoID0gTWF0aC5taW4oY29udGVudFdpZHRoLCBtYXhXaWR0aCAtIHN1Z2dlc3RCb3hQ YWRkaW5nWCkgKyBzdWdnZXN0Qm94UGFkZGluZ1g7CiAKICAgICAgICAgdmFyIG1heEhlaWdodCA9 IGRvY3VtZW50LmJvZHkub2Zmc2V0SGVpZ2h0IC0gYW5jaG9yQm94LnkgLSBhbmNob3JCb3guaGVp Z2h0IC0gc3BhY2VyOworICAgICAgICB2YXIgcGFkZGVkV2lkdGggPSBjb250ZW50V2lkdGggKyBz dWdnZXN0Qm94UGFkZGluZ1g7CiAgICAgICAgIHZhciBwYWRkZWRIZWlnaHQgPSBjb250ZW50SGVp Z2h0ICsgc3VnZ2VzdEJveFBhZGRpbmdZOwogICAgICAgICB2YXIgaGVpZ2h0ID0gTWF0aC5taW4o cGFkZGVkSGVpZ2h0LCBtYXhIZWlnaHQpOworICAgICAgICB2YXIgYm94WCA9IGFuY2hvckJveC54 OworICAgICAgICB2YXIgYm94WTsKICAgICAgICAgaWYgKGhlaWdodCA+PSBtaW5IZWlnaHQgfHwg aGVpZ2h0ID09PSBwYWRkZWRIZWlnaHQpIHsKICAgICAgICAgICAgIC8vIExvY2F0ZSB0aGUgc3Vn Z2VzdCBib3ggdW5kZXIgdGhlIGFuY2hvckJveC4KLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQu cG9zaXRpb25BdChhbmNob3JCb3gueCwgYW5jaG9yQm94LnkgKyBhbmNob3JCb3guaGVpZ2h0KTsK KyAgICAgICAgICAgIGJveFkgPSBhbmNob3JCb3gueSArIGFuY2hvckJveC5oZWlnaHQ7CiAgICAg ICAgICAgICB0aGlzLl9lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImFib3ZlLWFuY2hvciIpOwog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gTG9jYXRlIHRoZSBzdWdnZXN0IGJveCBh Ym92ZSB0aGUgYW5jaG9yQm94LgogICAgICAgICAgICAgbWF4SGVpZ2h0ID0gYW5jaG9yQm94Lnkg LSBzcGFjZXI7CiAgICAgICAgICAgICBoZWlnaHQgPSBNYXRoLm1pbihjb250ZW50SGVpZ2h0LCBt YXhIZWlnaHQgLSBzdWdnZXN0Qm94UGFkZGluZ1kpICsgc3VnZ2VzdEJveFBhZGRpbmdZOwotICAg ICAgICAgICAgdGhpcy5fZWxlbWVudC5wb3NpdGlvbkF0KGFuY2hvckJveC54LCBhbmNob3JCb3gu eSAtIGhlaWdodCk7CisgICAgICAgICAgICBib3hZID0gYW5jaG9yQm94LnkgLSBoZWlnaHQ7CiAg ICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImFib3ZlLWFuY2hvciIpOwog ICAgICAgICB9CisKKyAgICAgICAgaWYgKHdpZHRoIDwgcGFkZGVkV2lkdGgpIHsKKyAgICAgICAg ICAgIC8vIFNoaWZ0IHRoZSBzdWdnZXN0IGJveCB0byB0aGUgbGVmdCB0byBhY2NvbW1vZGF0ZSB0 aGUgY29udGVudCB3aXRob3V0IHRyaW1taW5nIHRvIHRoZSBCT0RZIGVkZ2UuCisgICAgICAgICAg ICBtYXhXaWR0aCA9IGRvY3VtZW50LmJvZHkub2Zmc2V0V2lkdGggLSBzcGFjZXI7CisgICAgICAg ICAgICB3aWR0aCA9IE1hdGgubWluKGNvbnRlbnRXaWR0aCwgbWF4V2lkdGggLSBzdWdnZXN0Qm94 UGFkZGluZ1gpICsgc3VnZ2VzdEJveFBhZGRpbmdYOworICAgICAgICAgICAgYm94WCA9IGRvY3Vt ZW50LmJvZHkub2Zmc2V0V2lkdGggLSB3aWR0aDsKKyAgICAgICAgfQorICAgICAgICB0aGlzLl9l bGVtZW50LnBvc2l0aW9uQXQoYm94WCwgYm94WSk7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuc3R5 bGUud2lkdGggPSB3aWR0aCArICJweCI7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuc3R5bGUuaGVp Z2h0ID0gaGVpZ2h0ICsgInB4IjsKICAgICB9LApAQCAtOTc0LDI0ICsxMDA0LDE2IEBAIFdlYklu c3BlY3Rvci5UZXh0UHJvbXB0LlN1Z2dlc3RCb3gucHJvdG90eXBlID0gewogICAgIH0sCiAKICAg ICAvKioKKyAgICAgKiBAcGFyYW0ge0FuY2hvckJveH0gYW5jaG9yQm94CiAgICAgICogQHBhcmFt IHtBcnJheS48c3RyaW5nPj19IGNvbXBsZXRpb25zCiAgICAgICovCi0gICAgdXBkYXRlU3VnZ2Vz dGlvbnNTb29uOiBmdW5jdGlvbihjb21wbGV0aW9ucykKLSAgICB7Ci0gICAgICAgIGlmICghdGhp cy5fc3VnZ2VzdFRpbWVvdXQpCi0gICAgICAgICAgICB0aGlzLl9zdWdnZXN0VGltZW91dCA9IHNl dFRpbWVvdXQodGhpcy51cGRhdGVTdWdnZXN0aW9ucy5iaW5kKHRoaXMsIGNvbXBsZXRpb25zKSwg MTApOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+PX0g Y29tcGxldGlvbnMKLSAgICAgKi8KLSAgICB1cGRhdGVTdWdnZXN0aW9uczogZnVuY3Rpb24oY29t cGxldGlvbnMpCisgICAgdXBkYXRlU3VnZ2VzdGlvbnM6IGZ1bmN0aW9uKGFuY2hvckJveCwgY29t cGxldGlvbnMpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fc3VnZ2VzdFRpbWVvdXQpIHsKICAg ICAgICAgICAgIGNsZWFyVGltZW91dCh0aGlzLl9zdWdnZXN0VGltZW91dCk7CiAgICAgICAgICAg ICBkZWxldGUgdGhpcy5fc3VnZ2VzdFRpbWVvdXQ7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5f Y29tcGxldGlvbnNSZWFkeShjb21wbGV0aW9ucyk7CisgICAgICAgIHRoaXMuX2NvbXBsZXRpb25z UmVhZHkoYW5jaG9yQm94LCBjb21wbGV0aW9ucyk7CiAgICAgfSwKIAogICAgIF9vbkl0ZW1Nb3Vz ZURvd246IGZ1bmN0aW9uKHRleHQsIGV2ZW50KQpAQCAtMTA1NCw5ICsxMDc2LDEwIEBAIFdlYklu c3BlY3Rvci5UZXh0UHJvbXB0LlN1Z2dlc3RCb3gucHJvdG90eXBlID0gewogICAgIH0sCiAKICAg ICAvKioKKyAgICAgKiBAcGFyYW0ge0FuY2hvckJveH0gYW5jaG9yQm94CiAgICAgICogQHBhcmFt IHtBcnJheS48c3RyaW5nPj19IGNvbXBsZXRpb25zCiAgICAgICovCi0gICAgX2NvbXBsZXRpb25z UmVhZHk6IGZ1bmN0aW9uKGNvbXBsZXRpb25zKQorICAgIF9jb21wbGV0aW9uc1JlYWR5OiBmdW5j dGlvbihhbmNob3JCb3gsIGNvbXBsZXRpb25zKQogICAgIHsKICAgICAgICAgaWYgKCFjb21wbGV0 aW9ucyB8fCAhY29tcGxldGlvbnMubGVuZ3RoKSB7CiAgICAgICAgICAgICB0aGlzLmhpZGUoKQpA QCAtMTA2NCw3ICsxMDg3LDcgQEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQuU3VnZ2VzdEJveC5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl91cGRhdGVJdGVtcyhjb21w bGV0aW9ucyk7Ci0gICAgICAgIHRoaXMuX3VwZGF0ZUJveFBvc2l0aW9uKCk7CisgICAgICAgIHRo aXMuX3VwZGF0ZUJveFBvc2l0aW9uKGFuY2hvckJveCk7CiAgICAgICAgIGlmICh0aGlzLmNvbnRl bnRFbGVtZW50LmNoaWxkcmVuLmxlbmd0aCAmJiAodGhpcy5jb250ZW50RWxlbWVudC5jaGlsZHJl bi5sZW5ndGggPiAxIHx8IHRoaXMuY29udGVudEVsZW1lbnQuY2hpbGRyZW5bMF0udGV4dENvbnRl bnQubGVuZ3RoICE9PSB0aGlzLl90ZXh0UHJvbXB0Ll91c2VyRW50ZXJlZFRleHQubGVuZ3RoKSkg ewogICAgICAgICAgICAgLy8gV2lsbCBub3QgYmUgc2hvd24gaWYgYSBzb2xlIHN1Z2dlc3Rpb24g aXMgZXF1YWwgdG8gdGhlIHVzZXIgaW5wdXQuCiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmFk ZFN0eWxlQ2xhc3MoInZpc2libGUiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC91dGlsaXRpZXMuanMKaW5kZXggMmJmNmFjNjNmMDcxMTM3MDgxNmZlYTYzN2VhODU5 ZGJjZjg4OGI5Ni4uNTBmMjg2OTEyZDFmYjU1MmU4MmExZTE5MGFmY2VhNTk3NTZiMDJhNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKQEAg LTI5LDggKzI5LDYgQEAKICAqIGh0dHA6Ly9lam9obi5vcmcvZmlsZXMvanNkaWZmLmpzIChyZWxl YXNlZCB1bmRlciB0aGUgTUlUIGxpY2Vuc2UpLgogICovCiAKLWZ1bmN0aW9uIHNldHVwUHJvdG90 eXBlVXRpbGl0aWVzKCkgewotCiBGdW5jdGlvbi5wcm90b3R5cGUuYmluZCA9IGZ1bmN0aW9uKHRo aXNPYmplY3QpCiB7CiAgICAgdmFyIGZ1bmMgPSB0aGlzOwpAQCAtMjgzLDkgKzI4MSwyNyBAQCBF bGVtZW50LnByb3RvdHlwZS50b3RhbE9mZnNldFRvcCA9IGZ1bmN0aW9uKCkKICAgICByZXR1cm4g dG90YWw7CiB9CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge251bWJlcj19IHgK KyAqIEBwYXJhbSB7bnVtYmVyPX0geQorICogQHBhcmFtIHtudW1iZXI9fSB3aWR0aAorICogQHBh cmFtIHtudW1iZXI9fSBoZWlnaHQKKyAqLworZnVuY3Rpb24gQW5jaG9yQm94KHgsIHksIHdpZHRo LCBoZWlnaHQpCit7CisgICAgdGhpcy54ID0geCB8fCAwOworICAgIHRoaXMueSA9IHkgfHwgMDsK KyAgICB0aGlzLndpZHRoID0gd2lkdGggfHwgMDsKKyAgICB0aGlzLmhlaWdodCA9IGhlaWdodCB8 fCAwOworfQorCisvKioKKyAqIEByZXR1cm4ge0FuY2hvckJveH0KKyAqLwogRWxlbWVudC5wcm90 b3R5cGUub2Zmc2V0UmVsYXRpdmVUb1dpbmRvdyA9IGZ1bmN0aW9uKHRhcmdldFdpbmRvdykKIHsK LSAgICB2YXIgZWxlbWVudE9mZnNldCA9IHt4OiAwLCB5OiAwfTsKKyAgICB2YXIgZWxlbWVudE9m ZnNldCA9IG5ldyBBbmNob3JCb3goKTsKICAgICB2YXIgY3VyRWxlbWVudCA9IHRoaXM7CiAgICAg dmFyIGN1cldpbmRvdyA9IHRoaXMub3duZXJEb2N1bWVudC5kZWZhdWx0VmlldzsKICAgICB3aGls ZSAoY3VyV2luZG93ICYmIGN1ckVsZW1lbnQpIHsKQEAgLTMwMSw2ICszMTcsOSBAQCBFbGVtZW50 LnByb3RvdHlwZS5vZmZzZXRSZWxhdGl2ZVRvV2luZG93ID0gZnVuY3Rpb24odGFyZ2V0V2luZG93 KQogICAgIHJldHVybiBlbGVtZW50T2Zmc2V0OwogfQogCisvKioKKyAqIEByZXR1cm4ge0FuY2hv ckJveH0KKyAqLwogRWxlbWVudC5wcm90b3R5cGUuYm94SW5XaW5kb3cgPSBmdW5jdGlvbih0YXJn ZXRXaW5kb3csIHJlbGF0aXZlUGFyZW50KQogewogICAgIHRhcmdldFdpbmRvdyA9IHRhcmdldFdp bmRvdyB8fCB0aGlzLm93bmVyRG9jdW1lbnQuZGVmYXVsdFZpZXc7CkBAIC04NTMsMTAgKzg3Miw2 IEBAIFN0cmluZy5mb3JtYXQgPSBmdW5jdGlvbihmb3JtYXQsIHN1YnN0aXR1dGlvbnMsIGZvcm1h dHRlcnMsIGluaXRpYWxWYWx1ZSwgYXBwZW5kCiAgICAgcmV0dXJuIHsgZm9ybWF0dGVkUmVzdWx0 OiByZXN1bHQsIHVudXNlZFN1YnN0aXR1dGlvbnM6IHVudXNlZFN1YnN0aXR1dGlvbnMgfTsKIH0K IAotfSAvLyBzZXR1cFByb3RvdHlwZVV0aWxpdGllcygpCi0KLXNldHVwUHJvdG90eXBlVXRpbGl0 aWVzKCk7Ci0KIGZ1bmN0aW9uIGlzRW50ZXJLZXkoZXZlbnQpIHsKICAgICAvLyBDaGVjayBpZiBp biBJTUUuCiAgICAgcmV0dXJuIGV2ZW50LmtleUNvZGUgIT09IDIyOSAmJiBldmVudC5rZXlJZGVu dGlmaWVyID09PSAiRW50ZXIiOwo=