127816 2014-01-28 16:09:06 -0800 Web Inspector: [REGRESSION(r162931)] Tab navigation broken in DataGrid 2014-01-29 05:53:17 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Minor --- 1 dpino webkit-unassigned commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 973200 0 dpino 2014-01-28 16:09:06 -0800 Tab navigation in the DataGrid doesn't work properly after r162931. How to reproduce: * Fill a DataGrid (for example LocalStorage) with two rows of data. * Edit row1.key and press tab. Expected result: cursor moves to row1.value. Actual result: cursor moves to row2.key. After r162931, columnIdentifier is a string. It's necessary to change comparisons of columnIdentifier in 'moveToNextIfNeeded' (function that handles tab navigation) to string values. 973201 1 webkit-bug-importer 2014-01-28 16:09:56 -0800 <rdar://problem/15931228> 973207 2 222528 dpino 2014-01-28 16:17:04 -0800 Created attachment 222528 Patch 973213 3 222528 timothy 2014-01-28 16:26:44 -0800 Comment on attachment 222528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222528&action=review > Source/WebInspectorUI/UserInterface/DataGrid.js:361 > return this._startEditingColumnOfDataGridNode(currentEditingNode, 1); There are a few 1s and 0s in this function that should also be strings for clarity. Right now they are being converted later into string. > Source/WebInspectorUI/UserInterface/DataGrid.js:375 > return this._startEditingColumnOfDataGridNode(currentEditingNode, 0); Another 0, but there are more. 973219 4 timothy 2014-01-28 16:36:29 -0800 This code is so confused… it assumes only two columns with numeric identifiers. Sigh. 973331 5 222562 dpino 2014-01-29 03:01:20 -0800 Created attachment 222562 Patch 973347 6 222566 dpino 2014-01-29 04:28:31 -0800 Created attachment 222566 Patch 973353 7 222566 commit-queue 2014-01-29 05:53:15 -0800 Comment on attachment 222566 Patch Clearing flags on attachment: 222566 Committed r163015: <http://trac.webkit.org/changeset/163015> 973354 8 commit-queue 2014-01-29 05:53:17 -0800 All reviewed patches have been landed. Closing bug. 222528 2014-01-28 16:17:04 -0800 2014-01-29 03:00:48 -0800 Patch bug-127816-20140129011703.patch text/plain 2340 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyOTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm M2RkOWJlNmM2NWNmZTI5YjdiOGZjNGUwMGY5YWIwMzI4ODkxYjQwLi5iNjU4NDg4YzQwMTJmNjNl YzYyZmIwYjhkOWI2Njc3M2IxODMzODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNyBAQAogMjAxNC0wMS0yOCAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OKHIxNjI5MzEpXSBUYWIg bmF2aWdhdGlvbiBicm9rZW4gaW4gRGF0YUdyaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzgxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9EYXRhR3JpZC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUubW92ZVRvTmV4dElmTmVlZGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX2VkaXRpbmdDb21taXR0 ZWQpOgorICAgICAgICBDb21wYXJlICdjb2x1bW5JZGVudGlmaWVyJyBhZ2FpbnN0IHN0cmluZyBj b25zdGFudHMgIjAiIG9yICIxIgorCisyMDE0LTAxLTI4ICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRw aW5vQGlnYWxpYS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW4gYSBEYXRhR3JpZCwg c3RvcmUgdmFsdWUgb2YgY29sdW1uSWRlbnRpZmllciB0byBET00gbm9kZSByZXByZXNlbnRpbmcg YSBjZWxsCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Mjc2MTMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3Jp ZC5qcwppbmRleCA4MjEyMWU4N2U4NjQ3OWEwMWQ4ZDRiZGRhNzgzNjlmMThiN2YxODI2Li44OTkw MGE4OTViZDAwZGRmYjk5NzAxZWY0MTlhMjZjNDY2ZGY4ZjViIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5qcwpAQCAtMzU0LDEwICszNTQsMTAg QEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgICAgIGlmIChtb3ZlRGlyZWN0aW9uID09PSAiZm9yd2FyZCIpIHsK LSAgICAgICAgICAgICAgICBpZiAoY3VycmVudEVkaXRpbmdOb2RlLmlzQ3JlYXRpb25Ob2RlICYm IGNvbHVtbklkZW50aWZpZXIgPT09IDAgJiYgIXdhc0NoYW5nZSkKKyAgICAgICAgICAgICAgICBp ZiAoY3VycmVudEVkaXRpbmdOb2RlLmlzQ3JlYXRpb25Ob2RlICYmIGNvbHVtbklkZW50aWZpZXIg PT09ICIwIiAmJiAhd2FzQ2hhbmdlKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gMCkKKyAgICAgICAgICAgICAg ICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gIjAiKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUoY3VycmVudEVkaXRpbmdO b2RlLCAxKTsKIAogICAgICAgICAgICAgICAgIHZhciBuZXh0RGF0YUdyaWROb2RlID0gY3VycmVu dEVkaXRpbmdOb2RlLnRyYXZlcnNlTmV4dE5vZGUodHJ1ZSwgbnVsbCwgdHJ1ZSk7CkBAIC0zNzEs NyArMzcxLDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIH0KIAogICAgICAgICAgICAgaWYgKG1vdmVEaXJlY3Rpb24gPT09ICJiYWNrd2FyZCIpIHsK LSAgICAgICAgICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gMSkKKyAgICAgICAgICAg ICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gIjEiKQogICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUoY3VycmVudEVkaXRp bmdOb2RlLCAwKTsKICAgICAgICAgICAgICAgICAgICAgdmFyIG5leHREYXRhR3JpZE5vZGUgPSBj dXJyZW50RWRpdGluZ05vZGUudHJhdmVyc2VQcmV2aW91c05vZGUodHJ1ZSwgbnVsbCwgdHJ1ZSk7 CiAK 222562 2014-01-29 03:01:20 -0800 2014-01-29 04:28:22 -0800 Patch bug-127816-20140129120118.patch text/plain 3248 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyOTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm M2RkOWJlNmM2NWNmZTI5YjdiOGZjNGUwMGY5YWIwMzI4ODkxYjQwLi4xN2I4ODcyYzdmODM5YTY0 NWY0MDlhZGMwMDUzZGM1MzA0ZjJmNTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNC0wMS0yOSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OKHIxNjI5MzEpXSBUYWIg bmF2aWdhdGlvbiBicm9rZW4gaW4gRGF0YUdyaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzgxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9EYXRhR3JpZC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUubW92ZVRvTmV4dElmTmVlZGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX2VkaXRpbmdDb21taXR0 ZWQpOgorICAgICAgICBDaGFuZ2UgY29sdW1uSWRlbnRpZmllciB2YWx1ZXMgMCBhbmQgMSB0byBz dHJpbmdzICIwIiBhbmQgIjEiLgorCiAyMDE0LTAxLTI4ICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRw aW5vQGlnYWxpYS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW4gYSBEYXRhR3JpZCwg c3RvcmUgdmFsdWUgb2YgY29sdW1uSWRlbnRpZmllciB0byBET00gbm9kZSByZXByZXNlbnRpbmcg YSBjZWxsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9E YXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RhdGFHcmlk LmpzCmluZGV4IDgyMTIxZTg3ZTg2NDc5YTAxZDhkNGJkZGE3ODM2OWYxOGI3ZjE4MjYuLjUyZTVm MDlhYjgwYjFjMmUyZWIyZmY4ODdlNTRjOGIxZjY1YTcyNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RhdGFHcmlkLmpzCkBAIC0zNTQsMjkgKzM1NCwyOSBA QCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICAgICAgaWYgKG1vdmVEaXJlY3Rpb24gPT09ICJmb3J3YXJkIikgewot ICAgICAgICAgICAgICAgIGlmIChjdXJyZW50RWRpdGluZ05vZGUuaXNDcmVhdGlvbk5vZGUgJiYg Y29sdW1uSWRlbnRpZmllciA9PT0gMCAmJiAhd2FzQ2hhbmdlKQorICAgICAgICAgICAgICAgIGlm IChjdXJyZW50RWRpdGluZ05vZGUuaXNDcmVhdGlvbk5vZGUgJiYgY29sdW1uSWRlbnRpZmllciA9 PT0gIjAiICYmICF3YXNDaGFuZ2UpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAg ICAgICAgICAgICAgIGlmIChjb2x1bW5JZGVudGlmaWVyID09PSAwKQotICAgICAgICAgICAgICAg ICAgICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUoY3VycmVu dEVkaXRpbmdOb2RlLCAxKTsKKyAgICAgICAgICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9 PT0gIjAiKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29s dW1uT2ZEYXRhR3JpZE5vZGUoY3VycmVudEVkaXRpbmdOb2RlLCAiMSIpOwogCiAgICAgICAgICAg ICAgICAgdmFyIG5leHREYXRhR3JpZE5vZGUgPSBjdXJyZW50RWRpdGluZ05vZGUudHJhdmVyc2VO ZXh0Tm9kZSh0cnVlLCBudWxsLCB0cnVlKTsKICAgICAgICAgICAgICAgICBpZiAobmV4dERhdGFH cmlkTm9kZSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0RWRpdGluZ0Nv bHVtbk9mRGF0YUdyaWROb2RlKG5leHREYXRhR3JpZE5vZGUsIDApOworICAgICAgICAgICAgICAg ICAgICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUobmV4dERh dGFHcmlkTm9kZSwgIjAiKTsKICAgICAgICAgICAgICAgICBpZiAoY3VycmVudEVkaXRpbmdOb2Rl LmlzQ3JlYXRpb25Ob2RlICYmIHdhc0NoYW5nZSkgewogICAgICAgICAgICAgICAgICAgICB0aGlz LmFkZENyZWF0aW9uTm9kZShmYWxzZSk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiB0aGlz Ll9zdGFydEVkaXRpbmdDb2x1bW5PZkRhdGFHcmlkTm9kZSh0aGlzLmNyZWF0aW9uTm9kZSwgMCk7 CisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdGFydEVkaXRpbmdDb2x1bW5PZkRh dGFHcmlkTm9kZSh0aGlzLmNyZWF0aW9uTm9kZSwgIjAiKTsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAo bW92ZURpcmVjdGlvbiA9PT0gImJhY2t3YXJkIikgewotICAgICAgICAgICAgICAgIGlmIChjb2x1 bW5JZGVudGlmaWVyID09PSAxKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fc3Rh cnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUoY3VycmVudEVkaXRpbmdOb2RlLCAwKTsKKyAg ICAgICAgICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gIjEiKQorICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUoY3Vy cmVudEVkaXRpbmdOb2RlLCAiMCIpOwogICAgICAgICAgICAgICAgICAgICB2YXIgbmV4dERhdGFH cmlkTm9kZSA9IGN1cnJlbnRFZGl0aW5nTm9kZS50cmF2ZXJzZVByZXZpb3VzTm9kZSh0cnVlLCBu dWxsLCB0cnVlKTsKIAogICAgICAgICAgICAgICAgIGlmIChuZXh0RGF0YUdyaWROb2RlKQotICAg ICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3Jp ZE5vZGUobmV4dERhdGFHcmlkTm9kZSwgMSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0 aGlzLl9zdGFydEVkaXRpbmdDb2x1bW5PZkRhdGFHcmlkTm9kZShuZXh0RGF0YUdyaWROb2RlLCAi MSIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQo= 222566 2014-01-29 04:28:31 -0800 2014-01-29 05:53:15 -0800 Patch bug-127816-20140129132829.patch text/plain 3249 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyOTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm M2RkOWJlNmM2NWNmZTI5YjdiOGZjNGUwMGY5YWIwMzI4ODkxYjQwLi5jNDFjYjY2OGUwMzZiNTkx ZjkzYjA4N2MwNDQxZDcxYjlkMTlhNGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNC0wMS0yOSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OKHIxNjI5MzEpXSBUYWIg bmF2aWdhdGlvbiBicm9rZW4gaW4gRGF0YUdyaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzgxNgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90 aHkgSGF0Y2hlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvRGF0YUdyaWQuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLm1vdmVUb05leHRJZk5lZWRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLl9lZGl0aW5nQ29tbWl0 dGVkKToKKyAgICAgICAgQ2hhbmdlIGNvbHVtbklkZW50aWZpZXIgdmFsdWVzIDAgYW5kIDEgdG8g c3RyaW5ncyAiMCIgYW5kICIxIi4KKwogMjAxNC0wMS0yOCAgRGllZ28gUGlubyBHYXJjaWEgIDxk cGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluIGEgRGF0YUdyaWQs IHN0b3JlIHZhbHVlIG9mIGNvbHVtbklkZW50aWZpZXIgdG8gRE9NIG5vZGUgcmVwcmVzZW50aW5n IGEgY2VsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv RGF0YUdyaWQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3Jp ZC5qcwppbmRleCA4MjEyMWU4N2U4NjQ3OWEwMWQ4ZDRiZGRhNzgzNjlmMThiN2YxODI2Li41MmU1 ZjA5YWI4MGIxYzJlMmViMmZmODg3ZTU0YzhiMWY2NWE3MjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EYXRhR3JpZC5qcwpAQCAtMzU0LDI5ICszNTQsMjkg QEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgICAgIGlmIChtb3ZlRGlyZWN0aW9uID09PSAiZm9yd2FyZCIpIHsK LSAgICAgICAgICAgICAgICBpZiAoY3VycmVudEVkaXRpbmdOb2RlLmlzQ3JlYXRpb25Ob2RlICYm IGNvbHVtbklkZW50aWZpZXIgPT09IDAgJiYgIXdhc0NoYW5nZSkKKyAgICAgICAgICAgICAgICBp ZiAoY3VycmVudEVkaXRpbmdOb2RlLmlzQ3JlYXRpb25Ob2RlICYmIGNvbHVtbklkZW50aWZpZXIg PT09ICIwIiAmJiAhd2FzQ2hhbmdlKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgICAgICAgICBpZiAoY29sdW1uSWRlbnRpZmllciA9PT0gMCkKLSAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0RWRpdGluZ0NvbHVtbk9mRGF0YUdyaWROb2RlKGN1cnJl bnRFZGl0aW5nTm9kZSwgMSk7CisgICAgICAgICAgICAgICAgaWYgKGNvbHVtbklkZW50aWZpZXIg PT09ICIwIikKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0RWRpdGluZ0Nv bHVtbk9mRGF0YUdyaWROb2RlKGN1cnJlbnRFZGl0aW5nTm9kZSwgIjEiKTsKIAogICAgICAgICAg ICAgICAgIHZhciBuZXh0RGF0YUdyaWROb2RlID0gY3VycmVudEVkaXRpbmdOb2RlLnRyYXZlcnNl TmV4dE5vZGUodHJ1ZSwgbnVsbCwgdHJ1ZSk7CiAgICAgICAgICAgICAgICAgaWYgKG5leHREYXRh R3JpZE5vZGUpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9zdGFydEVkaXRpbmdD b2x1bW5PZkRhdGFHcmlkTm9kZShuZXh0RGF0YUdyaWROb2RlLCAwKTsKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0RWRpdGluZ0NvbHVtbk9mRGF0YUdyaWROb2RlKG5leHRE YXRhR3JpZE5vZGUsICIwIik7CiAgICAgICAgICAgICAgICAgaWYgKGN1cnJlbnRFZGl0aW5nTm9k ZS5pc0NyZWF0aW9uTm9kZSAmJiB3YXNDaGFuZ2UpIHsKICAgICAgICAgICAgICAgICAgICAgdGhp cy5hZGRDcmVhdGlvbk5vZGUoZmFsc2UpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhp cy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUodGhpcy5jcmVhdGlvbk5vZGUsIDAp OworICAgICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZE YXRhR3JpZE5vZGUodGhpcy5jcmVhdGlvbk5vZGUsICIwIik7CiAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYg KG1vdmVEaXJlY3Rpb24gPT09ICJiYWNrd2FyZCIpIHsKLSAgICAgICAgICAgICAgICBpZiAoY29s dW1uSWRlbnRpZmllciA9PT0gMSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N0 YXJ0RWRpdGluZ0NvbHVtbk9mRGF0YUdyaWROb2RlKGN1cnJlbnRFZGl0aW5nTm9kZSwgMCk7Cisg ICAgICAgICAgICAgICAgaWYgKGNvbHVtbklkZW50aWZpZXIgPT09ICIxIikKKyAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0RWRpdGluZ0NvbHVtbk9mRGF0YUdyaWROb2RlKGN1 cnJlbnRFZGl0aW5nTm9kZSwgIjAiKTsKICAgICAgICAgICAgICAgICAgICAgdmFyIG5leHREYXRh R3JpZE5vZGUgPSBjdXJyZW50RWRpdGluZ05vZGUudHJhdmVyc2VQcmV2aW91c05vZGUodHJ1ZSwg bnVsbCwgdHJ1ZSk7CiAKICAgICAgICAgICAgICAgICBpZiAobmV4dERhdGFHcmlkTm9kZSkKLSAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0RWRpdGluZ0NvbHVtbk9mRGF0YUdy aWROb2RlKG5leHREYXRhR3JpZE5vZGUsIDEpOworICAgICAgICAgICAgICAgICAgICByZXR1cm4g dGhpcy5fc3RhcnRFZGl0aW5nQ29sdW1uT2ZEYXRhR3JpZE5vZGUobmV4dERhdGFHcmlkTm9kZSwg IjEiKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K