181410 2018-01-08 15:47:14 -0800 Add WKNavigationDelegate SPI exposing WebProcess crash reason 2018-01-08 19:28:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen webkit-bug-importer wenson_hsieh oldest_to_newest 1386966 0 achristensen 2018-01-08 15:47:14 -0800 Add WKNavigationDelegate SPI exposing WebProcess crash reason 1386967 1 330747 achristensen 2018-01-08 15:48:15 -0800 Created attachment 330747 Patch 1387070 2 330747 wenson_hsieh 2018-01-08 19:05:51 -0800 Comment on attachment 330747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=330747&action=review > Source/WebKit/UIProcess/Cocoa/NavigationState.mm:894 > +static _WKProcessTerminationReason toWKProcessTerminationReason(ProcessTerminationReason reason) Nit - I think WebKit style guidelines recommend not having the "to" prefix (https://webkit.org/code-style-guidelines/#names-verb). Maybe processTerminationReason is sufficient? > Source/WebKit/UIProcess/Cocoa/NavigationState.mm:927 > + if (m_navigationState.m_navigationDelegateMethods.webViewWebContentProcessDidTerminateWithReason) { Nit - Maybe this should go ahead of the webViewWebContentProcessDidTerminate check, so that if a delegate implements both versions, the SPI version is preferred. Or maybe this doesn't really matter :P 1387073 3 330779 achristensen 2018-01-08 19:11:44 -0800 Created attachment 330779 Patch 1387081 4 achristensen 2018-01-08 19:27:34 -0800 http://trac.webkit.org/r226610 1387082 5 webkit-bug-importer 2018-01-08 19:28:25 -0800 <rdar://problem/36367341> 330747 2018-01-08 15:48:15 -0800 2018-01-08 19:11:43 -0800 Patch bug-181410-20180108154815.patch text/plain 9617 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjYzNjkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE4LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlIFNQSSBleHBvc2luZyBXZWJQcm9jZXNzIGNyYXNoIHJlYXNvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxNDEwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zNjE2NzE5OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZSBleHBvc2VkIGl0IGluIHRoZSBDIFNQSS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmln YXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6dG9X S1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbik6CisgICAgICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25T dGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJvY2Vzc0RpZFRlcm1pbmF0ZSk6CisKIDIwMTgtMDEt MDMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09T XSBDb25zdGFudCBmcmFtZSBkcm9wcGluZyBkdXJpbmcgRmxhc2ggdmlkZW8gcGxheWJhY2sKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0 ZVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmgJKHJldmlzaW9uIDIyNjM2OSkKKysrIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZh dGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsMTMgQEAgdHlwZWRlZiBOU19FTlVNKE5T SW50ZWdlciwgX1dLV2ViR0xMb2FkUAogfSBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNf VEJBKSk7CiAjZW5kaWYKIAordHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgX1dLUHJvY2Vzc1Rl cm1pbmF0aW9uUmVhc29uKSB7CisgICAgX1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uRXhjZWVk ZWRNZW1vcnlMaW1pdCwKKyAgICBfV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb25FeGNlZWRlZENQ VUxpbWl0LAorICAgIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvblJlcXVlc3RlZEJ5Q2xpZW50 LAorICAgIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbkNyYXNoLAorfSBXS19BUElfQVZBSUxB QkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKwogc3RhdGljIGNvbnN0 IFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5RG93bmxv YWQgPSAoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5KShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lB bGxvdyArIDEpOwogc3RhdGljIGNvbnN0IFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSBXS19BUElf QVZBSUxBQkxFKG1hY29zeCgxMC4xMSksIGlvcyg5LjApKSBfV0tOYXZpZ2F0aW9uQWN0aW9uUG9s aWN5QWxsb3dXaXRob3V0VHJ5aW5nQXBwTGluayA9IChXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3kp KFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93ICsgMik7CiAKQEAgLTgyLDYgKzg5LDcgQEAg c3RhdGljIGNvbnN0IFdLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5IAogLSAodm9pZClfd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRGYWlsTmF2aWdhdGlvbjooV0tOYXZpZ2F0aW9uICop bmF2aWdhdGlvbiB3aXRoRXJyb3I6KE5TRXJyb3IgKillcnJvciB1c2VySW5mbzooaWQgPE5TU2Vj dXJlQ29kaW5nPil1c2VySW5mbyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpKTsKIAogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmll dyBVUkw6KE5TVVJMICopdXJsIGNvbnRlbnRSdWxlTGlzdElkZW50aWZpZXJzOihOU0FycmF5PE5T U3RyaW5nICo+ICopaWRlbnRpZmllcnMgbm90aWZpY2F0aW9uczooTlNBcnJheTxOU1N0cmluZyAq PiAqKW5vdGlmaWNhdGlvbnMgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlv cyhXS19JT1NfVEJBKSk7CistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHdl YkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlV2l0aFJlYXNvbjooX1dLUHJvY2Vzc1Rlcm1pbmF0 aW9uUmVhc29uKXJlYXNvbiBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9z KFdLX0lPU19UQkEpKTsKIAogI2lmIFRBUkdFVF9PU19JUEhPTkUKIC0gKHZvaWQpX3dlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkU3RhcnRMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1h aW5GcmFtZVdpdGhGaWxlTmFtZTooTlNTdHJpbmcgKilmaWxlTmFtZSB1dGk6KE5TU3RyaW5nICop dXRpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLmgJKHJldmlzaW9uIDIyNjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL05hdmlnYXRpb25TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsNiArMTk3LDcgQEAg cHJpdmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3UmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2Ug OiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVu Z2VDb21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1dlYkNvbnRlbnRQ cm9jZXNzRGlkVGVybWluYXRlIDogMTsKKyAgICAgICAgYm9vbCB3ZWJWaWV3V2ViQ29udGVudFBy b2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3Q2Fu QXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZSA6IDE7CiAgICAgICAgIGJvb2wgd2Vi Vmlld0RpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSA6IDE7CiAgICAgICAgIGJvb2wg d2ViVmlld1dlYlByb2Nlc3NEaWRDcmFzaCA6IDE7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCShyZXZpc2lvbiAyMjYzNjkpCisr KyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHdvcmtp bmcgY29weSkKQEAgLTE2Miw2ICsxNjIsNyBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6c2V0TmF2 aWdhdGlvbkRlbGVnCiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdSZW5k ZXJpbmdQcm9ncmVzc0RpZENoYW5nZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKF93ZWJWaWV3OnJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlOildOwogICAgIG1fbmF2 aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlQ29tcGxldGlvbkhhbmRsZXIgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3Rvcih3ZWJWaWV3OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpjb21wbGV0 aW9uSGFuZGxlcjopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dl YkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3Iod2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlOildOworICAg IG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRU ZXJtaW5hdGVXaXRoUmVhc29uID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoX3dlYlZpZXc6d2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOildOwog ICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3Q2FuQXV0aGVudGljYXRlQWdh aW5zdFByb3RlY3Rpb25TcGFjZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF93ZWJWaWV3OmNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2U6KV07CiAg ICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihf d2ViVmlldzpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6KV07CiAgICAgbV9uYXZp Z2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2ggPSBbZGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlld1dlYlByb2Nlc3NEaWRDcmFz aDopXTsKQEAgLTg5MCw5ICs4OTEsMjcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRp b25DbGllbnQ6OgogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAogfQogCi12b2lkIE5hdmln YXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJvY2Vzc0RpZFRlcm1pbmF0ZShXZWJQYWdl UHJveHkmIHBhZ2UsIFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbikKK3N0YXRpYyBfV0tQcm9jZXNz VGVybWluYXRpb25SZWFzb24gdG9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbihQcm9jZXNzVGVy bWluYXRpb25SZWFzb24gcmVhc29uKQogewotICAgIGlmICghbV9uYXZpZ2F0aW9uU3RhdGUubV9u YXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1p bmF0ZSAmJiAhbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndl YlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2gpCisgICAgc3dpdGNoIChyZWFzb24pIHsKKyAgICBjYXNl IFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbjo6RXhjZWVkZWRNZW1vcnlMaW1pdDoKKyAgICAgICAg cmV0dXJuIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbkV4Y2VlZGVkTWVtb3J5TGltaXQ7Cisg ICAgY2FzZSBQcm9jZXNzVGVybWluYXRpb25SZWFzb246OkV4Y2VlZGVkQ1BVTGltaXQ6CisgICAg ICAgIHJldHVybiBfV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb25FeGNlZWRlZENQVUxpbWl0Owor ICAgIGNhc2UgUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpSZXF1ZXN0ZWRCeUNsaWVudDoKKyAg ICAgICAgcmV0dXJuIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvblJlcXVlc3RlZEJ5Q2xpZW50 OworICAgIGNhc2UgUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uOjpDcmFzaDoKKyAgICAgICAgcmV0 dXJuIF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbkNyYXNoOworICAgIH0KKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gX1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uQ3Jh c2g7Cit9CisKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojpwcm9jZXNz RGlkVGVybWluYXRlKFdlYlBhZ2VQcm94eSYgcGFnZSwgUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29u IHJlYXNvbikKK3sKKyAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVn YXRlTWV0aG9kcy53ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUKKyAgICAgICAg JiYgIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3 V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uCisgICAgICAgICYmICFtX25h dmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dlYlByb2Nl c3NEaWRDcmFzaCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdh dGUgPSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKTsKQEAgLTkw NSw4ICs5MjQsMTMgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6Ogog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2 aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoKQotICAgICAg ICBbc3RhdGljX2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRp b25EZWxlZ2F0ZS5nZXQoKSkgX3dlYlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2g6bV9uYXZpZ2F0aW9u U3RhdGUubV93ZWJWaWV3XTsKKyAgICBpZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9u RGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhS ZWFzb24pIHsKKyAgICAgICAgW3N0YXRpY19jYXN0PGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVBy aXZhdGU+PihuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCkpIF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0 YXRlLm1fd2ViVmlldyB3ZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhSZWFzb246dG9X S1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbihyZWFzb24pXTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKworICAgIEFTU0VSVChtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1l dGhvZHMud2ViVmlld1dlYlByb2Nlc3NEaWRDcmFzaCk7CisgICAgW3N0YXRpY19jYXN0PGlkIDxX S05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+PihuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCkpIF93 ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoOm1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlld107CiB9 CiAKIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojpwcm9jZXNzRGlkQmVj b21lUmVzcG9uc2l2ZShXZWJQYWdlUHJveHkmIHBhZ2UpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjY1ODIpCisrKyBUb29s cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxOC0wMS0wOCAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFk ZCBXS05hdmlnYXRpb25EZWxlZ2F0ZSBTUEkgZXhwb3NpbmcgV2ViUHJvY2VzcyBjcmFzaCByZWFz b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTQx MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzYxNjcxOTk+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL05hdmlnYXRpb24ubW06CisgICAgICAgICgtW0NyYXNoUmVhc29uRGVsZWdhdGUgX3dl YlZpZXc6d2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOl0pOgorICAgICAg ICAoVEVTVCk6CisKIDIwMTgtMDEtMDggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBs ZS5jb20+CiAKICAgICAgICAgQ29weWluZywgcGFzdGluZywgYW5kIHRoZW4gZGVsZXRpbmcgYW4g YXR0YWNobWVudCBlbGVtZW50IGJyZWFrcyBhdHRhY2htZW50IGRhdGEgcmVxdWVzdHMKSW5kZXg6 IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmF2aWdhdGlvbi5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmlnYXRp b24ubW0JKHJldmlzaW9uIDIyNjM2OSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvTmF2aWdhdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCwzMiBA QCBURVNUKFdLTmF2aWdhdGlvbiwgRGlkRmFpbFByb3Zpc2lvbmFsTmF2CiAgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZpc0RvbmUpOwogfQogCitAaW50ZXJmYWNlIENyYXNoUmVhc29uRGVs ZWdhdGUgOiBOU09iamVjdCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+CitAZW5kCisKK0BpbXBsZW1l bnRhdGlvbiBDcmFzaFJlYXNvbkRlbGVnYXRlCisKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgd2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOihfV0tQ cm9jZXNzVGVybWluYXRpb25SZWFzb24pcmVhc29uCit7CisgICAgRVhQRUNUX0VRKHJlYXNvbiwg X1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uUmVxdWVzdGVkQnlDbGllbnQpOworICAgIGlzRG9u ZSA9IHRydWU7Cit9CisKK0BlbmQKKworVEVTVChXS05hdmlnYXRpb24sIENyYXNoUmVhc29uKQor eworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRo RnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsKKyAgICAKKyAgICBhdXRvIGRlbGVn YXRlID0gYWRvcHROUyhbW0NyYXNoUmVhc29uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBb d2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIAorICAg IFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+c3RhcnQgdGhlIHdlYiBwcm9jZXNzPC9o dG1sPiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8vd2Via2l0Lm9yZy8i XV07CisgICAgW3dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVdOwor ICAgIAorICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKK30KKwogQGludGVy ZmFjZSBEZWNpZGVQb2xpY3lGb3JQYWdlQ2FjaGVOYXZpZ2F0aW9uRGVsZWdhdGUgOiBOU09iamVj dCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBkZWNp ZGVkUG9saWN5Rm9yQmFja0ZvcndhcmROYXZpZ2F0aW9uOwogQGVuZAo= 330779 2018-01-08 19:11:44 -0800 2018-01-08 19:21:15 -0800 Patch bug-181410-20180108191143.patch text/plain 9848 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjY2MDgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE4LTAxLTA4ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlIFNQSSBleHBvc2luZyBXZWJQcm9jZXNzIGNyYXNoIHJlYXNvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxNDEwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zNjE2NzE5OT4KKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24g SHNpZWguCisKKyAgICAgICAgV2UgZXhwb3NlZCBpdCBpbiB0aGUgQyBTUEkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0 aW9uU3RhdGU6OnNldE5hdmlnYXRpb25EZWxlZ2F0ZSk6CisgICAgICAgIChXZWJLaXQ6OnRvV0tQ cm9jZXNzVGVybWluYXRpb25SZWFzb24pOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3Rh dGU6Ok5hdmlnYXRpb25DbGllbnQ6OnByb2Nlc3NEaWRUZXJtaW5hdGUpOgorCiAyMDE4LTAxLTA4 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIGlPUyBidWlsZCBm aXggYXR0ZW1wdCBhZnRlciByMjI2NjAyLgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZh dGUuaAkocmV2aXNpb24gMjI2MzY5KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2 ICs0MSwxMyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tXZWJHTExvYWRQCiB9IFdL X0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKICNlbmRpZgogCit0eXBlZGVmIE5T X0VOVU0oTlNJbnRlZ2VyLCBfV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24pIHsKKyAgICBfV0tQ cm9jZXNzVGVybWluYXRpb25SZWFzb25FeGNlZWRlZE1lbW9yeUxpbWl0LAorICAgIF9XS1Byb2Nl c3NUZXJtaW5hdGlvblJlYXNvbkV4Y2VlZGVkQ1BVTGltaXQsCisgICAgX1dLUHJvY2Vzc1Rlcm1p bmF0aW9uUmVhc29uUmVxdWVzdGVkQnlDbGllbnQsCisgICAgX1dLUHJvY2Vzc1Rlcm1pbmF0aW9u UmVhc29uQ3Jhc2gsCit9IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3Mo V0tfSU9TX1RCQSkpOworCiBzdGF0aWMgY29uc3QgV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5IF9X S05hdmlnYXRpb25BY3Rpb25Qb2xpY3lEb3dubG9hZCA9IChXS05hdmlnYXRpb25BY3Rpb25Qb2xp Y3kpKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93ICsgMSk7CiBzdGF0aWMgY29uc3QgV0tO YXZpZ2F0aW9uQWN0aW9uUG9saWN5IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KDEwLjExKSwgaW9z KDkuMCkpIF9XS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvd1dpdGhvdXRUcnlpbmdBcHBMaW5r ID0gKFdLTmF2aWdhdGlvbkFjdGlvblBvbGljeSkoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxs b3cgKyAyKTsKIApAQCAtODIsNiArODksNyBAQCBzdGF0aWMgY29uc3QgV0tOYXZpZ2F0aW9uUmVz cG9uc2VQb2xpY3kgCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZEZh aWxOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZpZ2F0aW9uIHdpdGhFcnJvcjooTlNFcnJv ciAqKWVycm9yIHVzZXJJbmZvOihpZCA8TlNTZWN1cmVDb2Rpbmc+KXVzZXJJbmZvIFdLX0FQSV9B VkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCiAtICh2b2lk KV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IFVSTDooTlNVUkwgKil1cmwgY29udGVudFJ1 bGVMaXN0SWRlbnRpZmllcnM6KE5TQXJyYXk8TlNTdHJpbmcgKj4gKilpZGVudGlmaWVycyBub3Rp ZmljYXRpb25zOihOU0FycmF5PE5TU3RyaW5nICo+ICopbm90aWZpY2F0aW9ucyBXS19BUElfQVZB SUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpX3dl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgd2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVX aXRoUmVhc29uOihfV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24pcmVhc29uIFdLX0FQSV9BVkFJ TEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCiAjaWYgVEFSR0VU X09TX0lQSE9ORQogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRTdGFy dExvYWRGb3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lV2l0aEZpbGVOYW1lOihOU1N0cmlu ZyAqKWZpbGVOYW1lIHV0aTooTlNTdHJpbmcgKil1dGk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAkocmV2aXNpb24gMjI2MzY5KQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTE5Nyw2ICsxOTcsNyBAQCBwcml2YXRlOgogICAgICAgICBib29sIHdlYlZp ZXdSZW5kZXJpbmdQcm9ncmVzc0RpZENoYW5nZSA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0Rp ZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyIDogMTsKICAg ICAgICAgYm9vbCB3ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUgOiAxOworICAg ICAgICBib29sIHdlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhSZWFzb24g OiAxOwogICAgICAgICBib29sIHdlYlZpZXdDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlv blNwYWNlIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlIDogMTsKICAgICAgICAgYm9vbCB3ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoIDog MTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUubW0JKHJldmlzaW9uIDIyNjM2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL05hdmlnYXRpb25TdGF0ZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMTYyLDYgKzE2Miw3IEBA IHZvaWQgTmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25hdmlnYXRp b25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlID0gW2Rl bGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cmVuZGVyaW5nUHJv Z3Jlc3NEaWRDaGFuZ2U6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZp ZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA9IFtk ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6ZGlkUmVjZWl2ZUF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5kbGVyOildOwogICAgIG1fbmF2aWdh dGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUg PSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3V2ViQ29udGVu dFByb2Nlc3NEaWRUZXJtaW5hdGU6KV07CisgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2Rz LndlYlZpZXdXZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhSZWFzb24gPSBbZGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzp3ZWJDb250ZW50UHJvY2Vz c0RpZFRlcm1pbmF0ZVdpdGhSZWFzb246KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRo b2RzLndlYlZpZXdDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlID0gW2RlbGVn YXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6Y2FuQXV0aGVudGljYXRl QWdhaW5zdFByb3RlY3Rpb25TcGFjZTopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhv ZHMud2ViVmlld0RpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSA9IFtkZWxlZ2F0ZSBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZFJlY2VpdmVBdXRoZW50aWNh dGlvbkNoYWxsZW5nZTopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmll d1dlYlByb2Nlc3NEaWRDcmFzaCA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF93ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoOildOwpAQCAtODkwLDIzICs4OTEsNDYgQEAg dm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OgogI3ByYWdtYSBjbGFuZyBk aWFnbm9zdGljIHBvcAogfQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVu dDo6cHJvY2Vzc0RpZFRlcm1pbmF0ZShXZWJQYWdlUHJveHkmIHBhZ2UsIFByb2Nlc3NUZXJtaW5h dGlvblJlYXNvbikKK3N0YXRpYyBfV0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24gd2tQcm9jZXNz VGVybWluYXRpb25SZWFzb24oUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uIHJlYXNvbikKIHsKLSAg ICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJW aWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGUgJiYgIW1fbmF2aWdhdGlvblN0YXRlLm1f bmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoKQorICAg IHN3aXRjaCAocmVhc29uKSB7CisgICAgY2FzZSBQcm9jZXNzVGVybWluYXRpb25SZWFzb246OkV4 Y2VlZGVkTWVtb3J5TGltaXQ6CisgICAgICAgIHJldHVybiBfV0tQcm9jZXNzVGVybWluYXRpb25S ZWFzb25FeGNlZWRlZE1lbW9yeUxpbWl0OworICAgIGNhc2UgUHJvY2Vzc1Rlcm1pbmF0aW9uUmVh c29uOjpFeGNlZWRlZENQVUxpbWl0OgorICAgICAgICByZXR1cm4gX1dLUHJvY2Vzc1Rlcm1pbmF0 aW9uUmVhc29uRXhjZWVkZWRDUFVMaW1pdDsKKyAgICBjYXNlIFByb2Nlc3NUZXJtaW5hdGlvblJl YXNvbjo6UmVxdWVzdGVkQnlDbGllbnQ6CisgICAgICAgIHJldHVybiBfV0tQcm9jZXNzVGVybWlu YXRpb25SZWFzb25SZXF1ZXN0ZWRCeUNsaWVudDsKKyAgICBjYXNlIFByb2Nlc3NUZXJtaW5hdGlv blJlYXNvbjo6Q3Jhc2g6CisgICAgICAgIHJldHVybiBfV0tQcm9jZXNzVGVybWluYXRpb25SZWFz b25DcmFzaDsKKyAgICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIF9X S1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbkNyYXNoOworfQorCit2b2lkIE5hdmlnYXRpb25TdGF0 ZTo6TmF2aWdhdGlvbkNsaWVudDo6cHJvY2Vzc0RpZFRlcm1pbmF0ZShXZWJQYWdlUHJveHkmIHBh Z2UsIFByb2Nlc3NUZXJtaW5hdGlvblJlYXNvbiByZWFzb24pCit7CisgICAgaWYgKCFtX25hdmln YXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dlYkNvbnRlbnRQ cm9jZXNzRGlkVGVybWluYXRlCisgICAgICAgICYmICFtX25hdmlnYXRpb25TdGF0ZS5tX25hdmln YXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRl V2l0aFJlYXNvbgorICAgICAgICAmJiAhbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVs ZWdhdGVNZXRob2RzLndlYlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2gpCiAgICAgICAgIHJldHVybjsK IAogICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0gbV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZp Z2F0aW9uRGVsZWdhdGUuZ2V0KCk7CiAgICAgaWYgKCFuYXZpZ2F0aW9uRGVsZWdhdGUpCiAgICAg ICAgIHJldHVybjsKIAorICAgIGlmIChtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25EZWxl Z2F0ZU1ldGhvZHMud2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlV2l0aFJlYXNv bikgeworICAgICAgICBbc3RhdGljX2Nhc3Q8aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0 ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUu bV93ZWJWaWV3IHdlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlV2l0aFJlYXNvbjp3a1Byb2Nl c3NUZXJtaW5hdGlvblJlYXNvbihyZWFzb24pXTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwog ICAgIC8vIFdlIHByZWZlciB3ZWJWaWV3V2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGU6IG92 ZXIgX3dlYlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2g6LgogICAgIGlmIChtX25hdmlnYXRpb25TdGF0 ZS5tX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dlYkNvbnRlbnRQcm9jZXNzRGlk VGVybWluYXRlKSB7CiAgICAgICAgIFtuYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlld1dlYkNvbnRl bnRQcm9jZXNzRGlkVGVybWluYXRlOm1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlld107CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0 aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2gpCi0gICAgICAgIFtz dGF0aWNfY2FzdDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlPj4obmF2aWdhdGlvbkRl bGVnYXRlLmdldCgpKSBfd2ViVmlld1dlYlByb2Nlc3NEaWRDcmFzaDptX25hdmlnYXRpb25TdGF0 ZS5tX3dlYlZpZXddOworICAgIEFTU0VSVChtX25hdmlnYXRpb25TdGF0ZS5tX25hdmlnYXRpb25E ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dlYlByb2Nlc3NEaWRDcmFzaCk7CisgICAgW3N0YXRpY19j YXN0PGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+PihuYXZpZ2F0aW9uRGVsZWdhdGUu Z2V0KCkpIF93ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoOm1fbmF2aWdhdGlvblN0YXRlLm1fd2Vi Vmlld107CiB9CiAKIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50Ojpwcm9j ZXNzRGlkQmVjb21lUmVzcG9uc2l2ZShXZWJQYWdlUHJveHkmIHBhZ2UpCkluZGV4OiBUb29scy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjY2MDcp CisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAx OC0wMS0wOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisg ICAgICAgIEFkZCBXS05hdmlnYXRpb25EZWxlZ2F0ZSBTUEkgZXhwb3NpbmcgV2ViUHJvY2VzcyBj cmFzaCByZWFzb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4MTQxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzYxNjcxOTk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9OYXZpZ2F0aW9uLm1tOgorICAgICAgICAoLVtDcmFzaFJlYXNvbkRlbGVn YXRlIF93ZWJWaWV3OndlYkNvbnRlbnRQcm9jZXNzRGlkVGVybWluYXRlV2l0aFJlYXNvbjpdKToK KyAgICAgICAgKFRFU1QpOgorCiAyMDE4LTAxLTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFNQSSBmb3IgV0tPcGVuUGFuZWxQYXJh bWV0ZXJzLl9hY2NlcHRlZE1JTUVUeXBlcyBhbmQgX2FjY2VwdGVkRmlsZUV4dGVuc2lvbnMKSW5k ZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvTmF2aWdhdGlvbi5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL05hdmln YXRpb24ubW0JKHJldmlzaW9uIDIyNjM2OSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvTmF2aWdhdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQ0LDYgKzE0NCwz MiBAQCBURVNUKFdLTmF2aWdhdGlvbiwgRGlkRmFpbFByb3Zpc2lvbmFsTmF2CiAgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZpc0RvbmUpOwogfQogCitAaW50ZXJmYWNlIENyYXNoUmVhc29u RGVsZWdhdGUgOiBOU09iamVjdCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+CitAZW5kCisKK0BpbXBs ZW1lbnRhdGlvbiBDcmFzaFJlYXNvbkRlbGVnYXRlCisKKy0gKHZvaWQpX3dlYlZpZXc6KFdLV2Vi VmlldyAqKXdlYlZpZXcgd2ViQ29udGVudFByb2Nlc3NEaWRUZXJtaW5hdGVXaXRoUmVhc29uOihf V0tQcm9jZXNzVGVybWluYXRpb25SZWFzb24pcmVhc29uCit7CisgICAgRVhQRUNUX0VRKHJlYXNv biwgX1dLUHJvY2Vzc1Rlcm1pbmF0aW9uUmVhc29uUmVxdWVzdGVkQnlDbGllbnQpOworICAgIGlz RG9uZSA9IHRydWU7Cit9CisKK0BlbmQKKworVEVTVChXS05hdmlnYXRpb24sIENyYXNoUmVhc29u KQoreworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsKKyAgICAKKyAgICBhdXRvIGRl bGVnYXRlID0gYWRvcHROUyhbW0NyYXNoUmVhc29uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAg ICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIAor ICAgIFt3ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+c3RhcnQgdGhlIHdlYiBwcm9jZXNz PC9odG1sPiIgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8vd2Via2l0Lm9y Zy8iXV07CisgICAgW3dlYlZpZXcgX2tpbGxXZWJDb250ZW50UHJvY2Vzc0FuZFJlc2V0U3RhdGVd OworICAgIAorICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKK30KKwogQGlu dGVyZmFjZSBEZWNpZGVQb2xpY3lGb3JQYWdlQ2FjaGVOYXZpZ2F0aW9uRGVsZWdhdGUgOiBOU09i amVjdCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBk ZWNpZGVkUG9saWN5Rm9yQmFja0ZvcndhcmROYXZpZ2F0aW9uOwogQGVuZAo=