181524 2018-01-11 01:40:53 -0800 WebDriver: implement get timeouts command 2018-01-15 02:34:00 -0800 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cgarcia webkit-unassigned bburg ews-watchlist webkit-bug-importer zan oldest_to_newest 1388159 0 cgarcia 2018-01-11 01:40:53 -0800 https://w3c.github.io/webdriver/webdriver-spec.html#get-timeouts 1388164 1 331042 cgarcia 2018-01-11 01:46:12 -0800 Created attachment 331042 Patch 1388165 2 ews-watchlist 2018-01-11 01:49:07 -0800 Attachment 331042 did not pass style-queue: ERROR: Source/WebDriver/WebDriverService.h:66: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/WebDriverService.cpp:723: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebDriver/Session.cpp:110: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 3 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1388167 3 cgarcia 2018-01-11 02:00:42 -0800 Committed r226770: <https://trac.webkit.org/changeset/226770> 1388168 4 webkit-bug-importer 2018-01-11 02:01:23 -0800 <rdar://problem/36432027> 1389265 5 cgarcia 2018-01-15 02:34:00 -0800 *** Bug 180406 has been marked as a duplicate of this bug. *** 331042 2018-01-11 01:46:12 -0800 2018-01-11 01:58:47 -0800 Patch wd-get-timeouts.diff text/plain 14661 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggNWM0NTlmZmNmZDMuLjc4YTcwNWMyZDI2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDM3IEBACisyMDE4LTAxLTExICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBXZWJEcml2ZXI6IGltcGxlbWVudCBnZXQgdGlt ZW91dHMgY29tbWFuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgxNTI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgOC40IEdldCBUaW1lb3V0cworICAgICAgICBodHRwczovL3czYy5naXRodWIuaW8vd2Vi ZHJpdmVyL3dlYmRyaXZlci1zcGVjLmh0bWwjZ2V0LXRpbWVvdXRzCisKKyAgICAgICAgQWxzbyBz aW1wbGlmeSB0aGUgd2F5IHRpbWVvdXRzIGFyZSBoYW5kbGVkIGluIFNlc3Npb24uIFN0b3AgdXNp bmcgVGltZW91dHMgc3RydWN0LCBiZWNhdXNlIG9uY2UgdGhlIHNlc3Npb24gaXMKKyAgICAgICAg Y3JlYXRlZCB0aGUgdGltZW91dHMgYXJlIG5vIGxvbmdlciBvcHRpb25hbCwgdGhleSBoYXZlIGEg ZGVmYXVsdCB2YWx1ZS4gVXNlIGluZGl2aWR1YWwgbWVtYmVycyBpbnN0ZWFkIHRoYXQgYXJlCisg ICAgICAgIGluaXRpYWxpemVkIHRvIHRoZWlyIGRlZmF1bHQgdmFsdWVzIG9uIGNvbnN0cnVjdGlv biBhbmQgb25seSBvdmVycmlkZW4gYnkgY2FwYWJpbGl0aWVzIG9yIHNldCB0aW1lb3V0cyBjb21t YW5kLgorCisgICAgICAgIEZpeGVzOiBpbXBvcnRlZC93M2Mvd2ViZHJpdmVyL3Rlc3RzL3Nlc3Np b25zL2dldF90aW1lb3V0cy5weTo6dGVzdF9nZXRfdGltZW91dHMKKyAgICAgICAgICAgICAgIGlt cG9ydGVkL3czYy93ZWJkcml2ZXIvdGVzdHMvc2Vzc2lvbnMvZ2V0X3RpbWVvdXRzLnB5Ojp0ZXN0 X2dldF9kZWZhdWx0X3RpbWVvdXRzCisgICAgICAgICAgICAgICBpbXBvcnRlZC93M2Mvd2ViZHJp dmVyL3Rlc3RzL3Nlc3Npb25zL2dldF90aW1lb3V0cy5weTo6dGVzdF9nZXRfbmV3X3RpbWVvdXRz CisKKyAgICAgICAgKiBTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6 U2Vzc2lvbik6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmdldFRpbWVvdXRzKToKKyAg ICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6c2V0VGltZW91dHMpOgorICAgICAgICAoV2ViRHJp dmVyOjpTZXNzaW9uOjpnbyk6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmJhY2spOgor ICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpmb3J3YXJkKToKKyAgICAgICAgKFdlYkRyaXZl cjo6U2Vzc2lvbjo6cmVmcmVzaCk6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmZpbmRF bGVtZW50cyk6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OndhaXRGb3JOYXZpZ2F0aW9u VG9Db21wbGV0ZSk6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmV4ZWN1dGVTY3JpcHQp OgorICAgICAgICAqIFNlc3Npb24uaDoKKyAgICAgICAgKiBXZWJEcml2ZXJTZXJ2aWNlLmNwcDoK KyAgICAgICAgKFdlYkRyaXZlcjo6V2ViRHJpdmVyU2VydmljZTo6Z2V0VGltZW91dHMpOgorICAg ICAgICAqIFdlYkRyaXZlclNlcnZpY2UuaDoKKwogMjAxOC0wMS0xMCAgWmFuIERvYmVyc2VrICA8 emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgV2ViRHJpdmVyOiBkZXNlcmlhbGl6ZVRp bWVvdXRzKCkgc2hvdWxkbid0IHJlamVjdCBkb3VibGUgdGltZW91dCB2YWx1ZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Np b24uY3BwCmluZGV4IGJiNjllOTYwYTY0Li4zZjMzMWNiZjYzNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkRyaXZlci9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3Bw CkBAIC0zOSw5ICszOSwxOSBAQCBuYW1lc3BhY2UgV2ViRHJpdmVyIHsKIC8vIGh0dHBzOi8vd3d3 LnczLm9yZy9UUi93ZWJkcml2ZXIvI2VsZW1lbnRzCiBzdGF0aWMgY29uc3QgU3RyaW5nIHdlYkVs ZW1lbnRJZGVudGlmaWVyID0gQVNDSUlMaXRlcmFsKCJlbGVtZW50LTYwNjYtMTFlNC1hNTJlLTRm NzM1NDY2Y2VjZiIpOwogCisvLyBodHRwczovL3czYy5naXRodWIuaW8vd2ViZHJpdmVyL3dlYmRy aXZlci1zcGVjLmh0bWwjZGZuLXNlc3Npb24tc2NyaXB0LXRpbWVvdXQKK3N0YXRpYyBjb25zdCBT ZWNvbmRzIGRlZmF1bHRTY3JpcHRUaW1lb3V0ID0gMzBfczsKKy8vIGh0dHBzOi8vdzNjLmdpdGh1 Yi5pby93ZWJkcml2ZXIvd2ViZHJpdmVyLXNwZWMuaHRtbCNkZm4tc2Vzc2lvbi1wYWdlLWxvYWQt dGltZW91dAorc3RhdGljIGNvbnN0IFNlY29uZHMgZGVmYXVsdFBhZ2VMb2FkVGltZW91dCA9IDMw MF9zOworLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3dlYmRyaXZlci93ZWJkcml2ZXItc3BlYy5o dG1sI2Rmbi1zZXNzaW9uLWltcGxpY2l0LXdhaXQtdGltZW91dAorc3RhdGljIGNvbnN0IFNlY29u ZHMgZGVmYXVsdEltcGxpY2l0V2FpdFRpbWVvdXQgPSAwX3M7CisKIFNlc3Npb246OlNlc3Npb24o c3RkOjp1bmlxdWVfcHRyPFNlc3Npb25Ib3N0PiYmIGhvc3QpCiAgICAgOiBtX2hvc3QoV1RGTW92 ZShob3N0KSkKICAgICAsIG1faWQoY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpKQorICAgICwg bV9zY3JpcHRUaW1lb3V0KGRlZmF1bHRTY3JpcHRUaW1lb3V0KQorICAgICwgbV9wYWdlTG9hZFRp bWVvdXQoZGVmYXVsdFBhZ2VMb2FkVGltZW91dCkKKyAgICAsIG1faW1wbGljaXRXYWl0VGltZW91 dChkZWZhdWx0SW1wbGljaXRXYWl0VGltZW91dCkKIHsKIH0KIApAQCAtOTcsMTQgKzEwNywyMyBA QCB2b2lkIFNlc3Npb246OmNsb3NlKEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYg Y29tcGxldGlvbkhhbmRsZXIpCiAgICAgfSk7CiB9CiAKK3ZvaWQgU2Vzc2lvbjo6Z2V0VGltZW91 dHMoRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikK K3sKKyAgICBSZWZQdHI8SlNPTjo6T2JqZWN0PiBwYXJhbWV0ZXJzID0gSlNPTjo6T2JqZWN0Ojpj cmVhdGUoKTsKKyAgICBwYXJhbWV0ZXJzLT5zZXRJbnRlZ2VyKEFTQ0lJTGl0ZXJhbCgic2NyaXB0 IiksIG1fc2NyaXB0VGltZW91dC5taWxsaXNlY29uZHNBczxpbnQ+KCkpOworICAgIHBhcmFtZXRl cnMtPnNldEludGVnZXIoQVNDSUlMaXRlcmFsKCJwYWdlTG9hZCIpLCBtX3BhZ2VMb2FkVGltZW91 dC5taWxsaXNlY29uZHNBczxpbnQ+KCkpOworICAgIHBhcmFtZXRlcnMtPnNldEludGVnZXIoQVND SUlMaXRlcmFsKCJpbXBsaWNpdCIpLCBtX2ltcGxpY2l0V2FpdFRpbWVvdXQubWlsbGlzZWNvbmRz QXM8aW50PigpKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihDb21tYW5kUmVzdWx0OjpzdWNjZXNz KFdURk1vdmUocGFyYW1ldGVycykpKTsKK30KKwogdm9pZCBTZXNzaW9uOjpzZXRUaW1lb3V0cyhj b25zdCBUaW1lb3V0cyYgdGltZW91dHMsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+ JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgaWYgKHRpbWVvdXRzLnNjcmlwdCkKLSAgICAg ICAgbV90aW1lb3V0cy5zY3JpcHQgPSB0aW1lb3V0cy5zY3JpcHQ7CisgICAgICAgIG1fc2NyaXB0 VGltZW91dCA9IHRpbWVvdXRzLnNjcmlwdC52YWx1ZSgpOwogICAgIGlmICh0aW1lb3V0cy5wYWdl TG9hZCkKLSAgICAgICAgbV90aW1lb3V0cy5wYWdlTG9hZCA9IHRpbWVvdXRzLnBhZ2VMb2FkOwor ICAgICAgICBtX3BhZ2VMb2FkVGltZW91dCA9IHRpbWVvdXRzLnBhZ2VMb2FkLnZhbHVlKCk7CiAg ICAgaWYgKHRpbWVvdXRzLmltcGxpY2l0KQotICAgICAgICBtX3RpbWVvdXRzLmltcGxpY2l0ID0g dGltZW91dHMuaW1wbGljaXQ7CisgICAgICAgIG1faW1wbGljaXRXYWl0VGltZW91dCA9IHRpbWVv dXRzLmltcGxpY2l0LnZhbHVlKCk7CiAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3Vs dDo6c3VjY2VzcygpKTsKIH0KIApAQCAtMjcwLDggKzI4OSw3IEBAIHZvaWQgU2Vzc2lvbjo6Z28o Y29uc3QgU3RyaW5nJiB1cmwsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29t cGxldGlvCiAgICAgICAgIFJlZlB0cjxKU09OOjpPYmplY3Q+IHBhcmFtZXRlcnMgPSBKU09OOjpP YmplY3Q6OmNyZWF0ZSgpOwogICAgICAgICBwYXJhbWV0ZXJzLT5zZXRTdHJpbmcoQVNDSUlMaXRl cmFsKCJoYW5kbGUiKSwgbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dC52YWx1ZSgpKTsKICAgICAg ICAgcGFyYW1ldGVycy0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgidXJsIiksIHVybCk7Ci0gICAg ICAgIGlmIChtX3RpbWVvdXRzLnBhZ2VMb2FkKQotICAgICAgICAgICAgcGFyYW1ldGVycy0+c2V0 SW50ZWdlcihBU0NJSUxpdGVyYWwoInBhZ2VMb2FkVGltZW91dCIpLCBtX3RpbWVvdXRzLnBhZ2VM b2FkLnZhbHVlKCkubWlsbGlzZWNvbmRzQXM8aW50PigpKTsKKyAgICAgICAgcGFyYW1ldGVycy0+ c2V0SW50ZWdlcihBU0NJSUxpdGVyYWwoInBhZ2VMb2FkVGltZW91dCIpLCBtX3BhZ2VMb2FkVGlt ZW91dC5taWxsaXNlY29uZHNBczxpbnQ+KCkpOwogICAgICAgICBpZiAoYXV0byBwYWdlTG9hZFN0 cmF0ZWd5ID0gcGFnZUxvYWRTdHJhdGVneVN0cmluZygpKQogICAgICAgICAgICAgcGFyYW1ldGVy cy0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgicGFnZUxvYWRTdHJhdGVneSIpLCBwYWdlTG9hZFN0 cmF0ZWd5LnZhbHVlKCkpOwogICAgICAgICBtX2hvc3QtPnNlbmRDb21tYW5kVG9CYWNrZW5kKEFT Q0lJTGl0ZXJhbCgibmF2aWdhdGVCcm93c2luZ0NvbnRleHQiKSwgV1RGTW92ZShwYXJhbWV0ZXJz KSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY29tcGxldGlvbkhhbmRs ZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oU2Vzc2lvbkhvc3Q6OkNvbW1hbmRSZXNw b25zZSYmIHJlc3BvbnNlKSB7CkBAIC0zMzQsOCArMzUyLDcgQEAgdm9pZCBTZXNzaW9uOjpiYWNr KEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiAg ICAgICAgIH0KICAgICAgICAgUmVmUHRyPEpTT046Ok9iamVjdD4gcGFyYW1ldGVycyA9IEpTT046 Ok9iamVjdDo6Y3JlYXRlKCk7CiAgICAgICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhBU0NJSUxp dGVyYWwoImhhbmRsZSIpLCBtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0LnZhbHVlKCkpOwotICAg ICAgICBpZiAobV90aW1lb3V0cy5wYWdlTG9hZCkKLSAgICAgICAgICAgIHBhcmFtZXRlcnMtPnNl dEludGVnZXIoQVNDSUlMaXRlcmFsKCJwYWdlTG9hZFRpbWVvdXQiKSwgbV90aW1lb3V0cy5wYWdl TG9hZC52YWx1ZSgpLm1pbGxpc2Vjb25kc0FzPGludD4oKSk7CisgICAgICAgIHBhcmFtZXRlcnMt PnNldEludGVnZXIoQVNDSUlMaXRlcmFsKCJwYWdlTG9hZFRpbWVvdXQiKSwgbV9wYWdlTG9hZFRp bWVvdXQubWlsbGlzZWNvbmRzQXM8aW50PigpKTsKICAgICAgICAgaWYgKGF1dG8gcGFnZUxvYWRT dHJhdGVneSA9IHBhZ2VMb2FkU3RyYXRlZ3lTdHJpbmcoKSkKICAgICAgICAgICAgIHBhcmFtZXRl cnMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoInBhZ2VMb2FkU3RyYXRlZ3kiKSwgcGFnZUxvYWRT dHJhdGVneS52YWx1ZSgpKTsKICAgICAgICAgbV9ob3N0LT5zZW5kQ29tbWFuZFRvQmFja2VuZChB U0NJSUxpdGVyYWwoImdvQmFja0luQnJvd3NpbmdDb250ZXh0IiksIFdURk1vdmUocGFyYW1ldGVy cyksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvbXBsZXRpb25IYW5k bGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKFNlc3Npb25Ib3N0OjpDb21tYW5kUmVz cG9uc2UmJiByZXNwb25zZSkgewpAQCAtMzYzLDggKzM4MCw3IEBAIHZvaWQgU2Vzc2lvbjo6Zm9y d2FyZChGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogICAgICAgICB9CiAgICAgICAgIFJlZlB0cjxKU09OOjpPYmplY3Q+IHBhcmFtZXRlcnMgPSBK U09OOjpPYmplY3Q6OmNyZWF0ZSgpOwogICAgICAgICBwYXJhbWV0ZXJzLT5zZXRTdHJpbmcoQVND SUlMaXRlcmFsKCJoYW5kbGUiKSwgbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dC52YWx1ZSgpKTsK LSAgICAgICAgaWYgKG1fdGltZW91dHMucGFnZUxvYWQpCi0gICAgICAgICAgICBwYXJhbWV0ZXJz LT5zZXRJbnRlZ2VyKEFTQ0lJTGl0ZXJhbCgicGFnZUxvYWRUaW1lb3V0IiksIG1fdGltZW91dHMu cGFnZUxvYWQudmFsdWUoKS5taWxsaXNlY29uZHNBczxpbnQ+KCkpOworICAgICAgICBwYXJhbWV0 ZXJzLT5zZXRJbnRlZ2VyKEFTQ0lJTGl0ZXJhbCgicGFnZUxvYWRUaW1lb3V0IiksIG1fcGFnZUxv YWRUaW1lb3V0Lm1pbGxpc2Vjb25kc0FzPGludD4oKSk7CiAgICAgICAgIGlmIChhdXRvIHBhZ2VM b2FkU3RyYXRlZ3kgPSBwYWdlTG9hZFN0cmF0ZWd5U3RyaW5nKCkpCiAgICAgICAgICAgICBwYXJh bWV0ZXJzLT5zZXRTdHJpbmcoQVNDSUlMaXRlcmFsKCJwYWdlTG9hZFN0cmF0ZWd5IiksIHBhZ2VM b2FkU3RyYXRlZ3kudmFsdWUoKSk7CiAgICAgICAgIG1faG9zdC0+c2VuZENvbW1hbmRUb0JhY2tl bmQoQVNDSUlMaXRlcmFsKCJnb0ZvcndhcmRJbkJyb3dzaW5nQ29udGV4dCIpLCBXVEZNb3ZlKHBh cmFtZXRlcnMpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShTZXNzaW9uSG9zdDo6Q29t bWFuZFJlc3BvbnNlJiYgcmVzcG9uc2UpIHsKQEAgLTM5Miw4ICs0MDgsNyBAQCB2b2lkIFNlc3Np b246OnJlZnJlc2goRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9u SGFuZGxlcikKICAgICAgICAgfQogICAgICAgICBSZWZQdHI8SlNPTjo6T2JqZWN0PiBwYXJhbWV0 ZXJzID0gSlNPTjo6T2JqZWN0OjpjcmVhdGUoKTsKICAgICAgICAgcGFyYW1ldGVycy0+c2V0U3Ry aW5nKEFTQ0lJTGl0ZXJhbCgiaGFuZGxlIiksIG1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQudmFs dWUoKSk7Ci0gICAgICAgIGlmIChtX3RpbWVvdXRzLnBhZ2VMb2FkKQotICAgICAgICAgICAgcGFy YW1ldGVycy0+c2V0SW50ZWdlcihBU0NJSUxpdGVyYWwoInBhZ2VMb2FkVGltZW91dCIpLCBtX3Rp bWVvdXRzLnBhZ2VMb2FkLnZhbHVlKCkubWlsbGlzZWNvbmRzQXM8aW50PigpKTsKKyAgICAgICAg cGFyYW1ldGVycy0+c2V0SW50ZWdlcihBU0NJSUxpdGVyYWwoInBhZ2VMb2FkVGltZW91dCIpLCBt X3BhZ2VMb2FkVGltZW91dC5taWxsaXNlY29uZHNBczxpbnQ+KCkpOwogICAgICAgICBpZiAoYXV0 byBwYWdlTG9hZFN0cmF0ZWd5ID0gcGFnZUxvYWRTdHJhdGVneVN0cmluZygpKQogICAgICAgICAg ICAgcGFyYW1ldGVycy0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgicGFnZUxvYWRTdHJhdGVneSIp LCBwYWdlTG9hZFN0cmF0ZWd5LnZhbHVlKCkpOwogICAgICAgICBtX2hvc3QtPnNlbmRDb21tYW5k VG9CYWNrZW5kKEFTQ0lJTGl0ZXJhbCgicmVsb2FkQnJvd3NpbmdDb250ZXh0IiksIFdURk1vdmUo cGFyYW1ldGVycyksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGNvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKFNlc3Npb25Ib3N0OjpD b21tYW5kUmVzcG9uc2UmJiByZXNwb25zZSkgewpAQCAtOTE1LDcgKzkzMCw2IEBAIHZvaWQgU2Vz c2lvbjo6ZmluZEVsZW1lbnRzKGNvbnN0IFN0cmluZyYgc3RyYXRlZ3ksIGNvbnN0IFN0cmluZyYg c2VsZWN0b3IsIEZpbmRFCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBhdXRvIGltcGxp Y2l0V2FpdCA9IG1fdGltZW91dHMuaW1wbGljaXQudmFsdWVfb3IoMF9zKTsKICAgICBSZWZQdHI8 SlNPTjo6QXJyYXk+IGFyZ3VtZW50cyA9IEpTT046OkFycmF5OjpjcmVhdGUoKTsKICAgICBhcmd1 bWVudHMtPnB1c2hTdHJpbmcoSlNPTjo6VmFsdWU6OmNyZWF0ZShzdHJhdGVneSktPnRvSlNPTlN0 cmluZygpKTsKICAgICBpZiAocm9vdEVsZW1lbnRJRC5pc0VtcHR5KCkpCkBAIC05MjQsNyArOTM4 LDcgQEAgdm9pZCBTZXNzaW9uOjpmaW5kRWxlbWVudHMoY29uc3QgU3RyaW5nJiBzdHJhdGVneSwg Y29uc3QgU3RyaW5nJiBzZWxlY3RvciwgRmluZEUKICAgICAgICAgYXJndW1lbnRzLT5wdXNoU3Ry aW5nKGNyZWF0ZUVsZW1lbnQocm9vdEVsZW1lbnRJRCktPnRvSlNPTlN0cmluZygpKTsKICAgICBh cmd1bWVudHMtPnB1c2hTdHJpbmcoSlNPTjo6VmFsdWU6OmNyZWF0ZShzZWxlY3RvciktPnRvSlNP TlN0cmluZygpKTsKICAgICBhcmd1bWVudHMtPnB1c2hTdHJpbmcoSlNPTjo6VmFsdWU6OmNyZWF0 ZShtb2RlID09IEZpbmRFbGVtZW50c01vZGU6OlNpbmdsZSktPnRvSlNPTlN0cmluZygpKTsKLSAg ICBhcmd1bWVudHMtPnB1c2hTdHJpbmcoSlNPTjo6VmFsdWU6OmNyZWF0ZShpbXBsaWNpdFdhaXQu bWlsbGlzZWNvbmRzKCkpLT50b0pTT05TdHJpbmcoKSk7CisgICAgYXJndW1lbnRzLT5wdXNoU3Ry aW5nKEpTT046OlZhbHVlOjpjcmVhdGUobV9pbXBsaWNpdFdhaXRUaW1lb3V0Lm1pbGxpc2Vjb25k cygpKS0+dG9KU09OU3RyaW5nKCkpOwogCiAgICAgUmVmUHRyPEpTT046Ok9iamVjdD4gcGFyYW1l dGVycyA9IEpTT046Ok9iamVjdDo6Y3JlYXRlKCk7CiAgICAgcGFyYW1ldGVycy0+c2V0U3RyaW5n KEFTQ0lJTGl0ZXJhbCgiYnJvd3NpbmdDb250ZXh0SGFuZGxlIiksIG1fdG9wbGV2ZWxCcm93c2lu Z0NvbnRleHQudmFsdWUoKSk7CkBAIC05MzQsOCArOTQ4LDggQEAgdm9pZCBTZXNzaW9uOjpmaW5k RWxlbWVudHMoY29uc3QgU3RyaW5nJiBzdHJhdGVneSwgY29uc3QgU3RyaW5nJiBzZWxlY3Rvciwg RmluZEUKICAgICBwYXJhbWV0ZXJzLT5zZXRBcnJheShBU0NJSUxpdGVyYWwoImFyZ3VtZW50cyIp LCBXVEZNb3ZlKGFyZ3VtZW50cykpOwogICAgIHBhcmFtZXRlcnMtPnNldEJvb2xlYW4oQVNDSUlM aXRlcmFsKCJleHBlY3RzSW1wbGljaXRDYWxsYmFja0FyZ3VtZW50IiksIHRydWUpOwogICAgIC8v IElmIHRoZXJlJ3MgYW4gaW1wbGljaXQgd2FpdCwgdXNlIG9uZSBzZWNvbmQgbW9yZSBhcyBjYWxs YmFjayB0aW1lb3V0LgotICAgIGlmIChpbXBsaWNpdFdhaXQpCi0gICAgICAgIHBhcmFtZXRlcnMt PnNldEludGVnZXIoQVNDSUlMaXRlcmFsKCJjYWxsYmFja1RpbWVvdXQiKSwgU2Vjb25kcyhpbXBs aWNpdFdhaXQgKyAxX3MpLm1pbGxpc2Vjb25kc0FzPGludD4oKSk7CisgICAgaWYgKG1faW1wbGlj aXRXYWl0VGltZW91dCkKKyAgICAgICAgcGFyYW1ldGVycy0+c2V0SW50ZWdlcihBU0NJSUxpdGVy YWwoImNhbGxiYWNrVGltZW91dCIpLCBTZWNvbmRzKG1faW1wbGljaXRXYWl0VGltZW91dCArIDFf cykubWlsbGlzZWNvbmRzQXM8aW50PigpKTsKIAogICAgIG1faG9zdC0+c2VuZENvbW1hbmRUb0Jh Y2tlbmQoQVNDSUlMaXRlcmFsKCJldmFsdWF0ZUphdmFTY3JpcHRGdW5jdGlvbiIpLCBXVEZNb3Zl KHBhcmFtZXRlcnMpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBtb2Rl LCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShTZXNzaW9u SG9zdDo6Q29tbWFuZFJlc3BvbnNlJiYgcmVzcG9uc2UpIHsKICAgICAgICAgaWYgKHJlc3BvbnNl LmlzRXJyb3IgfHwgIXJlc3BvbnNlLnJlc3BvbnNlT2JqZWN0KSB7CkBAIC0xMzYwLDggKzEzNzQs NyBAQCB2b2lkIFNlc3Npb246OndhaXRGb3JOYXZpZ2F0aW9uVG9Db21wbGV0ZShGdW5jdGlvbjx2 b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbQogICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhB U0NJSUxpdGVyYWwoImJyb3dzaW5nQ29udGV4dEhhbmRsZSIpLCBtX3RvcGxldmVsQnJvd3NpbmdD b250ZXh0LnZhbHVlKCkpOwogICAgIGlmIChtX2N1cnJlbnRCcm93c2luZ0NvbnRleHQpCiAgICAg ICAgIHBhcmFtZXRlcnMtPnNldFN0cmluZyhBU0NJSUxpdGVyYWwoImZyYW1lSGFuZGxlIiksIG1f Y3VycmVudEJyb3dzaW5nQ29udGV4dC52YWx1ZSgpKTsKLSAgICBpZiAobV90aW1lb3V0cy5wYWdl TG9hZCkKLSAgICAgICAgcGFyYW1ldGVycy0+c2V0SW50ZWdlcihBU0NJSUxpdGVyYWwoInBhZ2VM b2FkVGltZW91dCIpLCBtX3RpbWVvdXRzLnBhZ2VMb2FkLnZhbHVlKCkubWlsbGlzZWNvbmRzQXM8 aW50PigpKTsKKyAgICBwYXJhbWV0ZXJzLT5zZXRJbnRlZ2VyKEFTQ0lJTGl0ZXJhbCgicGFnZUxv YWRUaW1lb3V0IiksIG1fcGFnZUxvYWRUaW1lb3V0Lm1pbGxpc2Vjb25kc0FzPGludD4oKSk7CiAg ICAgaWYgKGF1dG8gcGFnZUxvYWRTdHJhdGVneSA9IHBhZ2VMb2FkU3RyYXRlZ3lTdHJpbmcoKSkK ICAgICAgICAgcGFyYW1ldGVycy0+c2V0U3RyaW5nKEFTQ0lJTGl0ZXJhbCgicGFnZUxvYWRTdHJh dGVneSIpLCBwYWdlTG9hZFN0cmF0ZWd5LnZhbHVlKCkpOwogICAgIG1faG9zdC0+c2VuZENvbW1h bmRUb0JhY2tlbmQoQVNDSUlMaXRlcmFsKCJ3YWl0Rm9yTmF2aWdhdGlvblRvQ29tcGxldGUiKSwg V1RGTW92ZShwYXJhbWV0ZXJzKSwgW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0oU2Vzc2lv bkhvc3Q6OkNvbW1hbmRSZXNwb25zZSYmIHJlc3BvbnNlKSB7CkBAIC0xNzI1LDggKzE3MzgsOCBA QCB2b2lkIFNlc3Npb246OmV4ZWN1dGVTY3JpcHQoY29uc3QgU3RyaW5nJiBzY3JpcHQsIFJlZlB0 cjxKU09OOjpBcnJheT4mJiBhcmd1bWVudAogICAgICAgICBwYXJhbWV0ZXJzLT5zZXRBcnJheShB U0NJSUxpdGVyYWwoImFyZ3VtZW50cyIpLCBXVEZNb3ZlKGFyZ3VtZW50cykpOwogICAgICAgICBp ZiAobW9kZSA9PSBFeGVjdXRlU2NyaXB0TW9kZTo6QXN5bmMpIHsKICAgICAgICAgICAgIHBhcmFt ZXRlcnMtPnNldEJvb2xlYW4oQVNDSUlMaXRlcmFsKCJleHBlY3RzSW1wbGljaXRDYWxsYmFja0Fy Z3VtZW50IiksIHRydWUpOwotICAgICAgICAgICAgaWYgKG1fdGltZW91dHMuc2NyaXB0KQotICAg ICAgICAgICAgICAgIHBhcmFtZXRlcnMtPnNldEludGVnZXIoQVNDSUlMaXRlcmFsKCJjYWxsYmFj a1RpbWVvdXQiKSwgbV90aW1lb3V0cy5zY3JpcHQudmFsdWUoKS5taWxsaXNlY29uZHNBczxpbnQ+ KCkpOworICAgICAgICAgICAgaWYgKG1fc2NyaXB0VGltZW91dCkKKyAgICAgICAgICAgICAgICBw YXJhbWV0ZXJzLT5zZXRJbnRlZ2VyKEFTQ0lJTGl0ZXJhbCgiY2FsbGJhY2tUaW1lb3V0IiksIG1f c2NyaXB0VGltZW91dC5taWxsaXNlY29uZHNBczxpbnQ+KCkpOwogICAgICAgICB9CiAgICAgICAg IG1faG9zdC0+c2VuZENvbW1hbmRUb0JhY2tlbmQoQVNDSUlMaXRlcmFsKCJldmFsdWF0ZUphdmFT Y3JpcHRGdW5jdGlvbiIpLCBXVEZNb3ZlKHBhcmFtZXRlcnMpLCBbdGhpcywgcHJvdGVjdGVkVGhp cyA9IG1ha2VSZWYoKnRoaXMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpXShTZXNzaW9uSG9zdDo6Q29tbWFuZFJlc3BvbnNlJiYgcmVzcG9uc2UpIG11dGFi bGUgewogICAgICAgICAgICAgaWYgKHJlc3BvbnNlLmlzRXJyb3IgfHwgIXJlc3BvbnNlLnJlc3Bv bnNlT2JqZWN0KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uaCBiL1Nv dXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5oCmluZGV4IDllYmRhZjI3M2U2Li41YThhODRlZDEwZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkRy aXZlci9TZXNzaW9uLmgKQEAgLTE3OCw4ICsxNzgsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBl cmZvcm1LZXlib2FyZEludGVyYWN0aW9ucyhWZWN0b3I8S2V5Ym9hcmRJbnRlcmFjdGlvbj4mJiwg RnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CiAKICAgICBzdGQ6OnVuaXF1ZV9w dHI8U2Vzc2lvbkhvc3Q+IG1faG9zdDsKLSAgICBUaW1lb3V0cyBtX3RpbWVvdXRzOwogICAgIFN0 cmluZyBtX2lkOworICAgIFNlY29uZHMgbV9zY3JpcHRUaW1lb3V0OworICAgIFNlY29uZHMgbV9w YWdlTG9hZFRpbWVvdXQ7CisgICAgU2Vjb25kcyBtX2ltcGxpY2l0V2FpdFRpbWVvdXQ7CiAgICAg c3RkOjpvcHRpb25hbDxTdHJpbmc+IG1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQ7CiAgICAgc3Rk OjpvcHRpb25hbDxTdHJpbmc+IG1fY3VycmVudEJyb3dzaW5nQ29udGV4dDsKIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViRHJpdmVyL1dlYkRyaXZlclNlcnZpY2UuY3BwIGIvU291cmNlL1dlYkRy aXZlci9XZWJEcml2ZXJTZXJ2aWNlLmNwcAppbmRleCBkYzQxMWJmNDJhZC4uNjU1M2M3MGIzMTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2VydmljZS5jcHAKKysrIGIv U291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNlLmNwcApAQCAtMTAxLDYgKzEwMSw3IEBA IGNvbnN0IFdlYkRyaXZlclNlcnZpY2U6OkNvbW1hbmQgV2ViRHJpdmVyU2VydmljZTo6c19jb21t YW5kc1tdID0gewogICAgIHsgSFRUUE1ldGhvZDo6UG9zdCwgIi9zZXNzaW9uIiwgJldlYkRyaXZl clNlcnZpY2U6Om5ld1Nlc3Npb24gfSwKICAgICB7IEhUVFBNZXRob2Q6OkRlbGV0ZSwgIi9zZXNz aW9uLyRzZXNzaW9uSWQiLCAmV2ViRHJpdmVyU2VydmljZTo6ZGVsZXRlU2Vzc2lvbiB9LAogICAg IHsgSFRUUE1ldGhvZDo6R2V0LCAiL3N0YXR1cyIsICZXZWJEcml2ZXJTZXJ2aWNlOjpzdGF0dXMg fSwKKyAgICB7IEhUVFBNZXRob2Q6OkdldCwgIi9zZXNzaW9uLyRzZXNzaW9uSWQvdGltZW91dHMi LCAmV2ViRHJpdmVyU2VydmljZTo6Z2V0VGltZW91dHMgfSwKICAgICB7IEhUVFBNZXRob2Q6OlBv c3QsICIvc2Vzc2lvbi8kc2Vzc2lvbklkL3RpbWVvdXRzIiwgJldlYkRyaXZlclNlcnZpY2U6OnNl dFRpbWVvdXRzIH0sCiAKICAgICB7IEhUVFBNZXRob2Q6OlBvc3QsICIvc2Vzc2lvbi8kc2Vzc2lv bklkL3VybCIsICZXZWJEcml2ZXJTZXJ2aWNlOjpnbyB9LApAQCAtNzE5LDYgKzcyMCwxNiBAQCB2 b2lkIFdlYkRyaXZlclNlcnZpY2U6OnN0YXR1cyhSZWZQdHI8SlNPTjo6T2JqZWN0PiYmLCBGdW5j dGlvbjx2b2lkIChDb21tYW5kUmVzdQogICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1 bHQ6OnN1Y2Nlc3MoV1RGTW92ZShib2R5KSkpOwogfQogCit2b2lkIFdlYkRyaXZlclNlcnZpY2U6 OmdldFRpbWVvdXRzKFJlZlB0cjxKU09OOjpPYmplY3Q+JiYgcGFyYW1ldGVycywgRnVuY3Rpb248 dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICAvLyDC pzguNCBHZXQgVGltZW91dHMuCisgICAgLy8gaHR0cHM6Ly93M2MuZ2l0aHViLmlvL3dlYmRyaXZl ci93ZWJkcml2ZXItc3BlYy5odG1sI2dldC10aW1lb3V0cworICAgIGlmICghZmluZFNlc3Npb25P ckNvbXBsZXRlV2l0aEVycm9yKCpwYXJhbWV0ZXJzLCBjb21wbGV0aW9uSGFuZGxlcikpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fc2Vzc2lvbi0+Z2V0VGltZW91dHMoV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcikpOworfQorCiB2b2lkIFdlYkRyaXZlclNlcnZpY2U6OnNldFRpbWVvdXRzKFJl ZlB0cjxKU09OOjpPYmplY3Q+JiYgcGFyYW1ldGVycywgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJl c3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICAvLyDCpzguNSBTZXQgVGltZW91 dHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL1dlYkRyaXZlclNlcnZpY2UuaCBiL1Nv dXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2VydmljZS5oCmluZGV4IGU4NDIxNzI2ZjJhLi5kN2M2 YTkxMzkzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNlLmgK KysrIGIvU291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNlLmgKQEAgLTYzLDYgKzYzLDcg QEAgcHJpdmF0ZToKICAgICB2b2lkIG5ld1Nlc3Npb24oUmVmUHRyPEpTT046Ok9iamVjdD4mJiwg RnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CiAgICAgdm9pZCBkZWxldGVTZXNz aW9uKFJlZlB0cjxKU09OOjpPYmplY3Q+JiYsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQm Jik+JiYpOwogICAgIHZvaWQgc3RhdHVzKFJlZlB0cjxKU09OOjpPYmplY3Q+JiYsIEZ1bmN0aW9u PHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYpOworICAgIHZvaWQgZ2V0VGltZW91dHMoUmVmUHRy PEpTT046Ok9iamVjdD4mJiwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJik7CiAg ICAgdm9pZCBzZXRUaW1lb3V0cyhSZWZQdHI8SlNPTjo6T2JqZWN0PiYmLCBGdW5jdGlvbjx2b2lk IChDb21tYW5kUmVzdWx0JiYpPiYmKTsKICAgICB2b2lkIGdvKFJlZlB0cjxKU09OOjpPYmplY3Q+ JiYsIEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYpOwogICAgIHZvaWQgZ2V0Q3Vy cmVudFVSTChSZWZQdHI8SlNPTjo6T2JqZWN0PiYmLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUmVz dWx0JiYpPiYmKTsK