184318 2018-04-04 15:06:15 -0700 Process Swap on Navigation causes many webpages to hang due to attempted process swap for iframe navigations 2018-04-05 16:18:07 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff beidson aestes beidson cdumez commit-queue ews-watchlist rniwa webkit-bug-importer oldest_to_newest 1411895 0 msaboff 2018-04-04 15:06:15 -0700 When Process Swap on Navigation is enabled, web pages that seem to have subresources from multiple origins hang. Some pages hang after updating the page title and address bar. Sometimes there appears to be a quick flash of web content. These sites hang: - amazon.com - facebook.com - ebay.com - wikipedia.org after searching for something - cnn.com - netflix.com 1411896 1 msaboff 2018-04-04 15:06:33 -0700 rdar://problem/39162236 1411900 2 337231 msaboff 2018-04-04 15:11:08 -0700 Created attachment 337231 Work in Progress Patch 1412167 3 337231 beidson 2018-04-05 14:16:52 -0700 Comment on attachment 337231 Work in Progress Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337231&action=review I had fixed this locally, not knowing someone else was working on it. My patch was simpler: > Source/WebKit/UIProcess/WebPageProxy.cpp:2354 > if (action == PolicyAction::Use && navigation) { > - auto proposedProcess = process().processPool().processForNavigation(*this, *navigation, action); > + auto proposedProcess = process().processPool().processForNavigation(*this, *navigation, action, frame.isMainFrame()); Instead of adding the new parameter, I just changed 2353 to: - if (action == PolicyAction::Use && navigation) { + if (action == PolicyAction::Use && navigation && frame.isMainFrame()) { 1412168 4 beidson 2018-04-05 14:17:56 -0700 That said, while the main frame patch definitely fixes things in MiniBrowser, for example... Safari still has problems with defersLoading. Sometimes. That may or may not be related, so we should fix it separately. 1412187 5 337304 beidson 2018-04-05 15:03:38 -0700 Created attachment 337304 Patch 1412188 6 ews-watchlist 2018-04-05 15:05:05 -0700 Attachment 337304 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:700: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:702: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:710: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:712: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:714: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:717: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:721: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 7 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1412202 7 337304 commit-queue 2018-04-05 16:18:05 -0700 Comment on attachment 337304 Patch Clearing flags on attachment: 337304 Committed r230315: <https://trac.webkit.org/changeset/230315> 1412203 8 commit-queue 2018-04-05 16:18:07 -0700 All reviewed patches have been landed. Closing bug. 337231 2018-04-04 15:11:08 -0700 2018-04-05 15:03:36 -0700 Work in Progress Patch 184318-wip1.patch text/plain 3579 msaboff SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzAyMjIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTA0ICBNaWNoYWVsIFNh Ym9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFByb2Nlc3MgU3dhcCBvbiBOYXZp Z2F0aW9uIGNhdXNlcyBtYW55IHdlYnBhZ2VzIHRvIGhhbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDMxOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGNyZWF0ZSBhIG5ldyBwcm9jZXNzIGZv ciBzdWJyZXNvdXJjZSBsb2FkcyB0byBhIGRpZmZlcmVudCBvcmlnaW4uCisKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0Zvck5h dmlnYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorCiAyMDE4 LTA0LTAzICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBQ cmlvcml0aXplIGZpbGUgcHJvbWlzZXMgb3ZlciBmaWxlbmFtZXMgZHVyaW5nIGRyYWcgYW5kIGRy b3AKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNp b24gMjMwMjIyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjM1MSw3ICsyMzUxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJl Y2VpdmVkUG9saWN5RGVjaXNpbwogICAgICAgICBBU1NFUlQoYWN0aXZlUG9saWN5TGlzdGVuZXIt Pmxpc3RlbmVySUQoKSA9PSBsaXN0ZW5lcklEKTsKIAogICAgICAgICBpZiAoYWN0aW9uID09IFBv bGljeUFjdGlvbjo6VXNlICYmIG5hdmlnYXRpb24pIHsKLSAgICAgICAgICAgIGF1dG8gcHJvcG9z ZWRQcm9jZXNzID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkucHJvY2Vzc0Zvck5hdmlnYXRpb24o KnRoaXMsICpuYXZpZ2F0aW9uLCBhY3Rpb24pOworICAgICAgICAgICAgYXV0byBwcm9wb3NlZFBy b2Nlc3MgPSBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5wcm9jZXNzRm9yTmF2aWdhdGlvbigqdGhp cywgKm5hdmlnYXRpb24sIGFjdGlvbiwgZnJhbWUuaXNNYWluRnJhbWUoKSk7CiAKICAgICAgICAg ICAgIGlmIChwcm9wb3NlZFByb2Nlc3MucHRyKCkgIT0gJnByb2Nlc3MoKSkgewogICAgICAgICAg ICAgICAgIExPRyhMb2FkaW5nLCAiU3dpdGNoaW5nIGZyb20gcHJvY2VzcyAlaSB0byBuZXcgcHJv Y2VzcyBmb3IgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lkZW50aWZpZXIo KSwgbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24tPmxvZ2dpbmdTdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5jcHAJKHJldmlzaW9uIDIzMDIyMikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk4MCw3ICsxOTgwLDcgQEAg U2VydmljZVdvcmtlclByb2Nlc3NQcm94eSogV2ViUHJvY2Vzc1BvbwogfQogI2VuZGlmCiAKLVJl ZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm9jZXNzRm9yTmF2aWdhdGlvbihX ZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgUG9s aWN5QWN0aW9uJiBhY3Rpb24pCitSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6 cHJvY2Vzc0Zvck5hdmlnYXRpb24oV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBBUEk6Ok5hdmln YXRpb24mIG5hdmlnYXRpb24sIFBvbGljeUFjdGlvbiYgYWN0aW9uLCBib29sIGlzTWFpbkZyYW1l KQogewogICAgIGlmICghbV9jb25maWd1cmF0aW9uLT5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24o KSkKICAgICAgICAgcmV0dXJuIHBhZ2UucHJvY2VzcygpOwpAQCAtMTk4OCw2ICsxOTg4LDEwIEBA IFJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQb29sOjpwcm8KICAgICBpZiAoIXBhZ2Uu cHJvY2VzcygpLmhhc0NvbW1pdHRlZEFueVByb3Zpc2lvbmFsTG9hZHMoKSkKICAgICAgICAgcmV0 dXJuIHBhZ2UucHJvY2VzcygpOwogCisgICAgLy8gRG9uJ3QgY3JlYXRlIGEgbmV3IHByb2Nlc3Mg Zm9yIHN1YmZyYW1lcy4KKyAgICBpZiAoIWlzTWFpbkZyYW1lKQorICAgICAgICByZXR1cm4gcGFn ZS5wcm9jZXNzKCk7CisKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHN1cHBvcnQgcHJvY2VzcyBz d2FwIHdoZW4gYSB3aW5kb3cgaGFzIGFuIG9wZW5lci4KICAgICBpZiAobmF2aWdhdGlvbi5vcGVu ZXIoKSkKICAgICAgICAgcmV0dXJuIHBhZ2UucHJvY2VzcygpOwpJbmRleDogU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCShyZXZpc2lvbiAyMzAyMjIpCisrKyBTb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NDYs NyArNDQ2LDcgQEAgcHVibGljOgogICAgIEJhY2tncm91bmRXZWJQcm9jZXNzVG9rZW4gYmFja2dy b3VuZFdlYlByb2Nlc3NUb2tlbigpIGNvbnN0IHsgcmV0dXJuIEJhY2tncm91bmRXZWJQcm9jZXNz VG9rZW4obV9iYWNrZ3JvdW5kV2ViUHJvY2Vzc0NvdW50ZXIuY291bnQoKSk7IH0KICNlbmRpZgog Ci0gICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRpb24oV2ViUGFnZVBy b3h5JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UG9saWN5QWN0aW9uJik7Cisg ICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzc0Zvck5hdmlnYXRpb24oV2ViUGFnZVByb3h5 JiwgY29uc3QgQVBJOjpOYXZpZ2F0aW9uJiwgV2ViQ29yZTo6UG9saWN5QWN0aW9uJiwgYm9vbCk7 CiAKIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoKTsK 337304 2018-04-05 15:03:38 -0700 2018-04-05 16:18:05 -0700 Patch bug-184318-20180405150337.patch text/plain 7252 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBiZjRiODAyOTY0MmE2Y2Jk ZWZlMWFkNjlkODE1NThkYTk2MjQ2NDIuLjliMzk0MmZjNzlhMTc5YzQzNTIwOGJjOWRhNjg3NjE0 NDhmYjYwZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMDQtMDUgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFByb2Nlc3MgU3dhcCBvbiBOYXZp Z2F0aW9uIGNhdXNlcyBtYW55IHdlYnBhZ2VzIHRvIGhhbmcgZHVlIHRvIGF0dGVtcHRlZCBwcm9j ZXNzIHN3YXAgZm9yIGlmcmFtZSBuYXZpZ2F0aW9ucy4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzM5MTYyMjM2PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 NDMxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbik6IERvbid0IGNvbnNpZGVyIGEgc3dhcCBpZiB0aGUg bmF2aWdhdGlvbiBpcyBub3QgaW4gdGhlIG1haW4gZnJhbWUuCisKIDIwMTgtMDQtMDQgIFdlbnNv biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0V4dHJhIHpvb20g bW9kZV0gUmVtb3ZlIGVmZmVjdGl2ZSBmb250IHNpemUgY29uc3RyYWludHMgd2hlbiBkZXRlcm1p bmluZyBmb2N1cyB6b29tIHNjYWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAppbmRleCAwM2IwYzZjNzcxZGZjZWFjMDE4ZDJiYzIzNjM4OGUwN2VmYjY5ZmJlLi5kMzQ3 Nzg3ODQ5NTgyNTgwOGU1N2M2M2M1MTZlMzVmY2ZlNjVhMDdlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTIzNTAsNyArMjM1MCw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBhY3Rpb24sIFdlYkZy YW1lUHJveHkmIGZyCiAgICAgaWYgKGFjdGl2ZVBvbGljeUxpc3RlbmVyICYmIGFjdGl2ZVBvbGlj eUxpc3RlbmVyLT5wb2xpY3lMaXN0ZW5lclR5cGUoKSA9PSBQb2xpY3lMaXN0ZW5lclR5cGU6Ok5h dmlnYXRpb25BY3Rpb24pIHsKICAgICAgICAgQVNTRVJUKGFjdGl2ZVBvbGljeUxpc3RlbmVyLT5s aXN0ZW5lcklEKCkgPT0gbGlzdGVuZXJJRCk7CiAKLSAgICAgICAgaWYgKGFjdGlvbiA9PSBQb2xp Y3lBY3Rpb246OlVzZSAmJiBuYXZpZ2F0aW9uKSB7CisgICAgICAgIGlmIChhY3Rpb24gPT0gUG9s aWN5QWN0aW9uOjpVc2UgJiYgbmF2aWdhdGlvbiAmJiBmcmFtZS5pc01haW5GcmFtZSgpKSB7CiAg ICAgICAgICAgICBhdXRvIHByb3Bvc2VkUHJvY2VzcyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgp LnByb2Nlc3NGb3JOYXZpZ2F0aW9uKCp0aGlzLCAqbmF2aWdhdGlvbiwgYWN0aW9uKTsKIAogICAg ICAgICAgICAgaWYgKHByb3Bvc2VkUHJvY2Vzcy5wdHIoKSAhPSAmcHJvY2VzcygpKSB7CmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjFjZGQ3MGFj OTZmMzI3NDk4MmNiNjQ3ZjFmMjQ4NjNmYTQwYzBhYi4uYzFmNDAyZmE4OWQxYmZiNjRhOTVkYTQ5 N2MwN2JmNmYzYzA5ZWRjMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE4LTA0LTA1ICBCcmFkeSBFaWRzb24gIDxi ZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBQcm9jZXNzIFN3YXAgb24gTmF2aWdhdGlvbiBj YXVzZXMgbWFueSB3ZWJwYWdlcyB0byBoYW5nIGR1ZSB0byBhdHRlbXB0ZWQgcHJvY2VzcyBzd2Fw IGZvciBpZnJhbWUgbmF2aWdhdGlvbnMuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTE2MjIz Nj4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQzMTgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisgICAg ICAgICgtW1BTT05NZXNzYWdlSGFuZGxlciB1c2VyQ29udGVudENvbnRyb2xsZXI6ZGlkUmVjZWl2 ZVNjcmlwdE1lc3NhZ2U6XSk6CisgICAgICAgICgtW1BTT05TY2hlbWUgYWRkTWFwcGluZ0Zyb21V UkxTdHJpbmc6dG9EYXRhOl0pOgorICAgICAgICAoLVtQU09OU2NoZW1lIHdlYlZpZXc6c3RhcnRV UkxTY2hlbWVUYXNrOl0pOgorCiAyMDE4LTA0LTA0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBJbnRyb2R1Y2UgYSBUaHJlYWRTYWZlUmVmQ291bnRlZCBwYXJh bWV0ZXIgdG8gZW5zdXJlIGJlaW5nIGRlc3Ryb3llZCBvbiB0aGUgbWFpbiB0aHJlYWQKZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By b2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IDJmNTFiMTU2OTZkYzVmYTI2YWY1YmQyOWUy YTQ1MDhkM2U5OWJhNWQuLjc3MmJkYjJmYzgwZmY1NTIxMDI5N2U3MzAzZmIyZjQwMWEzMDdhMDIg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz c1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtNzMsNiArNzMsNyBAQCBzdGF0 aWMgSGFzaFNldDxwaWRfdD4gc2VlblBJRHM7CiAgICAgICAgIFtyZWNlaXZlZE1lc3NhZ2VzIGFk ZE9iamVjdDpAIiJdOwogCiAgICAgcmVjZWl2ZWRNZXNzYWdlID0gdHJ1ZTsKKyAgICBzZWVuUElE cy5hZGQoW21lc3NhZ2Uud2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKIH0KIEBlbmQK IApAQCAtMTM0LDkgKzEzNSwxMSBAQCBzdGF0aWMgUmV0YWluUHRyPFdLV2ViVmlldz4gY3JlYXRl ZFdlYlZpZXc7CiBAaW50ZXJmYWNlIFBTT05TY2hlbWUgOiBOU09iamVjdCA8V0tVUkxTY2hlbWVI YW5kbGVyPiB7CiAgICAgY29uc3QgY2hhciogX2J5dGVzOwogICAgIEhhc2hNYXA8U3RyaW5nLCBT dHJpbmc+IF9yZWRpcmVjdHM7CisgICAgSGFzaE1hcDxTdHJpbmcsIFJldGFpblB0cjxOU0RhdGEg Kj4+IF9kYXRhTWFwcGluZ3M7CiB9CiAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhCeXRlczooY29u c3QgY2hhciopYnl0ZXM7CiAtICh2b2lkKWFkZFJlZGlyZWN0RnJvbVVSTFN0cmluZzooTlNTdHJp bmcgKilzb3VyY2VVUkxTdHJpbmcgdG9VUkxTdHJpbmc6KE5TU3RyaW5nICopZGVzdGluYXRpb25V UkxTdHJpbmc7CistICh2b2lkKWFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOihOU1N0cmluZyAqKXVy bFN0cmluZyB0b0RhdGE6KGNvbnN0IGNoYXIqKWRhdGE7CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlv biBQU09OU2NoZW1lCkBAIC0xNTMsNiArMTU2LDExIEBAIHN0YXRpYyBSZXRhaW5QdHI8V0tXZWJW aWV3PiBjcmVhdGVkV2ViVmlldzsKICAgICBfcmVkaXJlY3RzLnNldChzb3VyY2VVUkxTdHJpbmcs IGRlc3RpbmF0aW9uVVJMU3RyaW5nKTsKIH0KIAorLSAodm9pZClhZGRNYXBwaW5nRnJvbVVSTFN0 cmluZzooTlNTdHJpbmcgKil1cmxTdHJpbmcgdG9EYXRhOihjb25zdCBjaGFyKilkYXRhCit7Cisg ICAgX2RhdGFNYXBwaW5ncy5zZXQodXJsU3RyaW5nLCBbTlNEYXRhIGRhdGFXaXRoQnl0ZXNOb0Nv cHk6KHZvaWQqKWRhdGEgbGVuZ3RoOnN0cmxlbihkYXRhKSBmcmVlV2hlbkRvbmU6Tk9dKTsKK30K KwogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHN0YXJ0VVJMU2NoZW1lVGFz azooaWQgPFdLVVJMU2NoZW1lVGFzaz4pdGFzawogewogICAgIE5TVVJMICpmaW5hbFVSTCA9IHRh c2sucmVxdWVzdC5VUkw7CkBAIC0xNjksNyArMTc3LDkgQEAgc3RhdGljIFJldGFpblB0cjxXS1dl YlZpZXc+IGNyZWF0ZWRXZWJWaWV3OwogICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiByZXNw b25zZSA9IGFkb3B0TlMoW1tOU1VSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0aFVSTDpmaW5hbFVS TCBNSU1FVHlwZTpAInRleHQvaHRtbCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOjEgdGV4dEVuY29k aW5nTmFtZTpuaWxdKTsKICAgICBbdGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6cmVzcG9uc2UuZ2V0 KCldOwogCi0gICAgaWYgKF9ieXRlcykgeworICAgIGlmIChhdXRvIGRhdGEgPSBfZGF0YU1hcHBp bmdzLmdldChbZmluYWxVUkwgYWJzb2x1dGVTdHJpbmddKSkKKyAgICAgICAgW3Rhc2sgZGlkUmVj ZWl2ZURhdGE6ZGF0YS5nZXQoKV07CisgICAgZWxzZSBpZiAoX2J5dGVzKSB7CiAgICAgICAgIFJl dGFpblB0cjxOU0RhdGE+IGRhdGEgPSBhZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5 dGVzTm9Db3B5Oih2b2lkICopX2J5dGVzIGxlbmd0aDpzdHJsZW4oX2J5dGVzKSBmcmVlV2hlbkRv bmU6Tk9dKTsKICAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6ZGF0YS5nZXQoKV07CiAgICAg fSBlbHNlCkBAIC02ODcsNCArNjk3LDU4IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIFNlc3Npb25TdG9y YWdlKQogICAgIEVYUEVDVF9UUlVFKFtyZWNlaXZlZE1lc3NhZ2VzLmdldCgpWzFdIGlzRXF1YWxU b1N0cmluZzpAIkkgZXhpc3QhIl0pOwogfQogCitzdGF0aWMgY29uc3QgY2hhciogbWFpbkZyYW1l c09ubHlNYWluRnJhbWUgPSBSIlBTT05SRVNPVVJDRSgKKzxzY3JpcHQ+CitmdW5jdGlvbiBsb2Fk ZWQoKSB7CisgICAgc2V0VGltZW91dCgnd2luZG93LmZyYW1lc1swXS5sb2NhdGlvbi5ocmVmID0g InBzb24yOi8vaG9zdDIvbWFpbi5odG1sIicsIDApOworfQorPC9zY3JpcHQ+Cis8Ym9keSBvbmxv YWQ9ImxvYWRlZCgpOyI+CitTb21lIHRleHQKKzxpZnJhbWUgc3JjPSJwc29uMTovL2hvc3QvaWZy YW1lLmh0bWwiPjwvaWZyYW1lPgorPC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK3N0YXRpYyBj b25zdCBjaGFyKiBtYWluRnJhbWVzT25seVN1YmZyYW1lID0gUiJQU09OUkVTT1VSQ0UoCitTb21l IGNvbnRlbnQKKylQU09OUkVTT1VSQ0UiOworCisKK3N0YXRpYyBjb25zdCBjaGFyKiBtYWluRnJh bWVzT25seVN1YmZyYW1lMiA9IFIiUFNPTlJFU09VUkNFKAorPHNjcmlwdD4KKyAgICB3aW5kb3cu d2Via2l0Lm1lc3NhZ2VIYW5kbGVycy5wc29uLnBvc3RNZXNzYWdlKCJEb25lIik7Cis8L3Njcmlw dD4KKylQU09OUkVTT1VSQ0UiOworCitURVNUKFByb2Nlc3NTd2FwLCBNYWluRnJhbWVzT25seSkK K3sKKyAgICBhdXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9j ZXNzUG9vbENvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbcHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uIHNldFByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbjpZRVNdOworICAgIGF1dG8gcHJv Y2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmln dXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2Vi Vmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxv Y10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9j ZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUg YWxsb2NdIGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBz b24xOi8vaG9zdC9tYWluLmh0bWwiIHRvRGF0YTptYWluRnJhbWVzT25seU1haW5GcmFtZV07Cisg ICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uMTovL2hvc3QvaWZyYW1l IiB0b0RhdGE6bWFpbkZyYW1lc09ubHlTdWJmcmFtZV07CisgICAgW2hhbmRsZXIgYWRkTWFwcGlu Z0Zyb21VUkxTdHJpbmc6QCJwc29uMjovL2hvc3QyL21haW4uaHRtbCIgdG9EYXRhOm1haW5GcmFt ZXNPbmx5U3ViZnJhbWUyXTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1l SGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVtZTpAIlBTT04xIl07CisgICAgW3dlYlZp ZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxT Y2hlbWU6QCJQU09OMiJdOworCisgICAgYXV0byBtZXNzYWdlSGFuZGxlciA9IGFkb3B0TlMoW1tQ U09OTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbW3dlYlZpZXdDb25maWd1cmF0 aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6bWVzc2Fn ZUhhbmRsZXIuZ2V0KCkgbmFtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0 TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAs IDYwMCkgY29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1 dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5p dF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07 CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRo VVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjE6Ly9ob3N0L21haW4uaHRtbCJdXTsKKyAg ICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmcmVjZWl2ZWRNZXNzYWdlKTsKKyAgICByZWNlaXZlZE1lc3NhZ2UgPSBmYWxzZTsK KworICAgIEVYUEVDVF9FUSgxdSwgc2VlblBJRHMuc2l6ZSgpKTsKK30KKwogI2VuZGlmIC8vIFdL X0FQSV9FTkFCTEVECg==