207966 2020-02-19 14:38:33 -0800 [First paint] Introduce FrameView::m_firstVisuallyNonEmptyLayoutMilestoneIsPending 2020-02-19 16:48:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1620878 0 zalan 2020-02-19 14:38:33 -0800 to indicate that we've got a pending callback and we have to issue this callback soon after the content turns into visually non-empty. 1620879 1 webkit-bug-importer 2020-02-19 14:38:51 -0800 <rdar://problem/59606528> 1620880 2 391203 zalan 2020-02-19 14:43:49 -0800 Created attachment 391203 Patch 1620891 3 391203 simon.fraser 2020-02-19 15:10:11 -0800 Comment on attachment 391203 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391203&action=review > Source/WebCore/page/FrameView.cpp:5144 > + addPaintPendingMilestones(DidFirstMeaningfulPaint); I"m sad that we're giving up on the distinction between "first contentful paint" and "first meaningful paint". How does "relevant repainted objects" threshold fit into this? > Source/WebCore/page/FrameView.h:924 > + bool m_contentIsQualifiedAsVisuallyNonEmpty { false }; > + bool m_firstVisuallyNonEmptyLayoutCallbackPending { true }; Maybe collapse these two into a "state" enum. If not, please be consistent with naming. Maybe "contentIsQualified" -> qualifiesAs, and m_firstVisuallyNonEmptyLayoutCallbackPending -> m_didFirstMeaningfulPaintMilestone pending 1620920 4 zalan 2020-02-19 15:57:13 -0800 (In reply to Simon Fraser (smfr) from comment #3) > Comment on attachment 391203 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=391203&action=review > > > Source/WebCore/page/FrameView.cpp:5144 > > + addPaintPendingMilestones(DidFirstMeaningfulPaint); > > I"m sad that we're giving up on the distinction between "first contentful > paint" and "first meaningful paint". How does "relevant repainted objects" > threshold fit into this? I think it's more accurate to say that we don't even have the clear distinction yet. > > > Source/WebCore/page/FrameView.h:924 > > + bool m_contentIsQualifiedAsVisuallyNonEmpty { false }; > > + bool m_firstVisuallyNonEmptyLayoutCallbackPending { true }; > > Maybe collapse these two into a "state" enum. > > If not, please be consistent with naming. Maybe "contentIsQualified" -> > qualifiesAs, and m_firstVisuallyNonEmptyLayoutCallbackPending -> > m_didFirstMeaningfulPaintMilestone pending I'll do that. 1620922 5 391213 zalan 2020-02-19 15:59:22 -0800 Created attachment 391213 Patch 1620947 6 391213 commit-queue 2020-02-19 16:48:13 -0800 Comment on attachment 391213 Patch Clearing flags on attachment: 391213 Committed r256999: <https://trac.webkit.org/changeset/256999> 1620948 7 commit-queue 2020-02-19 16:48:15 -0800 All reviewed patches have been landed. Closing bug. 391203 2020-02-19 14:43:49 -0800 2020-02-19 15:59:19 -0800 Patch bug-207966-20200219144348.patch text/plain 4363 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2OTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWYwNDlhNzk1MWVkZWEw NTIwMDBmZTMzYTBmNzUzYjA2YWVjZTQ2ZS4uZDFlOTU4NDdjZGRmZDQyYjc5NzM3OTFkYWMwOTcw MTUxNDZlOTFlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZpcnN0IHBhaW50XSBJbnRy b2R1Y2UgRnJhbWVWaWV3OjptX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVu ZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3 OTY2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTYwNjUyOD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZv ciBkZWNvdXBsaW5nIHRoZSAiY29udGVudCBpcyBxdWFsaWZpZWQgYXMgdmlzdWFsbHkgbm9uLWVt cHR5IiBjaGVjayBhbmQgbGF5b3V0LCB3aGVuCisgICAgICAgIHRoZSBjaGVjayBoYXBwZW5zIHNv b24gYWZ0ZXIgc3R5bGUgcmVjYWxjL3JlbmRlciB0cmVlIGJ1aWxkaW5nIGFuZCB3ZSBuZWVkIHRv IHdhaXQgdW50aWwgYWZ0ZXIgbGF5b3V0IHRvCisgICAgICAgIGZvcndhcmQgdGhlIG1pbGVzdG9u ZSB1cGRhdGUuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OnJlc2V0TGF5b3V0TWlsZXN0b25lcyk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVZpZXc6OmZpcmVMYXlvdXRSZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKToKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorCiAyMDIwLTAyLTE5ICBNZWdhbiBHYXJkbmVyICA8bWVn YW5fZ2FyZG5lckBhcHBsZS5jb20+CiAKICAgICAgICAgRW5zdXJlIHRoYXQgY29udGVudGVkaXRh YmxlIGNhcmV0cyBvbiBtYWNDYXRhbHlzdCBhcmUgdGhlIHJpZ2h0IGNvbG9yLCBlc3BlY2lhbGx5 IGluIERhcmsgTW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDhmZGM4MGM2YmYz NzlmNmJiNTczNWYzM2I1NTlhZjlhZGEwOGQwNTguLmEzNGZiYzAyOWEyZDAzZWVkNDNhMDEyMWFm ZGEyNDQxMGEyOTcxZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTI2NCw3ICsy NjQsOCBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXQoKQogdm9pZCBGcmFtZVZpZXc6OnJlc2V0TGF5 b3V0TWlsZXN0b25lcygpCiB7CiAgICAgbV9maXJzdExheW91dENhbGxiYWNrUGVuZGluZyA9IGZh bHNlOwotICAgIG1faXNWaXN1YWxseU5vbkVtcHR5ID0gZmFsc2U7CisgICAgbV9maXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1BlbmRpbmcgPSB0cnVlOworICAgIG1fY29udGVudElz UXVhbGlmaWVkQXNWaXN1YWxseU5vbkVtcHR5ID0gZmFsc2U7CiAgICAgbV9oYXNSZWFjaGVkU2ln bmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlc2hvbGQgPSBmYWxzZTsKICAgICBtX3JlbmRlcmVkU2ln bmlmaWNhbnRBbW91bnRPZlRleHQgPSBmYWxzZTsKICAgICBtX3Zpc3VhbGx5Tm9uRW1wdHlDaGFy YWN0ZXJDb3VudCA9IDA7CkBAIC0yODQ5LDcgKzI4NTAsNyBAQCB2b2lkIEZyYW1lVmlldzo6ZGlz YWJsZUxheWVyRmx1c2hUaHJvdHRsaW5nVGVtcG9yYXJpbHlGb3JJbnRlcmFjdGlvbigpCiAKIHZv aWQgRnJhbWVWaWV3Ojpsb2FkUHJvZ3Jlc3NpbmdTdGF0dXNDaGFuZ2VkKCkKIHsKLSAgICBpZiAo IW1faXNWaXN1YWxseU5vbkVtcHR5ICYmIGZyYW1lKCkubG9hZGVyKCkuaXNDb21wbGV0ZSgpKQor ICAgIGlmICghbV9jb250ZW50SXNRdWFsaWZpZWRBc1Zpc3VhbGx5Tm9uRW1wdHkgJiYgZnJhbWUo KS5sb2FkZXIoKS5pc0NvbXBsZXRlKCkpCiAgICAgICAgIGZpcmVMYXlvdXRSZWxhdGVkTWlsZXN0 b25lc0lmTmVlZGVkKCk7CiAgICAgdXBkYXRlTGF5ZXJGbHVzaFRocm90dGxpbmcoKTsKICAgICBh ZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwpAQCAtNTEzNSwxMSArNTEzNiwxNSBAQCB2b2lk IEZyYW1lVmlldzo6ZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZOZWVkZWQoKQogICAgICAg ICAgICAgcGFnZS0+c3RhcnRDb3VudGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cygpOwogICAg IH0KIAotICAgIGlmICghbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgJiYgcXVhbGlmaWVzQXNWaXN1YWxs eU5vbkVtcHR5KCkpIHsKLSAgICAgICAgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkgPSB0cnVlOwotICAg ICAgICBhZGRQYWludFBlbmRpbmdNaWxlc3RvbmVzKERpZEZpcnN0TWVhbmluZ2Z1bFBhaW50KTsK LSAgICAgICAgaWYgKHJlcXVlc3RlZE1pbGVzdG9uZXMgJiBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1w dHlMYXlvdXQpCi0gICAgICAgICAgICBtaWxlc3RvbmVzQWNoaWV2ZWQuYWRkKERpZEZpcnN0Vmlz dWFsbHlOb25FbXB0eUxheW91dCk7CisgICAgaWYgKG1fZmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5 b3V0Q2FsbGJhY2tQZW5kaW5nKSB7CisgICAgICAgIGlmICghbV9jb250ZW50SXNRdWFsaWZpZWRB c1Zpc3VhbGx5Tm9uRW1wdHkgJiYgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkpIHsKKyAg ICAgICAgICAgIG1fY29udGVudElzUXVhbGlmaWVkQXNWaXN1YWxseU5vbkVtcHR5ID0gdHJ1ZTsK KyAgICAgICAgICAgIG1fZmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Q2FsbGJhY2tQZW5kaW5n ID0gZmFsc2U7CisKKyAgICAgICAgICAgIGFkZFBhaW50UGVuZGluZ01pbGVzdG9uZXMoRGlkRmly c3RNZWFuaW5nZnVsUGFpbnQpOworICAgICAgICAgICAgaWYgKHJlcXVlc3RlZE1pbGVzdG9uZXMg JiBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpCisgICAgICAgICAgICAgICAgbWlsZXN0 b25lc0FjaGlldmVkLmFkZChEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOworICAgICAg ICB9CiAgICAgfQogCiAgICAgaWYgKCFtX3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQg JiYgcXVhbGlmaWVzQXNTaWduaWZpY2FudFJlbmRlcmVkVGV4dCgpKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuaAppbmRleCA3ZjJjNjRkZjM4MGRmODdjYmYyOTk2ODllNTBmNjcyMjNjODkyODNkLi4x MWRhYWJiZjU5OWQ1N2Y5ZWZjYzBlYTdiMzI5M2I0MzkxNDc2MTY4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKQEAgLTM5Niw3ICszOTYsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGluY3JlbWVu dFZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lk IGluY3JlbWVudFZpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50KGNvbnN0IEludFNpemUmKTsKLSAg ICBib29sIGlzVmlzdWFsbHlOb25FbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1faXNWaXN1YWxseU5v bkVtcHR5OyB9CisgICAgYm9vbCBpc1Zpc3VhbGx5Tm9uRW1wdHkoKSBjb25zdCB7IHJldHVybiBt X2NvbnRlbnRJc1F1YWxpZmllZEFzVmlzdWFsbHlOb25FbXB0eTsgfQogICAgIFdFQkNPUkVfRVhQ T1JUIGJvb2wgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3Q7CiAKICAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIGVuYWJsZUF1dG9TaXplTW9kZShib29sIGVuYWJsZSwgY29uc3QgSW50 U2l6ZSYgbWluU2l6ZSk7CkBAIC05MjAsNyArOTIwLDggQEAgcHJpdmF0ZToKIAogICAgIGJvb2wg bV9pc1BhaW50aW5nIHsgZmFsc2UgfTsKIAotICAgIGJvb2wgbV9pc1Zpc3VhbGx5Tm9uRW1wdHkg eyBmYWxzZSB9OworICAgIGJvb2wgbV9jb250ZW50SXNRdWFsaWZpZWRBc1Zpc3VhbGx5Tm9uRW1w dHkgeyBmYWxzZSB9OworICAgIGJvb2wgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRDYWxs YmFja1BlbmRpbmcgeyB0cnVlIH07CiAKICAgICBib29sIG1fcmVuZGVyZWRTaWduaWZpY2FudEFt b3VudE9mVGV4dCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1JlYWNoZWRTaWduaWZpY2FudFJl bmRlcmVkVGV4dFRocmVzaG9sZCB7IGZhbHNlIH07Cg== 391213 2020-02-19 15:59:22 -0800 2020-02-19 16:48:13 -0800 Patch bug-207966-20200219155921.patch text/plain 4351 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2OTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNhNDFkZWNhZDdhMzRm MDEyMzIzYWQ4NGQzNzQyZDZkYTA0ODI1My4uMTk4MTNjNTg2ZDNkMGM5YjM5OWM0YzZjYTBlNDAw MGM3Yjk5YWIyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0ZpcnN0IHBhaW50XSBJbnRy b2R1Y2UgRnJhbWVWaWV3OjptX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZUlz UGVuZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA3OTY2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTYwNjUyOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBm b3IgZGVjb3VwbGluZyB0aGUgImNvbnRlbnQgaXMgcXVhbGlmaWVkIGFzIHZpc3VhbGx5IG5vbi1l bXB0eSIgY2hlY2sgYW5kIGxheW91dCwgd2hlbgorICAgICAgICB0aGUgY2hlY2sgaGFwcGVucyBz b29uIGFmdGVyIHN0eWxlIHJlY2FsYy9yZW5kZXIgdHJlZSBidWlsZGluZyBhbmQgd2UgbmVlZCB0 byB3YWl0IHVudGlsIGFmdGVyIGxheW91dCB0bworICAgICAgICBpc3N1ZSB0aGUgbWlsZXN0b25l LgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3OjpyZXNldExheW91dE1pbGVzdG9uZXMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpmaXJlTGF5b3V0UmVsYXRlZE1pbGVzdG9uZXNJZk5lZWRlZCk6CisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuaDoKKwogMjAyMC0wMi0xOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0Zsb2F0c10gRmxvYXRpbmdDb250ZXh0Ojpjb25zdHJhaW50 cyBzaG91bGQgYmUgYWJsZSB0byBoYW5kbGUgZW1wdHkgY2FuZGlkYXRlIHJhbmdlcyAocG9pbnRz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDhmZGM4MGM2YmYzNzlmNmJiNTczNWYz M2I1NTlhZjlhZGEwOGQwNTguLmNiZWY0Nzc2NjQ1YjE4YmZmMzFkZjJlM2U5YzFlMDdiYjY3OGZk NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTI2NCw3ICsyNjQsOCBAQCB2b2lk IEZyYW1lVmlldzo6cmVzZXQoKQogdm9pZCBGcmFtZVZpZXc6OnJlc2V0TGF5b3V0TWlsZXN0b25l cygpCiB7CiAgICAgbV9maXJzdExheW91dENhbGxiYWNrUGVuZGluZyA9IGZhbHNlOwotICAgIG1f aXNWaXN1YWxseU5vbkVtcHR5ID0gZmFsc2U7CisgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlM YXlvdXRNaWxlc3RvbmVJc1BlbmRpbmcgPSB0cnVlOworICAgIG1fY29udGVudFF1YWxpZmllc0Fz VmlzdWFsbHlOb25FbXB0eSA9IGZhbHNlOwogICAgIG1faGFzUmVhY2hlZFNpZ25pZmljYW50UmVu ZGVyZWRUZXh0VGhyZXNob2xkID0gZmFsc2U7CiAgICAgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1v dW50T2ZUZXh0ID0gZmFsc2U7CiAgICAgbV92aXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQg PSAwOwpAQCAtMjg0OSw3ICsyODUwLDcgQEAgdm9pZCBGcmFtZVZpZXc6OmRpc2FibGVMYXllckZs dXNoVGhyb3R0bGluZ1RlbXBvcmFyaWx5Rm9ySW50ZXJhY3Rpb24oKQogCiB2b2lkIEZyYW1lVmll dzo6bG9hZFByb2dyZXNzaW5nU3RhdHVzQ2hhbmdlZCgpCiB7Ci0gICAgaWYgKCFtX2lzVmlzdWFs bHlOb25FbXB0eSAmJiBmcmFtZSgpLmxvYWRlcigpLmlzQ29tcGxldGUoKSkKKyAgICBpZiAoIW1f Y29udGVudFF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSAmJiBmcmFtZSgpLmxvYWRlcigpLmlz Q29tcGxldGUoKSkKICAgICAgICAgZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZOZWVkZWQo KTsKICAgICB1cGRhdGVMYXllckZsdXNoVGhyb3R0bGluZygpOwogICAgIGFkanVzdFRpbGVkQmFj a2luZ0NvdmVyYWdlKCk7CkBAIC01MTM1LDExICs1MTM2LDE1IEBAIHZvaWQgRnJhbWVWaWV3Ojpm aXJlTGF5b3V0UmVsYXRlZE1pbGVzdG9uZXNJZk5lZWRlZCgpCiAgICAgICAgICAgICBwYWdlLT5z dGFydENvdW50aW5nUmVsZXZhbnRSZXBhaW50ZWRPYmplY3RzKCk7CiAgICAgfQogCi0gICAgaWYg KCFtX2lzVmlzdWFsbHlOb25FbXB0eSAmJiBxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSkg ewotICAgICAgICBtX2lzVmlzdWFsbHlOb25FbXB0eSA9IHRydWU7Ci0gICAgICAgIGFkZFBhaW50 UGVuZGluZ01pbGVzdG9uZXMoRGlkRmlyc3RNZWFuaW5nZnVsUGFpbnQpOwotICAgICAgICBpZiAo cmVxdWVzdGVkTWlsZXN0b25lcyAmIERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkKLSAg ICAgICAgICAgIG1pbGVzdG9uZXNBY2hpZXZlZC5hZGQoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0KTsKKyAgICBpZiAobV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVJ c1BlbmRpbmcpIHsKKyAgICAgICAgaWYgKCFtX2NvbnRlbnRRdWFsaWZpZXNBc1Zpc3VhbGx5Tm9u RW1wdHkgJiYgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkpIHsKKyAgICAgICAgICAgIG1f Y29udGVudFF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSA9IHRydWU7CisgICAgICAgICAgICBt X2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dE1pbGVzdG9uZUlzUGVuZGluZyA9IGZhbHNlOwor CisgICAgICAgICAgICBhZGRQYWludFBlbmRpbmdNaWxlc3RvbmVzKERpZEZpcnN0TWVhbmluZ2Z1 bFBhaW50KTsKKyAgICAgICAgICAgIGlmIChyZXF1ZXN0ZWRNaWxlc3RvbmVzICYgRGlkRmlyc3RW aXN1YWxseU5vbkVtcHR5TGF5b3V0KQorICAgICAgICAgICAgICAgIG1pbGVzdG9uZXNBY2hpZXZl ZC5hZGQoRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KTsKKyAgICAgICAgfQogICAgIH0K IAogICAgIGlmICghbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0ICYmIHF1YWxpZmll c0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5k ZXggN2YyYzY0ZGYzODBkZjg3Y2JmMjk5Njg5ZTUwZjY3MjIzYzg5MjgzZC4uNzg1M2Y2NmY2YTc2 MTM3NDY3NmQxMzllZWI1ZGE1ZjZkMzFiMTVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBA IC0zOTYsNyArMzk2LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBpbmNyZW1lbnRWaXN1YWxseU5v bkVtcHR5Q2hhcmFjdGVyQ291bnQoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCBpbmNyZW1lbnRW aXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudChjb25zdCBJbnRTaXplJik7Ci0gICAgYm9vbCBpc1Zp c3VhbGx5Tm9uRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzVmlzdWFsbHlOb25FbXB0eTsgfQor ICAgIGJvb2wgaXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50UXVh bGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5OyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBxdWFs aWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgZW5hYmxlQXV0b1NpemVNb2RlKGJvb2wgZW5hYmxlLCBjb25zdCBJbnRTaXplJiBtaW5TaXpl KTsKQEAgLTkyMCw3ICs5MjAsOCBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2lzUGFpbnRpbmcg eyBmYWxzZSB9OwogCi0gICAgYm9vbCBtX2lzVmlzdWFsbHlOb25FbXB0eSB7IGZhbHNlIH07Cisg ICAgYm9vbCBtX2NvbnRlbnRRdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkgeyBmYWxzZSB9Owor ICAgIGJvb2wgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRNaWxlc3RvbmVJc1BlbmRpbmcg eyB0cnVlIH07CiAKICAgICBib29sIG1fcmVuZGVyZWRTaWduaWZpY2FudEFtb3VudE9mVGV4dCB7 IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1JlYWNoZWRTaWduaWZpY2FudFJlbmRlcmVkVGV4dFRo cmVzaG9sZCB7IGZhbHNlIH07Cg==