226055 2021-05-20 16:55:56 -0700 [iOS] contextmenu hints don't follow scrolling inside `<iframe>` 2021-05-27 17:40:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224204 InRadar P2 Normal --- 1 hi hi hi simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1762218 0 hi 2021-05-20 16:55:56 -0700 . 1762222 1 429244 hi 2021-05-20 17:02:33 -0700 Created attachment 429244 Patch 1762277 2 429244 simon.fraser 2021-05-20 19:59:29 -0700 Comment on attachment 429244 Patch I'd love for us to have a generic solution to this problem that we can use for all the things that need to move with nested scrollers, like the caret, the callout bar, selection etc. 1762706 3 hi 2021-05-21 18:24:28 -0700 (In reply to Simon Fraser (smfr) from comment #2) > I'd love for us to have a generic solution to this problem that we can use for all the things that need to move with nested scrollers, like the caret, the callout bar, selection etc. While I agree that a general solution would be nice, I'm not sure there is a good way to do it as each of the things you mentioned seems to have a different structure. If you had something in mind I'd love to chat about it :) We're able to do this for contextmenu hints because we create and own the container `UIView` and can therefore manipulate it. Also, unlike the things you mentioned, contextmenus prevent other forms of interaction while they're presented, so this is only really necessary if the user is able to scroll while the contextmenu hint dismisses (which is possible, but requires quick reactions). 1764444 4 429244 thorton 2021-05-27 11:56:00 -0700 Comment on attachment 429244 Patch You should sell it as "a step on the path to the generic solution" instead :) For example, we totally do vend the view that UIKit installs the selection highlights into, so you could imagine reusing this mechanism for those (in reality I think it's possible they expect it to have the same coordinate space as WKContentView, would require some digging to see if it's directly reusable). 1764586 5 webkit-bug-importer 2021-05-27 16:56:18 -0700 <rdar://problem/78594637> 1764590 6 hi 2021-05-27 17:10:04 -0700 (In reply to Tim Horton from comment #4) > Comment on attachment 429244 [details] > Patch > > You should sell it as "a step on the path to the generic solution" instead :) Oh sure! I'm all for generic solutions :) > For example, we totally do vend the view that UIKit installs the selection highlights into, so you could imagine reusing this mechanism for those (in reality I think it's possible they expect it to have the same coordinate space as WKContentView, would require some digging to see if it's directly reusable). We do??!? For my own knowledge, can you point me to where we vend the view to UIKit? 1764606 7 ews-feeder 2021-05-27 17:40:42 -0700 Committed r278183 (238226@main): <https://commits.webkit.org/238226@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429244. 429244 2021-05-20 17:02:33 -0700 2021-05-27 17:40:43 -0700 Patch bug-226055-20210520180232.patch text/plain 12299 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNjgzNjMwNDYxZDEwMTg3M2FhYmQ1YzlkOWIwNDk3M2RjODdhZDdiOC4uYjc0 NmUwMTgwMWIyODAzNmQyYmRlMWJmZTZiOWU0ODM0ZmJiMzM2OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzMyBAQAorMjAyMS0wNS0yMCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgW2lPU10gY29udGV4dG1lbnUgaGludHMgZG9uJ3QgZm9sbG93IHNjcm9sbGluZyBp bnNpZGUgYDxpZnJhbWU+YAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI2MDU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAg ICAoLVtXS0NvbnRlbnRWaWV3IF9kaWRTY3JvbGxdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfcmVtb3ZlQ29udGFpbmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3NdKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBfdXBkYXRlRnJhbWVPZkNvbnRhaW5lckZvckNvbnRleHRNZW51SGlu dFByZXZpZXdzSWZOZWVkZWRdKTogQWRkZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3Vw ZGF0ZVRhcmdldGVkUHJldmlld1Njcm9sbFZpZXdVc2luZ0NvbnRhaW5lclNjcm9sbGluZ05vZGVJ RDpdKTogQWRkZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2NyZWF0ZVRhcmdldGVkQ29u dGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVtZW50XSk6IEFkZGVkLgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF9jcmVhdGVUYXJnZXRlZENvbnRleHRNZW51SGludFByZXZpZXdJZlBv c3NpYmxlXSk6IEFkZGVkLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IG92ZXJyaWRlUG9zaXRp b25UcmFja2luZ1ZpZXdGb3JUYXJnZXRlZFByZXZpZXdJZk5lY2Vzc2FyeTpjb250YWluZXJTY3Jv bGxpbmdOb2RlSUQ6XSk6IERlbGV0ZWQuCisgICAgICAgIFNhdmUgdGhlIGBVSVNjcm9sbFZpZXdg IGNvbnRhaW5pbmcgdGhlIHRhcmdldCBvZiB0aGUgY29udGV4dG1lbnUuICBXaGVuZXZlciBhbnkg dmlldyBpcworICAgICAgICBzY3JvbGxlZCwgYWRqdXN0IHRoZSBgZnJhbWVgIG9mIHRoZSBgX2Nv bnRleHRNZW51SGludENvbnRhaW5lclZpZXdgIHNvIHRoYXQgdGhlIGNvbnRleHRtZW51CisgICAg ICAgIGhpbnQgbW92ZXMgYnkgdGhlIGFtb3VudCBvZiBzY3JvbGxpbmcgdGhhdCdzIGhhcHBlbmVk IHNpbmNlIHRoZSBjb250ZXh0bWVudSBoaW50IHdhcyBzaG93bi4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJ T1MubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6 OnNjcm9sbFZpZXdGb3JTY3JvbGxpbmdOb2RlSUQgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1v dGVJT1MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpT Y3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlSU9TOjpzY3JvbGxWaWV3IGNvbnN0 KTogQWRkZWQuCisgICAgICAgIGBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3Rl SU9TYCBhbHNvIGhhcyBhIGNvcnJlc3BvbmRpbmcgYFVJU2Nyb2xsVmlld2AuCisKKyAgICAgICAg KiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAgIFJlbW92ZSBkZWNsYXJhdGlv biBmb3Igbm8tbG9uZ2VyLXVzZWQgU1BJLgorCiAyMDIxLTA1LTIwICBHZW9mZnJleSBHYXJlbiAg PGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgR3JhcGhpY3NMYXllcjo6c2V0TmFtZSgpIGNh dXNlcyBoZWFwIGZyYWdtZW50YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZv cm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJ S2l0U1BJLmgKaW5kZXggMWZiMmU5ZDU4ZTIwNjEzZGU3YWIxOTljYTI0MzI5YTkzYjA2ZDg3Ny4u MWFmODI5ZGQwMjVhMzgxOTJlYzg3MmViZGQ2NGY2M2ZkNjc2NmZhYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYktp dC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAgLTEyMjgsOSArMTIyOCw2IEBAIHR5cGVk ZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBfVUlDb250ZXh0TWVudUxheW91dCkgewogQGVuZAogCiAj aWYgVVNFKFVJQ09OVEVYVE1FTlUpCi1AaW50ZXJmYWNlIFVJVGFyZ2V0ZWRQcmV2aWV3ICgpCi1A cHJvcGVydHkgKG5vbmF0b21pYywgc3Ryb25nLCBzZXR0ZXI9X3NldE92ZXJyaWRlUG9zaXRpb25U cmFja2luZ1ZpZXc6KSBVSVZpZXcgKm92ZXJyaWRlUG9zaXRpb25UcmFja2luZ1ZpZXc7Ci1AZW5k CiAKIEBpbnRlcmZhY2UgVUlDb250ZXh0TWVudUludGVyYWN0aW9uICgpCiBAcHJvcGVydHkgKG5v bmF0b21pYywgcmVhZG9ubHkpIFVJR2VzdHVyZVJlY29nbml6ZXIgKmdlc3R1cmVSZWNvZ25pemVy Rm9yRmFpbHVyZVJlbGF0aW9uc2hpcHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJ T1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90 ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJT1MubW0KaW5kZXggY2M0ZWFkNjU3M2VmMDAzZWVm OTBmNzAyMzM3MzExZDMwMzM4YTllNy4uMzdmOThmN2VmMDEzYzAwZDk5Mjg5NjhjOTAzZWY4NmRl YWM4M2QwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJU cmVlL2lvcy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlU2Nyb2xsaW5nQ29v cmRpbmF0b3JQcm94eUlPUy5tbQpAQCAtMzEsNiArMzEsNyBAQAogCiAjaW1wb3J0ICJSZW1vdGVM YXllclRyZWVIb3N0LmgiCiAjaW1wb3J0ICJSZW1vdGVMYXllclRyZWVOb2RlLmgiCisjaW1wb3J0 ICJTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlSU9TLmgiCiAjaW1wb3J0ICJT Y3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlSU9TLmgiCiAjaW1wb3J0ICJXZWJQYWdl UHJveHkuaCIKICNpbXBvcnQgPFVJS2l0L1VJVmlldy5oPgpAQCAtNTYsMTIgKzU3LDIyIEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogVUlTY3JvbGxWaWV3ICpSZW1vdGVTY3JvbGxpbmdDb29y ZGluYXRvclByb3h5OjpzY3JvbGxWaWV3Rm9yU2Nyb2xsaW5nTm9kZUlEKFNjcm9sbGluZ05vZGVJ RCBub2RlSUQpIGNvbnN0CiB7CiAgICAgYXV0byogdHJlZU5vZGUgPSBtX3Njcm9sbGluZ1RyZWUt Pm5vZGVGb3JJRChub2RlSUQpOwotICAgIGlmICghaXM8U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Ny b2xsaW5nTm9kZT4odHJlZU5vZGUpKQotICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgYXV0byog c2Nyb2xsaW5nTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05v ZGU+KHRyZWVOb2RlKTsKLSAgICAvLyBBbGwgU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5n Tm9kZXMgYXJlIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJT1Mgb24gaU9TLgot ICAgIHJldHVybiBzdGF0aWNfY2FzdDxTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2Rl SU9TKj4oc2Nyb2xsaW5nTm9kZSktPnNjcm9sbFZpZXcoKTsKKyAgICBpZiAoaXM8U2Nyb2xsaW5n VHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZT4odHJlZU5vZGUpKSB7CisgICAgICAgIGF1dG8qIG92 ZXJmbG93U2Nyb2xsaW5nTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9s bGluZ05vZGU+KHRyZWVOb2RlKTsKKworICAgICAgICAvLyBBbGwgU2Nyb2xsaW5nVHJlZU92ZXJm bG93U2Nyb2xsaW5nTm9kZXMgYXJlIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVJ T1Mgb24gaU9TLgorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U2Nyb2xsaW5nVHJlZU92ZXJm bG93U2Nyb2xsaW5nTm9kZUlPUyo+KG92ZXJmbG93U2Nyb2xsaW5nTm9kZSktPnNjcm9sbFZpZXco KTsKKyAgICB9CisKKyAgICBpZiAoaXM8U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZT4o dHJlZU5vZGUpKSB7CisgICAgICAgIGF1dG8qIGZyYW1lU2Nyb2xsaW5nTm9kZSA9IGRvd25jYXN0 PFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGU+KHRyZWVOb2RlKTsKKworICAgICAgICAv LyBBbGwgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZXMgYXJlIFNjcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGVSZW1vdGVJT1Mgb24gaU9TLgorICAgICAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUyo+KGZyYW1lU2Ny b2xsaW5nTm9kZSktPnNjcm9sbFZpZXcoKTsKKyAgICB9CisKKyAgICByZXR1cm4gbmlsOwogfQog CiB2b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVM YXllcnMoU2Nyb2xsaW5nU3RhdGVUcmVlJiBzdGF0ZVRyZWUsIGNvbnN0IFJlbW90ZUxheWVyVHJl ZUhvc3QmIGxheWVyVHJlZUhvc3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1v dGVJT1MuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUy5oCmluZGV4IDU1YzBhYTQ5OTJj MzgxMmM1M2UwMzUxNGJlZjlmZTM2YTliMDYxODUuLjA2NmM5NTljM2E3OGNlY2UzNmE3NWIwNzAz OGQwODAwNDU5NzE2NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUy5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUy5oCkBAIC0zOCw2ICszOCw4IEBAIHB1 YmxpYzoKICAgICBzdGF0aWMgUmVmPFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1v dGVJT1M+IGNyZWF0ZShXZWJDb3JlOjpTY3JvbGxpbmdUcmVlJiwgV2ViQ29yZTo6U2Nyb2xsaW5n Tm9kZVR5cGUsIFdlYkNvcmU6OlNjcm9sbGluZ05vZGVJRCk7CiAgICAgdmlydHVhbCB+U2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUygpOwogCisgICAgVUlTY3JvbGxWaWV3 ICpzY3JvbGxWaWV3KCkgY29uc3Q7CisKIHByaXZhdGU6CiAgICAgU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZVJlbW90ZUlPUyhXZWJDb3JlOjpTY3JvbGxpbmdUcmVlJiwgV2ViQ29yZTo6 U2Nyb2xsaW5nTm9kZVR5cGUsIFdlYkNvcmU6OlNjcm9sbGluZ05vZGVJRCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5n VHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJl bW90ZUlPUy5tbQppbmRleCBlNTUzYTk0MDRiMTI3ODE4OGQ2NmQ5YzZkZmJhYjExYTY1MGU2OGQ2 Li4wYTU3YWZhMmMwNmNkMDg2MWUwMGI4MmRlZmQxODlhZGUyZDU1ZjEwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGVSZW1vdGVJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVt b3RlSU9TLm1tCkBAIC01MSw2ICs1MSwxMSBAQCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdO b2RlUmVtb3RlSU9TOjp+U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZQogewog fQogCitVSVNjcm9sbFZpZXcgKlNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVJ T1M6OnNjcm9sbFZpZXcoKSBjb25zdAoreworICAgIHJldHVybiBtX3Njcm9sbGluZ05vZGVEZWxl Z2F0ZSA/IG1fc2Nyb2xsaW5nTm9kZURlbGVnYXRlLT5zY3JvbGxWaWV3KCkgOiBuaWw7Cit9CisK IHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUzo6Y29tbWl0U3Rh dGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZU5vZGUmIHN0YXRlTm9kZSkKIHsK ICAgICBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNo aWxkcmVuKHN0YXRlTm9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggMjFmNzg3ZDcyNGFmNmEyNjJkMGVl ZDA2Y2VhZmEyZDJlYzA1MjdjYS4uYzdlZWU1NjhjZDFlOTk5OTJmOThkY2RhNzYwNjhjYzkzZDg3 NTQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24uaApAQCAtMzA1LDYgKzMwNSw4IEBAIHVzaW5nIEltYWdlRXh0cmFj dGlvblJlcXVlc3RJZGVudGlmaWVyID0gT2JqZWN0SWRlbnRpZmllcjxJbWFnZUV4dHJhY3Rpb25S ZXF1ZXN0CiAgICAgUmV0YWluUHRyPF9VSUhpZ2hsaWdodFZpZXc+IF9oaWdobGlnaHRWaWV3Owog ICAgIFJldGFpblB0cjxVSVZpZXc+IF9pbnRlcmFjdGlvblZpZXdzQ29udGFpbmVyVmlldzsKICAg ICBSZXRhaW5QdHI8VUlWaWV3PiBfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldzsKKyAgICBX ZWFrT2JqQ1B0cjxVSVNjcm9sbFZpZXc+IF9zY3JvbGxWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3Owor ICAgIENHUG9pbnQgX3Njcm9sbFZpZXdGb3JUYXJnZXRlZFByZXZpZXdJbml0aWFsT2Zmc2V0Owog ICAgIFJldGFpblB0cjxVSVZpZXc+IF9kcmFnUHJldmlld0NvbnRhaW5lclZpZXc7CiAgICAgUmV0 YWluUHRyPFVJVmlldz4gX2Ryb3BQcmV2aWV3Q29udGFpbmVyVmlldzsKICAgICBSZXRhaW5QdHI8 TlNTdHJpbmc+IF9tYXJrZWRUZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggZDNlNzAxNGIzYjk0ZGRl ZDFhY2Y2MmU0ZGE4YjgxYzNlOTM4Y2RlYi4uZGQ4NjQ1NTFhNDY5YjdhYzRlNzZlZWUxNTNiZDk1 OGIxNWE4ZWMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0yMDYyLDYgKzIwNjIsOCBAQCAtICh2b2lk KV9jYW5jZWxUb3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIKIAogLSAodm9pZClfZGlkU2Nyb2xs CiB7CisgICAgW3NlbGYgX3VwZGF0ZUZyYW1lT2ZDb250YWluZXJGb3JDb250ZXh0TWVudUhpbnRQ cmV2aWV3c0lmTmVlZGVkXTsKKwogICAgIFtzZWxmIF9jYW5jZWxMb25nUHJlc3NHZXN0dXJlUmVj b2duaXplcl07CiAgICAgW3NlbGYgX2NhbmNlbEludGVyYWN0aW9uXTsKIH0KQEAgLTc3MTcsNiAr NzcxOSwzNyBAQCAtICh2b2lkKV9yZW1vdmVDb250YWluZXJGb3JDb250ZXh0TWVudUhpbnRQcmV2 aWV3cwogICAgICAgICByZXR1cm47CiAKICAgICBbc3RkOjpleGNoYW5nZShfY29udGV4dE1lbnVI aW50Q29udGFpbmVyVmlldywgbmlsKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKKworICAgIF9zY3Jv bGxWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3ID0gbmlsOworICAgIF9zY3JvbGxWaWV3Rm9yVGFyZ2V0 ZWRQcmV2aWV3SW5pdGlhbE9mZnNldCA9IENHUG9pbnRaZXJvOworfQorCistICh2b2lkKV91cGRh dGVGcmFtZU9mQ29udGFpbmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3NJZk5lZWRlZAorewor ICAgIGlmICghX2NvbnRleHRNZW51SGludENvbnRhaW5lclZpZXcpCisgICAgICAgIHJldHVybjsK KworICAgIENHUG9pbnQgbmV3T2Zmc2V0ID0gW19zY3JvbGxWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3 IGNvbnZlcnRQb2ludDpDR1BvaW50WmVybyB0b1ZpZXc6W19jb250ZXh0TWVudUhpbnRDb250YWlu ZXJWaWV3IHN1cGVydmlld11dOworCisgICAgQ0dSZWN0IGZyYW1lID0gW19jb250ZXh0TWVudUhp bnRDb250YWluZXJWaWV3IGZyYW1lXTsKKyAgICBmcmFtZS5vcmlnaW4ueCA9IG5ld09mZnNldC54 IC0gX3Njcm9sbFZpZXdGb3JUYXJnZXRlZFByZXZpZXdJbml0aWFsT2Zmc2V0Lng7CisgICAgZnJh bWUub3JpZ2luLnkgPSBuZXdPZmZzZXQueSAtIF9zY3JvbGxWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3 SW5pdGlhbE9mZnNldC55OworICAgIFtfY29udGV4dE1lbnVIaW50Q29udGFpbmVyVmlldyBzZXRG cmFtZTpmcmFtZV07Cit9CisKKy0gKHZvaWQpX3VwZGF0ZVRhcmdldGVkUHJldmlld1Njcm9sbFZp ZXdVc2luZ0NvbnRhaW5lclNjcm9sbGluZ05vZGVJRDooV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlE KXNjcm9sbGluZ05vZGVJRAoreworICAgIGlmIChzY3JvbGxpbmdOb2RlSUQpIHsKKyAgICAgICAg aWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gX3BhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5h dG9yUHJveHkoKSkgeworICAgICAgICAgICAgaWYgKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlld0Zv clNjcm9sbGluZ05vZGUgPSBzY3JvbGxpbmdDb29yZGluYXRvci0+c2Nyb2xsVmlld0ZvclNjcm9s bGluZ05vZGVJRChzY3JvbGxpbmdOb2RlSUQpKQorICAgICAgICAgICAgICAgIF9zY3JvbGxWaWV3 Rm9yVGFyZ2V0ZWRQcmV2aWV3ID0gc2Nyb2xsVmlld0ZvclNjcm9sbGluZ05vZGU7CisgICAgICAg IH0KKyAgICB9CisKKyAgICBpZiAoIV9zY3JvbGxWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3KQorICAg ICAgICBfc2Nyb2xsVmlld0ZvclRhcmdldGVkUHJldmlldyA9IHNlbGYud2ViVmlldy5zY3JvbGxW aWV3OworCisgICAgX3Njcm9sbFZpZXdGb3JUYXJnZXRlZFByZXZpZXdJbml0aWFsT2Zmc2V0ID0g W19zY3JvbGxWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3IGNvbnZlcnRQb2ludDpDR1BvaW50WmVybyB0 b1ZpZXc6W19jb250ZXh0TWVudUhpbnRDb250YWluZXJWaWV3IHN1cGVydmlld11dOwogfQogCiAj cHJhZ21hIG1hcmsgLSBXS0RlZmVycmluZ0dlc3R1cmVSZWNvZ25pemVyRGVsZWdhdGUKQEAgLTgz OTQsMTkgKzg0MjcsNiBAQCBzdGF0aWMgUmV0YWluUHRyPFVJVGFyZ2V0ZWRQcmV2aWV3PiBjcmVh dGVGYWxsYmFja1RhcmdldGVkUHJldmlldyhVSVZpZXcgKnJvb3RWaQogICAgIHJldHVybiBhZG9w dE5TKFtbVUlUYXJnZXRlZFByZXZpZXcgYWxsb2NdIGluaXRXaXRoVmlldzpzbmFwc2hvdFZpZXcg cGFyYW1ldGVyczpwYXJhbWV0ZXJzLmdldCgpIHRhcmdldDp0YXJnZXQuZ2V0KCldKTsKIH0KIAot LSAodm9pZClvdmVycmlkZVBvc2l0aW9uVHJhY2tpbmdWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3SWZO ZWNlc3Nhcnk6KFVJVGFyZ2V0ZWRQcmV2aWV3ICopdGFyZ2V0ZWRQcmV2aWV3IGNvbnRhaW5lclNj cm9sbGluZ05vZGVJRDooV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEKXNjcm9sbGluZ05vZGVJRAot ewotICAgIGlmICghc2Nyb2xsaW5nTm9kZUlEKQotICAgICAgICByZXR1cm47Ci0KLSAgICBVSVNj cm9sbFZpZXcgKnBvc2l0aW9uVHJhY2tpbmdWaWV3ID0gc2VsZi53ZWJWaWV3LnNjcm9sbFZpZXc7 Ci0gICAgaWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gX3BhZ2UtPnNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHkoKSkKLSAgICAgICAgcG9zaXRpb25UcmFja2luZ1ZpZXcgPSBzY3JvbGxp bmdDb29yZGluYXRvci0+c2Nyb2xsVmlld0ZvclNjcm9sbGluZ05vZGVJRChzY3JvbGxpbmdOb2Rl SUQpOwotCi0gICAgaWYgKFt0YXJnZXRlZFByZXZpZXcgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihfc2V0T3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmlldzopXSkKLSAgICAgICAgW3Rhcmdl dGVkUHJldmlldyBfc2V0T3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmlldzpwb3NpdGlvblRyYWNr aW5nVmlld107Ci19Ci0KIC0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopX2NyZWF0ZVRhcmdldGVkQ29u dGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVtZW50CiB7CiAgICAgYXV0byBiYWNrZ3Jv dW5kQ29sb3IgPSBbJl0oKSAtPiBVSUNvbG9yICogewpAQCAtODQyMyw3ICs4NDQzLDcgQEAgLSAo VUlUYXJnZXRlZFByZXZpZXcgKilfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3 Rm9yRm9jdXNlZEVsZW1lbnQKIAogICAgIGF1dG8gdGFyZ2V0ZWRQcmV2aWV3ID0gY3JlYXRlRmFs bGJhY2tUYXJnZXRlZFByZXZpZXcoc2VsZiwgc2VsZi5jb250YWluZXJGb3JDb250ZXh0TWVudUhp bnRQcmV2aWV3cywgX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaW50ZXJhY3Rpb25SZWN0LCBi YWNrZ3JvdW5kQ29sb3IpOwogCi0gICAgW3NlbGYgb3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmll d0ZvclRhcmdldGVkUHJldmlld0lmTmVjZXNzYXJ5OnRhcmdldGVkUHJldmlldy5nZXQoKSBjb250 YWluZXJTY3JvbGxpbmdOb2RlSUQ6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY29udGFpbmVy U2Nyb2xsaW5nTm9kZUlEXTsKKyAgICBbc2VsZiBfdXBkYXRlVGFyZ2V0ZWRQcmV2aWV3U2Nyb2xs Vmlld1VzaW5nQ29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEOl9mb2N1c2VkRWxlbWVudEluZm9ybWF0 aW9uLmNvbnRhaW5lclNjcm9sbGluZ05vZGVJRF07CiAKICAgICBfY29udGV4dE1lbnVJbnRlcmFj dGlvblRhcmdldGVkUHJldmlldyA9IFdURk1vdmUodGFyZ2V0ZWRQcmV2aWV3KTsKICAgICByZXR1 cm4gX2NvbnRleHRNZW51SW50ZXJhY3Rpb25UYXJnZXRlZFByZXZpZXcuZ2V0KCk7CkBAIC04NDQ2 LDcgKzg0NjYsNyBAQCAtIChVSVRhcmdldGVkUHJldmlldyAqKV9jcmVhdGVUYXJnZXRlZENvbnRl eHRNZW51SGludFByZXZpZXdJZlBvc3NpYmxlCiAgICAgaWYgKCF0YXJnZXRlZFByZXZpZXcpCiAg ICAgICAgIHRhcmdldGVkUHJldmlldyA9IGNyZWF0ZUZhbGxiYWNrVGFyZ2V0ZWRQcmV2aWV3KHNl bGYsIHNlbGYuY29udGFpbmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3MsIF9wb3NpdGlvbklu Zm9ybWF0aW9uLmJvdW5kcywgbmlsKTsKIAotICAgIFtzZWxmIG92ZXJyaWRlUG9zaXRpb25UcmFj a2luZ1ZpZXdGb3JUYXJnZXRlZFByZXZpZXdJZk5lY2Vzc2FyeTp0YXJnZXRlZFByZXZpZXcuZ2V0 KCkgY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEOl9wb3NpdGlvbkluZm9ybWF0aW9uLmNvbnRhaW5l clNjcm9sbGluZ05vZGVJRF07CisgICAgW3NlbGYgX3VwZGF0ZVRhcmdldGVkUHJldmlld1Njcm9s bFZpZXdVc2luZ0NvbnRhaW5lclNjcm9sbGluZ05vZGVJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5j b250YWluZXJTY3JvbGxpbmdOb2RlSURdOwogCiAgICAgX2NvbnRleHRNZW51SW50ZXJhY3Rpb25U YXJnZXRlZFByZXZpZXcgPSBXVEZNb3ZlKHRhcmdldGVkUHJldmlldyk7CiAgICAgcmV0dXJuIF9j b250ZXh0TWVudUludGVyYWN0aW9uVGFyZ2V0ZWRQcmV2aWV3LmdldCgpOwo=