192318 2018-12-03 12:58:57 -0800 Update process assertions after swapping processes 2018-12-03 20:16:26 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 192348 1 achristensen achristensen berto cdumez cgarcia ews-watchlist gustavo mcatanzaro tsavell webkit-bug-importer oldest_to_newest 1484457 0 achristensen 2018-12-03 12:58:57 -0800 Update process assertions after swapping processes 1484458 1 356395 achristensen 2018-12-03 13:02:25 -0800 Created attachment 356395 Patch 1484459 2 achristensen 2018-12-03 13:02:27 -0800 <rdar://problem/46377552> 1484460 3 356395 cdumez 2018-12-03 13:06:22 -0800 Comment on attachment 356395 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356395&action=review > Source/WebKit/ChangeLog:10 > + after navigation and process swapping we need the new WebProcess to update its process assertions. typo: and process swapping -> and *after* ? > Source/WebKit/UIProcess/Cocoa/NavigationState.mm:1232 > + // Take the process assertion from the old web process. I would say: // Transfer our background assertion from the old process to the new one. 1484466 4 356397 achristensen 2018-12-03 13:07:33 -0800 Created attachment 356397 Patch 1484467 5 ews-watchlist 2018-12-03 13:10:18 -0800 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 1484470 6 achristensen 2018-12-03 13:20:17 -0800 http://trac.webkit.org/r238817 1484609 7 tsavell 2018-12-03 16:33:16 -0800 It looks like the changes in https://trac.webkit.org/changeset/238817/webkit may have caused sever process swap api failures on iOS. build: https://build.webkit.org/builders/Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/1316 output: https://build.webkit.org/builders/Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/1316/steps/run-api-tests/logs/stdio 1484622 8 cdumez 2018-12-03 16:45:18 -0800 (In reply to Truitt Savell from comment #7) > It looks like the changes in https://trac.webkit.org/changeset/238817/webkit > > may have caused sever process swap api failures on iOS. > > build: > https://build.webkit.org/builders/ > Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/1316 > > output: > https://build.webkit.org/builders/ > Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/1316/steps/ > run-api-tests/logs/stdio Seems to indicate Page Cache is not working. My bet is that the suspension relies on the process assertion on the old process, which gets dropped in this patch when we take the assertion for the new process. If so, we may need to SuspendedPageProxy to hold a background token for its WebProcess until SuspendedPageProxy::didFinishLoad() is called. 1484693 9 cdumez 2018-12-03 20:16:26 -0800 (In reply to Chris Dumez from comment #8) > (In reply to Truitt Savell from comment #7) > > It looks like the changes in https://trac.webkit.org/changeset/238817/webkit > > > > may have caused sever process swap api failures on iOS. > > > > build: > > https://build.webkit.org/builders/ > > Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/1316 > > > > output: > > https://build.webkit.org/builders/ > > Apple%20iOS%2012%20Simulator%20Release%20WK2%20%28Tests%29/builds/1316/steps/ > > run-api-tests/logs/stdio > > Seems to indicate Page Cache is not working. My bet is that the suspension > relies on the process assertion on the old process, which gets dropped in > this patch when we take the assertion for the new process. > > If so, we may need to SuspendedPageProxy to hold a background token for its > WebProcess until SuspendedPageProxy::didFinishLoad() is called. Dealing with those API test failures via Bug 192348. 356395 2018-12-03 13:02:25 -0800 2018-12-03 13:07:32 -0800 Patch bug-192318-20181203130224.patch text/plain 5080 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzg4MTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTEyLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXBkYXRlIHByb2Nl c3MgYXNzZXJ0aW9ucyBhZnRlciBzd2FwcGluZyBwcm9jZXNzZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjMxOAorICAgICAgICA8cmRhcjovL3By b2JsZW0vNDYzNzc1NTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSWYgdGhlIHByZXZpb3VzIFdlYlByb2Nlc3MgaGFkIGEgUHJvY2Vzc0Fzc2VydGlv biB0byBwcmV2ZW50IGl0IGZyb20gYmVpbmcgc3VzcGVuZGVkCisgICAgICAgIGFmdGVyIG5hdmln YXRpb24gYW5kIHByb2Nlc3Mgc3dhcHBpbmcgd2UgbmVlZCB0aGUgbmV3IFdlYlByb2Nlc3MgdG8g dXBkYXRlIGl0cyBwcm9jZXNzIGFzc2VydGlvbnMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL1BhZ2VMb2FkU3RhdGVPYnNlcnZlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9OYXZpZ2F0aW9uU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OmRpZFN3YXBXZWJQ cm9jZXNzZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6ZGlkU3dhcFdlYlByb2Nlc3Nlcyk6CisgICAgICAg ICogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MpOgorCiAyMDE4LTEyLTAzICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgaGFuZGxlIGtleSBldmVudHMgdGhhdCBh cmUga2V5IGNvbW1hbmRzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0 YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0 YXRlLmNwcAkocmV2aXNpb24gMjM4NzcxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFn ZUxvYWRTdGF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwNyw2ICs0MDcsMTEgQEAgYm9vbCBQ YWdlTG9hZFN0YXRlOjppc0xvYWRpbmcoY29uc3QgRGF0YQogICAgIHJldHVybiBmYWxzZTsKIH0K IAordm9pZCBQYWdlTG9hZFN0YXRlOjpkaWRTd2FwV2ViUHJvY2Vzc2VzKCkKK3sKKyAgICBjYWxs T2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OmRpZFN3YXBXZWJQcm9jZXNzZXMpOworfQorCiB2 b2lkIFBhZ2VMb2FkU3RhdGU6OndpbGxDaGFuZ2VQcm9jZXNzSXNSZXNwb25zaXZlKCkKIHsKICAg ICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OndpbGxDaGFuZ2VXZWJQcm9jZXNzSXNS ZXNwb25zaXZlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgJ KHJldmlzaW9uIDIzODc3MSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3Rh dGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzgsNiArNzgsOCBAQCBwdWJsaWM6CiAKICAgICAgICAg dmlydHVhbCB2b2lkIHdpbGxDaGFuZ2VXZWJQcm9jZXNzSXNSZXNwb25zaXZlKCkgPSAwOwogICAg ICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlV2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpID0gMDsK KyAgICAgICAgCisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRTd2FwV2ViUHJvY2Vzc2VzKCkgPSAw OwogICAgIH07CiAKICAgICBjbGFzcyBUcmFuc2FjdGlvbiB7CkBAIC0xNjUsNiArMTY3LDggQEAg cHVibGljOgogICAgIHZvaWQgZGlkRmluaXNoUHJvZ3Jlc3MoY29uc3QgVHJhbnNhY3Rpb246OlRv a2VuJik7CiAgICAgdm9pZCBzZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzKGNvbnN0IFRyYW5z YWN0aW9uOjpUb2tlbiYsIGJvb2wpOwogCisgICAgdm9pZCBkaWRTd2FwV2ViUHJvY2Vzc2VzKCk7 CisKICAgICBib29sIGNvbW1pdHRlZEhhc0luc2VjdXJlQ29udGVudCgpIGNvbnN0IHsgcmV0dXJu IG1fY29tbWl0dGVkU3RhdGUuaGFzSW5zZWN1cmVDb250ZW50OyB9CiAKICAgICAvLyBGSVhNRTog V2UgcGlnZ3ktYmFjayBvZmYgUGFnZUxvYWRTdGF0ZTo6T2JzZXJ2ZXIgc28gdGhhdCBib3RoIFdL V2ViVmlldyBhbmQgV0tPYnNlcnZhYmxlUGFnZVN0YXRlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIzODc3MSkKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1Miw2ICs4 NTIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQCiAgICAgY3Jl YXRlSW5zcGVjdG9yVGFyZ2V0cygpOwogCiAgICAgcGFnZUNsaWVudCgpLmRpZFJlbGF1bmNoUHJv Y2VzcygpOworICAgIG1fcGFnZUxvYWRTdGF0ZS5kaWRTd2FwV2ViUHJvY2Vzc2VzKCk7CiAgICAg bV9kcmF3aW5nQXJlYS0+d2FpdEZvckJhY2tpbmdTdG9yZVVwZGF0ZU9uTmV4dFBhaW50KCk7CiB9 CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9QYWdlTG9hZFN0YXRl T2JzZXJ2ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvUGFnZUxvYWRTdGF0ZU9ic2VydmVyLmgJKHJldmlzaW9uIDIzODc3MSkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9QYWdlTG9hZFN0YXRlT2JzZXJ2ZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtOTcsNiArOTcsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ2hhbmdlTmV0 d29ya1JlcXVlc3RzSW5Qcm9ncmVzcygpIG92ZXJyaWRlIHsgfQogICAgIHZvaWQgd2lsbENoYW5n ZUNlcnRpZmljYXRlSW5mbygpIG92ZXJyaWRlIHsgfQogICAgIHZvaWQgZGlkQ2hhbmdlQ2VydGlm aWNhdGVJbmZvKCkgb3ZlcnJpZGUgeyB9CisgICAgdm9pZCBkaWRTd2FwV2ViUHJvY2Vzc2VzKCkg b3ZlcnJpZGUgeyB9CiAKICAgICB2b2lkIHdpbGxDaGFuZ2VXZWJQcm9jZXNzSXNSZXNwb25zaXZl KCkgb3ZlcnJpZGUKICAgICB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9O YXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAkocmV2aXNpb24gMjM4NzcxKQorKysgU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3 Niw2ICsxNzYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ2hhbmdlQ2VydGlmaWNhdGVJbmZv KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCB3aWxsQ2hhbmdlV2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSgp IG92ZXJyaWRlOwogICAgIHZvaWQgZGlkQ2hhbmdlV2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpIG92 ZXJyaWRlOworICAgIHZvaWQgZGlkU3dhcFdlYlByb2Nlc3NlcygpIG92ZXJyaWRlOwogCiAjaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICB2b2lkIHJlbGVhc2VOZXR3b3JrQWN0aXZpdHlUb2tl bkFmdGVyTG9hZENvbXBsZXRpb24oKSB7IHJlbGVhc2VOZXR3b3JrQWN0aXZpdHlUb2tlbihOZXR3 b3JrQWN0aXZpdHlUb2tlblJlbGVhc2VSZWFzb246OkxvYWRDb21wbGV0ZWQpOyB9CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCShy ZXZpc2lvbiAyMzg3NzEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0 aW9uU3RhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyMjYsNiArMTIyNiwxNSBAQCB2b2lkIE5h dmlnYXRpb25TdGF0ZTo6ZGlkQ2hhbmdlV2ViUHJvY2VzCiAgICAgW21fd2ViVmlldyBkaWRDaGFu Z2VWYWx1ZUZvcktleTpAIl93ZWJQcm9jZXNzSXNSZXNwb25zaXZlIl07CiB9CiAKK3ZvaWQgTmF2 aWdhdGlvblN0YXRlOjpkaWRTd2FwV2ViUHJvY2Vzc2VzKCkKK3sKKyNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQorICAgIC8vIFRha2UgdGhlIHByb2Nlc3MgYXNzZXJ0aW9uIGZyb20gdGhlIG9sZCB3 ZWIgcHJvY2Vzcy4KKyAgICBpZiAobV9hY3Rpdml0eVRva2VuKQorICAgICAgICBtX2FjdGl2aXR5 VG9rZW4gPSBtX3dlYlZpZXctPl9wYWdlLT5wcm9jZXNzKCkudGhyb3R0bGVyKCkuYmFja2dyb3Vu ZEFjdGl2aXR5VG9rZW4oKTsKKyNlbmRpZgorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAog I2VuZGlmCg== 356397 2018-12-03 13:07:33 -0800 2018-12-03 13:20:25 -0800 Patch bug-192318-20181203130733.patch text/plain 5626 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzg4MTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTEyLTAzICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXBkYXRlIHByb2Nl c3MgYXNzZXJ0aW9ucyBhZnRlciBzd2FwcGluZyBwcm9jZXNzZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MjMxOAorICAgICAgICA8cmRhcjovL3By b2JsZW0vNDYzNzc1NTI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSWYgdGhlIHByZXZpb3VzIFdlYlByb2Nlc3MgaGFkIGEgUHJvY2Vzc0Fzc2VydGlv biB0byBwcmV2ZW50IGl0IGZyb20gYmVpbmcgc3VzcGVuZGVkCisgICAgICAgIGFmdGVyIG5hdmln YXRpb24gYW5kIHByb2Nlc3Mgc3dhcHBpbmcgd2UgbmVlZCB0aGUgbmV3IFdlYlByb2Nlc3MgdG8g dXBkYXRlIGl0cyBwcm9jZXNzIGFzc2VydGlvbnMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL1BhZ2VMb2FkU3RhdGVPYnNlcnZlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9OYXZpZ2F0aW9uU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlv blN0YXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OmRpZFN3YXBXZWJQ cm9jZXNzZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UGFnZUxvYWRTdGF0ZTo6ZGlkU3dhcFdlYlByb2Nlc3Nlcyk6CisgICAgICAg ICogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpmaW5pc2hBdHRhY2hp bmdUb1dlYlByb2Nlc3MpOgorCiAyMDE4LTEyLTAzICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBEbyBub3QgaGFuZGxlIGtleSBldmVudHMgdGhhdCBh cmUga2V5IGNvbW1hbmRzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0 YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0 YXRlLmNwcAkocmV2aXNpb24gMjM4NzcxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFn ZUxvYWRTdGF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwNyw2ICs0MDcsMTEgQEAgYm9vbCBQ YWdlTG9hZFN0YXRlOjppc0xvYWRpbmcoY29uc3QgRGF0YQogICAgIHJldHVybiBmYWxzZTsKIH0K IAordm9pZCBQYWdlTG9hZFN0YXRlOjpkaWRTd2FwV2ViUHJvY2Vzc2VzKCkKK3sKKyAgICBjYWxs T2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OmRpZFN3YXBXZWJQcm9jZXNzZXMpOworfQorCiB2 b2lkIFBhZ2VMb2FkU3RhdGU6OndpbGxDaGFuZ2VQcm9jZXNzSXNSZXNwb25zaXZlKCkKIHsKICAg ICBjYWxsT2JzZXJ2ZXJDYWxsYmFjaygmT2JzZXJ2ZXI6OndpbGxDaGFuZ2VXZWJQcm9jZXNzSXNS ZXNwb25zaXZlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgJ KHJldmlzaW9uIDIzODc3MSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3Rh dGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzgsNiArNzgsOCBAQCBwdWJsaWM6CiAKICAgICAgICAg dmlydHVhbCB2b2lkIHdpbGxDaGFuZ2VXZWJQcm9jZXNzSXNSZXNwb25zaXZlKCkgPSAwOwogICAg ICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlV2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpID0gMDsK KyAgICAgICAgCisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRTd2FwV2ViUHJvY2Vzc2VzKCkgPSAw OwogICAgIH07CiAKICAgICBjbGFzcyBUcmFuc2FjdGlvbiB7CkBAIC0xNjUsNiArMTY3LDggQEAg cHVibGljOgogICAgIHZvaWQgZGlkRmluaXNoUHJvZ3Jlc3MoY29uc3QgVHJhbnNhY3Rpb246OlRv a2VuJik7CiAgICAgdm9pZCBzZXROZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzKGNvbnN0IFRyYW5z YWN0aW9uOjpUb2tlbiYsIGJvb2wpOwogCisgICAgdm9pZCBkaWRTd2FwV2ViUHJvY2Vzc2VzKCk7 CisKICAgICBib29sIGNvbW1pdHRlZEhhc0luc2VjdXJlQ29udGVudCgpIGNvbnN0IHsgcmV0dXJu IG1fY29tbWl0dGVkU3RhdGUuaGFzSW5zZWN1cmVDb250ZW50OyB9CiAKICAgICAvLyBGSVhNRTog V2UgcGlnZ3ktYmFjayBvZmYgUGFnZUxvYWRTdGF0ZTo6T2JzZXJ2ZXIgc28gdGhhdCBib3RoIFdL V2ViVmlldyBhbmQgV0tPYnNlcnZhYmxlUGFnZVN0YXRlCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIzODc3MSkKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1Miw2ICs4 NTIsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZmluaXNoQXR0YWNoaW5nVG9XZWJQCiAgICAgY3Jl YXRlSW5zcGVjdG9yVGFyZ2V0cygpOwogCiAgICAgcGFnZUNsaWVudCgpLmRpZFJlbGF1bmNoUHJv Y2VzcygpOworICAgIG1fcGFnZUxvYWRTdGF0ZS5kaWRTd2FwV2ViUHJvY2Vzc2VzKCk7CiAgICAg bV9kcmF3aW5nQXJlYS0+d2FpdEZvckJhY2tpbmdTdG9yZVVwZGF0ZU9uTmV4dFBhaW50KCk7CiB9 CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9QYWdlTG9hZFN0YXRl T2JzZXJ2ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvUGFnZUxvYWRTdGF0ZU9ic2VydmVyLmgJKHJldmlzaW9uIDIzODc3MSkKKysrIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9QYWdlTG9hZFN0YXRlT2JzZXJ2ZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtOTcsNiArOTcsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ2hhbmdlTmV0 d29ya1JlcXVlc3RzSW5Qcm9ncmVzcygpIG92ZXJyaWRlIHsgfQogICAgIHZvaWQgd2lsbENoYW5n ZUNlcnRpZmljYXRlSW5mbygpIG92ZXJyaWRlIHsgfQogICAgIHZvaWQgZGlkQ2hhbmdlQ2VydGlm aWNhdGVJbmZvKCkgb3ZlcnJpZGUgeyB9CisgICAgdm9pZCBkaWRTd2FwV2ViUHJvY2Vzc2VzKCkg b3ZlcnJpZGUgeyB9CiAKICAgICB2b2lkIHdpbGxDaGFuZ2VXZWJQcm9jZXNzSXNSZXNwb25zaXZl KCkgb3ZlcnJpZGUKICAgICB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xp Yi9XZWJLaXRXZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvZ2xpYi9XZWJLaXRXZWJWaWV3LmNwcAkocmV2aXNpb24gMjM4NzcxKQorKysgU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0V2ViVmlldy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM1NCw2ICszNTQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkQ2hhbmdlQ2VydGlm aWNhdGVJbmZvKCkgb3ZlcnJpZGUgeyB9CiAgICAgdm9pZCB3aWxsQ2hhbmdlV2ViUHJvY2Vzc0lz UmVzcG9uc2l2ZSgpIG92ZXJyaWRlIHsgfQogICAgIHZvaWQgZGlkQ2hhbmdlV2ViUHJvY2Vzc0lz UmVzcG9uc2l2ZSgpIG92ZXJyaWRlIHsgfQorICAgIHZvaWQgZGlkU3dhcFdlYlByb2Nlc3Nlcygp IG92ZXJyaWRlIHsgfTsKIAogICAgIFdlYktpdFdlYlZpZXcqIG1fd2ViVmlldzsKIH07CkluZGV4 OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAko cmV2aXNpb24gMjM4NzcxKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvTmF2aWdh dGlvblN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3Niw2ICsxNzYsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgZGlkQ2hhbmdlQ2VydGlmaWNhdGVJbmZvKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCB3 aWxsQ2hhbmdlV2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpIG92ZXJyaWRlOwogICAgIHZvaWQgZGlk Q2hhbmdlV2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSgpIG92ZXJyaWRlOworICAgIHZvaWQgZGlkU3dh cFdlYlByb2Nlc3NlcygpIG92ZXJyaWRlOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAg ICB2b2lkIHJlbGVhc2VOZXR3b3JrQWN0aXZpdHlUb2tlbkFmdGVyTG9hZENvbXBsZXRpb24oKSB7 IHJlbGVhc2VOZXR3b3JrQWN0aXZpdHlUb2tlbihOZXR3b3JrQWN0aXZpdHlUb2tlblJlbGVhc2VS ZWFzb246OkxvYWRDb21wbGV0ZWQpOyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCShyZXZpc2lvbiAyMzg3NzEpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0JKHdvcmtpbmcgY29w eSkKQEAgLTEyMjYsNiArMTIyNiwxNSBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6ZGlkQ2hhbmdl V2ViUHJvY2VzCiAgICAgW21fd2ViVmlldyBkaWRDaGFuZ2VWYWx1ZUZvcktleTpAIl93ZWJQcm9j ZXNzSXNSZXNwb25zaXZlIl07CiB9CiAKK3ZvaWQgTmF2aWdhdGlvblN0YXRlOjpkaWRTd2FwV2Vi UHJvY2Vzc2VzKCkKK3sKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIC8vIFRha2UgdGhl IHByb2Nlc3MgYXNzZXJ0aW9uIGZyb20gdGhlIG9sZCB3ZWIgcHJvY2Vzcy4KKyAgICBpZiAobV9h Y3Rpdml0eVRva2VuKQorICAgICAgICBtX2FjdGl2aXR5VG9rZW4gPSBtX3dlYlZpZXctPl9wYWdl LT5wcm9jZXNzKCkudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKTsKKyNlbmRp ZgorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmCg==