235303 2022-01-17 14:48:31 -0800 [GTK] Implement native form validation bubbles for GTK4 2022-01-18 15:58:03 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 167579 1 changseok changseok alex aperez bugs-noreply cgarcia oldest_to_newest 1831574 0 changseok 2022-01-17 14:48:31 -0800 This is a follow-up ticket for bug 234629. We enable native validation bubbles for gtk4. 1831609 1 449362 changseok 2022-01-17 19:52:07 -0800 Created attachment 449362 Patch 1831625 2 449362 cgarcia 2022-01-18 00:25:35 -0800 Comment on attachment 449362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449362&action=review > Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp:68 > +#if USE(GTK4) > + gtk_label_set_wrap(GTK_LABEL(label), TRUE); > +#else > gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); > +#endif Include <WebCore/GtkVersioning.h> and just use gtk_label_set_line_wrap() without ifdefs. 1831626 3 449362 aperez 2022-01-18 00:28:29 -0800 Comment on attachment 449362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449362&action=review > Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp:83 > + gtk_popover_set_position(GTK_POPOVER(m_popover), GTK_POS_TOP); Is it needed to move the “gtk_popover_set_position()“ call? Also, maybe it would be possible to move the call after the “#endif” given that it is the same for both GTK3 and GTK4. 1831834 4 449426 changseok 2022-01-18 14:42:00 -0800 Created attachment 449426 Patch 1831841 5 449362 changseok 2022-01-18 14:50:06 -0800 Comment on attachment 449362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449362&action=review Thanks for your review. >> Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp:68 >> +#endif > > Include <WebCore/GtkVersioning.h> and just use gtk_label_set_line_wrap() without ifdefs. I was not aware of this abstraction. Good to know. Thanks. >> Source/WebCore/platform/gtk/ValidationBubbleGtk.cpp:83 >> + gtk_popover_set_position(GTK_POPOVER(m_popover), GTK_POS_TOP); > > Is it needed to move the “gtk_popover_set_position()“ call? Also, maybe it would be > possible to move the call after the “#endif” given that it is the same for both GTK3 > and GTK4. I was concerned about flickering possibly caused by the gtk_popover_set_position call after attaching the popover to parents. But it seems fine. I have moved this line below #endif. 1831849 6 449426 aperez 2022-01-18 15:19:20 -0800 Comment on attachment 449426 Patch Patch LGTM now, thanks for the update! 1831872 7 ews-feeder 2022-01-18 15:57:57 -0800 Committed r288156 (246150@main): <https://commits.webkit.org/246150@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449426. 449362 2022-01-17 19:52:07 -0800 2022-01-18 00:25:35 -0800 Patch bug-235303-20220117225206.patch text/plain 5757 changseok U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE3MjViOWI0NmY1NGYw MWMyNTBjNGU1NzUyNzVhYzA5MmRkMjUyOS4uNTkwMjc2MmJhMmJjYzgxNDg1MjM3ZmRlOWRiODVh YzQ1NmJhOGEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTAxLTE3ICBDaGFu Z1Nlb2sgT2ggIDxjaGFuZ3Nlb2tAd2Via2l0Lm9yZz4KKworICAgICAgICBbR1RLXSBJbXBsZW1l bnQgbmF0aXZlIGZvcm0gdmFsaWRhdGlvbiBidWJibGVzIGZvciBHVEs0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUzMDMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZ3RrIHBvcnQgdXNpbmcgZ3Rr MyBzdXBwb3J0cyBhIG5hdGl2ZSB2YWxpZGF0aW9uIGJ1YmJsZSBmb3IgdGhlIGZvcm0gdmFsaWRh dGlvbgorICAgICAgICBzaW5jZSByMjg4MTA0LiBUaGlzIGNoYW5nZSBicmluZ3MgdGhlIHNhbWUg c3VwcG9ydCBmb3IgZ3RrNC4KKyAgICAgICAgVGhlIHNhbWUgZmVhdHVyZXMgb2YgVmFsaWRhdGlv bkJ1YmJsZSBhcmUgaW1wbGVtZW50ZWQgdXNpbmcgZ3RrNCBBUEkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIHNpbmNlIGV4aXN0aW5nIHRlc3RzIGNvdmVyIHRoaXMgY2hhbmdlLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3RrL1ZhbGlkYXRpb25CdWJibGVHdGsuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VmFsaWRhdGlvbkJ1YmJsZTo6VmFsaWRhdGlvbkJ1YmJsZSk6CisgICAgICAgIChXZWJDb3Jl OjpWYWxpZGF0aW9uQnViYmxlOjppbnZhbGlkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlZhbGlk YXRpb25CdWJibGU6OnNob3dSZWxhdGl2ZVRvKToKKwogMjAyMi0wMS0xNyAgQ2hhbmdTZW9rIE9o ICA8Y2hhbmdzZW9rQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0dUS10gSW1wbGVtZW50IGZvcm0g dmFsaWRhdGlvbiB3aXRoIGd0azMgd2lkZ2V0cyBpbiB0aGUgVUkgcHJvY2VzcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRl eCA3OTM1NWI5Mzk1NmUwMzQ1NGMxNjZjYTVjZDNjZjkzM2EyMTVhYjI1Li45MzEyZTRiZGIwZmQ2 MmFiNTQ5NjUyNTBiNjRjNzg1MWIyOTgwYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDIyLTAxLTE3ICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2tAd2Via2l0Lm9yZz4KKworICAgICAg ICBbR1RLXSBJbXBsZW1lbnQgbmF0aXZlIGZvcm0gdmFsaWRhdGlvbiBidWJibGVzIGZvciBHVEs0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUzMDMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZ3Rr IHBvcnQgdXNpbmcgZ3RrMyBzdXBwb3J0cyBhIG5hdGl2ZSB2YWxpZGF0aW9uIGJ1YmJsZSBmb3Ig dGhlIGZvcm0gdmFsaWRhdGlvbgorICAgICAgICBzaW5jZSByMjg4MTA0LiBUaGlzIGNoYW5nZSBi cmluZ3MgdGhlIHNhbWUgc3VwcG9ydCBmb3IgZ3RrNC4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcDogRW5hYmxlIHBhZ2VDb25maWd1cmF0aW9uLnZhbGlkYXRpb25N ZXNzYWdlQ2xpZW50CisgICAgICAgICAgZm9yIGFsbCBndGsgYmFja2VuZHMKKyAgICAgICAgKFdl YktpdDo6bV9hcHBIaWdobGlnaHRzVmlzaWJsZSk6CisKIDIwMjItMDEtMTcgIENoYW5nU2VvayBP aCAgPGNoYW5nc2Vva0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtHVEtdIEltcGxlbWVudCBmb3Jt IHZhbGlkYXRpb24gd2l0aCBndGszIHdpZGdldHMgaW4gdGhlIFVJIHByb2Nlc3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9WYWxpZGF0aW9uQnViYmxlR3RrLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9WYWxpZGF0aW9uQnViYmxlR3RrLmNwcAppbmRl eCA0NmY5ZmEwNTliMzc5MDVkNmExNGY4MDBjYzIyODc3OTc4ZjdkZWYwLi5mYTQxNDU3MWU4MTU5 ZWMwZTU2M2JmNjA2Y2E5ZjI0MjZkNmM0NTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvVmFsaWRhdGlvbkJ1YmJsZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1ZhbGlkYXRpb25CdWJibGVHdGsuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAj aWYgUExBVEZPUk0oR1RLKQogCiAjaW5jbHVkZSA8Z2xpYi5oPgorI2luY2x1ZGUgPGd0ay9ndGsu aD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HVW5pcXVlUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKQEAgLTQ1LDcgKzQ2LDYgQEAgVmFsaWRhdGlvbkJ1YmJsZTo6VmFsaWRh dGlvbkJ1YmJsZShHdGtXaWRnZXQqIHdlYlZpZXcsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY28K ICAgICAsIG1fZm9udFNpemUoc3RkOjptYXgoc2V0dGluZ3MubWluaW11bUZvbnRTaXplLCBtaW5G b250U2l6ZSkpCiAgICAgLCBtX3Nob3VsZE5vdGlmeUZvY3VzRXZlbnRzQ2FsbGJhY2soV1RGTW92 ZShjYWxsYmFjaykpCiB7Ci0jaWYgIVVTRShHVEs0KQogICAgIEd0a1dpZGdldCogbGFiZWwgPSBn dGtfbGFiZWxfbmV3KG51bGxwdHIpOwogCiAgICAgLy8gaHR0cHM6Ly9kb2NzLmd0ay5vcmcvUGFu Z28vcGFuZ29fbWFya3VwLmh0bWwKQEAgLTYxLDIyICs2MSwzNCBAQCBWYWxpZGF0aW9uQnViYmxl OjpWYWxpZGF0aW9uQnViYmxlKEd0a1dpZGdldCogd2ViVmlldywgY29uc3QgU3RyaW5nJiBtZXNz YWdlLCBjbwogICAgIGd0a193aWRnZXRfc2V0X21hcmdpbl9lbmQobGFiZWwsIGhvcml6b250YWxN YXJnaW4pOwogCiAgICAgZ3RrX2xhYmVsX3NldF9lbGxpcHNpemUoR1RLX0xBQkVMKGxhYmVsKSwg UEFOR09fRUxMSVBTSVpFX0VORCk7CisjaWYgVVNFKEdUSzQpCisgICAgZ3RrX2xhYmVsX3NldF93 cmFwKEdUS19MQUJFTChsYWJlbCksIFRSVUUpOworI2Vsc2UKICAgICBndGtfbGFiZWxfc2V0X2xp bmVfd3JhcChHVEtfTEFCRUwobGFiZWwpLCBUUlVFKTsKKyNlbmRpZgogICAgIGd0a19sYWJlbF9z ZXRfbGluZXMoR1RLX0xBQkVMKGxhYmVsKSwgNCk7CiAgICAgZ3RrX2xhYmVsX3NldF9tYXhfd2lk dGhfY2hhcnMoR1RLX0xBQkVMKGxhYmVsKSwgbWF4TGFiZWxXaWR0aENoYXJzKTsKIAorI2lmIFVT RShHVEs0KQorICAgIG1fcG9wb3ZlciA9IGd0a19wb3BvdmVyX25ldygpOworICAgIGd0a19wb3Bv dmVyX3NldF9hdXRvaGlkZShHVEtfUE9QT1ZFUihtX3BvcG92ZXIpLCBGQUxTRSk7CisgICAgZ3Rr X3BvcG92ZXJfc2V0X3Bvc2l0aW9uKEdUS19QT1BPVkVSKG1fcG9wb3ZlciksIEdUS19QT1NfVE9Q KTsKKyAgICBndGtfcG9wb3Zlcl9zZXRfY2hpbGQoR1RLX1BPUE9WRVIobV9wb3BvdmVyKSwgbGFi ZWwpOworCisgICAgZ3RrX3dpZGdldF9zZXRfcGFyZW50KG1fcG9wb3Zlciwgd2ViVmlldyk7Cisj ZWxzZQogICAgIG1fcG9wb3ZlciA9IGd0a19wb3BvdmVyX25ldyh3ZWJWaWV3KTsKICAgICBndGtf cG9wb3Zlcl9zZXRfbW9kYWwoR1RLX1BPUE9WRVIobV9wb3BvdmVyKSwgRkFMU0UpOwotICAgIGd0 a19wb3BvdmVyX3NldF9wb3NpdGlvbihHVEtfUE9QT1ZFUihtX3BvcG92ZXIpLCBHVEtfUE9TX1RP UCk7CiAgICAgZ3RrX3BvcG92ZXJfc2V0X2NvbnN0cmFpbl90byhHVEtfUE9QT1ZFUihtX3BvcG92 ZXIpLCBHVEtfUE9QT1ZFUl9DT05TVFJBSU5UX05PTkUpOworICAgIGd0a19wb3BvdmVyX3NldF9w b3NpdGlvbihHVEtfUE9QT1ZFUihtX3BvcG92ZXIpLCBHVEtfUE9TX1RPUCk7CiAKICAgICBndGtf Y29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKG1fcG9wb3ZlciksIGxhYmVsKTsKICAgICBndGtf d2lkZ2V0X3Nob3cobGFiZWwpOworI2VuZGlmCiAKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBw ZWQobV9wb3BvdmVyLCAiY2xvc2VkIiwgR19DQUxMQkFDSygrW10oVmFsaWRhdGlvbkJ1YmJsZSog dmFsaWRhdGlvbkJ1YmJsZSkgewogICAgICAgICB2YWxpZGF0aW9uQnViYmxlLT5pbnZhbGlkYXRl KCk7CiAgICAgfSksIHRoaXMpOwotI2VuZGlmCiB9CiAKIFZhbGlkYXRpb25CdWJibGU6On5WYWxp ZGF0aW9uQnViYmxlKCkKQEAgLTg2LDI5ICs5OCwyOSBAQCBWYWxpZGF0aW9uQnViYmxlOjp+VmFs aWRhdGlvbkJ1YmJsZSgpCiAKIHZvaWQgVmFsaWRhdGlvbkJ1YmJsZTo6aW52YWxpZGF0ZSgpCiB7 Ci0jaWYgIVVTRShHVEs0KQogICAgIGlmICghbV9wb3BvdmVyKQogICAgICAgICByZXR1cm47CiAK ICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2RhdGEobV9wb3BvdmVyLCB0aGlz KTsKIAorI2lmIFVTRShHVEs0KQorICAgIGdfY2xlYXJfcG9pbnRlcigmbV9wb3BvdmVyLCBndGtf d2lkZ2V0X3VucGFyZW50KTsKKyNlbHNlCiAgICAgZ3RrX3dpZGdldF9kZXN0cm95KG1fcG9wb3Zl cik7CiAgICAgbV9wb3BvdmVyID0gbnVsbHB0cjsKKyNlbmRpZgogCiAgICAgbV9zaG91bGROb3Rp ZnlGb2N1c0V2ZW50c0NhbGxiYWNrKG1fdmlldywgdHJ1ZSk7Ci0jZW5kaWYKIH0KIAogdm9pZCBW YWxpZGF0aW9uQnViYmxlOjpzaG93UmVsYXRpdmVUbyhjb25zdCBJbnRSZWN0JiBhbmNob3JSZWN0 KQogewotI2lmICFVU0UoR1RLNCkKICAgICBtX3Nob3VsZE5vdGlmeUZvY3VzRXZlbnRzQ2FsbGJh Y2sobV92aWV3LCBmYWxzZSk7CiAKICAgICBHZGtSZWN0YW5nbGUgcmVjdChhbmNob3JSZWN0KTsK ICAgICBndGtfcG9wb3Zlcl9zZXRfcG9pbnRpbmdfdG8oR1RLX1BPUE9WRVIobV9wb3BvdmVyKSwg JnJlY3QpOwogCiAgICAgZ3RrX3BvcG92ZXJfcG9wdXAoR1RLX1BPUE9WRVIobV9wb3BvdmVyKSk7 Ci0jZW5kaWYKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAzN2Y4ZDVlOWZlYTlmYWRlZTI5YmVk YmNkNDg4MjFjMzUzYTRiYTkyLi42YTBlYzhmNTI2YjdmZWUwN2ZmZmRlNWMzM2QxZTdhOWVlNDZk ODlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApA QCAtNjA5LDcgKzYwOSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlE LCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICBwYWdlQ29uZmln dXJhdGlvbi5zcGVlY2hTeW50aGVzaXNDbGllbnQgPSBtYWtlVW5pcXVlPFdlYlNwZWVjaFN5bnRo ZXNpc0NsaWVudD4oKnRoaXMpOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShDT0NPQSkgfHwgKFBM QVRGT1JNKEdUSykgJiYgIVVTRShHVEs0KSkKKyNpZiBQTEFURk9STShDT0NPQSkgfHwgUExBVEZP Uk0oR1RLKQogICAgIHBhZ2VDb25maWd1cmF0aW9uLnZhbGlkYXRpb25NZXNzYWdlQ2xpZW50ID0g bWFrZVVuaXF1ZTxXZWJWYWxpZGF0aW9uTWVzc2FnZUNsaWVudD4oKnRoaXMpOwogI2VuZGlmCiAK 449426 2022-01-18 14:42:00 -0800 2022-01-18 15:58:01 -0800 Patch bug-235303-20220118174159.patch text/plain 5446 changseok U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE3MjViOWI0NmY1NGYw MWMyNTBjNGU1NzUyNzVhYzA5MmRkMjUyOS4uOGE4YzAwYjUxYWU3MmIxZjJlZmU5MjkwNzViOTIw MjBiMTQwYzM2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIyLTAxLTE4ICBDaGFu Z1Nlb2sgT2ggIDxjaGFuZ3Nlb2tAd2Via2l0Lm9yZz4KKworICAgICAgICBbR1RLXSBJbXBsZW1l bnQgbmF0aXZlIGZvcm0gdmFsaWRhdGlvbiBidWJibGVzIGZvciBHVEs0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUzMDMKKworICAgICAgICBSZXZp ZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAgICBUaGUgZ3RrIHBvcnQgdXNp bmcgZ3RrMyBzdXBwb3J0cyBhIG5hdGl2ZSB2YWxpZGF0aW9uIGJ1YmJsZSBmb3IgdGhlIGZvcm0g dmFsaWRhdGlvbgorICAgICAgICBzaW5jZSByMjg4MTA0LiBUaGlzIGNoYW5nZSBicmluZ3MgdGhl IHNhbWUgc3VwcG9ydCBmb3IgZ3RrNC4KKyAgICAgICAgVGhlIHNhbWUgZmVhdHVyZXMgb2YgVmFs aWRhdGlvbkJ1YmJsZSBhcmUgaW1wbGVtZW50ZWQgdXNpbmcgZ3RrNCBBUEkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIHNpbmNlIGV4aXN0aW5nIHRlc3RzIGNvdmVyIHRoaXMgY2hhbmdlLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL1ZhbGlkYXRpb25CdWJibGVHdGsuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VmFsaWRhdGlvbkJ1YmJsZTo6VmFsaWRhdGlvbkJ1YmJsZSk6CisgICAgICAgIChX ZWJDb3JlOjpWYWxpZGF0aW9uQnViYmxlOjppbnZhbGlkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6 OlZhbGlkYXRpb25CdWJibGU6OnNob3dSZWxhdGl2ZVRvKToKKwogMjAyMi0wMS0xNyAgQ2hhbmdT ZW9rIE9oICA8Y2hhbmdzZW9rQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0dUS10gSW1wbGVtZW50 IGZvcm0gdmFsaWRhdGlvbiB3aXRoIGd0azMgd2lkZ2V0cyBpbiB0aGUgVUkgcHJvY2VzcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwppbmRleCA3OTM1NWI5Mzk1NmUwMzQ1NGMxNjZjYTVjZDNjZjkzM2EyMTVhYjI1Li5iNTI1NzY3 NDZmOTg1NzFjMDAyNzhhZDBmMDFkMWRiOGNmOWNmMDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIyLTAxLTE4ICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2tAd2Via2l0Lm9yZz4KKwor ICAgICAgICBbR1RLXSBJbXBsZW1lbnQgbmF0aXZlIGZvcm0gdmFsaWRhdGlvbiBidWJibGVzIGZv ciBHVEs0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzUzMDMKKworICAgICAgICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAg ICAgICBUaGUgZ3RrIHBvcnQgdXNpbmcgZ3RrMyBzdXBwb3J0cyBhIG5hdGl2ZSB2YWxpZGF0aW9u IGJ1YmJsZSBmb3IgdGhlIGZvcm0gdmFsaWRhdGlvbgorICAgICAgICBzaW5jZSByMjg4MTA0LiBU aGlzIGNoYW5nZSBicmluZ3MgdGhlIHNhbWUgc3VwcG9ydCBmb3IgZ3RrNC4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDogRW5hYmxlIHBhZ2VDb25maWd1cmF0aW9u LnZhbGlkYXRpb25NZXNzYWdlQ2xpZW50CisgICAgICAgICAgZm9yIGFsbCBndGsgYmFja2VuZHMK KyAgICAgICAgKFdlYktpdDo6bV9hcHBIaWdobGlnaHRzVmlzaWJsZSk6CisKIDIwMjItMDEtMTcg IENoYW5nU2VvayBPaCAgPGNoYW5nc2Vva0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtHVEtdIElt cGxlbWVudCBmb3JtIHZhbGlkYXRpb24gd2l0aCBndGszIHdpZGdldHMgaW4gdGhlIFVJIHByb2Nl c3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9WYWxpZGF0aW9uQnVi YmxlR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9WYWxpZGF0aW9uQnViYmxl R3RrLmNwcAppbmRleCA0NmY5ZmEwNTliMzc5MDVkNmExNGY4MDBjYzIyODc3OTc4ZjdkZWYwLi5m MjAwYTRhZGViNTQ0OGUxZjU1YWIzZDQ1OGI0YzZmZWZkZTg1Zjk4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvVmFsaWRhdGlvbkJ1YmJsZUd0ay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1ZhbGlkYXRpb25CdWJibGVHdGsuY3BwCkBAIC0yOCw2 ICsyOCw3IEBACiAKICNpZiBQTEFURk9STShHVEspCiAKKyNpbmNsdWRlICJHdGtWZXJzaW9uaW5n LmgiCiAjaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4K ICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTQ1LDcgKzQ2LDYgQEAgVmFsaWRh dGlvbkJ1YmJsZTo6VmFsaWRhdGlvbkJ1YmJsZShHdGtXaWRnZXQqIHdlYlZpZXcsIGNvbnN0IFN0 cmluZyYgbWVzc2FnZSwgY28KICAgICAsIG1fZm9udFNpemUoc3RkOjptYXgoc2V0dGluZ3MubWlu aW11bUZvbnRTaXplLCBtaW5Gb250U2l6ZSkpCiAgICAgLCBtX3Nob3VsZE5vdGlmeUZvY3VzRXZl bnRzQ2FsbGJhY2soV1RGTW92ZShjYWxsYmFjaykpCiB7Ci0jaWYgIVVTRShHVEs0KQogICAgIEd0 a1dpZGdldCogbGFiZWwgPSBndGtfbGFiZWxfbmV3KG51bGxwdHIpOwogCiAgICAgLy8gaHR0cHM6 Ly9kb2NzLmd0ay5vcmcvUGFuZ28vcGFuZ29fbWFya3VwLmh0bWwKQEAgLTY1LDE4ICs2NSwyNSBA QCBWYWxpZGF0aW9uQnViYmxlOjpWYWxpZGF0aW9uQnViYmxlKEd0a1dpZGdldCogd2ViVmlldywg Y29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjbwogICAgIGd0a19sYWJlbF9zZXRfbGluZXMoR1RLX0xB QkVMKGxhYmVsKSwgNCk7CiAgICAgZ3RrX2xhYmVsX3NldF9tYXhfd2lkdGhfY2hhcnMoR1RLX0xB QkVMKGxhYmVsKSwgbWF4TGFiZWxXaWR0aENoYXJzKTsKIAorI2lmIFVTRShHVEs0KQorICAgIG1f cG9wb3ZlciA9IGd0a19wb3BvdmVyX25ldygpOworICAgIGd0a19wb3BvdmVyX3NldF9hdXRvaGlk ZShHVEtfUE9QT1ZFUihtX3BvcG92ZXIpLCBGQUxTRSk7CisgICAgZ3RrX3BvcG92ZXJfc2V0X2No aWxkKEdUS19QT1BPVkVSKG1fcG9wb3ZlciksIGxhYmVsKTsKKworICAgIGd0a193aWRnZXRfc2V0 X3BhcmVudChtX3BvcG92ZXIsIHdlYlZpZXcpOworI2Vsc2UKICAgICBtX3BvcG92ZXIgPSBndGtf cG9wb3Zlcl9uZXcod2ViVmlldyk7CiAgICAgZ3RrX3BvcG92ZXJfc2V0X21vZGFsKEdUS19QT1BP VkVSKG1fcG9wb3ZlciksIEZBTFNFKTsKLSAgICBndGtfcG9wb3Zlcl9zZXRfcG9zaXRpb24oR1RL X1BPUE9WRVIobV9wb3BvdmVyKSwgR1RLX1BPU19UT1ApOwogICAgIGd0a19wb3BvdmVyX3NldF9j b25zdHJhaW5fdG8oR1RLX1BPUE9WRVIobV9wb3BvdmVyKSwgR1RLX1BPUE9WRVJfQ09OU1RSQUlO VF9OT05FKTsKIAogICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIobV9wb3BvdmVy KSwgbGFiZWwpOwogICAgIGd0a193aWRnZXRfc2hvdyhsYWJlbCk7CisjZW5kaWYKKyAgICBndGtf cG9wb3Zlcl9zZXRfcG9zaXRpb24oR1RLX1BPUE9WRVIobV9wb3BvdmVyKSwgR1RLX1BPU19UT1Ap OwogCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fcG9wb3ZlciwgImNsb3NlZCIsIEdf Q0FMTEJBQ0soK1tdKFZhbGlkYXRpb25CdWJibGUqIHZhbGlkYXRpb25CdWJibGUpIHsKICAgICAg ICAgdmFsaWRhdGlvbkJ1YmJsZS0+aW52YWxpZGF0ZSgpOwogICAgIH0pLCB0aGlzKTsKLSNlbmRp ZgogfQogCiBWYWxpZGF0aW9uQnViYmxlOjp+VmFsaWRhdGlvbkJ1YmJsZSgpCkBAIC04NiwyOSAr OTMsMjkgQEAgVmFsaWRhdGlvbkJ1YmJsZTo6flZhbGlkYXRpb25CdWJibGUoKQogCiB2b2lkIFZh bGlkYXRpb25CdWJibGU6OmludmFsaWRhdGUoKQogewotI2lmICFVU0UoR1RLNCkKICAgICBpZiAo IW1fcG9wb3ZlcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlz Y29ubmVjdF9ieV9kYXRhKG1fcG9wb3ZlciwgdGhpcyk7CiAKKyNpZiBVU0UoR1RLNCkKKyAgICBn X2NsZWFyX3BvaW50ZXIoJm1fcG9wb3ZlciwgZ3RrX3dpZGdldF91bnBhcmVudCk7CisjZWxzZQog ICAgIGd0a193aWRnZXRfZGVzdHJveShtX3BvcG92ZXIpOwogICAgIG1fcG9wb3ZlciA9IG51bGxw dHI7CisjZW5kaWYKIAogICAgIG1fc2hvdWxkTm90aWZ5Rm9jdXNFdmVudHNDYWxsYmFjayhtX3Zp ZXcsIHRydWUpOwotI2VuZGlmCiB9CiAKIHZvaWQgVmFsaWRhdGlvbkJ1YmJsZTo6c2hvd1JlbGF0 aXZlVG8oY29uc3QgSW50UmVjdCYgYW5jaG9yUmVjdCkKIHsKLSNpZiAhVVNFKEdUSzQpCiAgICAg bV9zaG91bGROb3RpZnlGb2N1c0V2ZW50c0NhbGxiYWNrKG1fdmlldywgZmFsc2UpOwogCiAgICAg R2RrUmVjdGFuZ2xlIHJlY3QoYW5jaG9yUmVjdCk7CiAgICAgZ3RrX3BvcG92ZXJfc2V0X3BvaW50 aW5nX3RvKEdUS19QT1BPVkVSKG1fcG9wb3ZlciksICZyZWN0KTsKIAogICAgIGd0a19wb3BvdmVy X3BvcHVwKEdUS19QT1BPVkVSKG1fcG9wb3ZlcikpOwotI2VuZGlmCiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKaW5kZXggMzdmOGQ1ZTlmZWE5ZmFkZWUyOWJlZGJjZDQ4ODIxYzM1M2E0YmE5Mi4uNmEwZWM4 ZjUyNmI3ZmVlMDdmZmZkZTVjMzNkMWU3YTllZTQ2ZDg5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTYwOSw3ICs2MDksNyBAQCBXZWJQYWdl OjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cyYmIHBhcmFtZXRlcnMpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uc3BlZWNoU3ludGhlc2lzQ2xp ZW50ID0gbWFrZVVuaXF1ZTxXZWJTcGVlY2hTeW50aGVzaXNDbGllbnQ+KCp0aGlzKTsKICNlbmRp ZgogCi0jaWYgUExBVEZPUk0oQ09DT0EpIHx8IChQTEFURk9STShHVEspICYmICFVU0UoR1RLNCkp CisjaWYgUExBVEZPUk0oQ09DT0EpIHx8IFBMQVRGT1JNKEdUSykKICAgICBwYWdlQ29uZmlndXJh dGlvbi52YWxpZGF0aW9uTWVzc2FnZUNsaWVudCA9IG1ha2VVbmlxdWU8V2ViVmFsaWRhdGlvbk1l c3NhZ2VDbGllbnQ+KCp0aGlzKTsKICNlbmRpZgogCg==