174614 2017-07-18 00:29:57 -0700 WebDriver: implement user prompt commands 2017-08-07 23:23:23 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=175259 InRadar P2 Normal --- 166679 175184 1 cgarcia webkit-unassigned bburg buildbot clopez joepeck webkit-bug-importer oldest_to_newest 1329917 0 cgarcia 2017-07-18 00:29:57 -0700 https://www.w3.org/TR/webdriver/#user-prompts 1335902 1 317406 cgarcia 2017-08-07 02:54:53 -0700 Created attachment 317406 Patch 1335903 2 buildbot 2017-08-07 02:56:41 -0700 Attachment 317406 did not pass style-queue: ERROR: Source/WebDriver/Session.h:97: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.h:98: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.h:99: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.h:100: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.cpp:1236: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.cpp:1253: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.cpp:1270: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.cpp:1287: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.h:104: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.h:105: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.h:106: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.h:107: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.cpp:1466: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.cpp:1484: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.cpp:1502: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.cpp:1525: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 16 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1336000 3 317406 bburg 2017-08-07 10:03:48 -0700 Comment on attachment 317406 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=317406&action=review r=me > Source/WebDriver/Session.cpp:1525 > +void Session::sendAlertText(const String& text, Function<void (CommandResult&&)>&& completionHandler) Nit: 'setAlertText' would match 'getAlertText' 1336002 4 cgarcia 2017-08-07 10:06:19 -0700 (In reply to Brian Burg from comment #3) > Comment on attachment 317406 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=317406&action=review > > r=me Thanks! > > Source/WebDriver/Session.cpp:1525 > > +void Session::sendAlertText(const String& text, Function<void (CommandResult&&)>&& completionHandler) > > Nit: 'setAlertText' would match 'getAlertText' I agree, but I'm using the spec names in all other commands. . . 1336381 5 cgarcia 2017-08-07 23:22:13 -0700 Committed r220386: <http://trac.webkit.org/changeset/220386> 1336382 6 webkit-bug-importer 2017-08-07 23:23:23 -0700 <rdar://problem/33770045> 317406 2017-08-07 02:54:53 -0700 2017-08-07 10:03:48 -0700 Patch wd-alerts.diff text/plain 13293 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggNmRjZjRkZWJjMWEuLmFjMjAyN2RjYTA1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA4LTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBXZWJEcml2ZXI6IGltcGxlbWVudCB1c2VyIHBy b21wdCBjb21tYW5kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc0NjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBDb21tYW5kUmVzdWx0LmNwcDoKKyAgICAgICAgKFdlYkRyaXZlcjo6Q29tbWFuZFJl c3VsdDo6Q29tbWFuZFJlc3VsdCk6IEhhbmRsZSBOb0phdmFTY3JpcHREaWFsb2cgcHJvdG9jb2wg ZXJyb3IuCisgICAgICAgIChXZWJEcml2ZXI6OkNvbW1hbmRSZXN1bHQ6Omh0dHBTdGF0dXNDb2Rl IGNvbnN0KTogQWRkIE5vU3VjaEFsZXJ0LgorICAgICAgICAoV2ViRHJpdmVyOjpDb21tYW5kUmVz dWx0OjplcnJvclN0cmluZyBjb25zdCk6IERpdHRvLgorICAgICAgICAqIENvbW1hbmRSZXN1bHQu aDoKKyAgICAgICAgKiBTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6 ZGlzbWlzc0FsZXJ0KToKKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6YWNjZXB0QWxlcnQp OgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpnZXRBbGVydFRleHQpOgorICAgICAgICAo V2ViRHJpdmVyOjpTZXNzaW9uOjpzZW5kQWxlcnRUZXh0KToKKyAgICAgICAgKiBTZXNzaW9uLmg6 CisgICAgICAgICogV2ViRHJpdmVyU2VydmljZS5jcHA6CisgICAgICAgIChXZWJEcml2ZXI6Oldl YkRyaXZlclNlcnZpY2U6OmRpc21pc3NBbGVydCk6CisgICAgICAgIChXZWJEcml2ZXI6OldlYkRy aXZlclNlcnZpY2U6OmFjY2VwdEFsZXJ0KToKKyAgICAgICAgKFdlYkRyaXZlcjo6V2ViRHJpdmVy U2VydmljZTo6Z2V0QWxlcnRUZXh0KToKKyAgICAgICAgKFdlYkRyaXZlcjo6V2ViRHJpdmVyU2Vy dmljZTo6c2VuZEFsZXJ0VGV4dCk6CisgICAgICAgICogV2ViRHJpdmVyU2VydmljZS5oOgorCiAy MDE3LTA4LTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXVtXUEVdIEFkZCBBUEkgdG8gcHJvdmlkZSBicm93c2VyIGluZm9ybWF0aW9u IHJlcXVpcmVkIGJ5IGF1dG9tYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ29t bWFuZFJlc3VsdC5jcHAgYi9Tb3VyY2UvV2ViRHJpdmVyL0NvbW1hbmRSZXN1bHQuY3BwCmluZGV4 IDYzM2I4OTk1YmJhLi41NTU0MTljMDgxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9D b21tYW5kUmVzdWx0LmNwcAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NvbW1hbmRSZXN1bHQuY3Bw CkBAIC0xMDIsNiArMTAyLDggQEAgQ29tbWFuZFJlc3VsdDo6Q29tbWFuZFJlc3VsdChSZWZQdHI8 SW5zcGVjdG9yVmFsdWU+JiYgcmVzdWx0LCBzdGQ6Om9wdGlvbmFsPEVycm8KICAgICAgICAgICAg IG1fZXJyb3JDb2RlID0gRXJyb3JDb2RlOjpJbnZhbGlkU2VsZWN0b3I7CiAgICAgICAgIGVsc2Ug aWYgKGVycm9yTmFtZSA9PSAiVGltZW91dCIpCiAgICAgICAgICAgICBtX2Vycm9yQ29kZSA9IEVy cm9yQ29kZTo6VGltZW91dDsKKyAgICAgICAgZWxzZSBpZiAoZXJyb3JOYW1lID09ICJOb0phdmFT Y3JpcHREaWFsb2ciKQorICAgICAgICAgICAgbV9lcnJvckNvZGUgPSBFcnJvckNvZGU6Ok5vU3Vj aEFsZXJ0OwogCiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTEyNyw2ICsxMjksNyBAQCB1bnNp Z25lZCBDb21tYW5kUmVzdWx0OjpodHRwU3RhdHVzQ29kZSgpIGNvbnN0CiAgICAgY2FzZSBFcnJv ckNvZGU6OkludmFsaWRBcmd1bWVudDoKICAgICBjYXNlIEVycm9yQ29kZTo6SW52YWxpZEVsZW1l bnRTdGF0ZToKICAgICBjYXNlIEVycm9yQ29kZTo6SW52YWxpZFNlbGVjdG9yOgorICAgIGNhc2Ug RXJyb3JDb2RlOjpOb1N1Y2hBbGVydDoKICAgICBjYXNlIEVycm9yQ29kZTo6Tm9TdWNoRWxlbWVu dDoKICAgICBjYXNlIEVycm9yQ29kZTo6Tm9TdWNoRnJhbWU6CiAgICAgY2FzZSBFcnJvckNvZGU6 Ok5vU3VjaFdpbmRvdzoKQEAgLTE2OCw2ICsxNzEsOCBAQCBTdHJpbmcgQ29tbWFuZFJlc3VsdDo6 ZXJyb3JTdHJpbmcoKSBjb25zdAogICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJpbnZhbGlk IHNlc3Npb24gaWQiKTsKICAgICBjYXNlIEVycm9yQ29kZTo6SmF2YXNjcmlwdEVycm9yOgogICAg ICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJqYXZhc2NyaXB0IGVycm9yIik7CisgICAgY2FzZSBF cnJvckNvZGU6Ok5vU3VjaEFsZXJ0OgorICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJubyBz dWNoIGFsZXJ0Iik7CiAgICAgY2FzZSBFcnJvckNvZGU6Ok5vU3VjaEVsZW1lbnQ6CiAgICAgICAg IHJldHVybiBBU0NJSUxpdGVyYWwoIm5vIHN1Y2ggZWxlbWVudCIpOwogICAgIGNhc2UgRXJyb3JD b2RlOjpOb1N1Y2hGcmFtZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ29tbWFuZFJl c3VsdC5oIGIvU291cmNlL1dlYkRyaXZlci9Db21tYW5kUmVzdWx0LmgKaW5kZXggZWM1MzM5ODAx NDcuLmE2NjI5ZmRhMTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViRHJpdmVyL0NvbW1hbmRSZXN1 bHQuaAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NvbW1hbmRSZXN1bHQuaApAQCAtNDYsNiArNDYs NyBAQCBwdWJsaWM6CiAgICAgICAgIEludmFsaWRTZWxlY3RvciwKICAgICAgICAgSW52YWxpZFNl c3Npb25JRCwKICAgICAgICAgSmF2YXNjcmlwdEVycm9yLAorICAgICAgICBOb1N1Y2hBbGVydCwK ICAgICAgICAgTm9TdWNoRWxlbWVudCwKICAgICAgICAgTm9TdWNoRnJhbWUsCiAgICAgICAgIE5v U3VjaFdpbmRvdywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAgYi9T b3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwCmluZGV4IDY2YjJlZGRmMGE5Li5hZjRjYjVhM2Q3 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViRHJpdmVyL1Nlc3Npb24uY3BwCkBAIC0xNDYzLDQgKzE0NjMsODIgQEAgdm9pZCBTZXNzaW9u OjpwZXJmb3JtS2V5Ym9hcmRJbnRlcmFjdGlvbnMoVmVjdG9yPEtleWJvYXJkSW50ZXJhY3Rpb24+ JiYgaW50ZXJhY3QKICAgICB9KTsKIH0KIAordm9pZCBTZXNzaW9uOjpkaXNtaXNzQWxlcnQoRnVu Y3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAg ICBpZiAoIW1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQpIHsKKyAgICAgICAgY29tcGxldGlvbkhh bmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6Ok5vU3Vj aFdpbmRvdykpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4gcGFyYW1ldGVycyA9IEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CisgICAgcGFy YW1ldGVycy0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgiYnJvd3NpbmdDb250ZXh0SGFuZGxlIiks IG1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQudmFsdWUoKSk7CisgICAgbV9ob3N0LT5zZW5kQ29t bWFuZFRvQmFja2VuZChBU0NJSUxpdGVyYWwoImRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxv ZyIpLCBXVEZNb3ZlKHBhcmFtZXRlcnMpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShT ZXNzaW9uSG9zdDo6Q29tbWFuZFJlc3BvbnNlJiYgcmVzcG9uc2UpIHsKKyAgICAgICAgaWYgKHJl c3BvbnNlLmlzRXJyb3IpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRS ZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25zZS5yZXNwb25zZU9iamVjdCkpKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5k UmVzdWx0OjpzdWNjZXNzKCkpOworICAgIH0pOworfQorCit2b2lkIFNlc3Npb246OmFjY2VwdEFs ZXJ0KEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIp Cit7CisgICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2Rl OjpOb1N1Y2hXaW5kb3cpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFJlZlB0cjxJ bnNwZWN0b3JPYmplY3Q+IHBhcmFtZXRlcnMgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwor ICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoImJyb3dzaW5nQ29udGV4dEhh bmRsZSIpLCBtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0LnZhbHVlKCkpOworICAgIG1faG9zdC0+ c2VuZENvbW1hbmRUb0JhY2tlbmQoQVNDSUlMaXRlcmFsKCJhY2NlcHRDdXJyZW50SmF2YVNjcmlw dERpYWxvZyIpLCBXVEZNb3ZlKHBhcmFtZXRlcnMpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1h a2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpXShTZXNzaW9uSG9zdDo6Q29tbWFuZFJlc3BvbnNlJiYgcmVzcG9uc2UpIHsKKyAgICAgICAg aWYgKHJlc3BvbnNlLmlzRXJyb3IpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENv bW1hbmRSZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25zZS5yZXNwb25zZU9iamVjdCkpKTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihD b21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOworICAgIH0pOworfQorCit2b2lkIFNlc3Npb246Omdl dEFsZXJ0VGV4dChGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25I YW5kbGVyKQoreworICAgIGlmICghbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCkgeworICAgICAg ICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKENvbW1hbmRSZXN1bHQ6OkVy cm9yQ29kZTo6Tm9TdWNoV2luZG93KSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBS ZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBwYXJhbWV0ZXJzID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVh dGUoKTsKKyAgICBwYXJhbWV0ZXJzLT5zZXRTdHJpbmcoQVNDSUlMaXRlcmFsKCJicm93c2luZ0Nv bnRleHRIYW5kbGUiKSwgbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dC52YWx1ZSgpKTsKKyAgICBt X2hvc3QtPnNlbmRDb21tYW5kVG9CYWNrZW5kKEFTQ0lJTGl0ZXJhbCgibWVzc2FnZU9mQ3VycmVu dEphdmFTY3JpcHREaWFsb2ciKSwgV1RGTW92ZShwYXJhbWV0ZXJzKSwgW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKV0oU2Vzc2lvbkhvc3Q6OkNvbW1hbmRSZXNwb25zZSYmIHJlc3BvbnNlKSB7 CisgICAgICAgIGlmIChyZXNwb25zZS5pc0Vycm9yIHx8ICFyZXNwb25zZS5yZXNwb25zZU9iamVj dCkgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChX VEZNb3ZlKHJlc3BvbnNlLnJlc3BvbnNlT2JqZWN0KSkpOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisgICAgICAgIFN0cmluZyB2YWx1ZVN0cmluZzsKKyAgICAgICAgaWYgKCFyZXNw b25zZS5yZXNwb25zZU9iamVjdC0+Z2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgibWVzc2FnZSIpLCB2 YWx1ZVN0cmluZykpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1 bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpVbmtub3duRXJyb3IpKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihDb21t YW5kUmVzdWx0OjpzdWNjZXNzKEluc3BlY3RvclZhbHVlOjpjcmVhdGUodmFsdWVTdHJpbmcpKSk7 CisgICAgfSk7Cit9CisKK3ZvaWQgU2Vzc2lvbjo6c2VuZEFsZXJ0VGV4dChjb25zdCBTdHJpbmcm IHRleHQsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRs ZXIpCit7CisgICAgaWYgKCFtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0KSB7CisgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JD b2RlOjpOb1N1Y2hXaW5kb3cpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIFJlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IHBhcmFtZXRlcnMgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgp OworICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoImJyb3dzaW5nQ29udGV4 dEhhbmRsZSIpLCBtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0LnZhbHVlKCkpOworICAgIHBhcmFt ZXRlcnMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoInVzZXJJbnB1dCIpLCB0ZXh0KTsKKyAgICBt X2hvc3QtPnNlbmRDb21tYW5kVG9CYWNrZW5kKEFTQ0lJTGl0ZXJhbCgic2V0VXNlcklucHV0Rm9y Q3VycmVudEphdmFTY3JpcHRQcm9tcHQiKSwgV1RGTW92ZShwYXJhbWV0ZXJzKSwgW3RoaXMsIHBy b3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0oU2Vzc2lvbkhvc3Q6OkNvbW1hbmRSZXNwb25zZSYmIHJlc3Bv bnNlKSB7CisgICAgICAgIGlmIChyZXNwb25zZS5pc0Vycm9yKSB7CisgICAgICAgICAgICBjb21w bGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpmYWlsKFdURk1vdmUocmVzcG9uc2UucmVzcG9u c2VPYmplY3QpKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgY29t cGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKKyAgICB9KTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViRHJpdmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL1Nl c3Npb24uaCBiL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5oCmluZGV4IDllMGQ3Y2ZmOTgxLi45 N2UyM2JlZDA1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmgKKysrIGIv U291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmgKQEAgLTk0LDYgKzk0LDEwIEBAIHB1YmxpYzoKICAg ICB2b2lkIGVsZW1lbnRTZW5kS2V5cyhjb25zdCBTdHJpbmcmIGVsZW1lbnRJRCwgVmVjdG9yPFN0 cmluZz4mJiBrZXlzLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmKTsKICAgICB2 b2lkIGVsZW1lbnRTdWJtaXQoY29uc3QgU3RyaW5nJiBlbGVtZW50SUQsIEZ1bmN0aW9uPHZvaWQg KENvbW1hbmRSZXN1bHQmJik+JiYpOwogICAgIHZvaWQgZXhlY3V0ZVNjcmlwdChjb25zdCBTdHJp bmcmIHNjcmlwdCwgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXk+JiYgYXJndW1lbnRz LCBFeGVjdXRlU2NyaXB0TW9kZSwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7 CisgICAgdm9pZCBkaXNtaXNzQWxlcnQoRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4m Jik7CisgICAgdm9pZCBhY2NlcHRBbGVydChGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYp PiYmKTsKKyAgICB2b2lkIGdldEFsZXJ0VGV4dChGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0 JiYpPiYmKTsKKyAgICB2b2lkIHNlbmRBbGVydFRleHQoY29uc3QgU3RyaW5nJiwgRnVuY3Rpb248 dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CiAKIHByaXZhdGU6CiAgICAgU2Vzc2lvbihzdGQ6 OnVuaXF1ZV9wdHI8U2Vzc2lvbkhvc3Q+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRyaXZl ci9XZWJEcml2ZXJTZXJ2aWNlLmNwcCBiL1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2Vydmlj ZS5jcHAKaW5kZXggYzA4ODAzZTU0MzAuLmUyYzg1ZWQxOWI3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViRHJpdmVyL1dlYkRyaXZlclNlcnZpY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvV2Vi RHJpdmVyU2VydmljZS5jcHAKQEAgLTE1MSw2ICsxNTEsMTEgQEAgY29uc3QgV2ViRHJpdmVyU2Vy dmljZTo6Q29tbWFuZCBXZWJEcml2ZXJTZXJ2aWNlOjpzX2NvbW1hbmRzW10gPSB7CiAgICAgeyBI VFRQTWV0aG9kOjpQb3N0LCAiL3Nlc3Npb24vJHNlc3Npb25JZC9leGVjdXRlL3N5bmMiLCAmV2Vi RHJpdmVyU2VydmljZTo6ZXhlY3V0ZVNjcmlwdCB9LAogICAgIHsgSFRUUE1ldGhvZDo6UG9zdCwg Ii9zZXNzaW9uLyRzZXNzaW9uSWQvZXhlY3V0ZS9hc3luYyIsICZXZWJEcml2ZXJTZXJ2aWNlOjpl eGVjdXRlQXN5bmNTY3JpcHQgfSwKIAorICAgIHsgSFRUUE1ldGhvZDo6UG9zdCwgIi9zZXNzaW9u LyRzZXNzaW9uSWQvYWxlcnQvZGlzbWlzcyIsICZXZWJEcml2ZXJTZXJ2aWNlOjpkaXNtaXNzQWxl cnQgfSwKKyAgICB7IEhUVFBNZXRob2Q6OlBvc3QsICIvc2Vzc2lvbi8kc2Vzc2lvbklkL2FsZXJ0 L2FjY2VwdCIsICZXZWJEcml2ZXJTZXJ2aWNlOjphY2NlcHRBbGVydCB9LAorICAgIHsgSFRUUE1l dGhvZDo6R2V0LCAiL3Nlc3Npb24vJHNlc3Npb25JZC9hbGVydC90ZXh0IiwgJldlYkRyaXZlclNl cnZpY2U6OmdldEFsZXJ0VGV4dCB9LAorICAgIHsgSFRUUE1ldGhvZDo6UG9zdCwgIi9zZXNzaW9u LyRzZXNzaW9uSWQvYWxlcnQvdGV4dCIsICZXZWJEcml2ZXJTZXJ2aWNlOjpzZW5kQWxlcnRUZXh0 IH0sCisKICAgICB7IEhUVFBNZXRob2Q6OkdldCwgIi9zZXNzaW9uLyRzZXNzaW9uSWQvZWxlbWVu dC8kZWxlbWVudElkL2Rpc3BsYXllZCIsICZXZWJEcml2ZXJTZXJ2aWNlOjppc0VsZW1lbnREaXNw bGF5ZWQgfSwKIH07CiAKQEAgLTEyMjgsNCArMTIzMyw3OCBAQCB2b2lkIFdlYkRyaXZlclNlcnZp Y2U6OmV4ZWN1dGVBc3luY1NjcmlwdChSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYmIHBhcmFtZXRl cnMsCiAgICAgfSk7CiB9CiAKK3ZvaWQgV2ViRHJpdmVyU2VydmljZTo6ZGlzbWlzc0FsZXJ0KFJl ZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiYgcGFyYW1ldGVycywgRnVuY3Rpb248dm9pZCAoQ29tbWFu ZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICAvLyDCpzE4LjEgRGlzbWlz cyBBbGVydC4KKyAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vd2ViZHJpdmVyL3dlYmRyaXZl ci1zcGVjLmh0bWwjZGlzbWlzcy1hbGVydAorICAgIGF1dG8gc2Vzc2lvbiA9IGZpbmRTZXNzaW9u T3JDb21wbGV0ZVdpdGhFcnJvcigqcGFyYW1ldGVycywgY29tcGxldGlvbkhhbmRsZXIpOworICAg IGlmICghc2Vzc2lvbikKKyAgICAgICAgcmV0dXJuOworCisgICAgc2Vzc2lvbi0+d2FpdEZvck5h dmlnYXRpb25Ub0NvbXBsZXRlKFtzZXNzaW9uLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpXShDb21tYW5kUmVzdWx0JiYgcmVzdWx0KSBtdXRhYmxlIHsKKyAg ICAgICAgaWYgKHJlc3VsdC5pc0Vycm9yKCkpIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKFdURk1vdmUocmVzdWx0KSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgc2Vzc2lvbi0+ZGlzbWlzc0FsZXJ0KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsK KyAgICB9KTsKK30KKwordm9pZCBXZWJEcml2ZXJTZXJ2aWNlOjphY2NlcHRBbGVydChSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiYmIHBhcmFtZXRlcnMsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1 bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCit7CisgICAgLy8gwqcxOC4yIEFjY2VwdCBBbGVy dC4KKyAgICAvLyBodHRwczovL3czYy5naXRodWIuaW8vd2ViZHJpdmVyL3dlYmRyaXZlci1zcGVj Lmh0bWwjYWNjZXB0LWFsZXJ0CisgICAgYXV0byBzZXNzaW9uID0gZmluZFNlc3Npb25PckNvbXBs ZXRlV2l0aEVycm9yKCpwYXJhbWV0ZXJzLCBjb21wbGV0aW9uSGFuZGxlcik7CisgICAgaWYgKCFz ZXNzaW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBzZXNzaW9uLT53YWl0Rm9yTmF2aWdhdGlv blRvQ29tcGxldGUoW3Nlc3Npb24sIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildKENvbW1hbmRSZXN1bHQmJiByZXN1bHQpIG11dGFibGUgeworICAgICAgICBp ZiAocmVzdWx0LmlzRXJyb3IoKSkgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RG TW92ZShyZXN1bHQpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBz ZXNzaW9uLT5hY2NlcHRBbGVydChXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgfSk7 Cit9CisKK3ZvaWQgV2ViRHJpdmVyU2VydmljZTo6Z2V0QWxlcnRUZXh0KFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+JiYgcGFyYW1ldGVycywgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICAvLyDCpzE4LjMgR2V0IEFsZXJ0IFRleHQuCisg ICAgLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3dlYmRyaXZlci93ZWJkcml2ZXItc3BlYy5odG1s I2dldC1hbGVydC10ZXh0CisgICAgYXV0byBzZXNzaW9uID0gZmluZFNlc3Npb25PckNvbXBsZXRl V2l0aEVycm9yKCpwYXJhbWV0ZXJzLCBjb21wbGV0aW9uSGFuZGxlcik7CisgICAgaWYgKCFzZXNz aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBzZXNzaW9uLT53YWl0Rm9yTmF2aWdhdGlvblRv Q29tcGxldGUoW3Nlc3Npb24sIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcildKENvbW1hbmRSZXN1bHQmJiByZXN1bHQpIG11dGFibGUgeworICAgICAgICBpZiAo cmVzdWx0LmlzRXJyb3IoKSkgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92 ZShyZXN1bHQpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBzZXNz aW9uLT5nZXRBbGVydFRleHQoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIH0pOwor fQorCit2b2lkIFdlYkRyaXZlclNlcnZpY2U6OnNlbmRBbGVydFRleHQoUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4mJiBwYXJhbWV0ZXJzLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIC8vIMKnMTguNCBTZW5kIEFsZXJ0IFRleHQuCisg ICAgLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3dlYmRyaXZlci93ZWJkcml2ZXItc3BlYy5odG1s I3NlbmQtYWxlcnQtdGV4dAorICAgIGF1dG8gc2Vzc2lvbiA9IGZpbmRTZXNzaW9uT3JDb21wbGV0 ZVdpdGhFcnJvcigqcGFyYW1ldGVycywgY29tcGxldGlvbkhhbmRsZXIpOworICAgIGlmICghc2Vz c2lvbikKKyAgICAgICAgcmV0dXJuOworCisgICAgU3RyaW5nIHRleHQ7CisgICAgaWYgKCFwYXJh bWV0ZXJzLT5nZXRTdHJpbmcoQVNDSUlMaXRlcmFsKCJ0ZXh0IiksIHRleHQpKSB7CisgICAgICAg IGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJy b3JDb2RlOjpJbnZhbGlkQXJndW1lbnQpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IHNlc3Npb24tPndhaXRGb3JOYXZpZ2F0aW9uVG9Db21wbGV0ZShbc2Vzc2lvbiwgdGV4dCA9IFdU Rk1vdmUodGV4dCksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cildKENvbW1hbmRSZXN1bHQmJiByZXN1bHQpIG11dGFibGUgeworICAgICAgICBpZiAocmVzdWx0 LmlzRXJyb3IoKSkgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShyZXN1 bHQpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBzZXNzaW9uLT5z ZW5kQWxlcnRUZXh0KHRleHQsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICB9KTsK K30KKwogfSAvLyBuYW1lc3BhY2UgV2ViRHJpdmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJp dmVyL1dlYkRyaXZlclNlcnZpY2UuaCBiL1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2Vydmlj ZS5oCmluZGV4IDg5ODM3NDU3M2QyLi41ODg4NjVlNDk3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNlLmgKKysrIGIvU291cmNlL1dlYkRyaXZlci9XZWJEcml2 ZXJTZXJ2aWNlLmgKQEAgLTEwMSw2ICsxMDEsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIGVsZW1l bnRTdWJtaXQoUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiYmLCBGdW5jdGlvbjx2 b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmKTsKICAgICB2b2lkIGV4ZWN1dGVTY3JpcHQoUmVmUHRy PEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiYmLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVz dWx0JiYpPiYmKTsKICAgICB2b2lkIGV4ZWN1dGVBc3luY1NjcmlwdChSZWZQdHI8SW5zcGVjdG9y OjpJbnNwZWN0b3JPYmplY3Q+JiYsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYp OworICAgIHZvaWQgZGlzbWlzc0FsZXJ0KFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVj dD4mJiwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CisgICAgdm9pZCBhY2Nl cHRBbGVydChSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+JiYsIEZ1bmN0aW9uPHZv aWQgKENvbW1hbmRSZXN1bHQmJik+JiYpOworICAgIHZvaWQgZ2V0QWxlcnRUZXh0KFJlZlB0cjxJ bnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4mJiwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3Vs dCYmKT4mJik7CisgICAgdm9pZCBzZW5kQWxlcnRUZXh0KFJlZlB0cjxJbnNwZWN0b3I6Okluc3Bl Y3Rvck9iamVjdD4mJiwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CiAKICAg ICBzdGF0aWMgQ2FwYWJpbGl0aWVzIHBsYXRmb3JtQ2FwYWJpbGl0aWVzKCk7CiAgICAgUmVmUHRy PEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBwcm9jZXNzQ2FwYWJpbGl0aWVzKGNvbnN0IElu c3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0JiwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYm KT4mKSBjb25zdDsK