195037 2019-02-25 22:03:01 -0800 [iOS] REGRESSION(r238490?): Safari sometimes shows blank page until a cross site navigation or re-opening the tab 2019-02-26 12:31:24 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa bfulgham cdumez commit-queue ggaren koivisto simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1509946 0 rniwa 2019-02-25 22:03:01 -0800 Sometimes, Safari on iOS navigates to a blank page where the user can scroll, zoom, pan, etc... but nothing updates on the screen. <rdar://problem/48154508> 1509956 1 rniwa 2019-02-25 22:41:41 -0800 I was able to reproduce this issue on my phone other day, and upon detailed analysis, we came to conclusion that LayerTreeFreezeReason::ProcessSuspended is set in the affected WebPage, causing RemoteLayerTreeDrawingArea:: m_isFlushingSuspended to remain true, even though the page is clearly visible and I was actively interacting with it. This resulted in the layer tree to be never committed as RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush() would exit early in the first branch: void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush() {     if (m_isFlushingSuspended) {         m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = false;         m_hasDeferredFlush = true;         return;     }     if (m_isLayerFlushThrottlingTemporarilyDisabledForInteraction) {         m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = false;         scheduleCompositingLayerFlushImmediately();         return;     } ... } It means that WebProcess::freezeAllLayerTrees() was called but WebProcess::unfreezeAllLayerTrees() was somehow never called in this web content process. All evidence points to that ProcessThrottler in UI process is suspending the process but never waking up since all calls to WebProcess::freezeAllLayerTrees() and WebProcess::unfreezeAllLayerTrees() originate from ProcessThrottler. In fact, the console log on my phone indicated that the process was releasing the foreground assertion but never regaining its foreground status. However, Antti pointed out to me that he recently refactored WebPage::freezeLayerTree to use a OptionSet instead of relying upon a boolean argument and some boolean states of WebPage in https://trac.webkit.org/changeset/238490. Prior to this change, WebProcess::unfreezeAllLayerTrees() was necessary as long as WebPage::didCompletePageTransition, WebPage::endPrinting, or WebPage::applicationWillEnterForeground was called. Because WebPage::didCompletePageTransition would happen on almost every page load, it's possible that prior to this code change, iOS Safari was suffering from the same problem but the symptom was never surfacing as a end-user visible bug because WebPage::didCompletePageTransition would eventually come around to fix it. 1509962 2 362966 rniwa 2019-02-25 22:50:01 -0800 Created attachment 362966 Fix attempt 1510042 3 362966 cdumez 2019-02-26 08:40:42 -0800 Comment on attachment 362966 Fix attempt View in context: https://bugs.webkit.org/attachment.cgi?id=362966&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:3106 > + unfreezeLayerTree(LayerTreeFreezeReason::ProcessSuspended); Could we RELEASE_LOG_ERROR() or ASSERT() if LayerTreeFreezeReason::ProcessSuspended is still set when WebPage::didCompletePageTransition() is called? 1510049 4 362966 koivisto 2019-02-26 09:25:34 -0800 Comment on attachment 362966 Fix attempt r=me 1510127 5 rniwa 2019-02-26 11:52:07 -0800 (In reply to Chris Dumez from comment #3) > Comment on attachment 362966 [details] > Fix attempt > > View in context: > https://bugs.webkit.org/attachment.cgi?id=362966&action=review > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:3106 > > + unfreezeLayerTree(LayerTreeFreezeReason::ProcessSuspended); > > Could we RELEASE_LOG_ERROR() or ASSERT() if > LayerTreeFreezeReason::ProcessSuspended is still set when > WebPage::didCompletePageTransition() is called? Sure, let's add RELEASE_LOG_ERROR. 1510133 6 363002 rniwa 2019-02-26 12:09:10 -0800 Created attachment 363002 Patch for landing 1510138 7 rniwa 2019-02-26 12:24:45 -0800 Committed r242098: <https://trac.webkit.org/changeset/242098> 1510139 8 webkit-bug-importer 2019-02-26 12:31:24 -0800 <rdar://problem/48410096> 362966 2019-02-25 22:50:01 -0800 2019-02-26 12:09:09 -0800 Fix attempt bug-195037-20190225225001.patch text/plain 3689 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIwNzUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTAyLTI1ICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFtpT1NdIFJFR1JFU1NJT04ocjIzODQ5 MD8pOiBTYWZhcmkgc29tZXRpbWVzIHNob3dzIGJsYW5rIHBhZ2UgdW50aWwgYSBjcm9zcyBzaXRl IG5hdmlnYXRpb24gb3IgcmUtb3BlbmluZyB0aGUgdGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTUwMzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4MTU0NTA4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJlc3RvcmUgdGhlIHByZS1yMjM4NDkwIGJlaGF2aW9yIG9mIFdlYlBhZ2U6OmRpZENvbXBs ZXRlUGFnZVRyYW5zaXRpb24gY2xlYXJpbmcgTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNz U3VzcGVuZGVkCisgICAgICAgIGFzIHRoaXMgaGFzIGJlZW4gYW4gaXNzdWUgd2hlbiBJIHdhcyBh YmxlIHRvIHJlcHJvZHVjZSB0aGUgaXNzdWUgbG9jYWxseS4KKworICAgICAgICBBbHNvIGFkZGVk IHJlbGVhc2UgbG9nZ2luZyB0byBoZWxwIGRpYWdub3NlIHRoZSBpc3N1ZSBpbiB0aGUgZnV0dXJl LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpmcmVlemVMYXllclRyZWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjp1bmZyZWV6ZUxheWVyVHJlZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZENv bXBsZXRlUGFnZVRyYW5zaXRpb24pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmZyZWV6ZUFsbExheWVyVHJlZXMpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjp1bmZyZWV6ZUFsbExheWVyVHJlZXMpOgorCiAy MDE5LTAyLTI0ICBCYWJhayBTaGFmaWVpICA8YnNoYWZpZWlAYXBwbGUuY29tPgogCiAgICAgICAg IENoZXJyeS1waWNrIHIyNDE5NjMuIHJkYXI6Ly9wcm9ibGVtLzQ4MzUwMzY3CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCShyZXZpc2lvbiAyNDIwNjgpCisrKyBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE1MjgsMTIgKzE1MjgsMTQgQEAgdm9pZCBXZWJQcm9jZXNzOjpjYW5jZWxNYXJrQWxsTGF5ZXJz Vm9sYQogCiB2b2lkIFdlYlByb2Nlc3M6OmZyZWV6ZUFsbExheWVyVHJlZXMoKQogeworICAgIFJF TEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV2ViUHJvY2VzcyAlaSBpcyBmcmVlemluZyBh bGwgbGF5ZXIgdHJlZXMiLCBnZXRwaWQoKSk7CiAgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdl TWFwLnZhbHVlcygpKQogICAgICAgICBwYWdlLT5mcmVlemVMYXllclRyZWUoV2ViUGFnZTo6TGF5 ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3VzcGVuZGVkKTsKIH0KIAogdm9pZCBXZWJQcm9j ZXNzOjp1bmZyZWV6ZUFsbExheWVyVHJlZXMoKQogeworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NT dXNwZW5zaW9uLCAiV2ViUHJvY2VzcyAlaSBpcyB1bmZyZWV6aW5nIGFsbCBsYXllciB0cmVlcyIs IGdldHBpZCgpKTsKICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVzKCkpCiAg ICAgICAgIHBhZ2UtPnVuZnJlZXplTGF5ZXJUcmVlKFdlYlBhZ2U6OkxheWVyVHJlZUZyZWV6ZVJl YXNvbjo6UHJvY2Vzc1N1c3BlbmRlZCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMjQyMDY4KQorKysgU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIz ODcsMTIgKzIzODcsMTYgQEAgY29uc3QgV2ViRXZlbnQqIFdlYlBhZ2U6OmN1cnJlbnRFdmVudCgp CiAKIHZvaWQgV2ViUGFnZTo6ZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbiBy ZWFzb24pCiB7CisgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFdlYlBh Z2UgKFBhZ2VJRD0lbGx1KSAtIEFkZGluZyBhIHJlYXNvbiAlZCB0byBmcmVlemUgbGF5ZXIgdHJl ZTsgY3VycmVudCByZWFzb25zIGFyZSAlZCIsCisgICAgICAgIHRoaXMsIG1fcGFnZUlELCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4ocmVhc29uKSwgbV9MYXllclRyZWVGcmVlemVSZWFzb25zLnRvUmF3 KCkpOwogICAgIG1fTGF5ZXJUcmVlRnJlZXplUmVhc29ucy5hZGQocmVhc29uKTsKICAgICB1cGRh dGVEcmF3aW5nQXJlYUxheWVyVHJlZUZyZWV6ZVN0YXRlKCk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6 dW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uIHJlYXNvbikKIHsKKyAgICBS RUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAoUGFnZUlEPSVsbHUp IC0gUmVtb3ZpbmcgYSByZWFzb24gJWQgdG8gZnJlZXplIGxheWVyIHRyZWU7IGN1cnJlbnQgcmVh c29ucyBhcmUgJWQiLAorICAgICAgICB0aGlzLCBtX3BhZ2VJRCwgc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KHJlYXNvbiksIG1fTGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpKTsKICAgICBtX0xh eWVyVHJlZUZyZWV6ZVJlYXNvbnMucmVtb3ZlKHJlYXNvbik7CiAgICAgdXBkYXRlRHJhd2luZ0Fy ZWFMYXllclRyZWVGcmVlemVTdGF0ZSgpOwogfQpAQCAtMzA5OCw2ICszMTAyLDEwIEBAIHZvaWQg V2ViUGFnZTo6ZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbigKIHsKICAgICB1bmZyZWV6ZUxheWVy VHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VUcmFuc2l0aW9uKTsKIAorICAgIC8vIEZJ WE1FOiBJbiBpT1MsIHdlIHNvbWV0aW1lcyBuZXZlciB1bnNldCBQcm9jZXNzU3VzcGVuZGVkLiBT ZWUgPHJkYXI6Ly9wcm9ibGVtLzQ4MTU0NTA4Pi4KKyAgICB1bmZyZWV6ZUxheWVyVHJlZShMYXll clRyZWVGcmVlemVSZWFzb246OlByb2Nlc3NTdXNwZW5kZWQpOworICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoIiVwIC0gV2ViUGFnZSAtIERpZCBjb21wbGV0ZSBwYWdlIHRyYW5zaXRpb24iLCB0 aGlzKTsKKwogICAgIGJvb2wgaXNJbml0aWFsRW1wdHlEb2N1bWVudCA9ICFtX21haW5GcmFtZTsK ICAgICBpZiAoIWlzSW5pdGlhbEVtcHR5RG9jdW1lbnQpCiAgICAgICAgIHVuZnJlZXplTGF5ZXJU cmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UHJvY2Vzc1N3YXApOwo= 363002 2019-02-26 12:09:10 -0800 2019-02-26 12:09:10 -0800 Patch for landing bug-195037-20190226120910.patch text/plain 4051 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDIwNzUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTAyLTI1ICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFtpT1NdIFJFR1JFU1NJT04ocjIzODQ5 MD8pOiBTYWZhcmkgc29tZXRpbWVzIHNob3dzIGJsYW5rIHBhZ2UgdW50aWwgYSBjcm9zcyBzaXRl IG5hdmlnYXRpb24gb3IgcmUtb3BlbmluZyB0aGUgdGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTUwMzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzQ4MTU0NTA4PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAg ICAgIFJlc3RvcmUgdGhlIHByZS1yMjM4NDkwIGJlaGF2aW9yIG9mIFdlYlBhZ2U6OmRpZENvbXBs ZXRlUGFnZVRyYW5zaXRpb24gY2xlYXJpbmcgTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNz U3VzcGVuZGVkCisgICAgICAgIGFzIHRoaXMgaGFzIGJlZW4gYW4gaXNzdWUgd2hlbiBJIHdhcyBh YmxlIHRvIHJlcHJvZHVjZSB0aGUgaXNzdWUgbG9jYWxseS4KKworICAgICAgICBBbHNvIGFkZGVk IHJlbGVhc2UgbG9nZ2luZyB0byBoZWxwIGRpYWdub3NlIHRoZSBpc3N1ZSBpbiB0aGUgZnV0dXJl LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpmcmVlemVMYXllclRyZWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjp1bmZyZWV6ZUxheWVyVHJlZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZENv bXBsZXRlUGFnZVRyYW5zaXRpb24pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmZyZWV6ZUFsbExheWVyVHJlZXMpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjp1bmZyZWV6ZUFsbExheWVyVHJlZXMpOgorCiAy MDE5LTAyLTI0ICBCYWJhayBTaGFmaWVpICA8YnNoYWZpZWlAYXBwbGUuY29tPgogCiAgICAgICAg IENoZXJyeS1waWNrIHIyNDE5NjMuIHJkYXI6Ly9wcm9ibGVtLzQ4MzUwMzY3CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCShyZXZpc2lvbiAyNDIwNjgpCisrKyBT b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE1MjgsMTIgKzE1MjgsMTQgQEAgdm9pZCBXZWJQcm9jZXNzOjpjYW5jZWxNYXJrQWxsTGF5ZXJz Vm9sYQogCiB2b2lkIFdlYlByb2Nlc3M6OmZyZWV6ZUFsbExheWVyVHJlZXMoKQogeworICAgIFJF TEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiV2ViUHJvY2VzcyAlaSBpcyBmcmVlemluZyBh bGwgbGF5ZXIgdHJlZXMiLCBnZXRwaWQoKSk7CiAgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdl TWFwLnZhbHVlcygpKQogICAgICAgICBwYWdlLT5mcmVlemVMYXllclRyZWUoV2ViUGFnZTo6TGF5 ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3VzcGVuZGVkKTsKIH0KIAogdm9pZCBXZWJQcm9j ZXNzOjp1bmZyZWV6ZUFsbExheWVyVHJlZXMoKQogeworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NT dXNwZW5zaW9uLCAiV2ViUHJvY2VzcyAlaSBpcyB1bmZyZWV6aW5nIGFsbCBsYXllciB0cmVlcyIs IGdldHBpZCgpKTsKICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVzKCkpCiAg ICAgICAgIHBhZ2UtPnVuZnJlZXplTGF5ZXJUcmVlKFdlYlBhZ2U6OkxheWVyVHJlZUZyZWV6ZVJl YXNvbjo6UHJvY2Vzc1N1c3BlbmRlZCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMjQyMDY4KQorKysgU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIz ODcsMTIgKzIzODcsMTYgQEAgY29uc3QgV2ViRXZlbnQqIFdlYlBhZ2U6OmN1cnJlbnRFdmVudCgp CiAKIHZvaWQgV2ViUGFnZTo6ZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbiBy ZWFzb24pCiB7CisgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFdlYlBh Z2UgKFBhZ2VJRD0lbGx1KSAtIEFkZGluZyBhIHJlYXNvbiAlZCB0byBmcmVlemUgbGF5ZXIgdHJl ZTsgY3VycmVudCByZWFzb25zIGFyZSAlZCIsCisgICAgICAgIHRoaXMsIG1fcGFnZUlELCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4ocmVhc29uKSwgbV9MYXllclRyZWVGcmVlemVSZWFzb25zLnRvUmF3 KCkpOwogICAgIG1fTGF5ZXJUcmVlRnJlZXplUmVhc29ucy5hZGQocmVhc29uKTsKICAgICB1cGRh dGVEcmF3aW5nQXJlYUxheWVyVHJlZUZyZWV6ZVN0YXRlKCk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6 dW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uIHJlYXNvbikKIHsKKyAgICBS RUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAoUGFnZUlEPSVsbHUp IC0gUmVtb3ZpbmcgYSByZWFzb24gJWQgdG8gZnJlZXplIGxheWVyIHRyZWU7IGN1cnJlbnQgcmVh c29ucyBhcmUgJWQiLAorICAgICAgICB0aGlzLCBtX3BhZ2VJRCwgc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KHJlYXNvbiksIG1fTGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpKTsKICAgICBtX0xh eWVyVHJlZUZyZWV6ZVJlYXNvbnMucmVtb3ZlKHJlYXNvbik7CiAgICAgdXBkYXRlRHJhd2luZ0Fy ZWFMYXllclRyZWVGcmVlemVTdGF0ZSgpOwogfQpAQCAtMzA5OCw2ICszMTAyLDE1IEBAIHZvaWQg V2ViUGFnZTo6ZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbigKIHsKICAgICB1bmZyZWV6ZUxheWVy VHJlZShMYXllclRyZWVGcmVlemVSZWFzb246OlBhZ2VUcmFuc2l0aW9uKTsKIAorICAgIGlmICht X0xheWVyVHJlZUZyZWV6ZVJlYXNvbnMuY29udGFpbnMoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQ cm9jZXNzU3VzcGVuZGVkKSkgeworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3Vz cGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAoUGFnZUlEPSVsbHUpIC0gTGF5ZXJUcmVlRnJlZXplUmVh c29uOjpQcm9jZXNzU3VzcGVuZGVkIHdhcyBzZXQgd2hlbiByZW1vdmluZyBMYXllclRyZWVGcmVl emVSZWFzb246OlBhZ2VUcmFuc2l0aW9uOyBjdXJyZW50IHJlYXNvbnMgYXJlICVkIiwKKyAgICAg ICAgICAgIHRoaXMsIG1fcGFnZUlELCBtX0xheWVyVHJlZUZyZWV6ZVJlYXNvbnMudG9SYXcoKSk7 CisgICAgfQorCisgICAgLy8gRklYTUU6IEluIGlPUywgd2Ugc29tZXRpbWVzIG5ldmVyIHVuc2V0 IFByb2Nlc3NTdXNwZW5kZWQuIFNlZSA8cmRhcjovL3Byb2JsZW0vNDgxNTQ1MDg+LgorICAgIHVu ZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbjo6UHJvY2Vzc1N1c3BlbmRlZCk7 CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgLSBXZWJQYWdlIC0gRGlkIGNvbXBsZXRl IHBhZ2UgdHJhbnNpdGlvbiIsIHRoaXMpOworCiAgICAgYm9vbCBpc0luaXRpYWxFbXB0eURvY3Vt ZW50ID0gIW1fbWFpbkZyYW1lOwogICAgIGlmICghaXNJbml0aWFsRW1wdHlEb2N1bWVudCkKICAg ICAgICAgdW5mcmVlemVMYXllclRyZWUoTGF5ZXJUcmVlRnJlZXplUmVhc29uOjpQcm9jZXNzU3dh cCk7Cg==