176728 2017-09-11 13:36:28 -0700 Add WKUIDelegatePrivate equivalent of WKPageUIClient's runModal 2017-09-27 13:01:27 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen berto buildbot cgarcia gustavo mcatanzaro thorton webkit-bug-importer oldest_to_newest 1347570 0 achristensen 2017-09-11 13:36:28 -0700 Add WKUIDelegatePrivate equivalent of WKPageUIClient's runModal 1347574 1 320466 achristensen 2017-09-11 13:41:51 -0700 Created attachment 320466 Patch 1347575 2 buildbot 2017-09-11 13:43:25 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1347828 3 320526 achristensen 2017-09-12 00:19:08 -0700 Created attachment 320526 Patch 1347921 4 320526 thorton 2017-09-12 09:29:07 -0700 Comment on attachment 320526 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320526&action=review > Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:157 > +- (void)_webViewRunModal:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA)); As mentioned on IRC, I think we can do better with this name. 1347934 5 achristensen 2017-09-12 09:35:43 -0700 It's just SPI. I think I'm going to keep the name as it is. We should remove it eventually once we've implemented the dialog element. See https://bugs.webkit.org/show_bug.cgi?id=151885 1347935 6 achristensen 2017-09-12 09:37:25 -0700 http://trac.webkit.org/r221922 1347936 7 thorton 2017-09-12 09:42:20 -0700 (In reply to Alex Christensen from comment #5) > It's just SPI. I think I'm going to keep the name as it is. You know how I feel about that excuse :P > We should remove it eventually once we've implemented the dialog element. See > https://bugs.webkit.org/show_bug.cgi?id=151885 Fair. 1347938 8 achristensen 2017-09-12 09:42:53 -0700 http://trac.webkit.org/r221923 1353771 9 webkit-bug-importer 2017-09-27 13:01:27 -0700 <rdar://problem/34694493> 320466 2017-09-11 13:41:51 -0700 2017-09-12 00:19:07 -0700 Patch bug-176728-20170911134150.patch text/plain 10385 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE3NzcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE3LTA5LTExICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLVUlEZWxl Z2F0ZVByaXZhdGUgZXF1aXZhbGVudCBvZiBXS1BhZ2VVSUNsaWVudCdzIHJ1bk1vZGFsCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY3MjgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI5MjcwMDM1PgorICAgICAgICAKKyAgICAgICAgQ292ZXJlZCBi eSBhIG5ldyBBUEkgdGVzdC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6 VUlDbGllbnQ6OnJ1bk1vZGFsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNw cDoKKyAgICAgICAgKFdLUGFnZVNldFBhZ2VVSUNsaWVudCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nv Y29hL1VJRGVsZWdhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5t bToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6c2V0RGVsZWdhdGUpOgorICAgICAgICAo V2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6Y2FuUnVuTW9kYWwgY29uc3QpOgorICAgICAg ICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6cnVuTW9kYWwpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJ1bk1vZGFsKToKKwogMjAxNy0wOS0wNyAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+ CiAKICAgICAgICAgW01hY10gVXBzdHJlYW0gUVRLaXQtcmVsYXRlZCBXZWJLaXRTeXN0ZW1JbnRl cmZhY2UgZnVuY3Rpb25zCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHJldmlzaW9uIDIyMTc3MSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5NDAsNyArNTk0MCw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpydW5Nb2RhbCgpCiAgICAgLy8gU2VlIGh0dHA6Ly93ZWJraXQub3JnL2IvODk1 OTAgZm9yIG1vcmUgZGlzY3Vzc2lvbi4KICAgICBtX3Byb2Nlc3MtPmNvbm5lY3Rpb24oKS0+d2Fr ZVVwUnVuTG9vcCgpOwogCi0gICAgbV91aUNsaWVudC0+cnVuTW9kYWwodGhpcyk7CisgICAgbV91 aUNsaWVudC0+cnVuTW9kYWwoKnRoaXMpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6bm90aWZ5 U2Nyb2xsZXJUaHVtYklzVmlzaWJsZUluUmVjdChjb25zdCBJbnRSZWN0JiBzY3JvbGxlclRodW1i KQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmgJKHJldmlz aW9uIDIyMTc3MSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElVSUNsaWVudC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMzcsNyArMTM3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBwcmludEZyYW1lKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVBy b3h5KikgeyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuUnVuTW9kYWwoKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQotICAgIHZpcnR1YWwgdm9pZCBydW5Nb2RhbChXZWJLaXQ6OldlYlBhZ2VQcm94 eSopIHsgfQorICAgIHZpcnR1YWwgdm9pZCBydW5Nb2RhbChXZWJLaXQ6OldlYlBhZ2VQcm94eSYp IHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNhdmVEYXRhVG9GaWxlSW5Eb3dubG9hZHNGb2xkZXIo V2ViS2l0OjpXZWJQYWdlUHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3Ry aW5nJiwgY29uc3QgV2ViQ29yZTo6VVJMJiwgRGF0YSYpIHsgfQogCkluZGV4OiBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDIyMTc3MSkKKysrIFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIw MzUsMTIgKzIwMzUsMTIgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlVUlDbGllbnQoV0tQYWdlUmVmIHBh ZwogICAgICAgICAgICAgcmV0dXJuIG1fY2xpZW50LnJ1bk1vZGFsOwogICAgICAgICB9CiAKLSAg ICAgICAgdm9pZCBydW5Nb2RhbChXZWJQYWdlUHJveHkqIHBhZ2UpIGZpbmFsCisgICAgICAgIHZv aWQgcnVuTW9kYWwoV2ViUGFnZVByb3h5JiBwYWdlKSBmaW5hbAogICAgICAgICB7CiAgICAgICAg ICAgICBpZiAoIW1fY2xpZW50LnJ1bk1vZGFsKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICAgICAgbV9jbGllbnQucnVuTW9kYWwodG9BUEkocGFnZSksIG1fY2xpZW50LmJhc2Uu Y2xpZW50SW5mbyk7CisgICAgICAgICAgICBtX2NsaWVudC5ydW5Nb2RhbCh0b0FQSSgmcGFnZSks IG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0KIAogICAgICAgICB2b2lkIHNh dmVEYXRhVG9GaWxlSW5Eb3dubG9hZHNGb2xkZXIoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBT dHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBX ZWJDb3JlOjpVUkwmIG9yaWdpbmF0aW5nVVJMLCBBUEk6OkRhdGEmIGRhdGEpIGZpbmFsCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVs ZWdhdGVQcml2YXRlLmgJKHJldmlzaW9uIDIyMTc2OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1 Myw2ICsxNTMsNyBAQCBzdHJ1Y3QgVUlFZGdlSW5zZXRzOwogLSAodm9pZClfZm9jdXNXZWJWaWV3 OihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEp KTsKIC0gKHZvaWQpX3VuZm9jdXNXZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9B VkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKHZvaWQpX3dlYlZpZXdEaWRTY3JvbGw6 KFdLV2ViVmlldyAqKXdlYlZpZXcgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkp OworLSAodm9pZClfd2ViVmlld1J1bk1vZGFsOihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9B VkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgdGFrZUZvY3VzOihfV0tGb2N1c0RpcmVjdGlvbilkaXJlY3Rpb24gV0tfQVBJ X0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldyBkaWROb3RIYW5kbGVXaGVlbEV2ZW50OihOU0V2ZW50ICopZXZlbnQgV0tf QVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSkpOwogLSAodm9pZClfd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBoYW5kbGVBdXRvcGxheUV2ZW50OihfV0tBdXRvcGxheUV2ZW50KWV2 ZW50IHdpdGhGbGFnczooX1dLQXV0b3BsYXlFdmVudEZsYWdzKWZsYWdzIFdLX0FQSV9BVkFJTEFC TEUobWFjb3N4KFdLX01BQ19UQkEpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9nbGliL1dlYktpdFVJQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVSUNsaWVudC5jcHAJKHJldmlzaW9uIDIyMTc3MSkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVJQ2xpZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjEyLDcgKzIxMiw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIGNhblJ1 bk1vZGFsKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgdm9pZCBydW5N b2RhbChXZWJQYWdlUHJveHkqKSBvdmVycmlkZQorICAgIHZvaWQgcnVuTW9kYWwoV2ViUGFnZVBy b3h5Jikgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIHdlYmtpdFdlYlZpZXdSdW5Bc01vZGFsKG1f d2ViVmlldyk7CiAgICAgfQpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlE ZWxlZ2F0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJ RGVsZWdhdGUuaAkocmV2aXNpb24gMjIxNzcxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvVUlEZWxlZ2F0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw4IEBAIHByaXZh dGU6CiAgICAgICAgIHZvaWQgdGFrZUZvY3VzKFdlYlBhZ2VQcm94eSosIFdLRm9jdXNEaXJlY3Rp b24pIGZpbmFsOwogICAgICAgICB2b2lkIGZvY3VzKFdlYlBhZ2VQcm94eSopIGZpbmFsOwogICAg ICAgICB2b2lkIHVuZm9jdXMoV2ViUGFnZVByb3h5KikgZmluYWw7CisgICAgICAgIGJvb2wgY2Fu UnVuTW9kYWwoKSBjb25zdCBmaW5hbDsKKyAgICAgICAgdm9pZCBydW5Nb2RhbChXZWJQYWdlUHJv eHkmKSBmaW5hbDsKICAgICAgICAgdm9pZCBwYWdlRGlkU2Nyb2xsKFdlYlBhZ2VQcm94eSopIGZp bmFsOwogICAgICAgICB2b2lkIGRpZE5vdEhhbmRsZVdoZWVsRXZlbnQoV2ViUGFnZVByb3h5Kiwg Y29uc3QgTmF0aXZlV2ViV2hlZWxFdmVudCYpIGZpbmFsOwogICAgICAgICB2b2lkIGhhbmRsZUF1 dG9wbGF5RXZlbnQoV2ViUGFnZVByb3h5JiwgV2ViQ29yZTo6QXV0b3BsYXlFdmVudCwgT3B0aW9u U2V0PFdlYkNvcmU6OkF1dG9wbGF5RXZlbnRGbGFncz4pIGZpbmFsOwpAQCAtMTQ4LDYgKzE1MCw3 IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgc2hvd1dlYlZpZXcgOiAxOwogICAgICAgICBib29s IGZvY3VzV2ViVmlldyA6IDE7CiAgICAgICAgIGJvb2wgdW5mb2N1c1dlYlZpZXcgOiAxOworICAg ICAgICBib29sIHdlYlZpZXdSdW5Nb2RhbCA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1Rha2VG b2N1cyA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFNjcm9sbCA6IDE7CiAgICAgICAgIGJv b2wgd2ViVmlld0RpZE5vdEhhbmRsZVdoZWVsRXZlbnQgOiAxOwpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCShyZXZpc2lvbiAyMjE3NzEpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xMDksNiArMTA5LDcgQEAgdm9pZCBVSURlbGVnYXRlOjpzZXREZWxlZ2F0ZShpZCA8V0tV SURlbAogICAgIG1fZGVsZWdhdGVNZXRob2RzLmZvY3VzV2ViVmlldyA9IFtkZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9mb2N1c1dlYlZpZXc6KV07CiAgICAgbV9kZWxlZ2F0 ZU1ldGhvZHMudW5mb2N1c1dlYlZpZXcgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3RvcihfdW5mb2N1c1dlYlZpZXc6KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmll d1Rha2VGb2N1cyA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3OnRha2VGb2N1czopXTsKKyAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3UnVuTW9kYWwg PSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlld1J1bk1vZGFs OildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRTY3JvbGwgPSBbZGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlld0RpZFNjcm9sbDopXTsKICAgICBt X2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3R2V0VG9vbGJhcnNBcmVWaXNpYmxlV2l0aENvbXBsZXRp b25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZp ZXc6Z2V0VG9vbGJhcnNBcmVWaXNpYmxlV2l0aENvbXBsZXRpb25IYW5kbGVyOildOwogICAgIG1f ZGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWROb3RIYW5kbGVXaGVlbEV2ZW50ID0gW2RlbGVnYXRl IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGlkTm90SGFuZGxlV2hlZWxF dmVudDopXTsKQEAgLTM4MSw2ICszODIsMjMgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6 dGFrZUZvY3VzKFdlYgogICAgIFsoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KWRlbGVnYXRlIF93 ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgdGFrZUZvY3VzOnRvV0tGb2N1c0RpcmVjdGlv bihkaXJlY3Rpb24pXTsKIH0KIAorYm9vbCBVSURlbGVnYXRlOjpVSUNsaWVudDo6Y2FuUnVuTW9k YWwoKSBjb25zdAoreworICAgIHJldHVybiBtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZU1ldGhvZHMu d2ViVmlld1J1bk1vZGFsOworfQorCit2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpydW5Nb2Rh bChXZWJQYWdlUHJveHkmKQoreworICAgIGlmICghbV91aURlbGVnYXRlLm1fZGVsZWdhdGVNZXRo b2RzLndlYlZpZXdSdW5Nb2RhbCkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIGF1dG8gZGVs ZWdhdGUgPSBtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZS5nZXQoKTsKKyAgICBpZiAoIWRlbGVnYXRl KQorICAgICAgICByZXR1cm47CisKKyAgICBbKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilkZWxl Z2F0ZSBfd2ViVmlld1J1bk1vZGFsOm1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXddOworfQorCiB2b2lk IFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpwYWdlRGlkU2Nyb2xsKFdlYlBhZ2VQcm94eSopCiB7CiAg ICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFNjcm9sbCkK SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMTg3MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTA5LTExICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLVUlEZWxlZ2F0ZVByaXZhdGUgZXF1aXZhbGVudCBv ZiBXS1BhZ2VVSUNsaWVudCdzIHJ1bk1vZGFsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY3MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5Mjcw MDM1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tOgorICAgICAgICAo LVtNb2RhbERlbGVnYXRlIF93ZWJWaWV3UnVuTW9kYWw6XSk6CisgICAgICAgICgtW01vZGFsRGVs ZWdhdGUgd2ViVmlldzpjcmVhdGVXZWJWaWV3V2l0aENvbmZpZ3VyYXRpb246Zm9yTmF2aWdhdGlv bkFjdGlvbjp3aW5kb3dGZWF0dXJlczpdKToKKyAgICAgICAgKFRFU1QpOgorCiAyMDE3LTA5LTEx ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1Mg RG5EXSBFbGVtZW50cyBpbiB0aGUgRE9NIHdpdGggdGhlIGBkcmFnZ2FibGVgIGF0dHJpYnV0ZSBz aG91bGQgYmUgZHJhZ2dhYmxlCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1VJRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tCShyZXZpc2lvbiAyMjE3NjkpCisrKyBUb29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEyNSw2ICsxMjUsMzcgQEAgVEVTVChXZWJLaXQsIFNob3dXZWJWaWV3KQogICAg IEFTU0VSVF9FUSh3ZWJWaWV3RnJvbURlbGVnYXRlQ2FsbGJhY2ssIGNyZWF0ZWRXZWJWaWV3KTsK IH0KIAorQGludGVyZmFjZSBNb2RhbERlbGVnYXRlIDogTlNPYmplY3QgPFdLVUlEZWxlZ2F0ZVBy aXZhdGU+CitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBNb2RhbERlbGVnYXRlCisKKy0gKHZvaWQp X3dlYlZpZXdSdW5Nb2RhbDooV0tXZWJWaWV3ICopd2ViVmlldworeworICAgIEVYUEVDVF9FUSh3 ZWJWaWV3LCBjcmVhdGVkV2ViVmlldy5nZXQoKSk7CisgICAgZG9uZSA9IHRydWU7Cit9CisKKy0g KG51bGxhYmxlIFdLV2ViVmlldyAqKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY3JlYXRl V2ViVmlld1dpdGhDb25maWd1cmF0aW9uOihXS1dlYlZpZXdDb25maWd1cmF0aW9uICopY29uZmln dXJhdGlvbiBmb3JOYXZpZ2F0aW9uQWN0aW9uOihXS05hdmlnYXRpb25BY3Rpb24gKiluYXZpZ2F0 aW9uQWN0aW9uIHdpbmRvd0ZlYXR1cmVzOihXS1dpbmRvd0ZlYXR1cmVzICopd2luZG93RmVhdHVy ZXMKK3sKKyAgICBjcmVhdGVkV2ViVmlldyA9IFtbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1 cmF0aW9uXSBhdXRvcmVsZWFzZV07CisgICAgW2NyZWF0ZWRXZWJWaWV3IHNldFVJRGVsZWdhdGU6 c2VsZl07CisgICAgcmV0dXJuIGNyZWF0ZWRXZWJWaWV3LmdldCgpOworfQorCitAZW5kCisKK1RF U1QoV2ViS2l0LCBSdW5Nb2RhbCkKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW01v ZGFsRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtb VGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwg NjAwKV0pOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAg IE5TVVJMICp1cmwgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2lt cGxlIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5y ZXNvdXJjZXMiXTsKKyAgICBOU1N0cmluZyAqaHRtbCA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9y bWF0OkAiJUAlQCVAIiwgQCI8c2NyaXB0PiBmdW5jdGlvbiBvcGVuTW9kYWwoKSB7IHdpbmRvdy5z aG93TW9kYWxEaWFsb2coJyIsIHVybCwgQCInKTsgfSA8L3NjcmlwdD4gPGlucHV0IHR5cGU9J2J1 dHRvbicgdmFsdWU9J0NsaWNrIHRvIG9wZW4gbW9kYWwnIG9uY2xpY2s9J29wZW5Nb2RhbCgpOyc+ Il07CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOmh0bWxdOworICAg IFt3ZWJWaWV3IHNlbmRDbGlja3NBdFBvaW50Ok5TTWFrZVBvaW50KDIwLCA2MDAgLSAyMCkgbnVt YmVyT2ZDbGlja3M6MV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKK30K IAogQGludGVyZmFjZSBQbHVnSW5EZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS1VJRGVsZWdhdGVQcml2 YXRlPgogQGVuZAo= 320526 2017-09-12 00:19:08 -0700 2017-09-12 09:29:07 -0700 Patch bug-176728-20170912001907.patch text/plain 10386 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE5MDcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE3LTA5LTEyICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIFdLVUlEZWxl Z2F0ZVByaXZhdGUgZXF1aXZhbGVudCBvZiBXS1BhZ2VVSUNsaWVudCdzIHJ1bk1vZGFsCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY3MjgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzI5MjcwMDM1PgorICAgICAgICAKKyAgICAgICAgQ292ZXJlZCBi eSBhIG5ldyBBUEkgdGVzdC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaDoKKyAgICAgICAgKEFQSTo6 VUlDbGllbnQ6OnJ1bk1vZGFsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNw cDoKKyAgICAgICAgKFdLUGFnZVNldFBhZ2VVSUNsaWVudCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nv Y29hL1VJRGVsZWdhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5t bToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6c2V0RGVsZWdhdGUpOgorICAgICAgICAo V2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6Y2FuUnVuTW9kYWwgY29uc3QpOgorICAgICAg ICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6cnVuTW9kYWwpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJ1bk1vZGFsKToKKwogMjAxNy0wOS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TIERuRF0gU3VwcG9ydCBEYXRhVHJhbnNmZXIuc2V0RHJh Z0ltYWdlIHdoZW4gc3RhcnRpbmcgYSBkcmFnIG9uIGlPUwpJbmRleDogU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAyMjE5MDcpCisrKyBTb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OTU5LDcg KzU5NTksNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cnVuTW9kYWwoKQogICAgIC8vIFNlZSBodHRw Oi8vd2Via2l0Lm9yZy9iLzg5NTkwIGZvciBtb3JlIGRpc2N1c3Npb24uCiAgICAgbV9wcm9jZXNz LT5jb25uZWN0aW9uKCktPndha2VVcFJ1bkxvb3AoKTsKIAotICAgIG1fdWlDbGllbnQtPnJ1bk1v ZGFsKHRoaXMpOworICAgIG1fdWlDbGllbnQtPnJ1bk1vZGFsKCp0aGlzKTsKIH0KIAogdm9pZCBX ZWJQYWdlUHJveHk6Om5vdGlmeVNjcm9sbGVyVGh1bWJJc1Zpc2libGVJblJlY3QoY29uc3QgSW50 UmVjdCYgc2Nyb2xsZXJUaHVtYikKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElVSUNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9B UElVSUNsaWVudC5oCShyZXZpc2lvbiAyMjE5MDcpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQVBJVUlDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDcgKzEzNyw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcHJpbnRGcmFtZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYs IFdlYktpdDo6V2ViRnJhbWVQcm94eSYpIHsgfQogCiAgICAgdmlydHVhbCBib29sIGNhblJ1bk1v ZGFsKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIHZvaWQgcnVuTW9kYWwo V2ViS2l0OjpXZWJQYWdlUHJveHkqKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgcnVuTW9kYWwoV2Vi S2l0OjpXZWJQYWdlUHJveHkmKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBzYXZlRGF0YVRvRmls ZUluRG93bmxvYWRzRm9sZGVyKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgY29uc3QgV1RGOjpTdHJp bmcmLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdlYkNvcmU6OlVSTCYsIERhdGEmKSB7IH0K IApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCShyZXZpc2lv biAyMjE5MDcpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMDMzLDEyICsyMDMzLDEyIEBAIHZvaWQgV0tQYWdlU2V0UGFnZVVJ Q2xpZW50KFdLUGFnZVJlZiBwYWcKICAgICAgICAgICAgIHJldHVybiBtX2NsaWVudC5ydW5Nb2Rh bDsKICAgICAgICAgfQogCi0gICAgICAgIHZvaWQgcnVuTW9kYWwoV2ViUGFnZVByb3h5KiBwYWdl KSBmaW5hbAorICAgICAgICB2b2lkIHJ1bk1vZGFsKFdlYlBhZ2VQcm94eSYgcGFnZSkgZmluYWwK ICAgICAgICAgewogICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5ydW5Nb2RhbCkKICAgICAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIG1fY2xpZW50LnJ1bk1vZGFsKHRvQVBJKHBh Z2UpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICAgICAgbV9jbGllbnQucnVu TW9kYWwodG9BUEkoJnBhZ2UpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogICAgICAgICB9 CiAKICAgICAgICAgdm9pZCBzYXZlRGF0YVRvRmlsZUluRG93bmxvYWRzRm9sZGVyKFdlYlBhZ2VQ cm94eSogcGFnZSwgY29uc3QgU3RyaW5nJiBzdWdnZXN0ZWRGaWxlbmFtZSwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgY29uc3QgV2ViQ29yZTo6VVJMJiBvcmlnaW5hdGluZ1VSTCwgQVBJOjpEYXRh JiBkYXRhKSBmaW5hbApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL VUlEZWxlZ2F0ZVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCShyZXZpc2lvbiAyMjE5MDcpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTQsNiArMTU0LDcgQEAgc3RydWN0IFVJRWRnZUluc2V0czsKIC0g KHZvaWQpX2ZvY3VzV2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBXS19BUElfQVZBSUxBQkxF KG1hY29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lkKV91bmZvY3VzV2ViVmlldzooV0tXZWJWaWV3 ICopd2ViVmlldyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lk KV93ZWJWaWV3RGlkU2Nyb2xsOihXS1dlYlZpZXcgKil3ZWJWaWV3IFdLX0FQSV9BVkFJTEFCTEUo bWFjb3N4KFdLX01BQ19UQkEpKTsKKy0gKHZvaWQpX3dlYlZpZXdSdW5Nb2RhbDooV0tXZWJWaWV3 ICopd2ViVmlldyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CiAtICh2b2lk KV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHRha2VGb2N1czooX1dLRm9jdXNEaXJlY3Rp b24pZGlyZWN0aW9uIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0gKHZv aWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkTm90SGFuZGxlV2hlZWxFdmVudDoo TlNFdmVudCAqKWV2ZW50IFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpKTsKIC0g KHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgaGFuZGxlQXV0b3BsYXlFdmVudDoo X1dLQXV0b3BsYXlFdmVudClldmVudCB3aXRoRmxhZ3M6KF9XS0F1dG9wbGF5RXZlbnRGbGFncylm bGFncyBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVSUNsaWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VUlDbGllbnQuY3BwCShy ZXZpc2lvbiAyMjE5MDcpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJL aXRVSUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMCw3ICsyMTAsNyBAQCBwcml2YXRl OgogCiAgICAgYm9vbCBjYW5SdW5Nb2RhbCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0K IAotICAgIHZvaWQgcnVuTW9kYWwoV2ViUGFnZVByb3h5KikgZmluYWwKKyAgICB2b2lkIHJ1bk1v ZGFsKFdlYlBhZ2VQcm94eSYpIGZpbmFsCiAgICAgewogICAgICAgICB3ZWJraXRXZWJWaWV3UnVu QXNNb2RhbChtX3dlYlZpZXcpOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1VJRGVsZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db2NvYS9VSURlbGVnYXRlLmgJKHJldmlzaW9uIDIyMTkwNykKKysrIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcs OCBAQCBwcml2YXRlOgogICAgICAgICB2b2lkIHRha2VGb2N1cyhXZWJQYWdlUHJveHkqLCBXS0Zv Y3VzRGlyZWN0aW9uKSBmaW5hbDsKICAgICAgICAgdm9pZCBmb2N1cyhXZWJQYWdlUHJveHkqKSBm aW5hbDsKICAgICAgICAgdm9pZCB1bmZvY3VzKFdlYlBhZ2VQcm94eSopIGZpbmFsOworICAgICAg ICBib29sIGNhblJ1bk1vZGFsKCkgY29uc3QgZmluYWw7CisgICAgICAgIHZvaWQgcnVuTW9kYWwo V2ViUGFnZVByb3h5JikgZmluYWw7CiAgICAgICAgIHZvaWQgcGFnZURpZFNjcm9sbChXZWJQYWdl UHJveHkqKSBmaW5hbDsKICAgICAgICAgdm9pZCBkaWROb3RIYW5kbGVXaGVlbEV2ZW50KFdlYlBh Z2VQcm94eSosIGNvbnN0IE5hdGl2ZVdlYldoZWVsRXZlbnQmKSBmaW5hbDsKICAgICAgICAgdm9p ZCBoYW5kbGVBdXRvcGxheUV2ZW50KFdlYlBhZ2VQcm94eSYsIFdlYkNvcmU6OkF1dG9wbGF5RXZl bnQsIE9wdGlvblNldDxXZWJDb3JlOjpBdXRvcGxheUV2ZW50RmxhZ3M+KSBmaW5hbDsKQEAgLTE1 MCw2ICsxNTIsNyBAQCBwcml2YXRlOgogICAgICAgICBib29sIHNob3dXZWJWaWV3IDogMTsKICAg ICAgICAgYm9vbCBmb2N1c1dlYlZpZXcgOiAxOwogICAgICAgICBib29sIHVuZm9jdXNXZWJWaWV3 IDogMTsKKyAgICAgICAgYm9vbCB3ZWJWaWV3UnVuTW9kYWwgOiAxOwogICAgICAgICBib29sIHdl YlZpZXdUYWtlRm9jdXMgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRTY3JvbGwgOiAxOwog ICAgICAgICBib29sIHdlYlZpZXdEaWROb3RIYW5kbGVXaGVlbEV2ZW50IDogMTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjIx OTA3KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQkod29y a2luZyBjb3B5KQpAQCAtMTEwLDYgKzExMCw3IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6c2V0RGVsZWdh dGUoaWQgPFdLVUlEZWwKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5mb2N1c1dlYlZpZXcgPSBbZGVs ZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfZm9jdXNXZWJWaWV3OildOwogICAg IG1fZGVsZWdhdGVNZXRob2RzLnVuZm9jdXNXZWJWaWV3ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX3VuZm9jdXNXZWJWaWV3OildOwogICAgIG1fZGVsZWdhdGVNZXRo b2RzLndlYlZpZXdUYWtlRm9jdXMgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihfd2ViVmlldzp0YWtlRm9jdXM6KV07CisgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmll d1J1bk1vZGFsID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZp ZXdSdW5Nb2RhbDopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkU2Nyb2xsID0g W2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXdEaWRTY3JvbGw6 KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0dldFRvb2xiYXJzQXJlVmlzaWJsZVdp dGhDb21wbGV0aW9uSGFuZGxlciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF93ZWJWaWV3OmdldFRvb2xiYXJzQXJlVmlzaWJsZVdpdGhDb21wbGV0aW9uSGFuZGxlcjop XTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkTm90SGFuZGxlV2hlZWxFdmVudCA9 IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZE5vdEhh bmRsZVdoZWVsRXZlbnQ6KV07CkBAIC00MDEsNiArNDAyLDIzIEBAIHZvaWQgVUlEZWxlZ2F0ZTo6 VUlDbGllbnQ6OnRha2VGb2N1cyhXZWIKICAgICBbKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilk ZWxlZ2F0ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUubV93ZWJWaWV3IHRha2VGb2N1czp0b1dLRm9j dXNEaXJlY3Rpb24oZGlyZWN0aW9uKV07CiB9CiAKK2Jvb2wgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6 OmNhblJ1bk1vZGFsKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV91aURlbGVnYXRlLm1fZGVsZWdh dGVNZXRob2RzLndlYlZpZXdSdW5Nb2RhbDsKK30KKwordm9pZCBVSURlbGVnYXRlOjpVSUNsaWVu dDo6cnVuTW9kYWwoV2ViUGFnZVByb3h5JikKK3sKKyAgICBpZiAoIW1fdWlEZWxlZ2F0ZS5tX2Rl bGVnYXRlTWV0aG9kcy53ZWJWaWV3UnVuTW9kYWwpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAg ICBhdXRvIGRlbGVnYXRlID0gbV91aURlbGVnYXRlLm1fZGVsZWdhdGUuZ2V0KCk7CisgICAgaWYg KCFkZWxlZ2F0ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgWyhpZCA8V0tVSURlbGVnYXRlUHJp dmF0ZT4pZGVsZWdhdGUgX3dlYlZpZXdSdW5Nb2RhbDptX3VpRGVsZWdhdGUubV93ZWJWaWV3XTsK K30KKwogdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6cGFnZURpZFNjcm9sbChXZWJQYWdlUHJv eHkqKQogewogICAgIGlmICghbV91aURlbGVnYXRlLm1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdE aWRTY3JvbGwpCkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMjE5MDcpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0wOS0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIEFkZCBXS1VJRGVsZWdhdGVQcml2YXRlIGVx dWl2YWxlbnQgb2YgV0tQYWdlVUlDbGllbnQncyBydW5Nb2RhbAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2NzI4CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yOTI3MDAzNT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbToK KyAgICAgICAgKC1bTW9kYWxEZWxlZ2F0ZSBfd2ViVmlld1J1bk1vZGFsOl0pOgorICAgICAgICAo LVtNb2RhbERlbGVnYXRlIHdlYlZpZXc6Y3JlYXRlV2ViVmlld1dpdGhDb25maWd1cmF0aW9uOmZv ck5hdmlnYXRpb25BY3Rpb246d2luZG93RmVhdHVyZXM6XSk6CisgICAgICAgIChURVNUKToKKwog MjAxNy0wOS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TIERuRF0gU3VwcG9ydCBEYXRhVHJhbnNmZXIuc2V0RHJhZ0ltYWdlIHdoZW4gc3Rh cnRpbmcgYSBkcmFnIG9uIGlPUwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9VSURlbGVnYXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjIxOTA3KQorKysgVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0yMDIsNiArMjAyLDM3IEBAIFRFU1QoV2ViS2l0LCBTaG93V2ViVmlldykKICAg ICBBU1NFUlRfRVEod2ViVmlld0Zyb21EZWxlZ2F0ZUNhbGxiYWNrLCBjcmVhdGVkV2ViVmlldyk7 CiB9CiAKK0BpbnRlcmZhY2UgTW9kYWxEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS1VJRGVsZWdhdGVQ cml2YXRlPgorQGVuZAorCitAaW1wbGVtZW50YXRpb24gTW9kYWxEZWxlZ2F0ZQorCistICh2b2lk KV93ZWJWaWV3UnVuTW9kYWw6KFdLV2ViVmlldyAqKXdlYlZpZXcKK3sKKyAgICBFWFBFQ1RfRVEo d2ViVmlldywgY3JlYXRlZFdlYlZpZXcuZ2V0KCkpOworICAgIGRvbmUgPSB0cnVlOworfQorCist IChudWxsYWJsZSBXS1dlYlZpZXcgKil3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNyZWF0 ZVdlYlZpZXdXaXRoQ29uZmlndXJhdGlvbjooV0tXZWJWaWV3Q29uZmlndXJhdGlvbiAqKWNvbmZp Z3VyYXRpb24gZm9yTmF2aWdhdGlvbkFjdGlvbjooV0tOYXZpZ2F0aW9uQWN0aW9uICopbmF2aWdh dGlvbkFjdGlvbiB3aW5kb3dGZWF0dXJlczooV0tXaW5kb3dGZWF0dXJlcyAqKXdpbmRvd0ZlYXR1 cmVzCit7CisgICAgY3JlYXRlZFdlYlZpZXcgPSBbW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0 V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmln dXJhdGlvbl0gYXV0b3JlbGVhc2VdOworICAgIFtjcmVhdGVkV2ViVmlldyBzZXRVSURlbGVnYXRl OnNlbGZdOworICAgIHJldHVybiBjcmVhdGVkV2ViVmlldy5nZXQoKTsKK30KKworQGVuZAorCitU RVNUKFdlYktpdCwgUnVuTW9kYWwpCit7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tN b2RhbERlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhb W1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAs IDYwMCldKTsKKyAgICBbd2ViVmlldyBzZXRVSURlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKyAg ICBOU1VSTCAqdXJsID0gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAInNp bXBsZSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEku cmVzb3VyY2VzIl07CisgICAgTlNTdHJpbmcgKmh0bWwgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZv cm1hdDpAIiVAJUAlQCIsIEAiPHNjcmlwdD4gZnVuY3Rpb24gb3Blbk1vZGFsKCkgeyB3aW5kb3cu c2hvd01vZGFsRGlhbG9nKCciLCB1cmwsIEAiJyk7IH0gPC9zY3JpcHQ+IDxpbnB1dCB0eXBlPSdi dXR0b24nIHZhbHVlPSdDbGljayB0byBvcGVuIG1vZGFsJyBvbmNsaWNrPSdvcGVuTW9kYWwoKTsn PiJdOworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZzpodG1sXTsKKyAg ICBbd2ViVmlldyBzZW5kQ2xpY2tzQXRQb2ludDpOU01ha2VQb2ludCgyMCwgNjAwIC0gMjApIG51 bWJlck9mQ2xpY2tzOjFdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7Cit9 CiAKIEBpbnRlcmZhY2UgUGx1Z0luRGVsZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlUHJp dmF0ZT4KIEBlbmQK