201544 2019-09-06 08:30:08 -0700 REGRESSION(r249142): [GTK] Epiphany delayed page loads continue indefinitely 2019-09-16 00:49:17 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro webkit-unassigned bugs-noreply cdumez cgarcia lantw44 mcatanzaro oldest_to_newest 1568519 0 mcatanzaro 2019-09-06 08:30:08 -0700 When starting Epiphany, it loads a blank page in all web views except the one that's initially-visited using webkit_web_view_load_alternate_html(). In 2.25.4 and earlier, the load completes. In 2.25.92, the load seems to continue forever. It's easy to see in Epiphany because all tabs you haven't visited yet have a spinner that spins forever until you visit the tab. I haven't investigated yet, but it's probably not receiving a load finished event. 1570014 1 mcatanzaro 2019-09-11 15:37:18 -0700 ca18a70558b52ae21287b5e0003c36085baa59e7 is the first bad commit commit ca18a70558b52ae21287b5e0003c36085baa59e7 Author: commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Date: Tue Aug 27 16:08:48 2019 +0000 Do not clear the pending api request when there's no navigation ID https://bugs.webkit.org/show_bug.cgi?id=201175 Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2019-08-27 Reviewed by Chris Dumez. After r247851, the pending API request URL is cleared for subresources in some cases. * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared): (WebKit::WebPageProxy::decidePolicyForNavigationAction): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@249142 268f45cc-cd09-0410-ab3c-d52691b4dbfc 1570566 2 378727 cgarcia 2019-09-13 06:17:36 -0700 Created attachment 378727 Patch 1570579 3 378727 mcatanzaro 2019-09-13 08:11:57 -0700 Comment on attachment 378727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378727&action=review Nice test. Tests are r=me. The actual code change needs an owner, of course. > Tools/TestWebKitAPI/Tests/WebKitGLib/TestLoaderClient.cpp:439 > + test->checkURIAtState(ViewURITrackingTest::State::Commited, "/normal"); Preexisting type: this should be Committed 1570581 4 378727 cdumez 2019-09-13 08:21:22 -0700 Comment on attachment 378727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378727&action=review > Source/WebKit/UIProcess/WebPageProxy.cpp:4050 > + bool fromAlternateHTMLAPI = !unreachableURL.isEmpty() && unreachableURL == m_pageLoadState.pendingAPIRequestURL(); WK2 Owner LGTM. 1571035 5 cgarcia 2019-09-16 00:49:17 -0700 Committed r249890: <https://trac.webkit.org/changeset/249890> 378727 2019-09-13 06:17:36 -0700 2019-09-13 08:11:57 -0700 Patch wk2-alternate-pending-api-request.diff text/plain 10453 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggY2IzNzk4NzI2ZDkuLjI0ZDJjNTFjMDA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE5LTA5LTEzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDkxNDIpOiBbR1RLXSBFcGlwaGFueSBkZWxh eWVkIHBhZ2UgbG9hZHMgY29udGludWUgaW5kZWZpbml0ZWx5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE1NDQKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJQYWdlUHJveHk6OmxvYWRBbHRlcm5hdGVI VE1MKCkgaXMgYW4gZXhjZXB0aW9uLCBiZWNhdXNlIGl0J3MgYW4gQVBJIHJlcXVlc3QgYnV0IGFs d2F5cyBzZXRzIHRoZSBuYXZpZ2F0aW9uSUQKKyAgICAgICAgdG8gMC4gV2UgYWx3YXlzIHdhbnQg dG8gcmVzZXQgdGhlIHBlbmRpbmcgQVBJIHJlcXVlc3QgVVJMIHdoZW4gYWx0ZXJuYXRlIEhUTUwg bG9hZCBzdGFydHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lU2hhcmVkKTogQ2hlY2sgYWxzbyB0aGF0IGl0J3MgYW4gQVBJIGFsdGVybmF0ZSBIVE1MIGxv YWQKKyAgICAgICAgdG8gcmVzZXQgdGhlIHBlbmRpbmcgQVBJIHJlcXVlc3QgVVJMLgorCiAyMDE5 LTA5LTEyICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2Ug V2ViUHJvY2VzcyBwcm9jZXNzSWRlbnRpZmllciB0byBpZGVudGlmeSBTZXJ2aWNlIFdvcmtlciBj b25uZWN0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg YzNjNWE2NDNkZWQuLmZlZGM4ODg2YmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKQEAgLTQwNDcsOCArNDA0Nyw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRT dGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYK ICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKExvYWRpbmcsICJkaWRTdGFydFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lOiBmcmFtZUlEID0gJSIgUFJJdTY0LCBmcmFtZUlELnRvVUludDY0KCkpOwog CiAgICAgYXV0byB0cmFuc2FjdGlvbiA9IG1fcGFnZUxvYWRTdGF0ZS50cmFuc2FjdGlvbigpOwot Ci0gICAgaWYgKG5hdmlnYXRpb24pCisgICAgYm9vbCBmcm9tQWx0ZXJuYXRlSFRNTEFQSSA9ICF1 bnJlYWNoYWJsZVVSTC5pc0VtcHR5KCkgJiYgdW5yZWFjaGFibGVVUkwgPT0gbV9wYWdlTG9hZFN0 YXRlLnBlbmRpbmdBUElSZXF1ZXN0VVJMKCk7CisgICAgaWYgKG5hdmlnYXRpb24gfHwgZnJvbUFs dGVybmF0ZUhUTUxBUEkpCiAgICAgICAgIG1fcGFnZUxvYWRTdGF0ZS5jbGVhclBlbmRpbmdBUElS ZXF1ZXN0KHRyYW5zYWN0aW9uKTsKIAogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkgewpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDM4ZDAz MmY4YmEwLi44YWQ5MTM2MWM5NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTA5LTEzICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyNDkx NDIpOiBbR1RLXSBFcGlwaGFueSBkZWxheWVkIHBhZ2UgbG9hZHMgY29udGludWUgaW5kZWZpbml0 ZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE1 NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg bmV3IHRlc3QgY2FzZXMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdM aWIvVGVzdExvYWRlckNsaWVudC5jcHA6CisgICAgICAgICh0ZXN0V2ViVmlld0FjdGl2ZVVSSSk6 CisgICAgICAgICh0ZXN0V2ViVmlld0lzTG9hZGluZyk6CisgICAgICAgICogVGVzdFdlYktpdEFQ SS9nbGliL1dlYktpdEdMaWIvTG9hZFRyYWNraW5nVGVzdC5jcHA6CisgICAgICAgIChsb2FkQ2hh bmdlZENhbGxiYWNrKToKKyAgICAgICAgKExvYWRUcmFja2luZ1Rlc3Q6OmxvYWRBbHRlcm5hdGVI VE1MKToKKyAgICAgICAgKExvYWRUcmFja2luZ1Rlc3Q6OnJlc2V0KToKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9Mb2FkVHJhY2tpbmdUZXN0Lmg6CisKIDIwMTktMDkt MTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdIENhbm5vdCBidWlsZCBXZWJLaXRHVEsgMi4yNi4wIHdpdGggTVNFIGluIERlYmlhbiBz dGFibGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9U ZXN0TG9hZGVyQ2xpZW50LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xp Yi9UZXN0TG9hZGVyQ2xpZW50LmNwcAppbmRleCAwODQzMTRiMDQ1Yi4uODc3YjI1ZTEzZmUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0TG9hZGVy Q2xpZW50LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVz dExvYWRlckNsaWVudC5jcHAKQEAgLTI5Miw2ICsyOTIsMTMgQEAgcHVibGljOgogICAgICAgICBM b2FkVHJhY2tpbmdUZXN0Ojpsb2FkVVJJKHVyaSk7CiAgICAgfQogCisgICAgdm9pZCBsb2FkVVJJ QW5kUmVkaXJlY3RPbkNvbW1pdHRlZChjb25zdCBjaGFyKiB1cmksIGNvbnN0IGNoYXIqIHJlZGly ZWN0VVJJKQorICAgIHsKKyAgICAgICAgcmVzZXQoKTsKKyAgICAgICAgbV91cmlUb0xvYWRPbkNv bW1pdHRlZCA9IHJlZGlyZWN0VVJJOworICAgICAgICBMb2FkVHJhY2tpbmdUZXN0Ojpsb2FkVVJJ KHVyaSk7CisgICAgfQorCiAgICAgdm9pZCBwcm92aXNpb25hbExvYWRTdGFydGVkKCkKICAgICB7 CiAgICAgICAgIG1fY3VycmVudFVSSUxpc3RbUHJvdmlzaW9uYWxdID0gbV9jdXJyZW50VVJJOwpA QCAtMzA1LDEyICszMTIsMTkgQEAgcHVibGljOgogICAgIHZvaWQgbG9hZENvbW1pdHRlZCgpCiAg ICAgewogICAgICAgICBtX2N1cnJlbnRVUklMaXN0W0NvbW1pdGVkXSA9IG1fY3VycmVudFVSSTsK KyAgICAgICAgaWYgKCFtX3VyaVRvTG9hZE9uQ29tbWl0dGVkLmlzTnVsbCgpKSB7CisgICAgICAg ICAgICBtX2VzdGltYXRlZFByb2dyZXNzID0gMDsKKyAgICAgICAgICAgIG1fYWN0aXZlVVJJID0g bV91cmlUb0xvYWRPbkNvbW1pdHRlZDsKKyAgICAgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2Fk X3VyaShtX3dlYlZpZXcsIG1fdXJpVG9Mb2FkT25Db21taXR0ZWQuZGF0YSgpKTsKKyAgICAgICAg fQogICAgIH0KIAogICAgIHZvaWQgbG9hZEZpbmlzaGVkKCkKICAgICB7CiAgICAgICAgIG1fY3Vy cmVudFVSSUxpc3RbRmluaXNoZWRdID0gbV9jdXJyZW50VVJJOwogICAgICAgICBMb2FkVHJhY2tp bmdUZXN0Ojpsb2FkRmluaXNoZWQoKTsKKyAgICAgICAgaWYgKCFtX3VyaVRvTG9hZE9uQ29tbWl0 dGVkLmlzTnVsbCgpKQorICAgICAgICAgICAgbV91cmlUb0xvYWRPbkNvbW1pdHRlZCA9IHsgfTsK ICAgICB9CiAKICAgICB2b2lkIGNoZWNrVVJJQXRTdGF0ZShTdGF0ZSBzdGF0ZSwgY29uc3QgY2hh ciogcGF0aCkKQEAgLTMyNCwxMiArMzM4LDE0IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdm9p ZCByZXNldCgpCiAgICAgewotICAgICAgICBtX2N1cnJlbnRVUkkgPSBDU3RyaW5nKCk7CisgICAg ICAgIG1fY3VycmVudFVSSSA9IHsgfTsKKyAgICAgICAgbV91cmlUb0xvYWRPbkNvbW1pdHRlZCA9 IHsgfTsKICAgICAgICAgbV9jdXJyZW50VVJJTGlzdC5jbGVhcigpOwogICAgICAgICBtX2N1cnJl bnRVUklMaXN0Lmdyb3cobV9jdXJyZW50VVJJTGlzdC5jYXBhY2l0eSgpKTsKICAgICB9CiAKICAg ICBDU3RyaW5nIG1fY3VycmVudFVSSTsKKyAgICBDU3RyaW5nIG1fdXJpVG9Mb2FkT25Db21taXR0 ZWQ7CiAgICAgVmVjdG9yPENTdHJpbmcsIDQ+IG1fY3VycmVudFVSSUxpc3Q7CiB9OwogCkBAIC00 MTUsNiArNDMxLDE5IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3QWN0aXZlVVJJKFZpZXdVUklU cmFja2luZ1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgdGVzdC0+Y2hlY2tVUklBdFN0 YXRlKFZpZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpQcm92aXNpb25hbEFmdGVyUmVkaXJlY3Qs ICIvbm9ybWFsLWNoYW5nZS1yZXF1ZXN0Iik7CiAgICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRlKFZp ZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpDb21taXRlZCwgIi9yZXF1ZXN0LWNoYW5nZWQtb24t cmVkaXJlY3QiKTsKICAgICB0ZXN0LT5jaGVja1VSSUF0U3RhdGUoVmlld1VSSVRyYWNraW5nVGVz dDo6U3RhdGU6OkZpbmlzaGVkLCAiL3JlcXVlc3QtY2hhbmdlZC1vbi1yZWRpcmVjdCIpOworCisg ICAgdGVzdC0+bG9hZFVSSUFuZFJlZGlyZWN0T25Db21taXR0ZWQoa1NlcnZlci0+Z2V0VVJJRm9y UGF0aCgiL25vcm1hbCIpLmRhdGEoKSwga1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2hlYWRlcnMi KS5kYXRhKCkpOworICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOworICAgIHRlc3Qt PmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0OjpTdGF0ZTo6UHJvdmlzaW9uYWws ICIvbm9ybWFsIik7CisgICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRlKFZpZXdVUklUcmFja2luZ1Rl c3Q6OlN0YXRlOjpQcm92aXNpb25hbEFmdGVyUmVkaXJlY3QsIG51bGxwdHIpOworICAgIHRlc3Qt PmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0OjpTdGF0ZTo6Q29tbWl0ZWQsICIv bm9ybWFsIik7CisgICAgLy8gUGVuZGluZyBBUEkgcmVxdWVzdCBpcyBhbHdheXMgdXBkYXRlZCBp bW1lZGF0ZWx5LgorICAgIHRlc3QtPmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0 OjpTdGF0ZTo6RmluaXNoZWQsICIvaGVhZGVycyIpOworICAgIHRlc3QtPndhaXRVbnRpbExvYWRG aW5pc2hlZCgpOworICAgIHRlc3QtPmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0 OjpTdGF0ZTo6UHJvdmlzaW9uYWwsICIvaGVhZGVycyIpOworICAgIHRlc3QtPmNoZWNrVVJJQXRT dGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0OjpTdGF0ZTo6UHJvdmlzaW9uYWxBZnRlclJlZGlyZWN0 LCBudWxscHRyKTsKKyAgICB0ZXN0LT5jaGVja1VSSUF0U3RhdGUoVmlld1VSSVRyYWNraW5nVGVz dDo6U3RhdGU6OkNvbW1pdGVkLCAiL2hlYWRlcnMiKTsKKyAgICB0ZXN0LT5jaGVja1VSSUF0U3Rh dGUoVmlld1VSSVRyYWNraW5nVGVzdDo6U3RhdGU6OkZpbmlzaGVkLCAiL2hlYWRlcnMiKTsKIH0K IAogY2xhc3MgVmlld0lzTG9hZGluZ1Rlc3Q6IHB1YmxpYyBMb2FkVHJhY2tpbmdUZXN0IHsKQEAg LTQ1NCwyMyArNDgzLDM0IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3SXNMb2FkaW5nKFZpZXdJ c0xvYWRpbmdUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogewogICAgIHRlc3QtPmxvYWRVUkko a1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL25vcm1hbCIpLmRhdGEoKSk7CiAgICAgdGVzdC0+d2Fp dFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X3dlYl92aWV3 X2lzX2xvYWRpbmcodGVzdC0+bV93ZWJWaWV3KSk7CiAKICAgICB0ZXN0LT5yZWxvYWQoKTsKICAg ICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJr aXRfd2ViX3ZpZXdfaXNfbG9hZGluZyh0ZXN0LT5tX3dlYlZpZXcpKTsKIAogICAgIHRlc3QtPmxv YWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2Vycm9yIikuZGF0YSgpKTsKICAgICB0ZXN0 LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2Vi X3ZpZXdfaXNfbG9hZGluZyh0ZXN0LT5tX3dlYlZpZXcpKTsKIAogICAgIHRlc3QtPmxvYWRVUkko a1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL25vcm1hbCIpLmRhdGEoKSk7CiAgICAgdGVzdC0+d2Fp dFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X3dlYl92aWV3 X2lzX2xvYWRpbmcodGVzdC0+bV93ZWJWaWV3KSk7CiAgICAgdGVzdC0+bG9hZFVSSShrU2VydmVy LT5nZXRVUklGb3JQYXRoKCIvbm9ybWFsMiIpLmRhdGEoKSk7CiAgICAgdGVzdC0+d2FpdFVudGls TG9hZEZpbmlzaGVkKCk7CisgICAgZ19hc3NlcnRfZmFsc2Uod2Via2l0X3dlYl92aWV3X2lzX2xv YWRpbmcodGVzdC0+bV93ZWJWaWV3KSk7CiAKICAgICB0ZXN0LT5nb0JhY2soKTsKICAgICB0ZXN0 LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2Vi X3ZpZXdfaXNfbG9hZGluZyh0ZXN0LT5tX3dlYlZpZXcpKTsKIAogICAgIHRlc3QtPmdvRm9yd2Fy ZCgpOwogICAgIHRlc3QtPndhaXRVbnRpbExvYWRGaW5pc2hlZCgpOworICAgIGdfYXNzZXJ0X2Zh bHNlKHdlYmtpdF93ZWJfdmlld19pc19sb2FkaW5nKHRlc3QtPm1fd2ViVmlldykpOworCisgICAg dGVzdC0+bG9hZEFsdGVybmF0ZUhUTUwoIjxodG1sPjxoZWFkPjx0aXRsZT5UaXRsZTwvdGl0bGU+ PC9oZWFkPjwvaHRtbD4iLCAiZmlsZTovLy9mb28iLCBudWxscHRyKTsKKyAgICB0ZXN0LT53YWl0 VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2ViX3ZpZXdf aXNfbG9hZGluZyh0ZXN0LT5tX3dlYlZpZXcpKTsKIH0KIAogY2xhc3MgV2ViUGFnZVVSSVRlc3Q6 IHB1YmxpYyBXZWJWaWV3VGVzdCB7CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2ds aWIvV2ViS2l0R0xpYi9Mb2FkVHJhY2tpbmdUZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv Z2xpYi9XZWJLaXRHTGliL0xvYWRUcmFja2luZ1Rlc3QuY3BwCmluZGV4IDJkZGRlY2EzNjJlLi43 YzI5NjM4OWUwMiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdM aWIvTG9hZFRyYWNraW5nVGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9nbGliL1dl YktpdEdMaWIvTG9hZFRyYWNraW5nVGVzdC5jcHAKQEAgLTMxLDYgKzMxLDcgQEAgc3RhdGljIHZv aWQgbG9hZENoYW5nZWRDYWxsYmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2Fk RXZlbnQgbG9hZEV2ZW4KICAgICBjYXNlIFdFQktJVF9MT0FEX1JFRElSRUNURUQ6CiAgICAgICAg IGdfYXNzZXJ0X3RydWUod2Via2l0X3dlYl92aWV3X2lzX2xvYWRpbmcod2ViVmlldykpOwogICAg ICAgICB0ZXN0LT5tX2FjdGl2ZVVSSSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcp OworICAgICAgICB0ZXN0LT5tX2NvbW1pdHRlZFVSSSA9IHRlc3QtPm1fYWN0aXZlVVJJOwogICAg ICAgICBpZiAoIXRlc3QtPm1fcmVkaXJlY3RVUkkuaXNOdWxsKCkpCiAgICAgICAgICAgICBnX2Fz c2VydF9jbXBzdHIodGVzdC0+bV9yZWRpcmVjdFVSSS5kYXRhKCksID09LCB0ZXN0LT5tX2FjdGl2 ZVVSSS5kYXRhKCkpOwogICAgICAgICB0ZXN0LT5wcm92aXNpb25hbExvYWRSZWNlaXZlZFNlcnZl clJlZGlyZWN0KCk7CkBAIC00OCwxNSArNDksMTUgQEAgc3RhdGljIHZvaWQgbG9hZENoYW5nZWRD YWxsYmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW4K ICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgV0VCS0lUX0xPQURfRklOSVNIRUQ6Ci0g ICAgICAgIGlmICghdGVzdC0+bV9sb2FkRmFpbGVkKSB7Ci0gICAgICAgICAgICBnX2Fzc2VydF9m YWxzZSh3ZWJraXRfd2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSk7CisgICAgICAgIGlmICgh dGVzdC0+bV9sb2FkRmFpbGVkKQogICAgICAgICAgICAgZ19hc3NlcnRfY21wc3RyKHRlc3QtPm1f YWN0aXZlVVJJLmRhdGEoKSwgPT0sIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZpZXcpKTsK LSAgICAgICAgfSBlbHNlIGlmICghZ19lcnJvcl9tYXRjaGVzKHRlc3QtPm1fZXJyb3IuZ2V0KCks IFdFQktJVF9ORVRXT1JLX0VSUk9SLCBXRUJLSVRfTkVUV09SS19FUlJPUl9DQU5DRUxMRUQpKSB7 Ci0gICAgICAgICAgICAvLyBXaGVuIGEgbmV3IGxvYWQgaXMgc3RhcnRlZCBiZWZvcmUgdGhlIHBy ZXZpb3VzIG9uZSBoYXMgZmluaXNoZWQsIHdlIHJlY2VpdmUgdGhlIGxvYWQtZmluaXNoZWQgc2ln bmFsCi0gICAgICAgICAgICAvLyBvZiB0aGUgb25nb2luZyBsb2FkIHdoaWxlIHdlIGFscmVhZHkg aGF2ZSBhIHByb3Zpc2lvbmFsIFVSTCBmb3IgdGhlIG5ldyBsb2FkLiBUaGlzIGlzIHRoZSBvbmx5 IGNhc2UKLSAgICAgICAgICAgIC8vIHdoZXJlIGlzbG9hZGluZyBpcyB0cnVlIHdoZW4gdGhlIGxv YWQgaGFzIGZpbmlzaGVkLgorCisgICAgICAgIC8vIFdoZW4gYSBuZXcgbG9hZCBpcyBzdGFydGVk IGJlZm9yZSB0aGUgcHJldmlvdXMgb25lIGhhcyBmaW5pc2hlZCwgd2UgcmVjZWl2ZSB0aGUgbG9h ZC1maW5pc2hlZCBzaWduYWwKKyAgICAgICAgLy8gb2YgdGhlIG9uZ29pbmcgbG9hZCB3aGlsZSB3 ZSBhbHJlYWR5IGhhdmUgYSBwcm92aXNpb25hbCBVUkwgZm9yIHRoZSBuZXcgbG9hZC4gVGhpcyBp cyB0aGUgb25seSBjYXNlCisgICAgICAgIC8vIHdoZXJlIGlzbG9hZGluZyBpcyB0cnVlIHdoZW4g dGhlIGxvYWQgaGFzIGZpbmlzaGVkLgorICAgICAgICBpZiAodGVzdC0+bV9hY3RpdmVVUkkgPT0g dGVzdC0+bV9jb21taXR0ZWRVUkkpCiAgICAgICAgICAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRf d2ViX3ZpZXdfaXNfbG9hZGluZyh3ZWJWaWV3KSk7Ci0gICAgICAgIH0KKwogICAgICAgICB0ZXN0 LT5sb2FkRmluaXNoZWQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKQEAgLTIyNCw2 ICsyMjUsMTIgQEAgdm9pZCBMb2FkVHJhY2tpbmdUZXN0Ojpnb0ZvcndhcmQoKQogICAgIFdlYlZp ZXdUZXN0Ojpnb0ZvcndhcmQoKTsKIH0KIAordm9pZCBMb2FkVHJhY2tpbmdUZXN0Ojpsb2FkQWx0 ZXJuYXRlSFRNTChjb25zdCBjaGFyKiBodG1sLCBjb25zdCBjaGFyKiBjb250ZW50VVJJLCBjb25z dCBjaGFyKiBiYXNlVVJJKQoreworICAgIHJlc2V0KCk7CisgICAgV2ViVmlld1Rlc3Q6OmxvYWRB bHRlcm5hdGVIVE1MKGh0bWwsIGNvbnRlbnRVUkksIGJhc2VVUkkpOworfQorCiB2b2lkIExvYWRU cmFja2luZ1Rlc3Q6OnJlc2V0KCkKIHsKICAgICBtX3J1bkxvYWRVbnRpbENvbXBsZXRpb24gPSBm YWxzZTsKQEAgLTIzMSw0ICsyMzgsNSBAQCB2b2lkIExvYWRUcmFja2luZ1Rlc3Q6OnJlc2V0KCkK ICAgICBtX2xvYWRFdmVudHMuY2xlYXIoKTsKICAgICBtX2VzdGltYXRlZFByb2dyZXNzID0gMDsK ICAgICBtX2Vycm9yLnJlc2V0KCk7CisgICAgbV9jb21taXR0ZWRVUkkgPSB7IH07CiB9CmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9Mb2FkVHJhY2tpbmdU ZXN0LmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9Mb2FkVHJhY2tpbmdU ZXN0LmgKaW5kZXggMDI4ODA5MDRhNzQuLmJhZDA0Mjc0OTY4IDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL2dsaWIvV2ViS2l0R0xpYi9Mb2FkVHJhY2tpbmdUZXN0LmgKKysrIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9nbGliL1dlYktpdEdMaWIvTG9hZFRyYWNraW5nVGVzdC5oCkBAIC00 Niw2ICs0Niw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbG9hZCgpOwogICAgIHZvaWQgZ29CYWNr KCk7CiAgICAgdm9pZCBnb0ZvcndhcmQoKTsKKyAgICB2b2lkIGxvYWRBbHRlcm5hdGVIVE1MKGNv bnN0IGNoYXIqIGh0bWwsIGNvbnN0IGNoYXIqIGNvbnRlbnRVUkksIGNvbnN0IGNoYXIqIGJhc2VV UkkpOwogICAgIHZvaWQgcmVzZXQoKTsKIAogICAgIHZvaWQgc2V0UmVkaXJlY3RVUkkoY29uc3Qg Y2hhciogdXJpKSB7IG1fcmVkaXJlY3RVUkkgPSB1cmk7IH0KQEAgLTY1LDQgKzY2LDUgQEAgcHVi bGljOgogICAgIFZlY3RvcjxMb2FkRXZlbnRzPiBtX2xvYWRFdmVudHM7CiAgICAgZmxvYXQgbV9l c3RpbWF0ZWRQcm9ncmVzczsKICAgICBDU3RyaW5nIG1fcmVkaXJlY3RVUkk7CisgICAgQ1N0cmlu ZyBtX2NvbW1pdHRlZFVSSTsKIH07Cg==