225314 2021-05-03 10:27:35 -0700 [iOS][FCR] Grouped <select> options should appear inline in the menu 2021-05-03 13:13:52 -0700 1 1 1 Unclassified WebKit Forms Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi cdumez webkit-bug-importer wenson_hsieh oldest_to_newest 1756223 0 akeerthi 2021-05-03 10:27:35 -0700 ... 1756224 1 akeerthi 2021-05-03 10:28:01 -0700 <rdar://problem/76785797> 1756228 2 427571 akeerthi 2021-05-03 10:31:04 -0700 Created attachment 427571 Patch 1756236 3 427574 akeerthi 2021-05-03 10:50:23 -0700 Created attachment 427574 Patch 1756291 4 ews-feeder 2021-05-03 13:13:50 -0700 Committed r276919 (237261@main): <https://commits.webkit.org/237261@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427574. 427571 2021-05-03 10:31:04 -0700 2021-05-03 10:50:07 -0700 Patch bug-225314-20210503133059.patch text/plain 4943 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhNzk1YzQ5NDFmZmJlN2Rl MWMxY2JjYjg0YjA0MjEzYmM4M2U1N2MuLjE2MTYyZDE5MDY5ODk5OTNlZWMwMmRkNzg1YWQ0Mzc0 NjYxMGNkYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMDUtMDMgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW0ZDUl0gR3JvdXBl ZCA8c2VsZWN0PiBvcHRpb25zIHNob3VsZCBhcHBlYXIgaW5saW5lIGluIHRoZSBtZW51CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUzMTQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc2Nzg1Nzk3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgPHNlbGVjdD4gb3B0aW9ucyB3aXRoaW4g YW4gPG9wdGdyb3VwPiBlbGVtZW50IGFyZSBwcmVzZW50ZWQKKyAgICAgICAgd2l0aGluIGFuIGV4 cGFuZGFibGUvY29sbGFwc2libGUgc3VibWVudS4gSG93ZXZlciwgdG8gYmV0dGVyIG1hdGNoIHRo ZQorICAgICAgICB2aXN1YWwgc3R5bGUgYWNyb3NzIHRoZSByZXN0IG9mIHRoZSBzeXN0ZW0sIHRo ZSBncm91cGVkIG9wdGlvbnMgc2hvdWxkCisgICAgICAgIGFwcGVhciBpbmxpbmUgaW4gdGhlIHJv b3QgbWVudSwgYW5kIGdyb3VwcyBzaG91bGQgYmUgc2VwYXJhdGVkIGJ5IGEKKyAgICAgICAgdmlz dWFsIHNlcGFyYXRvci4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLiBBIHRl c3Rpbmctb25seSBtZXRob2Qgd2FzIHVwZGF0ZWQgdG8gcmVmbGVjdAorICAgICAgICB0aGUgY2hh bmdlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2Vy Lm1tOgorICAgICAgICAoLVtXS1NlbGVjdFBpY2tlciBjcmVhdGVNZW51XSk6CisKKyAgICAgICAg VXNlZCBVSU1lbnVPcHRpb25zRGlzcGxheUlubGluZSB0byBwcmVzZW50IHN1Ym1lbnVzIGlubGlu ZSBpbiB0aGUgcm9vdAorICAgICAgICBtZW51LiBUaGlzIG9wdGlvbiBzZXBhcmF0ZXMgc3VibWVu dXMgdXNpbmcgYSB2aXN1YWwgc2VwYXJhdG9yLgorCisgICAgICAgIFNpbmNlIGlubGluZSBzdWJt ZW51cyBkbyBub3Qgc3VwcG9ydCBhIHRpdGxlLCBhbmQgPG9wdGdyb3VwPiBlbGVtZW50cworICAg ICAgICBjYW4gYmUgbGFiZWxlZCwgdGhlIGdyb3VwIHRpdGxlIGlzIGRpc3BsYXllZCBhcyBhIGRp c2FibGVkIGFjdGlvbiBhdAorICAgICAgICB0aGUgdG9wIG9mIHRoZSBzdWJtZW51LgorCisgICAg ICAgIFJlbW92ZWQgbG9naWMgdG8gcHJvbW90ZSB0aGUgZ3JvdXBlZCBzdWJtZW51IHRvIHRoZSBy b290IG1lbnUgaW4gdGhlCisgICAgICAgIGNhc2Ugd2hlcmUgb25seSBvbmUgc3VibWVudSBjb250 YWlucyBhbGwgb3B0aW9ucywgc2luY2UgdGhlIHN1Ym1lbnUKKyAgICAgICAgbm93IGFwcGVhcnMg aW5saW5lLCBhbmQgYW4gYWRkaXRpb25hbCB0YXAgaXMgbm8gbG9uZ2VyIG5lY2Vzc2FyeSB0bwor ICAgICAgICB2aWV3IHRoZSBvcHRpb25zLgorCisgICAgICAgICgtW1dLU2VsZWN0UGlja2VyIGFj dGlvbkZvck9wdGlvbkluZGV4Ol0pOgorCisgICAgICAgIFVwZGF0ZWQgdGhpcyB0ZXN0aW5nLW9u bHkgbWV0aG9kIHRvIGFjY291bnQgZm9yIHRoZSBwb3RlbnRpYWwgZXhpc3RlbmNlCisgICAgICAg IG9mIGFuIGFkZGl0aW9uYWwgYWN0aW9uIHJlcHJlc2VudGluZyBhIGdyb3VwIHRpdGxlLgorCiAy MDIxLTA0LTMwICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAg ICBbaU9TXSBDcmFzaCB3aGVuIHRhcHBpbmcgZmllbGRzIG9uIGN5Y2xlLnRyYXZlbApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBpY2tl ci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQaWNr ZXIubW0KaW5kZXggZjJhZmUzZTY1ODI0Y2ViM2QzNjNhODU3MDQ3ZjA5MTQyMzc1Nzc2Yy4uZTNl MDgyMzZmYjU5MjU2NmQxODU1MDZjMWRlMzZjN2QxOGFmOTFkZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBpY2tlci5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2VyLm1tCkBA IC01NjQsNiArNTY0LDEyIEBAIHN0YXRpYyBjb25zdCBmbG9hdCBHcm91cE9wdGlvblRleHRDb2xv ckFscGhhID0gMC41OwogICAgICAgICAgICAgTlNTdHJpbmcgKmdyb3VwVGV4dCA9IG9wdGlvbkl0 ZW0udGV4dDsKICAgICAgICAgICAgIE5TTXV0YWJsZUFycmF5ICpncm91cGVkSXRlbXMgPSBbTlNN dXRhYmxlQXJyYXkgYXJyYXldOwogCisgICAgICAgICAgICBpZiAoZ3JvdXBUZXh0Lmxlbmd0aCkg eworICAgICAgICAgICAgICAgIFVJQWN0aW9uICphY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0 aFRpdGxlOmdyb3VwVGV4dCBpbWFnZTpuaWwgaWRlbnRpZmllcjpuaWwgaGFuZGxlcjpeKFVJQWN0 aW9uICphY3Rpb24peyB9XTsKKyAgICAgICAgICAgICAgICBhY3Rpb24uYXR0cmlidXRlcyA9IFVJ TWVudUVsZW1lbnRBdHRyaWJ1dGVzRGlzYWJsZWQ7CisgICAgICAgICAgICAgICAgW2dyb3VwZWRJ dGVtcyBhZGRPYmplY3Q6YWN0aW9uXTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgY3Vy cmVudEluZGV4Kys7CiAgICAgICAgICAgICB3aGlsZSAoY3VycmVudEluZGV4IDwgX3ZpZXcuZm9j dXNlZFNlbGVjdEVsZW1lbnRPcHRpb25zLnNpemUoKSkgewogICAgICAgICAgICAgICAgIGF1dG8m IGNoaWxkT3B0aW9uSXRlbSA9IF92aWV3LmZvY3VzZWRTZWxlY3RFbGVtZW50T3B0aW9uc1tjdXJy ZW50SW5kZXhdOwpAQCAtNTc2LDcgKzU4Miw3IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBHcm91cE9w dGlvblRleHRDb2xvckFscGhhID0gMC41OwogICAgICAgICAgICAgICAgIGN1cnJlbnRJbmRleCsr OwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBVSU1lbnUgKmdyb3VwTWVudSA9IFtVSU1l bnUgbWVudVdpdGhUaXRsZTpncm91cFRleHQgY2hpbGRyZW46Z3JvdXBlZEl0ZW1zXTsKKyAgICAg ICAgICAgIFVJTWVudSAqZ3JvdXBNZW51ID0gW1VJTWVudSBtZW51V2l0aFRpdGxlOmdyb3VwVGV4 dCBpbWFnZTpuaWwgaWRlbnRpZmllcjpuaWwgb3B0aW9uczpVSU1lbnVPcHRpb25zRGlzcGxheUlu bGluZSBjaGlsZHJlbjpncm91cGVkSXRlbXNdOwogICAgICAgICAgICAgW2l0ZW1zIGFkZE9iamVj dDpncm91cE1lbnVdOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KQEAgLTU4Nywx MiArNTkzLDYgQEAgc3RhdGljIGNvbnN0IGZsb2F0IEdyb3VwT3B0aW9uVGV4dENvbG9yQWxwaGEg PSAwLjU7CiAgICAgICAgIGN1cnJlbnRJbmRleCsrOwogICAgIH0KIAotICAgIC8vIFNvbWUgc2l0 ZXMsIHN1Y2ggYXMgU3F1YXJlIENoZWNrb3V0LCB3cmFwIGFsbCB0aGUgZWxlbWVudCdzIDxvcHRp b24+cyBpbgotICAgIC8vIGFuIGEgc2luZ2xlIDxvcHRncm91cD4uIEluIHRoaXMgY2FzZSwgcHJv bW90ZSB0aGUgZ3JvdXBlZCBzdWJtZW51IHRvIHRoZQotICAgIC8vIHJvb3QgbWVudSwgYXZvaWRp bmcgdGhlIG5lZWQgZm9yIGFuIGFkZGl0aW9uYWwgdGFwIHRvIHZpZXcgdGhlIG9wdGlvbnMuCi0g ICAgaWYgKGl0ZW1zLmNvdW50ID09IDEgJiYgW1tpdGVtcyBmaXJzdE9iamVjdF0gaXNLaW5kT2ZD bGFzczpVSU1lbnUuY2xhc3NdKQotICAgICAgICByZXR1cm4gW2l0ZW1zIGZpcnN0T2JqZWN0XTsK LQogICAgIHJldHVybiBbVUlNZW51IG1lbnVXaXRoVGl0bGU6QCIiIGNoaWxkcmVuOml0ZW1zXTsK IH0KIApAQCAtNjI2LDEwICs2MjYsMTYgQEAgc3RhdGljIGNvbnN0IGZsb2F0IEdyb3VwT3B0aW9u VGV4dENvbG9yQWxwaGEgPSAwLjU7CiAgICAgICAgIH0KIAogICAgICAgICBVSU1lbnUgKmdyb3Vw ZWRNZW51ID0gKFVJTWVudSAqKW1lbnVFbGVtZW50OwotICAgICAgICBpZiAoY3VycmVudEluZGV4 ICsgZ3JvdXBlZE1lbnUuY2hpbGRyZW4uY291bnQgPD0gKE5TVUludGVnZXIpb3B0aW9uSW5kZXgp Ci0gICAgICAgICAgICBjdXJyZW50SW5kZXggKz0gZ3JvdXBlZE1lbnUuY2hpbGRyZW4uY291bnQ7 CisgICAgICAgIE5TVUludGVnZXIgbnVtR3JvdXBlZE9wdGlvbnMgPSBncm91cGVkTWVudS5jaGls ZHJlbi5jb3VudDsKKworICAgICAgICAvLyBUaGUgZmlyc3QgY2hpbGQgb2YgYSBncm91cGVkIG1l bnUgd2l0aCBhIHRpdGxlIHJlcHJlc2VudHMgdGhlIHRpdGxlLCBhbmQgaXMgbm90IGEgc2VsZWN0 YWJsZSBvcHRpb24uCisgICAgICAgIGlmIChncm91cGVkTWVudS50aXRsZS5sZW5ndGgpCisgICAg ICAgICAgICBudW1Hcm91cGVkT3B0aW9ucy0tOworCisgICAgICAgIGlmIChjdXJyZW50SW5kZXgg KyBudW1Hcm91cGVkT3B0aW9ucyA8PSAoTlNVSW50ZWdlcilvcHRpb25JbmRleCkKKyAgICAgICAg ICAgIGN1cnJlbnRJbmRleCArPSBudW1Hcm91cGVkT3B0aW9uczsKICAgICAgICAgZWxzZQotICAg ICAgICAgICAgcmV0dXJuIChVSUFjdGlvbiAqKVtncm91cGVkTWVudS5jaGlsZHJlbiBvYmplY3RB dEluZGV4Om9wdGlvbkluZGV4IC0gY3VycmVudEluZGV4XTsKKyAgICAgICAgICAgIHJldHVybiAo VUlBY3Rpb24gKilbZ3JvdXBlZE1lbnUuY2hpbGRyZW4gb2JqZWN0QXRJbmRleDooZ3JvdXBlZE1l bnUuY2hpbGRyZW4uY291bnQgLSBudW1Hcm91cGVkT3B0aW9ucykgKyAob3B0aW9uSW5kZXggLSBj dXJyZW50SW5kZXgpXTsKICAgICB9CiAKICAgICByZXR1cm4gbmlsOwo= 427574 2021-05-03 10:50:23 -0700 2021-05-03 13:13:51 -0700 Patch bug-225314-20210503135019.patch text/plain 4944 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhNzk1YzQ5NDFmZmJlN2Rl MWMxY2JjYjg0YjA0MjEzYmM4M2U1N2MuLjE2MTYyZDE5MDY5ODk5OTNlZWMwMmRkNzg1YWQ0Mzc0 NjYxMGNkYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMDUtMDMgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW0ZDUl0gR3JvdXBl ZCA8c2VsZWN0PiBvcHRpb25zIHNob3VsZCBhcHBlYXIgaW5saW5lIGluIHRoZSBtZW51CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUzMTQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzc2Nzg1Nzk3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgPHNlbGVjdD4gb3B0aW9ucyB3aXRoaW4g YW4gPG9wdGdyb3VwPiBlbGVtZW50IGFyZSBwcmVzZW50ZWQKKyAgICAgICAgd2l0aGluIGFuIGV4 cGFuZGFibGUvY29sbGFwc2libGUgc3VibWVudS4gSG93ZXZlciwgdG8gYmV0dGVyIG1hdGNoIHRo ZQorICAgICAgICB2aXN1YWwgc3R5bGUgYWNyb3NzIHRoZSByZXN0IG9mIHRoZSBzeXN0ZW0sIHRo ZSBncm91cGVkIG9wdGlvbnMgc2hvdWxkCisgICAgICAgIGFwcGVhciBpbmxpbmUgaW4gdGhlIHJv b3QgbWVudSwgYW5kIGdyb3VwcyBzaG91bGQgYmUgc2VwYXJhdGVkIGJ5IGEKKyAgICAgICAgdmlz dWFsIHNlcGFyYXRvci4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLiBBIHRl c3Rpbmctb25seSBtZXRob2Qgd2FzIHVwZGF0ZWQgdG8gcmVmbGVjdAorICAgICAgICB0aGUgY2hh bmdlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2Vy Lm1tOgorICAgICAgICAoLVtXS1NlbGVjdFBpY2tlciBjcmVhdGVNZW51XSk6CisKKyAgICAgICAg VXNlZCBVSU1lbnVPcHRpb25zRGlzcGxheUlubGluZSB0byBwcmVzZW50IHN1Ym1lbnVzIGlubGlu ZSBpbiB0aGUgcm9vdAorICAgICAgICBtZW51LiBUaGlzIG9wdGlvbiBzZXBhcmF0ZXMgc3VibWVu dXMgdXNpbmcgYSB2aXN1YWwgc2VwYXJhdG9yLgorCisgICAgICAgIFNpbmNlIGlubGluZSBzdWJt ZW51cyBkbyBub3Qgc3VwcG9ydCBhIHRpdGxlLCBhbmQgPG9wdGdyb3VwPiBlbGVtZW50cworICAg ICAgICBjYW4gYmUgbGFiZWxlZCwgdGhlIGdyb3VwIHRpdGxlIGlzIGRpc3BsYXllZCBhcyBhIGRp c2FibGVkIGFjdGlvbiBhdAorICAgICAgICB0aGUgdG9wIG9mIHRoZSBzdWJtZW51LgorCisgICAg ICAgIFJlbW92ZWQgbG9naWMgdG8gcHJvbW90ZSB0aGUgZ3JvdXBlZCBzdWJtZW51IHRvIHRoZSBy b290IG1lbnUgaW4gdGhlCisgICAgICAgIGNhc2Ugd2hlcmUgb25seSBvbmUgc3VibWVudSBjb250 YWlucyBhbGwgb3B0aW9ucywgc2luY2UgdGhlIHN1Ym1lbnUKKyAgICAgICAgbm93IGFwcGVhcnMg aW5saW5lLCBhbmQgYW4gYWRkaXRpb25hbCB0YXAgaXMgbm8gbG9uZ2VyIG5lY2Vzc2FyeSB0bwor ICAgICAgICB2aWV3IHRoZSBvcHRpb25zLgorCisgICAgICAgICgtW1dLU2VsZWN0UGlja2VyIGFj dGlvbkZvck9wdGlvbkluZGV4Ol0pOgorCisgICAgICAgIFVwZGF0ZWQgdGhpcyB0ZXN0aW5nLW9u bHkgbWV0aG9kIHRvIGFjY291bnQgZm9yIHRoZSBwb3RlbnRpYWwgZXhpc3RlbmNlCisgICAgICAg IG9mIGFuIGFkZGl0aW9uYWwgYWN0aW9uIHJlcHJlc2VudGluZyBhIGdyb3VwIHRpdGxlLgorCiAy MDIxLTA0LTMwICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAg ICBbaU9TXSBDcmFzaCB3aGVuIHRhcHBpbmcgZmllbGRzIG9uIGN5Y2xlLnRyYXZlbApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBpY2tl ci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQaWNr ZXIubW0KaW5kZXggZjJhZmUzZTY1ODI0Y2ViM2QzNjNhODU3MDQ3ZjA5MTQyMzc1Nzc2Yy4uZTYx ZWFmZWRhMGExNWE5NjJkYzViODEwNTgyN2JiZmFkZDA0ODNhNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNlbGVjdFBpY2tlci5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2VyLm1tCkBA IC01NjQsNiArNTY0LDEyIEBAIHN0YXRpYyBjb25zdCBmbG9hdCBHcm91cE9wdGlvblRleHRDb2xv ckFscGhhID0gMC41OwogICAgICAgICAgICAgTlNTdHJpbmcgKmdyb3VwVGV4dCA9IG9wdGlvbkl0 ZW0udGV4dDsKICAgICAgICAgICAgIE5TTXV0YWJsZUFycmF5ICpncm91cGVkSXRlbXMgPSBbTlNN dXRhYmxlQXJyYXkgYXJyYXldOwogCisgICAgICAgICAgICBpZiAoZ3JvdXBUZXh0Lmxlbmd0aCkg eworICAgICAgICAgICAgICAgIFVJQWN0aW9uICphY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0 aFRpdGxlOmdyb3VwVGV4dCBpbWFnZTpuaWwgaWRlbnRpZmllcjpuaWwgaGFuZGxlcjpeKFVJQWN0 aW9uICphY3Rpb24pIHsgfV07CisgICAgICAgICAgICAgICAgYWN0aW9uLmF0dHJpYnV0ZXMgPSBV SU1lbnVFbGVtZW50QXR0cmlidXRlc0Rpc2FibGVkOworICAgICAgICAgICAgICAgIFtncm91cGVk SXRlbXMgYWRkT2JqZWN0OmFjdGlvbl07CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGN1 cnJlbnRJbmRleCsrOwogICAgICAgICAgICAgd2hpbGUgKGN1cnJlbnRJbmRleCA8IF92aWV3LmZv Y3VzZWRTZWxlY3RFbGVtZW50T3B0aW9ucy5zaXplKCkpIHsKICAgICAgICAgICAgICAgICBhdXRv JiBjaGlsZE9wdGlvbkl0ZW0gPSBfdmlldy5mb2N1c2VkU2VsZWN0RWxlbWVudE9wdGlvbnNbY3Vy cmVudEluZGV4XTsKQEAgLTU3Niw3ICs1ODIsNyBAQCBzdGF0aWMgY29uc3QgZmxvYXQgR3JvdXBP cHRpb25UZXh0Q29sb3JBbHBoYSA9IDAuNTsKICAgICAgICAgICAgICAgICBjdXJyZW50SW5kZXgr KzsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgVUlNZW51ICpncm91cE1lbnUgPSBbVUlN ZW51IG1lbnVXaXRoVGl0bGU6Z3JvdXBUZXh0IGNoaWxkcmVuOmdyb3VwZWRJdGVtc107CisgICAg ICAgICAgICBVSU1lbnUgKmdyb3VwTWVudSA9IFtVSU1lbnUgbWVudVdpdGhUaXRsZTpncm91cFRl eHQgaW1hZ2U6bmlsIGlkZW50aWZpZXI6bmlsIG9wdGlvbnM6VUlNZW51T3B0aW9uc0Rpc3BsYXlJ bmxpbmUgY2hpbGRyZW46Z3JvdXBlZEl0ZW1zXTsKICAgICAgICAgICAgIFtpdGVtcyBhZGRPYmpl Y3Q6Z3JvdXBNZW51XTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CkBAIC01ODcs MTIgKzU5Myw2IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBHcm91cE9wdGlvblRleHRDb2xvckFscGhh ID0gMC41OwogICAgICAgICBjdXJyZW50SW5kZXgrKzsKICAgICB9CiAKLSAgICAvLyBTb21lIHNp dGVzLCBzdWNoIGFzIFNxdWFyZSBDaGVja291dCwgd3JhcCBhbGwgdGhlIGVsZW1lbnQncyA8b3B0 aW9uPnMgaW4KLSAgICAvLyBhbiBhIHNpbmdsZSA8b3B0Z3JvdXA+LiBJbiB0aGlzIGNhc2UsIHBy b21vdGUgdGhlIGdyb3VwZWQgc3VibWVudSB0byB0aGUKLSAgICAvLyByb290IG1lbnUsIGF2b2lk aW5nIHRoZSBuZWVkIGZvciBhbiBhZGRpdGlvbmFsIHRhcCB0byB2aWV3IHRoZSBvcHRpb25zLgot ICAgIGlmIChpdGVtcy5jb3VudCA9PSAxICYmIFtbaXRlbXMgZmlyc3RPYmplY3RdIGlzS2luZE9m Q2xhc3M6VUlNZW51LmNsYXNzXSkKLSAgICAgICAgcmV0dXJuIFtpdGVtcyBmaXJzdE9iamVjdF07 Ci0KICAgICByZXR1cm4gW1VJTWVudSBtZW51V2l0aFRpdGxlOkAiIiBjaGlsZHJlbjppdGVtc107 CiB9CiAKQEAgLTYyNiwxMCArNjI2LDE2IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBHcm91cE9wdGlv blRleHRDb2xvckFscGhhID0gMC41OwogICAgICAgICB9CiAKICAgICAgICAgVUlNZW51ICpncm91 cGVkTWVudSA9IChVSU1lbnUgKiltZW51RWxlbWVudDsKLSAgICAgICAgaWYgKGN1cnJlbnRJbmRl eCArIGdyb3VwZWRNZW51LmNoaWxkcmVuLmNvdW50IDw9IChOU1VJbnRlZ2VyKW9wdGlvbkluZGV4 KQotICAgICAgICAgICAgY3VycmVudEluZGV4ICs9IGdyb3VwZWRNZW51LmNoaWxkcmVuLmNvdW50 OworICAgICAgICBOU1VJbnRlZ2VyIG51bUdyb3VwZWRPcHRpb25zID0gZ3JvdXBlZE1lbnUuY2hp bGRyZW4uY291bnQ7CisKKyAgICAgICAgLy8gVGhlIGZpcnN0IGNoaWxkIG9mIGEgZ3JvdXBlZCBt ZW51IHdpdGggYSB0aXRsZSByZXByZXNlbnRzIHRoZSB0aXRsZSwgYW5kIGlzIG5vdCBhIHNlbGVj dGFibGUgb3B0aW9uLgorICAgICAgICBpZiAoZ3JvdXBlZE1lbnUudGl0bGUubGVuZ3RoKQorICAg ICAgICAgICAgbnVtR3JvdXBlZE9wdGlvbnMtLTsKKworICAgICAgICBpZiAoY3VycmVudEluZGV4 ICsgbnVtR3JvdXBlZE9wdGlvbnMgPD0gKE5TVUludGVnZXIpb3B0aW9uSW5kZXgpCisgICAgICAg ICAgICBjdXJyZW50SW5kZXggKz0gbnVtR3JvdXBlZE9wdGlvbnM7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHJldHVybiAoVUlBY3Rpb24gKilbZ3JvdXBlZE1lbnUuY2hpbGRyZW4gb2JqZWN0 QXRJbmRleDpvcHRpb25JbmRleCAtIGN1cnJlbnRJbmRleF07CisgICAgICAgICAgICByZXR1cm4g KFVJQWN0aW9uICopW2dyb3VwZWRNZW51LmNoaWxkcmVuIG9iamVjdEF0SW5kZXg6KGdyb3VwZWRN ZW51LmNoaWxkcmVuLmNvdW50IC0gbnVtR3JvdXBlZE9wdGlvbnMpICsgKG9wdGlvbkluZGV4IC0g Y3VycmVudEluZGV4KV07CiAgICAgfQogCiAgICAgcmV0dXJuIG5pbDsK