201619 2019-09-09 16:40:32 -0700 Clarify some macCatalyst feature flags 2019-09-09 18:01:53 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin benjamin cdumez cmarcelo commit-queue dbates ews-watchlist megan_gardner timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1569344 0 thorton 2019-09-09 16:40:32 -0700 Clarify some macCatalyst feature flags 1569345 1 378416 thorton 2019-09-09 16:40:55 -0700 Created attachment 378416 Patch 1569346 2 thorton 2019-09-09 16:40:57 -0700 <rdar://problem/54615618> 1569350 3 378416 megan_gardner 2019-09-09 16:45:49 -0700 Comment on attachment 378416 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378416&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7530 > Why split this? Seems like you could just not have either the above or the below line and it work the same. 1569351 4 378416 thorton 2019-09-09 16:47:10 -0700 Comment on attachment 378416 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378416&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7530 >> > > Why split this? Seems like you could just not have either the above or the below line and it work the same. Nah, you just can't see what's happening because of the diff :) This is a few thousand lines below the previous hunk. Hit "show all" 1569354 5 378416 megan_gardner 2019-09-09 16:49:22 -0700 Comment on attachment 378416 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378416&action=review >>> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7530 >>> >> >> Why split this? Seems like you could just not have either the above or the below line and it work the same. > > Nah, you just can't see what's happening because of the diff :) This is a few thousand lines below the previous hunk. Hit "show all" I see it now, I retract my statement. 1569369 6 378416 commit-queue 2019-09-09 18:01:52 -0700 Comment on attachment 378416 Patch Clearing flags on attachment: 378416 Committed r249681: <https://trac.webkit.org/changeset/249681> 1569370 7 commit-queue 2019-09-09 18:01:53 -0700 All reviewed patches have been landed. Closing bug. 378416 2019-09-09 16:40:55 -0700 2019-09-09 18:01:52 -0700 Patch bug-201619-20190909164054.patch text/plain 8904 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDhjZTI0ZmQ0ZGNjZTlmYTllOGU5YTYz NDY4MzI0NDNlM2Y2NjkwNTAuLmQ2OGVlMWMxZDJjYzAxMzdjM2U0YTA5NTBlOTU3OTM4OTYxNzFm MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDktMDkgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xhcmlmeSBzb21lIG1hY0NhdGFseXN0IGZl YXR1cmUgZmxhZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMTYxOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTQ2MTU2MTg+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoK KyAgICAgICAgV2UgcHJlZmVyIHNwZWNpZmljIGZsYWdzIG92ZXIgcGxhdGZvcm0gY2hlY2tzLgor CiAyMDE5LTA5LTA3ICBEYXZpZCBRdWVzYWRhICA8ZGF2aWRfcXVlc2FkYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTihyMjQ4NTMzKTogVW5hYmxlIHRvIHVzZSBXVEY6OlJlZkNvdW50 ZWQgd2hlbiBidWlsZGluZyBpbiBhIGRlYnVnIGNvbmZpZ3VyYXRpb24gYWdhaW5zdCBhIG5vbi1k ZWJ1ZyBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMjZiZWE3OThjZjQ5ZWM2YTM1OWQ1YTlhOTI3ZDRmOTE4 ZWFmNjc3NS4uZWY2ZDM5YzBlMmRlYzMyNjlkNWFhY2I0NjVlMGU2MDg5M2JjZDc3MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOS0wOS0wOSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9y dG9uQGFwcGxlLmNvbT4KKworICAgICAgICBDbGFyaWZ5IHNvbWUgbWFjQ2F0YWx5c3QgZmVhdHVy ZSBmbGFncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjAxNjE5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDYxNTYxOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgc2V0dXBJbnRlcmFj dGlvbl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGNsZWFudXBJbnRlcmFjdGlvbl0pOgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9yZW1vdmVEZWZhdWx0R2VzdHVyZVJlY29nbml6ZXJz XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2FkZERlZmF1bHRHZXN0dXJlUmVjb2duaXpl cnNdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRS ZWNvZ25pemVTaW11bHRhbmVvdXNseVdpdGhHZXN0dXJlUmVjb2duaXplcjpdKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBfc2hvd1NoYXJlU2hlZXQ6aW5SZWN0OmNvbXBsZXRpb25IYW5kbGVy Ol0pOgorICAgICAgICBXZSBwcmVmZXIgc3BlY2lmaWMgZmxhZ3Mgb3ZlciBwbGF0Zm9ybSBjaGVj a3MuCisKIDIwMTktMDktMDkgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFttYWNPU10gUGlkIGlzIHNvbWV0aW1lcyBpbnZhbGlkIHdoZW4gY3JlYXRpbmcg c2FuZGJveCBleHRlbnNpb25zIGJ5IHBpZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1Bs YXRmb3JtLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCmluZGV4IDIzZTFjZDFkOWIxYzc2 OTJhNTg1NTcwYjFkMzhiY2I5YmYyNjNlNGYuLmE1MWYzN2M4ODI2NTg5M2I5OWI0ZTlmZjFmOTVi MzBkNjFlNTVjZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKKysrIGIv U291cmNlL1dURi93dGYvUGxhdGZvcm0uaApAQCAtMTU1NSw2ICsxNTU1LDcgQEAKIAogI2lmIFBM QVRGT1JNKE1BQ0NBVEFMWVNUKQogI2RlZmluZSBFTkFCTEVfUExBVEZPUk1fRFJJVkVOX1RFWFRf Q0hFQ0tJTkcgMQorI2RlZmluZSBIQVZFX0hPVkVSX0dFU1RVUkVfUkVDT0dOSVpFUiAxCiAjZW5k aWYKIAogI2lmIChQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxNTAwKSB8fCAoUExBVEZPUk0oSU9TKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMzAwMDApIHx8IFBMQVRGT1JNKFdBVENIT1MpIHx8IFBMQVRGT1JNKEFQ UExFVFYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggOTQ2NjE4NjkxYjRjZGQ5ZjhlNzU2YWM4YjczOTg5ZDcx YTNhZDhlMy4uODA3MGQzZDE0YWRhNjlmYTg0OTVlMGFhN2VkZmUyYzcwZGFiMmRhOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24uaApAQCAtMjI4LDggKzIyOCwxMSBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEg ewogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUNDQVRBTFlTVCkKLSAgICBSZXRhaW5QdHI8VUlI b3Zlckdlc3R1cmVSZWNvZ25pemVyPiBfaG92ZXJHZXN0dXJlUmVjb2duaXplcjsKICAgICBSZXRh aW5QdHI8X1VJTG9va3VwR2VzdHVyZVJlY29nbml6ZXI+IF9sb29rdXBHZXN0dXJlUmVjb2duaXpl cjsKKyNlbmRpZgorCisjaWYgSEFWRShIT1ZFUl9HRVNUVVJFX1JFQ09HTklaRVIpCisgICAgUmV0 YWluUHRyPFVJSG92ZXJHZXN0dXJlUmVjb2duaXplcj4gX2hvdmVyR2VzdHVyZVJlY29nbml6ZXI7 CiAgICAgQ0dQb2ludCBfbGFzdEhvdmVyTG9jYXRpb247CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K aW5kZXggZDRlOGRkODZjMzIzZTdiZGYyZTQ1ZjQ4NzMzMDA5M2YwNzRhMGQ0MC4uYTQzZWE2M2Q5 ZTNjYjUxMDc0ZjM3NGQ2YjYwNGUyMGI1ZTRiNmVmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMjgs OSArMTI4LDEyIEBACiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQorI2ltcG9y dCA8VUlLaXQvX1VJTG9va3VwR2VzdHVyZVJlY29nbml6ZXIuaD4KKyNlbmRpZgorCisjaWYgSEFW RShIT1ZFUl9HRVNUVVJFX1JFQ09HTklaRVIpCiAjaW1wb3J0ICJOYXRpdmVXZWJNb3VzZUV2ZW50 LmgiCiAjaW1wb3J0IDxVSUtpdC9VSUhvdmVyR2VzdHVyZVJlY29nbml6ZXIuaD4KLSNpbXBvcnQg PFVJS2l0L19VSUxvb2t1cEdlc3R1cmVSZWNvZ25pemVyLmg+CiAjZW5kaWYKIAogI2lmIEVOQUJM RShJTlBVVF9UWVBFX0NPTE9SKQpAQCAtNzE3LDExICs3MjAsMTMgQEAgLSAodm9pZClzZXR1cElu dGVyYWN0aW9uCiAgICAgW190b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsZWdhdGU6 c2VsZl07CiAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6X3RvdWNoRXZlbnRHZXN0dXJl UmVjb2duaXplci5nZXQoKV07CiAKLSNpZiBQTEFURk9STShNQUNDQVRBTFlTVCkKKyNpZiBIQVZF KEhPVkVSX0dFU1RVUkVfUkVDT0dOSVpFUikKICAgICBfaG92ZXJHZXN0dXJlUmVjb2duaXplciA9 IGFkb3B0TlMoW1tVSUhvdmVyR2VzdHVyZVJlY29nbml6ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0 OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihfaG92ZXJHZXN0dXJlUmVjb2duaXplckNoYW5nZWQ6KV0p OwogICAgIFtfaG92ZXJHZXN0dXJlUmVjb2duaXplciBzZXREZWxlZ2F0ZTpzZWxmXTsKICAgICBb c2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpfaG92ZXJHZXN0dXJlUmVjb2duaXplci5nZXQoKV07 Ci0gICAgCisjZW5kaWYKKworI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKSAgICAKICAgICBfbG9v a3VwR2VzdHVyZVJlY29nbml6ZXIgPSBhZG9wdE5TKFtbX1VJTG9va3VwR2VzdHVyZVJlY29nbml6 ZXIgYWxsb2NdIGluaXRXaXRoVGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihfbG9va3VwR2Vz dHVyZVJlY29nbml6ZWQ6KV0pOwogICAgIFtfbG9va3VwR2VzdHVyZVJlY29nbml6ZXIgc2V0RGVs ZWdhdGU6c2VsZl07CiAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6X2xvb2t1cEdlc3R1 cmVSZWNvZ25pemVyLmdldCgpXTsKQEAgLTg2NywxMCArODcyLDEyIEBAIC0gKHZvaWQpY2xlYW51 cEludGVyYWN0aW9uCiAgICAgW190b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsZWdh dGU6bmlsXTsKICAgICBbc2VsZiByZW1vdmVHZXN0dXJlUmVjb2duaXplcjpfdG91Y2hFdmVudEdl c3R1cmVSZWNvZ25pemVyLmdldCgpXTsKIAotI2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQorI2lm IEhBVkUoSE9WRVJfR0VTVFVSRV9SRUNPR05JWkVSKQogICAgIFtfaG92ZXJHZXN0dXJlUmVjb2du aXplciBzZXREZWxlZ2F0ZTpuaWxdOwogICAgIFtzZWxmIHJlbW92ZUdlc3R1cmVSZWNvZ25pemVy Ol9ob3Zlckdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKLSAgICAKKyNlbmRpZgorCisjaWYgUExB VEZPUk0oTUFDQ0FUQUxZU1QpICAgIAogICAgIFtfbG9va3VwR2VzdHVyZVJlY29nbml6ZXIgc2V0 RGVsZWdhdGU6bmlsXTsKICAgICBbc2VsZiByZW1vdmVHZXN0dXJlUmVjb2duaXplcjpfbG9va3Vw R2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOwogI2VuZGlmCkBAIC05NzgsOCArOTg1LDEwIEBAIC0g KHZvaWQpX3JlbW92ZURlZmF1bHRHZXN0dXJlUmVjb2duaXplcnMKICAgICBbc2VsZiByZW1vdmVH ZXN0dXJlUmVjb2duaXplcjpfdHdvRmluZ2VyRG91YmxlVGFwR2VzdHVyZVJlY29nbml6ZXIuZ2V0 KCldOwogICAgIFtzZWxmIHJlbW92ZUdlc3R1cmVSZWNvZ25pemVyOl90d29GaW5nZXJTaW5nbGVU YXBHZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAgICAgW3NlbGYgcmVtb3ZlR2VzdHVyZVJlY29n bml6ZXI6X3N0eWx1c1NpbmdsZVRhcEdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKLSNpZiBQTEFU Rk9STShNQUNDQVRBTFlTVCkKKyNpZiBIQVZFKEhPVkVSX0dFU1RVUkVfUkVDT0dOSVpFUikKICAg ICBbc2VsZiByZW1vdmVHZXN0dXJlUmVjb2duaXplcjpfaG92ZXJHZXN0dXJlUmVjb2duaXplci5n ZXQoKV07CisjZW5kaWYKKyNpZiBQTEFURk9STShNQUNDQVRBTFlTVCkKICAgICBbc2VsZiByZW1v dmVHZXN0dXJlUmVjb2duaXplcjpfbG9va3VwR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOwogI2Vu ZGlmCiAjaWYgRU5BQkxFKFBPSU5URVJfRVZFTlRTKQpAQCAtOTk4LDggKzEwMDcsMTAgQEAgLSAo dm9pZClfYWRkRGVmYXVsdEdlc3R1cmVSZWNvZ25pemVycwogICAgIFtzZWxmIGFkZEdlc3R1cmVS ZWNvZ25pemVyOl90d29GaW5nZXJEb3VibGVUYXBHZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAg ICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6X3R3b0ZpbmdlclNpbmdsZVRhcEdlc3R1cmVS ZWNvZ25pemVyLmdldCgpXTsKICAgICBbc2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpfc3R5bHVz U2luZ2xlVGFwR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOwotI2lmIFBMQVRGT1JNKE1BQ0NBVEFM WVNUKQorI2lmIEhBVkUoSE9WRVJfR0VTVFVSRV9SRUNPR05JWkVSKQogICAgIFtzZWxmIGFkZEdl c3R1cmVSZWNvZ25pemVyOl9ob3Zlckdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKKyNlbmRpZgor I2lmIFBMQVRGT1JNKE1BQ0NBVEFMWVNUKQogICAgIFtzZWxmIGFkZEdlc3R1cmVSZWNvZ25pemVy Ol9sb29rdXBHZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAjZW5kaWYKICNpZiBFTkFCTEUoUE9J TlRFUl9FVkVOVFMpCkBAIC0xODgxLDYgKzE4OTIsMTEgQEAgLSAoQk9PTClnZXN0dXJlUmVjb2du aXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyIHNob3VsZFJlY29n bmkKICAgICBpZiAoaXNTYW1lUGFpcihnZXN0dXJlUmVjb2duaXplciwgb3RoZXJHZXN0dXJlUmVj b2duaXplciwgX2hpZ2hsaWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyLmdldCgpLCBfbG9u Z1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCkpKQogICAgICAgICByZXR1cm4gWUVTOwogCisj aWYgSEFWRShIT1ZFUl9HRVNUVVJFX1JFQ09HTklaRVIpCisgICAgaWYgKFtnZXN0dXJlUmVjb2du aXplciBpc0tpbmRPZkNsYXNzOltVSUhvdmVyR2VzdHVyZVJlY29nbml6ZXIgY2xhc3NdXSB8fCBb b3RoZXJHZXN0dXJlUmVjb2duaXplciBpc0tpbmRPZkNsYXNzOltVSUhvdmVyR2VzdHVyZVJlY29n bml6ZXIgY2xhc3NdXSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgorCiAjaWYgX19JUEhP TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTIwMDAwCiAjaWYgUExBVEZPUk0oTUFDQ0FU QUxZU1QpCiAgICAgaWYgKGlzU2FtZVBhaXIoZ2VzdHVyZVJlY29nbml6ZXIsIG90aGVyR2VzdHVy ZVJlY29nbml6ZXIsIF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50LmdldCgpLmxvdXBlR2VzdHVyZSwg X3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCkuZm9yY2VQcmVzc0dlc3R1cmUpKQpAQCAtMTg4 OSwxMiArMTkwNSw4IEBAIC0gKEJPT0wpZ2VzdHVyZVJlY29nbml6ZXI6KFVJR2VzdHVyZVJlY29n bml6ZXIgKilnZXN0dXJlUmVjb2duaXplciBzaG91bGRSZWNvZ25pCiAgICAgaWYgKGlzU2FtZVBh aXIoZ2VzdHVyZVJlY29nbml6ZXIsIG90aGVyR2VzdHVyZVJlY29nbml6ZXIsIF9zaW5nbGVUYXBH ZXN0dXJlUmVjb2duaXplci5nZXQoKSwgX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCkubG91 cGVHZXN0dXJlKSkKICAgICAgICAgcmV0dXJuIFlFUzsKIAotICAgIGlmIChbZ2VzdHVyZVJlY29n bml6ZXIgaXNLaW5kT2ZDbGFzczpbVUlIb3Zlckdlc3R1cmVSZWNvZ25pemVyIGNsYXNzXV0gfHwg W290aGVyR2VzdHVyZVJlY29nbml6ZXIgaXNLaW5kT2ZDbGFzczpbVUlIb3Zlckdlc3R1cmVSZWNv Z25pemVyIGNsYXNzXV0pCi0gICAgICAgIHJldHVybiBZRVM7Ci0gICAgCiAgICAgaWYgKChbZ2Vz dHVyZVJlY29nbml6ZXIgaXNLaW5kT2ZDbGFzczpbX1VJTG9va3VwR2VzdHVyZVJlY29nbml6ZXIg Y2xhc3NdXSAmJiBbb3RoZXJHZXN0dXJlUmVjb2duaXplciBpc0tpbmRPZkNsYXNzOltVSUxvbmdQ cmVzc0dlc3R1cmVSZWNvZ25pemVyIGNsYXNzXV0pIHx8IChbb3RoZXJHZXN0dXJlUmVjb2duaXpl ciBpc0tpbmRPZkNsYXNzOltVSUxvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyIGNsYXNzXV0gJiYg W2dlc3R1cmVSZWNvZ25pemVyIGlzS2luZE9mQ2xhc3M6W19VSUxvb2t1cEdlc3R1cmVSZWNvZ25p emVyIGNsYXNzXV0pKQogICAgICAgICByZXR1cm4gWUVTOwotCiAjZW5kaWYKICAgICBpZiAoaXNT YW1lUGFpcihnZXN0dXJlUmVjb2duaXplciwgb3RoZXJHZXN0dXJlUmVjb2duaXplciwgX2hpZ2hs aWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyLmdldCgpLCBfdGV4dFNlbGVjdGlvbkFzc2lz dGFudC5nZXQoKS5mb3JjZVByZXNzR2VzdHVyZSkpCiAgICAgICAgIHJldHVybiBZRVM7CkBAIC02 MjI2LDcgKzYyMzgsNyBAQCAtICh2b2lkKV9zaG93U2hhcmVTaGVldDooY29uc3QgV2ViQ29yZTo6 U2hhcmVEYXRhV2l0aFBhcnNlZFVSTCYpZGF0YSBpblJlY3Q6KFdURgogICAgIF9zaGFyZVNoZWV0 ID0gYWRvcHROUyhbW1dLU2hhcmVTaGVldCBhbGxvY10gaW5pdFdpdGhWaWV3Ol93ZWJWaWV3XSk7 CiAgICAgW19zaGFyZVNoZWV0IHNldERlbGVnYXRlOnNlbGZdOwogCi0jaWYgUExBVEZPUk0oTUFD Q0FUQUxZU1QpCisjaWYgSEFWRShIT1ZFUl9HRVNUVVJFX1JFQ09HTklaRVIpCiAgICAgaWYgKCFy ZWN0KSB7CiAgICAgICAgIGF1dG8gaG92ZXJMb2NhdGlvbkluV2ViVmlldyA9IFtzZWxmIGNvbnZl cnRQb2ludDpfbGFzdEhvdmVyTG9jYXRpb24gdG9WaWV3Ol93ZWJWaWV3XTsKICAgICAgICAgcmVj dCA9IFdlYkNvcmU6OkZsb2F0UmVjdChob3ZlckxvY2F0aW9uSW5XZWJWaWV3LngsIGhvdmVyTG9j YXRpb25JbldlYlZpZXcueSwgMSwgMSk7CkBAIC03NTE0LDcgKzc1MjYsOSBAQCAtICh2b2lkKV9s b29rdXBHZXN0dXJlUmVjb2duaXplZDooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNv Z25pemVyCiAgICAgTlNQb2ludCBsb2NhdGlvbkluVmlld0Nvb3JkaW5hdGVzID0gW2dlc3R1cmVS ZWNvZ25pemVyIGxvY2F0aW9uSW5WaWV3OnNlbGZdOwogICAgIF9wYWdlLT5wZXJmb3JtRGljdGlv bmFyeUxvb2t1cEF0TG9jYXRpb24oV2ViQ29yZTo6RmxvYXRQb2ludChsb2NhdGlvbkluVmlld0Nv b3JkaW5hdGVzKSk7CiB9CisjZW5kaWYKIAorI2lmIEhBVkUoSE9WRVJfR0VTVFVSRV9SRUNPR05J WkVSKQogc3RhdGljIFdlYkV2ZW50RmxhZ3Mgd2ViRXZlbnRGbGFnc0ZvclVJS2V5TW9kaWZpZXJG bGFncyhVSUtleU1vZGlmaWVyRmxhZ3MgZmxhZ3MpCiB7CiAgICAgV2ViRXZlbnRGbGFncyBldmVu dEZsYWdzID0gMDsK