157509 2016-05-09 23:52:19 -0700 Web Automation: add command to asynchronously load the Web Inspector frontend in the background 2016-05-11 13:56:29 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1191465 0 bburg 2016-05-09 23:52:19 -0700 In case you want to use `debugger;` or hit a breakpoint whilst running other actions. 1191466 1 webkit-bug-importer 2016-05-09 23:52:44 -0700 <rdar://problem/26190121> 1191467 2 278481 bburg 2016-05-10 00:06:50 -0700 Created attachment 278481 Proposed Fix 1191551 3 278481 timothy 2016-05-10 10:00:32 -0700 Comment on attachment 278481 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=278481&action=review > Source/WebKit2/ChangeLog:36 > + * WebProcess/Automation/WebAutomationSessionProxy.js: > + (let.AutomationSessionProxy.prototype.evaluateJavaScriptFunction): > + Rename clearTimeout to window.clearTimeout to be less ambiguous. I'm not sure why this is needed. We hardly ever prefix the timeout functions. > Source/WebKit2/UIProcess/Automation/Automation.json:303 > + }, Stray? 1191603 4 278481 joepeck 2016-05-10 12:26:48 -0700 Comment on attachment 278481 Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=278481&action=review > Source/WebKit2/UIProcess/Automation/Automation.json:298 > + "description": "Inspect the specified browsing context using the Web Inspector.", We normally drop 'this' in the phrase "the Web Inspector". You wouldn't say "the Xcode" or "the Safari". > Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp:448 > + page->inspector()->connect(); Most code that uses page->inspector() includes a nullptr check. We should do that here as well. If the WebPage is closed / invalid then inspector() would be nullptr. Unless there is some other way that this would be avoided. 1191605 5 joepeck 2016-05-10 12:27:17 -0700 > We normally drop 'this' Err, 'the' 1192079 6 bburg 2016-05-11 13:56:29 -0700 Committed r200702: <http://trac.webkit.org/changeset/200702> 278481 2016-05-10 00:06:50 -0700 2016-05-10 10:00:32 -0700 Proposed Fix bug-157509-20160510000737.patch text/plain 14091 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwNjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2NhYjBlYzAyNzdhM2Ji ZjhjN2NlYzJjZDZmOWMwMmUwNzIwZDliNS4uNmZhODA3YzQyNzQ0M2JkMjlhOTllY2Y5OTQ5MjJi ZmVkNmUzNWQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDE2LTA1LTA5ICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBBdXRvbWF0aW9uOiBhZGQg Y29tbWFuZCB0byBhc3luY2hyb25vdXNseSBsb2FkIHRoZSBXZWIgSW5zcGVjdG9yIGZyb250ZW5k IGluIHRoZSBiYWNrZ3JvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTc1MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiBvcmRlciB0byBtYWtlIGl0IGVhc2llciB0byBkZWJ1ZyBjb2RlIHRoYXQg ZXhlY3V0ZXMgYXMgYSByZXN1bHQgb2YgYW4gYXV0b21hdGlvbgorICAgICAgICBjb21tYW5kLCB0 aGlzIHBhdGNoIGFkZHMgYSBuZXcgQXV0b21hdGlvbiBjb21tYW5kIHRvIGFzeW5jaHJvbm91c2x5 IGxvYWQgdGhlIGRlYnVnZ2VyCisgICAgICAgIGFuZCBJbnNwZWN0b3IgZnJvbnRlbmQuIEl0IGlz IGRlc2lnbmVkIGZvciB1c2UgYnkgYXV0b21hdGlvbiBjbGllbnRzIHRvIGltcGxlbWVudCBhbgor ICAgICAgICBhdXRvLWluc3BlY3Rpb24gZmVhdHVyZSB0byBhaWQgaW4gZGVidWdnaW5nIGF1dG9t YXRpb24gc2NyaXB0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRp b24uanNvbjogQWRkIG5ldyBjb21tYW5kLgorICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9u L1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlv blNlc3Npb246Omluc3BlY3RCcm93c2luZ0NvbnRleHQpOiBBZGRlZC4KKyAgICAgICAgKFdlYktp dDo6V2ViQXV0b21hdGlvblNlc3Npb246Omluc3BlY3RvckZyb250ZW5kTG9hZGVkKTogQWRkZWQu CisgICAgICAgIFRoaXMgbWVzc2FnZSBpcyBmb3J3YXJkZWQgYnkgV2ViSW5zcGVjdG9yUHJveHkg dG8gdGhlIGluc3BlY3RlZCBwYWdlJ3Mgc2Vzc2lvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B dXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nv Y29hL1dlYkF1dG9tYXRpb25TZXNzaW9uQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYkF1 dG9tYXRpb25TZXNzaW9uOjpzZW5kU3ludGhlc2l6ZWRFdmVudHNUb1BhZ2UpOgorICAgICAgICBG b3JjZSB0aGUgYWN0aXZlIGF1dG9tYXRpb24gd2luZG93IHRvIGJlY29tZSBrZXkgYW5kIGJyaW5n IHRvIGZyb250IHByaW9yIHRvCisgICAgICAgIHNlbmRpbmcgZWFjaCBOU0V2ZW50LiBUaGlzIHdh eSwgaWYgdGhlIEluc3BlY3RvciBwYXVzZXMgd2hpbGUgYSBjb21tYW5kIGV4ZWN1dGVzLAorICAg ICAgICB0aGUgYXV0b21hdGlvbiB3aW5kb3cgd2lsbCBnZXQgYmFjayBmb2N1cyB3aGVuIHRoZSBJ bnNwZWN0b3IgdW5wYXVzZXMgcHJpb3IgdG8KKyAgICAgICAgYSBtb3VzZSBvciBrZXlib2FyZCBl dmVudCB0aGF0IHNlbmRzIHN5bnRoZXNpemVkIE5TRXZlbnRzIHRvIHRoZSBOU1dpbmRvdy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkluc3BlY3RvclByb3h5Ojpmcm9udGVuZExvYWRlZCk6CisgICAgICAgIEZvcndhcmQg dG8gdGhlIGluc3BlY3RlZCBwYWdlJ3Mgc2Vzc2lvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJJbnNwZWN0b3JQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94 eS5tZXNzYWdlcy5pbjogQWRkIG5vdGlmaWNhdGlvbiBvZiB0aGUgZnJvbnRlbmQncyBsb2FkLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uUHJv eHkuanM6CisgICAgICAgIChsZXQuQXV0b21hdGlvblNlc3Npb25Qcm94eS5wcm90b3R5cGUuZXZh bHVhdGVKYXZhU2NyaXB0RnVuY3Rpb24pOgorICAgICAgICBSZW5hbWUgY2xlYXJUaW1lb3V0IHRv IHdpbmRvdy5jbGVhclRpbWVvdXQgdG8gYmUgbGVzcyBhbWJpZ3VvdXMuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yVUkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnNwZWN0b3JVSTo6ZnJvbnRlbmRMb2FkZWQpOgorICAgICAgICBLaWNrIG9mZiBub3RpZnlp bmcgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiBpbiBVSVByb2Nlc3MgdGhhdCB0aGUgaW5zcGVjdG9y IGxvYWRlZC4KKworICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JVSTo6Y2xvc2VXaW5kb3cp OgorICAgICAgICBJbiBzb21lIGNpcmN1bXN0YW5jZXMsIHRoZSBXZWIgSW5zcGVjdG9yIGNhbiBi ZSBsb2FkZWQgd2l0aG91dCBzaG93aW5nCisgICAgICAgIHRoZSB3aW5kb3cuIElmIHRoaXMgaGlk ZGVuIHBhZ2UgY2xvc2VzLCBtYWtlIHN1cmUgdGhlIGZyb250ZW5kIGhvc3QgZ2V0cworICAgICAg ICBhIGNoYW5jZSB0byBkaXNjb25uZWN0IGl0cyBJbnNwZWN0b3JGcm9udGVuZENsaWVudC4gTm9y bWFsbHkgdGhpcyBoYXBwZW5zCisgICAgICAgIHdoZW4gdGhlIHdpbmRvdyBjbG9zZXMsIGJ1dCB1 bnNob3duIEluc3BlY3RvcnMgZG8gbm90IGdldCB3aW5kb3cgaW5zdGFuY2VzLgorCiAyMDE2LTA1 LTA5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJF R1JFU1NJT04gKHIxOTE5MjIpOiBab29tIGluL1pvb20gT3V0IGlzIG5vdCB3b3JraW5nIGZvciBQ REZzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRv bWF0aW9uLmpzb24gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0 aW9uLmpzb24KaW5kZXggOGU1YjZmYzE2YzM1MmMzZTA1MTQ2MDc1NzNjMzlmZGY5ZmU2NzYxOC4u ZjU3MTgyNDkxMWMzMjc3OTIwYmE5ZTIwMGM4ZjAwYjczM2EwZGI5ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vQXV0b21hdGlvbi5qc29uCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24uanNvbgpAQCAtMjk0 LDYgKzI5NCwxNCBAQAogICAgICAgICAgICAgImFzeW5jIjogdHJ1ZQogICAgICAgICB9LAogICAg ICAgICB7CisgICAgICAgICAgICAibmFtZSI6ICJpbnNwZWN0QnJvd3NpbmdDb250ZXh0IiwKKyAg ICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJJbnNwZWN0IHRoZSBzcGVjaWZpZWQgYnJvd3Npbmcg Y29udGV4dCB1c2luZyB0aGUgV2ViIEluc3BlY3Rvci4iLAorICAgICAgICAgICAgInBhcmFtZXRl cnMiOiBbCisgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoYW5kbGUiLCAiJHJlZiI6ICJCcm93 c2luZ0NvbnRleHRIYW5kbGUiLCAiZGVzY3JpcHRpb24iOiAiVGhlIGhhbmRsZSBmb3IgdGhlIGJy b3dzaW5nIGNvbnRleHQgdGhhdCBzaG91bGQgYmUgaW5zcGVjdGVkLiIgfQorICAgICAgICAgICAg XSwKKyAgICAgICAgICAgICJhc3luYyI6IHRydWUKKyAgICAgICAgICAgIH0sCisgICAgICAgIHsK ICAgICAgICAgICAgICJuYW1lIjogImV2YWx1YXRlSmF2YVNjcmlwdEZ1bmN0aW9uIiwKICAgICAg ICAgICAgICJkZXNjcmlwdGlvbiI6ICJFdmFsdWF0ZXMgYSBzY3JpcHQgZnVuY3Rpb24gaW4gYSBi cm93c2luZyBjb250ZXh0IGFuZCBjYWxscyBpdCB3aXRoIHRoZSBzdXBwbGllZCBhcmd1bWVudHMu IiwKICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwCmlu ZGV4IDA3OWNiMWE5Zjc2OWNiMmU5YzE0MjYxMzY0MjNkMjQ1ZjI3NWViZDguLmNmMjc5ODI5NTJj MzVkODNhZDc3NjJlODU5MDg4MmFhMTY0MjFlNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAK QEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJXZWJBdXRvbWF0aW9uU2Vzc2lvbk1lc3NhZ2Vz LmgiCiAjaW5jbHVkZSAiV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eU1lc3NhZ2VzLmgiCiAjaW5j bHVkZSAiV2ViQ29va2llTWFuYWdlclByb3h5LmgiCisjaW5jbHVkZSAiV2ViSW5zcGVjdG9yUHJv eHkuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRD b3JlL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENv cmUvSW5zcGVjdG9yRnJvbnRlbmRSb3V0ZXIuaD4KQEAgLTQzMiwxMiArNDMzLDMzIEBAIHZvaWQg V2ViQXV0b21hdGlvblNlc3Npb246OnJlbG9hZEJyb3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVy cm9yU3RyaW5nJiBlcnJvclN0CiAgICAgcGFnZS0+cmVsb2FkKHJlbG9hZEZyb21PcmlnaW4sIGNv bnRlbnRCbG9ja2Vyc0VuYWJsZWQpOwogfQogCit2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpp bnNwZWN0QnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5n LCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgUmVmPEluc3BlY3RCcm93c2luZ0NvbnRleHRDYWxsYmFj az4mJiBjYWxsYmFjaykKK3sKKyAgICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlUHJveHlG b3JIYW5kbGUoaGFuZGxlKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIEZBSUxfV0lUSF9QUkVE RUZJTkVEX0VSUk9SKFdpbmRvd05vdEZvdW5kKTsKKworICAgIGlmIChhdXRvIGNhbGxiYWNrID0g bV9wZW5kaW5nSW5zcGVjdG9yQ2FsbGJhY2tzUGVyUGFnZS50YWtlKHBhZ2UtPnBhZ2VJRCgpKSkK KyAgICAgICAgY2FsbGJhY2stPnNlbmRGYWlsdXJlKFNUUklOR19GT1JfUFJFREVGSU5FRF9FUlJP Ul9OQU1FKFRpbWVvdXQpKTsKKyAgICBtX3BlbmRpbmdJbnNwZWN0b3JDYWxsYmFja3NQZXJQYWdl LnNldChwYWdlLT5wYWdlSUQoKSwgV1RGTW92ZShjYWxsYmFjaykpOworCisgICAgLy8gRG9uJ3Qg YnJpbmcgdGhlIGluc3BlY3RvciB0byBmcm9udCBzaW5jZSB0aGlzIG1heSBiZSBkb25lIGF1dG9t YXRpY2FsbHkuCisgICAgLy8gV2UganVzdCB3YW50IGl0IGxvYWRlZCBzbyBpdCBjYW4gcGF1c2Ug aWYgYSBicmVha3BvaW50IGlzIGhpdCBkdXJpbmcgYSBjb21tYW5kLgorICAgIHBhZ2UtPmluc3Bl Y3RvcigpLT5jb25uZWN0KCk7Cit9CisKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246Om5hdmln YXRpb25PY2N1cnJlZEZvclBhZ2UoY29uc3QgV2ViUGFnZVByb3h5JiBwYWdlKQogewogICAgIGlm IChhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nTmF2aWdhdGlvbkluQnJvd3NpbmdDb250ZXh0Q2Fs bGJhY2tzUGVyUGFnZS50YWtlKHBhZ2UucGFnZUlEKCkpKQogICAgICAgICBjYWxsYmFjay0+c2Vu ZFN1Y2Nlc3MoSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKSk7CiB9CiAKK3ZvaWQgV2ViQXV0b21h dGlvblNlc3Npb246Omluc3BlY3RvckZyb250ZW5kTG9hZGVkKGNvbnN0IFdlYlBhZ2VQcm94eSYg cGFnZSkKK3sKKyAgICBpZiAoYXV0byBjYWxsYmFjayA9IG1fcGVuZGluZ0luc3BlY3RvckNhbGxi YWNrc1BlclBhZ2UudGFrZShwYWdlLnBhZ2VJRCgpKSkKKyAgICAgICAgY2FsbGJhY2stPnNlbmRT dWNjZXNzKEluc3BlY3Rvck9iamVjdDo6Y3JlYXRlKCkpOworfQorCiB2b2lkIFdlYkF1dG9tYXRp b25TZXNzaW9uOjpldmFsdWF0ZUphdmFTY3JpcHRGdW5jdGlvbihJbnNwZWN0b3I6OkVycm9yU3Ry aW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBicm93c2luZ0NvbnRleHRIYW5kbGUsIGNv bnN0IFN0cmluZyogb3B0aW9uYWxGcmFtZUhhbmRsZSwgY29uc3QgU3RyaW5nJiBmdW5jdGlvbiwg Y29uc3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheSYgYXJndW1lbnRzLCBjb25zdCBib29sKiBv cHRpb25hbEV4cGVjdHNJbXBsaWNpdENhbGxiYWNrQXJndW1lbnQsIGNvbnN0IGludCogb3B0aW9u YWxDYWxsYmFja1RpbWVvdXQsIFJlZjxFdmFsdWF0ZUphdmFTY3JpcHRGdW5jdGlvbkNhbGxiYWNr PiYmIGNhbGxiYWNrKQogewogICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYlBhZ2VQcm94eUZv ckhhbmRsZShicm93c2luZ0NvbnRleHRIYW5kbGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmgKaW5kZXgg ZTVhZmQzM2FjNTM5OGFmNzVhYzliN2M2YWU5NjAyZDZmNTNiYWEwNC4uN2NhNmExZWE2OTJkOTBm NzZlZTE2MzkzYzZmN2RmNzlmZDQxNjYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5oCkBAIC04Myw2 ICs4Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFByb2Nlc3NQb29sKFdlYlByb2Nlc3NQb29s Kik7CiAKICAgICB2b2lkIG5hdmlnYXRpb25PY2N1cnJlZEZvclBhZ2UoY29uc3QgV2ViUGFnZVBy b3h5Jik7CisgICAgdm9pZCBpbnNwZWN0b3JGcm9udGVuZExvYWRlZChjb25zdCBXZWJQYWdlUHJv eHkmKTsKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogICAgIC8vIEluc3BlY3Rvcjo6 UmVtb3RlQXV0b21hdGlvblRhcmdldCBBUEkKQEAgLTEwNCw2ICsxMDUsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBnb0JhY2tJbkJyb3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwg Y29uc3QgU3RyaW5nJiwgUmVmPEdvQmFja0luQnJvd3NpbmdDb250ZXh0Q2FsbGJhY2s+JiYpIG92 ZXJyaWRlOwogICAgIHZvaWQgZ29Gb3J3YXJkSW5Ccm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpF cnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYsIFJlZjxHb0ZvcndhcmRJbkJyb3dzaW5nQ29udGV4 dENhbGxiYWNrPiYmKSBvdmVycmlkZTsKICAgICB2b2lkIHJlbG9hZEJyb3dzaW5nQ29udGV4dChJ bnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgUmVmPFJlbG9hZEJyb3dzaW5n Q29udGV4dENhbGxiYWNrPiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIGluc3BlY3RCcm93c2luZ0Nv bnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYsIFJlZjxJbnNwZWN0 QnJvd3NpbmdDb250ZXh0Q2FsbGJhY2s+JiYpIG92ZXJyaWRlOwogICAgIHZvaWQgZXZhbHVhdGVK YXZhU2NyaXB0RnVuY3Rpb24oSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYg YnJvd3NpbmdDb250ZXh0SGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsRnJhbWVIYW5kbGUs IGNvbnN0IFN0cmluZyYgZnVuY3Rpb24sIGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXkm IGFyZ3VtZW50cywgY29uc3QgYm9vbCogb3B0aW9uYWxFeHBlY3RzSW1wbGljaXRDYWxsYmFja0Fy Z3VtZW50LCBjb25zdCBpbnQqIG9wdGlvbmFsQ2FsbGJhY2tUaW1lb3V0LCBSZWY8SW5zcGVjdG9y OjpBdXRvbWF0aW9uQmFja2VuZERpc3BhdGNoZXJIYW5kbGVyOjpFdmFsdWF0ZUphdmFTY3JpcHRG dW5jdGlvbkNhbGxiYWNrPiYmKSBvdmVycmlkZTsKICAgICB2b2lkIHBlcmZvcm1Nb3VzZUludGVy YWN0aW9uKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgY29u c3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QmIHJlcXVlc3RlZFBvc2l0aW9uLCBjb25zdCBT dHJpbmcmIG1vdXNlQnV0dG9uLCBjb25zdCBTdHJpbmcmIG1vdXNlSW50ZXJhY3Rpb24sIGNvbnN0 IEluc3BlY3Rvcjo6SW5zcGVjdG9yQXJyYXkmIGtleU1vZGlmaWVycywgUmVmUHRyPEluc3BlY3Rv cjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlBvaW50PiYgdXBkYXRlZFBvc2l0aW9uKSBvdmVycmlk ZTsKICAgICB2b2lkIHBlcmZvcm1LZXlib2FyZEludGVyYWN0aW9ucyhJbnNwZWN0b3I6OkVycm9y U3RyaW5nJiwgY29uc3QgU3RyaW5nJiBoYW5kbGUsIGNvbnN0IEluc3BlY3Rvcjo6SW5zcGVjdG9y QXJyYXkmIGludGVyYWN0aW9ucykgb3ZlcnJpZGU7CkBAIC0xNzYsNiArMTc4LDggQEAgcHJpdmF0 ZToKIAogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxJbnNwZWN0b3I6OkJhY2tlbmREaXNw YXRjaGVyOjpDYWxsYmFja0Jhc2U+PiBtX3BlbmRpbmdOYXZpZ2F0aW9uSW5Ccm93c2luZ0NvbnRl eHRDYWxsYmFja3NQZXJQYWdlOwogCisgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPEluc3Bl Y3Rvcjo6QmFja2VuZERpc3BhdGNoZXI6OkNhbGxiYWNrQmFzZT4+IG1fcGVuZGluZ0luc3BlY3Rv ckNhbGxiYWNrc1BlclBhZ2U7CisKICAgICB1aW50NjRfdCBtX25leHRFdmFsdWF0ZUphdmFTY3Jp cHRDYWxsYmFja0lEIHsgMSB9OwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxJbnNwZWN0 b3I6OkF1dG9tYXRpb25CYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXI6OkV2YWx1YXRlSmF2YVNjcmlw dEZ1bmN0aW9uQ2FsbGJhY2s+PiBtX2V2YWx1YXRlSmF2YVNjcmlwdEZ1bmN0aW9uQ2FsbGJhY2tz OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViQXV0b21h dGlvblNlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJB dXRvbWF0aW9uU2Vzc2lvbkNvY29hLm1tCmluZGV4IGNkODljYWFiNGYzNzliN2YwYWE1NDRjNDI3 OWEwMmZmNGQwNzYwMDAuLjgwNjljYzI0MDM5MzFlNWMzZDc3ZmQ0NmQyM2M0MWIzZWFjOWU5NjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJBdXRvbWF0aW9u U2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJB dXRvbWF0aW9uU2Vzc2lvbkNvY29hLm1tCkBAIC01MSw2ICs1MSwxMCBAQCB2b2lkIFdlYkF1dG9t YXRpb25TZXNzaW9uOjpzZW5kU3ludGhlc2l6ZWRFdmVudHNUb1BhZ2UoV2ViUGFnZVByb3h5JiBw YWdlLCBOU0FycgogICAgIE5TV2luZG93ICp3aW5kb3cgPSBwYWdlLnBsYXRmb3JtV2luZG93KCk7 CiAKICAgICBmb3IgKE5TRXZlbnQgKmV2ZW50IGluIGV2ZW50c1RvU2VuZCkgeworICAgICAgICAv LyBUYWtlIGZvY3VzIGJhY2sgaW4gY2FzZSB0aGUgSW5zcGVjdG9yIGJlY2FtZSBmb2N1c2VkIHdo aWxlIHRoZSBwcmlvciBjb21tYW5kIG9yCisgICAgICAgIC8vIE5TRXZlbnQgd2FzIGRlbGl2ZXJl ZCB0byB0aGUgd2luZG93LgorICAgICAgICBbd2luZG93IG1ha2VLZXlBbmRPcmRlckZyb250Om5p bF07CisKICAgICAgICAgbWFya0V2ZW50QXNTeW50aGVzaXplZEZvckF1dG9tYXRpb24oZXZlbnQp OwogICAgICAgICBbd2luZG93IHNlbmRFdmVudDpldmVudF07CiAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKaW5kZXggYmIwYTZkZDc3YTM2 YWJiNmRkOGVhYmQyMTM4MWFkMjdhMWNmYjQyNS4uYmMzNmVhM2M0Nzg0NjIwNjAxZjg5ZWZkYWEx NjVmNDkxNTllZWUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYklu c3BlY3RvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVj dG9yUHJveHkuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiV0tBcnJheS5oIgogI2lu Y2x1ZGUgIldLQ29udGV4dE1lbnVJdGVtLmgiCiAjaW5jbHVkZSAiV0tNdXRhYmxlQXJyYXkuaCIK KyNpbmNsdWRlICJXZWJBdXRvbWF0aW9uU2Vzc2lvbi5oIgogI2luY2x1ZGUgIldlYkZyYW1lUG9s aWN5TGlzdGVuZXJQcm94eS5oIgogI2luY2x1ZGUgIldlYkZyYW1lUHJveHkuaCIKICNpbmNsdWRl ICJXZWJJbnNwZWN0b3JNZXNzYWdlcy5oIgpAQCAtNjAxLDYgKzYwMiwxMiBAQCB2b2lkIFdlYklu c3BlY3RvclByb3h5OjpkaWRDbG9zZSgpCiAgICAgcGxhdGZvcm1EaWRDbG9zZSgpOwogfQogCit2 b2lkIFdlYkluc3BlY3RvclByb3h5Ojpmcm9udGVuZExvYWRlZCgpCit7CisgICAgaWYgKGF1dG8q IGF1dG9tYXRpb25TZXNzaW9uID0gbV9pbnNwZWN0ZWRQYWdlLT5wcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS5hdXRvbWF0aW9uU2Vzc2lvbigpKQorICAgICAgICBhdXRvbWF0aW9uU2Vzc2lvbi0+aW5z cGVjdG9yRnJvbnRlbmRMb2FkZWQoKm1faW5zcGVjdGVkUGFnZSk7Cit9CisKIHZvaWQgV2ViSW5z cGVjdG9yUHJveHk6OmJyaW5nVG9Gcm9udCgpCiB7CiAgICAgLy8gV2ViQ29yZTo6SW5zcGVjdG9y RnJvbnRlbmRDbGllbnRMb2NhbCB0ZWxscyB1cyB0byBkbyB0aGlzIG9uIGxvYWQuIFdlIHdhbnQg dG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94 eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmgKaW5kZXgg YzZiY2VhMGM0OWJlNzUyMWYwMDg4YTRkZDE1MDg3YzBhZTg1MjRhZC4uOTdlZDI5YWY2ZThhMTdk ZTRkOWUyNzg5MDQzMGE0NTZmNjU3OWMyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkluc3BlY3RvclByb3h5LmgKQEAgLTE5MCw2ICsxOTAsNyBAQCBwcml2YXRlOgogCiAgICAg Ly8gQ2FsbGVkIGJ5IFdlYkluc3BlY3RvclByb3h5IG1lc3NhZ2VzCiAgICAgdm9pZCBjcmVhdGVJ bnNwZWN0b3JQYWdlKElQQzo6QXR0YWNobWVudCwgYm9vbCBjYW5BdHRhY2gsIGJvb2wgdW5kZXJU ZXN0KTsKKyAgICB2b2lkIGZyb250ZW5kTG9hZGVkKCk7CiAgICAgdm9pZCBkaWRDbG9zZSgpOwog ICAgIHZvaWQgYnJpbmdUb0Zyb250KCk7CiAgICAgdm9pZCBhdHRhY2hBdmFpbGFiaWxpdHlDaGFu Z2VkKGJvb2wpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3Bl Y3RvclByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3Bl Y3RvclByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDAxOTNiNzJjNWExYTk4YTJkMTU5MmRkODIzMjU2 YmUzZmNjMmUxMWMuLmMyZWQ3ODJkYjE5Y2I4YjRhZWNhZWI5NDU3OGQyNWYwZGEyNjc3YzQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5tZXNz YWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHku bWVzc2FnZXMuaW4KQEAgLTIzLDYgKzIzLDcgQEAKIG1lc3NhZ2VzIC0+IFdlYkluc3BlY3RvclBy b3h5IHsKICAgICBDcmVhdGVJbnNwZWN0b3JQYWdlKElQQzo6QXR0YWNobWVudCBjb25uZWN0aW9u SWRlbnRpZmllciwgYm9vbCBjYW5BdHRhY2gsIGJvb2wgdW5kZXJUZXN0KQogCisgICAgRnJvbnRl bmRMb2FkZWQoKQogICAgIERpZENsb3NlKCkKICAgICBCcmluZ1RvRnJvbnQoKQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNl c3Npb25Qcm94eS5qcyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJB dXRvbWF0aW9uU2Vzc2lvblByb3h5LmpzCmluZGV4IDNhN2RlNDliNzMxNWY4NDNjNDU5ZWE5NWM2 YzM1ZGY0MWY4ZTUyZDkuLmNjYjI5YTI1ZTQzMWVjZGIwNmRhN2VmYmZlMjNhOTc5MjNiYzcxZjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRv bWF0aW9uU2Vzc2lvblByb3h5LmpzCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvblByb3h5LmpzCkBAIC01MCwxMSArNTAsMTEgQEAg bGV0IEF1dG9tYXRpb25TZXNzaW9uUHJveHkgPSBjbGFzcyBBdXRvbWF0aW9uU2Vzc2lvblByb3h5 CiAKICAgICAgICAgbGV0IHRpbWVvdXRJZGVudGlmaWVyID0gMDsKIAotICAgICAgICBsZXQgcmVw b3J0UmVzdWx0ID0gKHJlc3VsdCkgPT4geyBjbGVhclRpbWVvdXQodGltZW91dElkZW50aWZpZXIp OyByZXN1bHRDYWxsYmFjayhmcmFtZUlELCBjYWxsYmFja0lELCB0aGlzLl9qc29uU3RyaW5naWZ5 KHJlc3VsdCksIGZhbHNlKTsgfTsKKyAgICAgICAgbGV0IHJlcG9ydFJlc3VsdCA9IChyZXN1bHQp ID0+IHsgd2luZG93LmNsZWFyVGltZW91dCh0aW1lb3V0SWRlbnRpZmllcik7IHJlc3VsdENhbGxi YWNrKGZyYW1lSUQsIGNhbGxiYWNrSUQsIHRoaXMuX2pzb25TdHJpbmdpZnkocmVzdWx0KSwgZmFs c2UpOyB9OwogICAgICAgICBsZXQgcmVwb3J0VGltZW91dEVycm9yID0gKCkgPT4geyByZXN1bHRD YWxsYmFjayhmcmFtZUlELCBjYWxsYmFja0lELCAiSmF2YVNjcmlwdFRpbWVvdXQiLCB0cnVlKTsg fTsKIAogICAgICAgICBpZiAoZXhwZWN0c0ltcGxpY2l0Q2FsbGJhY2tBcmd1bWVudCkgewotICAg ICAgICAgICAgdGltZW91dElkZW50aWZpZXIgPSBzZXRUaW1lb3V0KHJlcG9ydFRpbWVvdXRFcnJv ciwgY2FsbGJhY2tUaW1lb3V0KTsKKyAgICAgICAgICAgIHRpbWVvdXRJZGVudGlmaWVyID0gd2lu ZG93LnNldFRpbWVvdXQocmVwb3J0VGltZW91dEVycm9yLCBjYWxsYmFja1RpbWVvdXQpOwogCiAg ICAgICAgICAgICBhcmd1bWVudFZhbHVlcy5wdXNoKHJlcG9ydFJlc3VsdCk7CiAgICAgICAgICAg ICBmdW5jdGlvblZhbHVlLmFwcGx5KG51bGwsIGFyZ3VtZW50VmFsdWVzKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JVSS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yVUkuY3BwCmluZGV4 IGM1OWVmNzU5NzYyMTFjYzk3MGEzNThiZjhmMGYyNTliNzg1ZWJlNTEuLjRjYThkNjEyZjFkZTRm NTI2YTk4MzllNWFjNWRjNDU2YjcyMWU4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JVSS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3RvclVJLmNwcApAQCAtOTYsNiArOTYsOCBAQCB2 b2lkIFdlYkluc3BlY3RvclVJOjpmcm9udGVuZExvYWRlZCgpCiAgICAgc2V0RG9ja2luZ1VuYXZh aWxhYmxlKG1fZG9ja2luZ1VuYXZhaWxhYmxlKTsKICAgICBzZXREb2NrU2lkZShtX2RvY2tTaWRl KTsKIAorICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9u KCktPnNlbmQoTWVzc2FnZXM6OldlYkluc3BlY3RvclByb3h5OjpGcm9udGVuZExvYWRlZCgpLCBt X2luc3BlY3RlZFBhZ2VJZGVudGlmaWVyKTsKKwogICAgIGJyaW5nVG9Gcm9udCgpOwogfQogCkBA IC0xMjgsNiArMTMwLDkgQEAgdm9pZCBXZWJJbnNwZWN0b3JVSTo6Y2xvc2VXaW5kb3coKQogICAg ICAgICBtX2Zyb250ZW5kQ29udHJvbGxlci0+c2V0SW5zcGVjdG9yRnJvbnRlbmRDbGllbnQobnVs bHB0cik7CiAgICAgbV9mcm9udGVuZENvbnRyb2xsZXIgPSBudWxscHRyOwogCisgICAgaWYgKG1f ZnJvbnRlbmRIb3N0KQorICAgICAgICBtX2Zyb250ZW5kSG9zdC0+ZGlzY29ubmVjdENsaWVudCgp OworCiAgICAgbV9pbnNwZWN0ZWRQYWdlSWRlbnRpZmllciA9IDA7CiAgICAgbV91bmRlclRlc3Qg PSBmYWxzZTsKIH0K