156063 2016-03-31 08:07:37 -0700 Web Automation: Navigation commands should not return until page loads or fails 2018-02-21 10:49:31 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=183007 InRadar P2 Normal --- 1 timothy timothy bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1179398 0 timothy 2016-03-31 08:07:37 -0700 We need to block these endpoints on waiting until the page loads. 1179399 1 webkit-bug-importer 2016-03-31 08:08:21 -0700 <rdar://problem/25464373> 1179400 2 275282 timothy 2016-03-31 08:11:53 -0700 Created attachment 275282 Patch 1179422 3 275282 bburg 2016-03-31 08:47:34 -0700 Comment on attachment 275282 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=275282&action=review > Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp:418 > +} I believe that this should cancel any pending async script evaluations first so that they error out. We can add this later. > Source/WebKit2/UIProcess/Automation/WebAutomationSession.h:85 > + void navigationOccuredForPage(const WebPageProxy&); Please fix spelling: navigationOccurredForPage > Source/WebKit2/UIProcess/WebPageProxy.cpp:3126 > + if (auto automationSession = process().processPool().automationSession()) Nit: auto should be auto& or auto* so the type is less mysterious (and so we don't accidentally make a copy in some cases). 1179504 4 275282 timothy 2016-03-31 11:44:55 -0700 Comment on attachment 275282 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=275282&action=review >> Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp:418 >> +} > > I believe that this should cancel any pending async script evaluations first so that they error out. We can add this later. That is already done on the WebProcess side. 1179558 5 timothy 2016-03-31 13:55:22 -0700 https://trac.webkit.org/r198914 275282 2016-03-31 08:11:53 -0700 2016-03-31 08:47:34 -0700 Patch bug-156063-20160331081157.patch text/plain 14954 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4ODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzNjOTU1YzU4ODlmNDhk NWQ3MTk0NWY2OTI4OGQ3MTdjNjFlZTBkMC4uYmVkMzM2Y2M0NGFmOWFhNWM2ZDkwNjcwMjY5YTgx N2IyNTVhYjhmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTAzLTMxICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgQXV0b21hdGlv bjogTmF2aWdhdGlvbiBjb21tYW5kcyBzaG91bGQgbm90IHJldHVybiB1bnRpbCBwYWdlIGxvYWRz IG9yIGZhaWxzCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NjA2MworICAgICAgICByZGFyOi8vcHJvYmxlbS8yNTQ2NDM3MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRp b24vQXV0b21hdGlvbi5qc29uOiBNYWtlIG5hdmlnYXRpb24gY29tbWFuZHMgYXN5bmMuCisgICAg ICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6bmF2aWdhdGVCcm93c2luZ0NvbnRl eHQpOiBTYXZlIGNhbGxiYWNrIGFuZCB0aW1lb3V0IHByZXZpb3VzLgorICAgICAgICAoV2ViS2l0 OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6Z29CYWNrSW5Ccm93c2luZ0NvbnRleHQpOiBEaXR0by4K KyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OmdvRm9yd2FyZEluQnJvd3Np bmdDb250ZXh0KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9u OjpyZWxvYWRCcm93c2luZ0NvbnRleHQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViQXV0 b21hdGlvblNlc3Npb246Om5hdmlnYXRpb25PY2N1cmVkRm9yUGFnZSk6IEFkZGVkLiBGaXJlIGNh bGxiYWNrIGZvciBwYWdlLgorICAgICAgICAqIFVJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9t YXRpb25TZXNzaW9uLmg6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpOiBD YWxsIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpuYXZpZ2F0aW9uT2NjdXJlZEZvclBhZ2UuCisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmFpbExvYWRGb3JGcmFtZSk6IERpdHRvLgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25G b3JGcmFtZSk6IERpdHRvLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmg6 IEFkZGVkIGF1dG9tYXRpb25TZXNzaW9uKCkgZ2V0dGVyLgorCiAyMDE2LTAzLTMwICBUaW1vdGh5 IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgQXV0b21hdGlvbjog QWRkIHN1cHBvcnQgZm9yIHNjcmlwdCB0aW1lb3V0cyB0byB0aGUgZXZhbHVhdGVKYXZhU2NyaXB0 RnVuY3Rpb24gY29tbWFuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1 dG9tYXRpb24vQXV0b21hdGlvbi5qc29uIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9t YXRpb24vQXV0b21hdGlvbi5qc29uCmluZGV4IDNiMDAxMDc3ZGM2NzQzMDA3MjY4NzM2MGFiNTgw YmVlMDc1Y2VjNzUuLmVhNjhmOGRjYjNlMzJiNTlmNDU4MDViNjBhOTg0ODRmZWI3OTAwNzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24u anNvbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9BdXRvbWF0aW9u Lmpzb24KQEAgLTQ3LDYgKzQ3LDcgQEAKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJUaGlz IGVudW0gY29udGFpbnMgcHJlZGVmaW5lZCBlcnJvciBtZXNzYWdlcyB0aGF0IGNhbiBiZSB1c2Vk IHRvIHNpZ25hbCBhIHdlbGwtZGVmaW5lZCBlcnJvciBjb25kaXRpb24sIHN1Y2ggYXMgYSBtaXNz aW5nIGltcGxlbWVudGF0aW9uLCB1bmtub3duIHdpbmRvdyBoYW5kbGUsIGFuZCBzbyBmb3J0aC4g VGhlIGJhY2tlbmQgc2lnbmFscyBvbmUgb2YgdGhlc2UgZXJyb3JzIGJ5IHVzaW5nIGl0IGFzIGEg cHJlZml4IG9mIHRoZSBjb21tYW5kcydzIGVycm9yIG1lc3NhZ2UgKHRoZSBlcnJvclN0cmluZyBh cmd1bWVudCBpbiBnZW5lcmF0ZWQgQysrIGJhY2tlbmQgZGlzcGF0Y2hlcnMpLiBUaGlzIHdpbGwg YmUgcmVwb3J0ZWQgdG8gdGhlIGZyb250ZW5kIGFzIGEgcHJvdG9jb2wgZXJyb3Igd2l0aCBhIEpT T04tUlBDIGVycm9yIGNvZGUgb2YgJ1NlcnZlckVycm9yJy4gSXQgaXMgdXAgdG8gdGhlIGZyb250 ZW5kIHdoZXRoZXIgYW5kIGhvdyB0byBkZWFsIHdpdGggZXJyb3JzLiIsCiAgICAgICAgICAgICAi ZW51bSI6IFsKICAgICAgICAgICAgICAgICAiSW50ZXJuYWxFcnJvciIsCisgICAgICAgICAgICAg ICAgIlRpbWVvdXQiLAogICAgICAgICAgICAgICAgICJKYXZhU2NyaXB0RXJyb3IiLAogICAgICAg ICAgICAgICAgICJKYXZhU2NyaXB0VGltZW91dCIsCiAgICAgICAgICAgICAgICAgIldpbmRvd05v dEZvdW5kIiwKQEAgLTE2OCwyOCArMTY5LDMyIEBACiAgICAgICAgICAgICAicGFyYW1ldGVycyI6 IFsKICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhhbmRsZSIsICIkcmVmIjogIkJyb3dzaW5n Q29udGV4dEhhbmRsZSIsICJkZXNjcmlwdGlvbiI6ICJUaGUgaGFuZGxlIGZvciB0aGUgYnJvd3Np bmcgY29udGV4dCB0aGF0IHNob3VsZCBiZSBuYXZpZ2F0ZWQuIiB9LAogICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlRoZSBV UkwgdG8gbG9hZCBpbiB0aGUgYnJvd3NpbmcgY29udGV4dC4iIH0KLSAgICAgICAgICAgIF0KKyAg ICAgICAgICAgIF0sCisgICAgICAgICAgICAiYXN5bmMiOiB0cnVlCiAgICAgICAgIH0sCiAgICAg ICAgIHsKICAgICAgICAgICAgICJuYW1lIjogImdvQmFja0luQnJvd3NpbmdDb250ZXh0IiwKICAg ICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJOYXZpZ2F0ZXMgYSBicm93c2luZyBjb250ZXh0IHRv IGdvIGJhY2sgb25lIHBhZ2UgaW4gaGlzdG9yeS4iLAogICAgICAgICAgICAgInBhcmFtZXRlcnMi OiBbCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoYW5kbGUiLCAiJHJlZiI6ICJCcm93c2lu Z0NvbnRleHRIYW5kbGUiLCAiZGVzY3JpcHRpb24iOiAiVGhlIGhhbmRsZSBmb3IgdGhlIGJyb3dz aW5nIGNvbnRleHQgdGhhdCBzaG91bGQgYmUgbmF2aWdhdGVkLiIgfQotICAgICAgICAgICAgXQor ICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICJhc3luYyI6IHRydWUKICAgICAgICAgfSwKICAg ICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAiZ29Gb3J3YXJkSW5Ccm93c2luZ0NvbnRleHQi LAogICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIk5hdmlnYXRlcyBhIGJyb3dzaW5nIGNvbnRl eHQgdG8gZ290IGZvcndhcmQgb25lIHBhZ2UgaW4gaGlzdG9yeS4iLAogICAgICAgICAgICAgInBh cmFtZXRlcnMiOiBbCiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJoYW5kbGUiLCAiJHJlZiI6 ICJCcm93c2luZ0NvbnRleHRIYW5kbGUiLCAiZGVzY3JpcHRpb24iOiAiVGhlIGhhbmRsZSBmb3Ig dGhlIGJyb3dzaW5nIGNvbnRleHQgdGhhdCBzaG91bGQgYmUgbmF2aWdhdGVkLiIgfQotICAgICAg ICAgICAgXQorICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICJhc3luYyI6IHRydWUKICAgICAg ICAgfSwKICAgICAgICAgewogICAgICAgICAgICAgIm5hbWUiOiAicmVsb2FkQnJvd3NpbmdDb250 ZXh0IiwKICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJSZWxvYWRzIHRoZSBjdXJyZW50IHBh Z2UgaW4gYSBicm93c2luZyBjb250ZXh0LiIsCiAgICAgICAgICAgICAicGFyYW1ldGVycyI6IFsK ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImhhbmRsZSIsICIkcmVmIjogIkJyb3dzaW5nQ29u dGV4dEhhbmRsZSIsICJkZXNjcmlwdGlvbiI6ICJUaGUgaGFuZGxlIGZvciB0aGUgYnJvd3Npbmcg Y29udGV4dCB0aGF0IHNob3VsZCBiZSByZWxvYWRlZC4iIH0KLSAgICAgICAgICAgIF0KKyAgICAg ICAgICAgIF0sCisgICAgICAgICAgICAiYXN5bmMiOiB0cnVlCiAgICAgICAgIH0sCiAgICAgICAg IHsKICAgICAgICAgICAgICJuYW1lIjogImV2YWx1YXRlSmF2YVNjcmlwdEZ1bmN0aW9uIiwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRp b25TZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1 dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCBjM2UyODJiYWFjYmFhMGJlYzgxOGY2ZTFhNTYwNDA2 MGM0OTYwNjM3Li4zOTlkNDk3MzRlYWVmMWEyZmVhNTM5NzBjZWNkZjlhZWMwMTlhYzQ0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9u U2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2Vi QXV0b21hdGlvblNlc3Npb24uY3BwCkBAIC0zNTcsNDQgKzM1Nyw2NiBAQCB2b2lkIFdlYkF1dG9t YXRpb25TZXNzaW9uOjptb3ZlV2luZG93T2ZCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJv clN0cmluZyYgZQogICAgICAgICBGQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUl9NRVNTQUdFKElu dGVybmFsRXJyb3IpOwogfQogCi12b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpuYXZpZ2F0ZUJy b3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3Qg U3RyaW5nJiBoYW5kbGUsIGNvbnN0IFN0cmluZyYgdXJsKQordm9pZCBXZWJBdXRvbWF0aW9uU2Vz c2lvbjo6bmF2aWdhdGVCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYgZXJy b3JTdHJpbmcsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBjb25zdCBTdHJpbmcmIHVybCwgUmVmPE5h dmlnYXRlQnJvd3NpbmdDb250ZXh0Q2FsbGJhY2s+JiYgY2FsbGJhY2spCiB7CiAgICAgV2ViUGFn ZVByb3h5KiBwYWdlID0gd2ViUGFnZVByb3h5Rm9ySGFuZGxlKGhhbmRsZSk7CiAgICAgaWYgKCFw YWdlKQogICAgICAgICBGQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUl9NRVNTQUdFKFdpbmRvd05v dEZvdW5kKTsKIAorICAgIGlmIChhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nTmF2aWdhdGlvbklu QnJvd3NpbmdDb250ZXh0Q2FsbGJhY2tzUGVyUGFnZS50YWtlKHBhZ2UtPnBhZ2VJRCgpKSkKKyAg ICAgICAgY2FsbGJhY2stPnNlbmRGYWlsdXJlKEluc3BlY3Rvcjo6UHJvdG9jb2w6OmdldEVudW1D b25zdGFudFZhbHVlKEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2Fn ZTo6VGltZW91dCkpOworICAgIG1fcGVuZGluZ05hdmlnYXRpb25JbkJyb3dzaW5nQ29udGV4dENh bGxiYWNrc1BlclBhZ2Uuc2V0KHBhZ2UtPnBhZ2VJRCgpLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisK ICAgICBwYWdlLT5sb2FkUmVxdWVzdChXZWJDb3JlOjpVUkwoV2ViQ29yZTo6VVJMKCksIHVybCkp OwogfQogCi12b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpnb0JhY2tJbkJyb3dzaW5nQ29udGV4 dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBoYW5k bGUpCit2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpnb0JhY2tJbkJyb3dzaW5nQ29udGV4dChJ bnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBoYW5kbGUs IFJlZjxHb0JhY2tJbkJyb3dzaW5nQ29udGV4dENhbGxiYWNrPiYmIGNhbGxiYWNrKQogewogICAg IFdlYlBhZ2VQcm94eSogcGFnZSA9IHdlYlBhZ2VQcm94eUZvckhhbmRsZShoYW5kbGUpOwogICAg IGlmICghcGFnZSkKICAgICAgICAgRkFJTF9XSVRIX1BSRURFRklORURfRVJST1JfTUVTU0FHRShX aW5kb3dOb3RGb3VuZCk7CiAKKyAgICBpZiAoYXV0byBjYWxsYmFjayA9IG1fcGVuZGluZ05hdmln YXRpb25JbkJyb3dzaW5nQ29udGV4dENhbGxiYWNrc1BlclBhZ2UudGFrZShwYWdlLT5wYWdlSUQo KSkpCisgICAgICAgIGNhbGxiYWNrLT5zZW5kRmFpbHVyZShJbnNwZWN0b3I6OlByb3RvY29sOjpn ZXRFbnVtQ29uc3RhbnRWYWx1ZShJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpFcnJv ck1lc3NhZ2U6OlRpbWVvdXQpKTsKKyAgICBtX3BlbmRpbmdOYXZpZ2F0aW9uSW5Ccm93c2luZ0Nv bnRleHRDYWxsYmFja3NQZXJQYWdlLnNldChwYWdlLT5wYWdlSUQoKSwgV1RGTW92ZShjYWxsYmFj aykpOworCiAgICAgcGFnZS0+Z29CYWNrKCk7CiB9CiAKLXZvaWQgV2ViQXV0b21hdGlvblNlc3Np b246OmdvRm9yd2FyZEluQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVy cm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSkKK3ZvaWQgV2ViQXV0b21hdGlvblNlc3Np b246OmdvRm9yd2FyZEluQnJvd3NpbmdDb250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVy cm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGhhbmRsZSwgUmVmPEdvRm9yd2FyZEluQnJvd3NpbmdD b250ZXh0Q2FsbGJhY2s+JiYgY2FsbGJhY2spCiB7CiAgICAgV2ViUGFnZVByb3h5KiBwYWdlID0g d2ViUGFnZVByb3h5Rm9ySGFuZGxlKGhhbmRsZSk7CiAgICAgaWYgKCFwYWdlKQogICAgICAgICBG QUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUl9NRVNTQUdFKFdpbmRvd05vdEZvdW5kKTsKIAorICAg IGlmIChhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nTmF2aWdhdGlvbkluQnJvd3NpbmdDb250ZXh0 Q2FsbGJhY2tzUGVyUGFnZS50YWtlKHBhZ2UtPnBhZ2VJRCgpKSkKKyAgICAgICAgY2FsbGJhY2st PnNlbmRGYWlsdXJlKEluc3BlY3Rvcjo6UHJvdG9jb2w6OmdldEVudW1Db25zdGFudFZhbHVlKElu c3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkVycm9yTWVzc2FnZTo6VGltZW91dCkpOwor ICAgIG1fcGVuZGluZ05hdmlnYXRpb25JbkJyb3dzaW5nQ29udGV4dENhbGxiYWNrc1BlclBhZ2Uu c2V0KHBhZ2UtPnBhZ2VJRCgpLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisKICAgICBwYWdlLT5nb0Zv cndhcmQoKTsKIH0KIAotdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6cmVsb2FkQnJvd3NpbmdD b250ZXh0KEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcm IGhhbmRsZSkKK3ZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OnJlbG9hZEJyb3dzaW5nQ29udGV4 dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBoYW5k bGUsIFJlZjxSZWxvYWRCcm93c2luZ0NvbnRleHRDYWxsYmFjaz4mJiBjYWxsYmFjaykKIHsKICAg ICBXZWJQYWdlUHJveHkqIHBhZ2UgPSB3ZWJQYWdlUHJveHlGb3JIYW5kbGUoaGFuZGxlKTsKICAg ICBpZiAoIXBhZ2UpCiAgICAgICAgIEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SX01FU1NBR0Uo V2luZG93Tm90Rm91bmQpOwogCisgICAgaWYgKGF1dG8gY2FsbGJhY2sgPSBtX3BlbmRpbmdOYXZp Z2F0aW9uSW5Ccm93c2luZ0NvbnRleHRDYWxsYmFja3NQZXJQYWdlLnRha2UocGFnZS0+cGFnZUlE KCkpKQorICAgICAgICBjYWxsYmFjay0+c2VuZEZhaWx1cmUoSW5zcGVjdG9yOjpQcm90b2NvbDo6 Z2V0RW51bUNvbnN0YW50VmFsdWUoSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6RXJy b3JNZXNzYWdlOjpUaW1lb3V0KSk7CisgICAgbV9wZW5kaW5nTmF2aWdhdGlvbkluQnJvd3NpbmdD b250ZXh0Q2FsbGJhY2tzUGVyUGFnZS5zZXQocGFnZS0+cGFnZUlEKCksIFdURk1vdmUoY2FsbGJh Y2spKTsKKwogICAgIGNvbnN0IGJvb2wgcmVsb2FkRnJvbU9yaWdpbiA9IGZhbHNlOwogICAgIGNv bnN0IGJvb2wgY29udGVudEJsb2NrZXJzRW5hYmxlZCA9IHRydWU7CiAgICAgcGFnZS0+cmVsb2Fk KHJlbG9hZEZyb21PcmlnaW4sIGNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQpOwogfQogCit2b2lkIFdl YkF1dG9tYXRpb25TZXNzaW9uOjpuYXZpZ2F0aW9uT2NjdXJlZEZvclBhZ2UoY29uc3QgV2ViUGFn ZVByb3h5JiBwYWdlKQoreworICAgIGlmIChhdXRvIGNhbGxiYWNrID0gbV9wZW5kaW5nTmF2aWdh dGlvbkluQnJvd3NpbmdDb250ZXh0Q2FsbGJhY2tzUGVyUGFnZS50YWtlKHBhZ2UucGFnZUlEKCkp KQorICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUo KSk7Cit9CisKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmV2YWx1YXRlSmF2YVNjcmlwdEZ1 bmN0aW9uKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcm IGJyb3dzaW5nQ29udGV4dEhhbmRsZSwgY29uc3QgU3RyaW5nKiBvcHRpb25hbEZyYW1lSGFuZGxl LCBjb25zdCBTdHJpbmcmIGZ1bmN0aW9uLCBjb25zdCBJbnNwZWN0b3I6Okluc3BlY3RvckFycmF5 JiBhcmd1bWVudHMsIGNvbnN0IGJvb2wqIG9wdGlvbmFsRXhwZWN0c0ltcGxpY2l0Q2FsbGJhY2tB cmd1bWVudCwgY29uc3QgaW50KiBvcHRpb25hbENhbGxiYWNrVGltZW91dCwgUmVmPEV2YWx1YXRl SmF2YVNjcmlwdEZ1bmN0aW9uQ2FsbGJhY2s+JiYgY2FsbGJhY2spCiB7CiAgICAgV2ViUGFnZVBy b3h5KiBwYWdlID0gd2ViUGFnZVByb3h5Rm9ySGFuZGxlKGJyb3dzaW5nQ29udGV4dEhhbmRsZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRv bWF0aW9uU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2Vi QXV0b21hdGlvblNlc3Npb24uaAppbmRleCA3YzVjNTc2ZjhiNjdhODBmMzlhMTRkMDg5YjNlNzQ2 M2NlNDIxZTAwLi5hZTY3MzI3YmJkMzUyNzkwNTYwYTAyYzc1YjkyZGUxOTgyNGY0ZDY5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9u U2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1 dG9tYXRpb25TZXNzaW9uLmgKQEAgLTgyLDYgKzgyLDggQEAgcHVibGljOgogICAgIFdlYlByb2Nl c3NQb29sKiBwcm9jZXNzUG9vbCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJvY2Vzc1Bvb2w7IH0KICAg ICB2b2lkIHNldFByb2Nlc3NQb29sKFdlYlByb2Nlc3NQb29sKik7CiAKKyAgICB2b2lkIG5hdmln YXRpb25PY2N1cmVkRm9yUGFnZShjb25zdCBXZWJQYWdlUHJveHkmKTsKKwogI2lmIEVOQUJMRShS RU1PVEVfSU5TUEVDVE9SKQogICAgIC8vIEluc3BlY3Rvcjo6UmVtb3RlQXV0b21hdGlvblRhcmdl dCBBUEkKICAgICBTdHJpbmcgbmFtZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fc2Vzc2lv bklkZW50aWZpZXI7IH0KQEAgLTk4LDEwICsxMDAsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc3dp dGNoVG9Ccm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmlu ZyYgYnJvd3NpbmdDb250ZXh0SGFuZGxlLCBjb25zdCBTdHJpbmcqIG9wdGlvbmFsRnJhbWVIYW5k bGUpIG92ZXJyaWRlOwogICAgIHZvaWQgcmVzaXplV2luZG93T2ZCcm93c2luZ0NvbnRleHQoSW5z cGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBjb25zdCBJbnNwZWN0 b3I6Okluc3BlY3Rvck9iamVjdCYgc2l6ZSkgb3ZlcnJpZGU7CiAgICAgdm9pZCBtb3ZlV2luZG93 T2ZCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYg aGFuZGxlLCBjb25zdCBJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdCYgcG9zaXRpb24pIG92ZXJy aWRlOwotICAgIHZvaWQgbmF2aWdhdGVCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0 cmluZyYsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBjb25zdCBTdHJpbmcmIHVybCkgb3ZlcnJpZGU7 Ci0gICAgdm9pZCBnb0JhY2tJbkJyb3dzaW5nQ29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5n JiwgY29uc3QgU3RyaW5nJikgb3ZlcnJpZGU7Ci0gICAgdm9pZCBnb0ZvcndhcmRJbkJyb3dzaW5n Q29udGV4dChJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJikgb3ZlcnJpZGU7 Ci0gICAgdm9pZCByZWxvYWRCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYs IGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlOworICAgIHZvaWQgbmF2aWdhdGVCcm93c2luZ0NvbnRl eHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBjb25zdCBT dHJpbmcmIHVybCwgUmVmPE5hdmlnYXRlQnJvd3NpbmdDb250ZXh0Q2FsbGJhY2s+JiYpIG92ZXJy aWRlOworICAgIHZvaWQgZ29CYWNrSW5Ccm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0 cmluZyYsIGNvbnN0IFN0cmluZyYsIFJlZjxHb0JhY2tJbkJyb3dzaW5nQ29udGV4dENhbGxiYWNr PiYmKSBvdmVycmlkZTsKKyAgICB2b2lkIGdvRm9yd2FyZEluQnJvd3NpbmdDb250ZXh0KEluc3Bl Y3Rvcjo6RXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBSZWY8R29Gb3J3YXJkSW5Ccm93c2lu Z0NvbnRleHRDYWxsYmFjaz4mJikgb3ZlcnJpZGU7CisgICAgdm9pZCByZWxvYWRCcm93c2luZ0Nv bnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYsIFJlZjxSZWxvYWRC cm93c2luZ0NvbnRleHRDYWxsYmFjaz4mJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBldmFsdWF0ZUph dmFTY3JpcHRGdW5jdGlvbihJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiwgY29uc3QgU3RyaW5nJiBi cm93c2luZ0NvbnRleHRIYW5kbGUsIGNvbnN0IFN0cmluZyogb3B0aW9uYWxGcmFtZUhhbmRsZSwg Y29uc3QgU3RyaW5nJiBmdW5jdGlvbiwgY29uc3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheSYg YXJndW1lbnRzLCBjb25zdCBib29sKiBvcHRpb25hbEV4cGVjdHNJbXBsaWNpdENhbGxiYWNrQXJn dW1lbnQsIGNvbnN0IGludCogb3B0aW9uYWxDYWxsYmFja1RpbWVvdXQsIFJlZjxJbnNwZWN0b3I6 OkF1dG9tYXRpb25CYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXI6OkV2YWx1YXRlSmF2YVNjcmlwdEZ1 bmN0aW9uQ2FsbGJhY2s+JiYpIG92ZXJyaWRlOwogICAgIHZvaWQgcGVyZm9ybU1vdXNlSW50ZXJh Y3Rpb24oSW5zcGVjdG9yOjpFcnJvclN0cmluZyYsIGNvbnN0IFN0cmluZyYgaGFuZGxlLCBjb25z dCBJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdCYgcmVxdWVzdGVkUG9zaXRpb24sIGNvbnN0IFN0 cmluZyYgbW91c2VCdXR0b24sIGNvbnN0IFN0cmluZyYgbW91c2VJbnRlcmFjdGlvbiwgY29uc3Qg SW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheSYga2V5TW9kaWZpZXJzLCBSZWZQdHI8SW5zcGVjdG9y OjpQcm90b2NvbDo6QXV0b21hdGlvbjo6UG9pbnQ+JiB1cGRhdGVkUG9zaXRpb24pIG92ZXJyaWRl OwogICAgIHZvaWQgcmVzb2x2ZUNoaWxkRnJhbWVIYW5kbGUoSW5zcGVjdG9yOjpFcnJvclN0cmlu ZyYsIGNvbnN0IFN0cmluZyYgYnJvd3NpbmdDb250ZXh0SGFuZGxlLCBjb25zdCBTdHJpbmcqIG9w dGlvbmFsRnJhbWVIYW5kbGUsIGNvbnN0IGludCogb3B0aW9uYWxPcmRpbmFsLCBjb25zdCBTdHJp bmcqIG9wdGlvbmFsTmFtZSwgY29uc3QgU3RyaW5nKiBvcHRpb25hbE5vZGVIYW5kbGUsIFJlZjxS ZXNvbHZlQ2hpbGRGcmFtZUhhbmRsZUNhbGxiYWNrPiYmKSBvdmVycmlkZTsKQEAgLTE1Nyw2ICsx NTksOCBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8dWludDY0X3QsIFN0cmluZz4gbV93ZWJGcmFt ZUhhbmRsZU1hcDsKICAgICBIYXNoTWFwPFN0cmluZywgdWludDY0X3Q+IG1faGFuZGxlV2ViRnJh bWVNYXA7CiAKKyAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8SW5zcGVjdG9yOjpCYWNrZW5k RGlzcGF0Y2hlcjo6Q2FsbGJhY2tCYXNlPj4gbV9wZW5kaW5nTmF2aWdhdGlvbkluQnJvd3NpbmdD b250ZXh0Q2FsbGJhY2tzUGVyUGFnZTsKKwogICAgIHVpbnQ2NF90IG1fbmV4dEV2YWx1YXRlSmF2 YVNjcmlwdENhbGxiYWNrSUQgeyAxIH07CiAgICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPElu c3BlY3Rvcjo6QXV0b21hdGlvbkJhY2tlbmREaXNwYXRjaGVySGFuZGxlcjo6RXZhbHVhdGVKYXZh U2NyaXB0RnVuY3Rpb25DYWxsYmFjaz4+IG1fZXZhbHVhdGVKYXZhU2NyaXB0RnVuY3Rpb25DYWxs YmFja3M7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg ZThjMDc2MmYyOTU1NmU2OTk0MTkyMWM5MTBlYzBjZjc5YTcyZjkzYy4uN2RkZDJjOTVjMGIzOTkw ZmI1OTFkOTQyNTcwNDhkYjA1MzhhZjFiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKQEAgLTcxLDYgKzcxLDcgQEAKICNpbmNsdWRlICJUZXh0Q2hlY2tlclN0 YXRlLmgiCiAjaW5jbHVkZSAiVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94eS5oIgogI2lu Y2x1ZGUgIldLQ29udGV4dFByaXZhdGUuaCIKKyNpbmNsdWRlICJXZWJBdXRvbWF0aW9uU2Vzc2lv bi5oIgogI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5oIgogI2luY2x1ZGUgIldlYkJhY2tG b3J3YXJkTGlzdEl0ZW0uaCIKICNpbmNsdWRlICJXZWJDZXJ0aWZpY2F0ZUluZm8uaCIKQEAgLTMx MjEsNiArMzEyMiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1l KHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRAogICAgIGlmIChpc01haW5G cmFtZSkKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLmRpZEZpbmlzaExvYWQodHJhbnNhY3Rpb24p OwogCisgICAgaWYgKGlzTWFpbkZyYW1lICYmIG1fY29udHJvbGxlZEJ5QXV0b21hdGlvbikgewor ICAgICAgICBpZiAoYXV0byBhdXRvbWF0aW9uU2Vzc2lvbiA9IHByb2Nlc3MoKS5wcm9jZXNzUG9v bCgpLmF1dG9tYXRpb25TZXNzaW9uKCkpCisgICAgICAgICAgICBhdXRvbWF0aW9uU2Vzc2lvbi0+ bmF2aWdhdGlvbk9jY3VyZWRGb3JQYWdlKCp0aGlzKTsKKyAgICB9CisKICAgICBmcmFtZS0+ZGlk RmluaXNoTG9hZCgpOwogCiAgICAgbV9wYWdlTG9hZFN0YXRlLmNvbW1pdENoYW5nZXMoKTsKQEAg LTMxNTUsNiArMzE2MSwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbExvYWRGb3JGcmFt ZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsCiAgICAgaWYgKGlzTWFp bkZyYW1lKQogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuZGlkRmFpbExvYWQodHJhbnNhY3Rpb24p OwogCisgICAgaWYgKGlzTWFpbkZyYW1lICYmIG1fY29udHJvbGxlZEJ5QXV0b21hdGlvbikgewor ICAgICAgICBpZiAoYXV0byBhdXRvbWF0aW9uU2Vzc2lvbiA9IHByb2Nlc3MoKS5wcm9jZXNzUG9v bCgpLmF1dG9tYXRpb25TZXNzaW9uKCkpCisgICAgICAgICAgICBhdXRvbWF0aW9uU2Vzc2lvbi0+ bmF2aWdhdGlvbk9jY3VyZWRGb3JQYWdlKCp0aGlzKTsKKyAgICB9CisKICAgICBmcmFtZS0+ZGlk RmFpbExvYWQoKTsKIAogICAgIG1fcGFnZUxvYWRTdGF0ZS5jb21taXRDaGFuZ2VzKCk7CkBAIC0z MTg3LDYgKzMxOTgsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmln YXRpb25Gb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdAogICAgIGlmIChpc01haW5G cmFtZSkKICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb24o dHJhbnNhY3Rpb24sIHVybCk7CiAKKyAgICBpZiAoaXNNYWluRnJhbWUgJiYgbV9jb250cm9sbGVk QnlBdXRvbWF0aW9uKSB7CisgICAgICAgIGlmIChhdXRvIGF1dG9tYXRpb25TZXNzaW9uID0gcHJv Y2VzcygpLnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkKKyAgICAgICAgICAgIGF1 dG9tYXRpb25TZXNzaW9uLT5uYXZpZ2F0aW9uT2NjdXJlZEZvclBhZ2UoKnRoaXMpOworICAgIH0K KwogICAgIG1fcGFnZUxvYWRTdGF0ZS5jbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5zYWN0 aW9uKTsKICAgICBmcmFtZS0+ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbih1cmwpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IGZiY2Q4NDJjM2NlN2Vi ZTQ3ODY2YjY3MThhMGJkYWNhMTgwNjViZDkuLmRhYjVmMjA1YTI3OThiZGMwNTM2NGJjYzliYmU4 M2U3YjFmMjAzNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5o CkBAIC0yNTksNiArMjU5LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCB1cGRhdGVBdXRvbWF0aW9u Q2FwYWJpbGl0aWVzKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRBdXRvbWF0aW9uU2Vzc2lvbihSZWZQ dHI8V2ViQXV0b21hdGlvblNlc3Npb24+JiYpOworICAgIFdlYkF1dG9tYXRpb25TZXNzaW9uKiBh dXRvbWF0aW9uU2Vzc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1fYXV0b21hdGlvblNlc3Npb24uZ2V0 KCk7IH0KIAogICAgIC8vIERlZmF1bHRzIHRvIGZhbHNlLgogICAgIHZvaWQgc2V0SFRUUFBpcGVs aW5pbmdFbmFibGVkKGJvb2wpOwo=