229885 2021-09-03 12:31:12 -0700 [macCatalyst] Support photo picker and camera actions for file inputs 2021-09-03 13:35:39 -0700 1 1 1 Unclassified WebKit Forms Other Unspecified Unspecified NEW InRadar P2 Normal --- 1 akeerthi akeerthi cdumez hi megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1790288 0 akeerthi 2021-09-03 12:31:12 -0700 iOS supports three actions for media-accepting file inputs: 1. Choose Photo or Video 2. Take Photo or Video 3. Choose File macCatalyst currently only supports (3) – we should add support for (1) and (2). 1790294 1 437298 akeerthi 2021-09-03 12:40:22 -0700 Created attachment 437298 Patch 1790298 2 akeerthi 2021-09-03 12:44:21 -0700 rdar://49961589 1790314 3 437304 akeerthi 2021-09-03 13:00:13 -0700 Created attachment 437304 Patch 1790322 4 437304 thorton 2021-09-03 13:08:23 -0700 Comment on attachment 437304 Patch It seems slightly odd to me that we would make macCatalyst WebKit and macOS WebKit do different things when you click a file input, but I don't know if that means "macOS WebKit should get an image picker" or "macCatalyst WebKit should just go straight to NSOpenPanel". Regardless, that should be an explicit decision instead of a random ifdef about missing API, so I guess this is a change in a good /direction/. 1790336 5 437306 akeerthi 2021-09-03 13:34:43 -0700 Created attachment 437306 Patch for landing 1790337 6 akeerthi 2021-09-03 13:35:39 -0700 (In reply to Tim Horton from comment #4) > Comment on attachment 437304 [details] > Patch > > It seems slightly odd to me that we would make macCatalyst WebKit and macOS > WebKit do different things when you click a file input, but I don't know if > that means "macOS WebKit should get an image picker" or "macCatalyst WebKit > should just go straight to NSOpenPanel". Regardless, that should be an > explicit decision instead of a random ifdef about missing API, so I guess > this is a change in a good /direction/. Thanks for the review! I will discuss with more Catalyst folks prior to landing. 437298 2021-09-03 12:40:22 -0700 2021-09-03 13:00:11 -0700 Patch bug-229885-20210903154021.patch text/plain 4161 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1ZWRiYzQxMDAxOTM3NWU3 NThjNGRlZDkzMTQxNmFlM2ExMGVhOWYuLmU4ZmRjNTcxZWYzNGFmZmZlOTMxYmJlZDMzOWIwYWM0 N2UyNDQwODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDktMDMgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNDYXRhbHlzdF0gU3Vw cG9ydCBwaG90byBwaWNrZXIgYW5kIGNhbWVyYSBhY3Rpb25zIGZvciBmaWxlIGlucHV0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5ODg1CisgICAg ICAgIHJkYXI6Ly80OTk2MTU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE9uIGlPUywgbWVkaWEtYWNjZXB0aW5nIGZpbGUgaW5wdXRzIHN1cHBvcnQg dHdvIGFkZGl0aW9uYWwgYWN0aW9uczoKKyAgICAgICAgIkNob29zZSBQaG90byBvciBWaWRlbyIg YW5kICJUYWtlIFBob3RvIG9yIFZpZGVvIi4gVGhlIGZvcm1lciBwcmVzZW50cworICAgICAgICBh IHBpY2tlciB0aGF0IGxldHMgdXNlcnMgdXBsb2FkIHBob3Rvcy92aWRlb3MgZnJvbSB0aGVpciBQ aG90byBMaWJyYXJ5LAorICAgICAgICB3aGlsZSB0aGUgbGF0dGVyIGxldHMgdXNlcnMgY2FwdHVy ZSBhbmQgdXBsb2FkIHBob3RvL3ZpZGVvLgorCisgICAgICAgIFRoZXNlIGFjdGlvbnMgd2VyZSB1 bnN1cHBvcnRlZCBvbiBtYWNDYXRhbHlzdCBkdWUgdG8gaXNzdWVzIHdpdGggVUlLaXQKKyAgICAg ICAgY29udGV4dCBtZW51cyBhbmQgVUlJbWFnZVBpY2tlckNvbnRyb2xsZXIuIE5vdyB0aGF0IHRo ZSBpc3N1ZXMgaGF2ZQorICAgICAgICBiZWVuIHJlc29sdmVkLCB0aGUgYWN0aW9ucyBjYW4gYmUg c3VwcG9ydGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQ YW5lbC5tbToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgY29udGV4dE1lbnVJbnRlcmFj dGlvbjp3aWxsRW5kRm9yQ29uZmlndXJhdGlvbjphbmltYXRvcjpdKToKKworICAgICAgICBtYWND YXRhbHlzdCBkb2VzIG5vdCBhbmltYXRlIHRoZSBkaXNtaXNzYWwgb2YgY29udGV4dCBtZW51cy4g SGVuY2UsIHRoZQorICAgICAgICBhbmltYXRvciBpcyBuaWwuIEhvd2V2ZXIsIHdlIG5lZWQgdG8g ZW5zdXJlIHRoZSBjb21wbGV0aW9uIGJsb2NrIGlzCisgICAgICAgIGNhbGxlZCB3aGVuIHRoZSBt ZW51IGlzIGRpc21pc3NlZCwgdG8gZW5zdXJlIHRoZSBvYmplY3QgaXMgbGVmdCBpbiBhCisgICAg ICAgIGNvbnNpc3RlbnQgc3RhdGUuCisKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgc2hv d0RvY3VtZW50UGlja2VyTWVudV0pOgorCisgICAgICAgIFByZXNlbnQgdGhlIGNvbnRleHQgbWVu dSBhZnRlciBnZXR0aW5nIGEgcG9zaXRpb24gaW5mb3JtYXRpb24gdXBkYXRlLgorICAgICAgICBU aGUgZWxlbWVudCByZWN0IGlzIG5lY2Vzc2FyeSB0byBwcmVzZW50IHRoZSBtZW51IGF0IHRoZSBy aWdodCBsb2NhdGlvbi4KKwogMjAyMS0wOS0wMiAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBh cHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gU2ltcGxpZnkgZGF0ZSBwaWNrZXIgbG9naWMgZm9y IGRhdGV0aW1lLWxvY2FsIGlucHV0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCmluZGV4IGYxY2U2N2ZlMzEyYjg1OThl MGY4N2ZmZWQ1N2Y4YmE3Y2RhM2Y3ZjMuLjNkZjE0OGNmNzI0Y2NiZTk2ZjIzMWFhZmVlOGE2NWI4 ZjZkYmYyOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0ZpbGVVcGxvYWRQYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9y bXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KQEAgLTQ4NiwxMSArNDg2LDE2IEBAIHN0YXRpYyBOU1Nl dDxOU1N0cmluZyAqPiAqVVRJc0Zvck1JTUVUeXBlcyhOU0FycmF5ICptaW1lVHlwZXMpCiAKIC0g KHZvaWQpY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICop aW50ZXJhY3Rpb24gd2lsbEVuZEZvckNvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1 cmF0aW9uICopY29uZmlndXJhdGlvbiBhbmltYXRvcjooaWQ8VUlDb250ZXh0TWVudUludGVyYWN0 aW9uQW5pbWF0aW5nPilhbmltYXRvcgogewotICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOl57 CisgICAgYXV0byBjb21wbGV0aW9uQmxvY2sgPSBeewogICAgICAgICBbc2VsZiByZW1vdmVDb250 ZXh0TWVudUludGVyYWN0aW9uXTsKICAgICAgICAgaWYgKCFzZWxmLT5faXNQcmVzZW50aW5nU3Vi TWVudSkKICAgICAgICAgICAgIFtzZWxmIF9jYW5jZWxdOwotICAgIH1dOworICAgIH07CisKKyAg ICBpZiAoYW5pbWF0b3IpCisgICAgICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOmNvbXBsZXRp b25CbG9ja107CisgICAgZWxzZQorICAgICAgICBjb21wbGV0aW9uQmxvY2soKTsKIH0KIAogLSAo dm9pZClyZW1vdmVDb250ZXh0TWVudUludGVyYWN0aW9uCkBAIC01MjksMTMgKzUzNCwxNyBAQCBz dGF0aWMgTlNTZXQ8TlNTdHJpbmcgKj4gKlVUSXNGb3JNSU1FVHlwZXMoTlNBcnJheSAqbWltZVR5 cGVzKQogCiAtICh2b2lkKXNob3dEb2N1bWVudFBpY2tlck1lbnUKIHsKLSAgICAvLyBGSVhNRSA0 OTk2MTU4OTogU3VwcG9ydCBwaWNraW5nIG1lZGlhIHdpdGggVUlJbWFnZVBpY2tlckNvbnRyb2xs ZXIKLSNpZiBIQVZFKFVJQ09OVEVYVE1FTlVfTE9DQVRJT04pCiAgICAgaWYgKF9hbGxvd2VkSW1h Z2VQaWNrZXJUeXBlcy5jb250YWluc0FueSh7IFdLRmlsZVVwbG9hZFBhbmVsSW1hZ2VQaWNrZXJU eXBlOjpJbWFnZSwgV0tGaWxlVXBsb2FkUGFuZWxJbWFnZVBpY2tlclR5cGU6OlZpZGVvIH0pKSB7 Ci0gICAgICAgIFtzZWxmIGVuc3VyZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dOwotICAgICAgICBb X2RvY3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbiBfcHJlc2VudE1lbnVBdExvY2F0aW9uOl9p bnRlcmFjdGlvblBvaW50XTsKKyAgICAgICAgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9u UmVxdWVzdCBwb3NpdGlvbkluZm9ybWF0aW9uUmVxdWVzdCB7IFdlYkNvcmU6OkludFBvaW50KF9p bnRlcmFjdGlvblBvaW50KSB9OworICAgICAgICBbX3ZpZXcgZG9BZnRlclBvc2l0aW9uSW5mb3Jt YXRpb25VcGRhdGU6W3dlYWtTZWxmID0gV2Vha09iakNQdHI8V0tGaWxlVXBsb2FkUGFuZWw+KHNl bGYpXSAoV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiBpbmZvcm1hdGlv bikgeworICAgICAgICAgICAgYXV0byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7CisgICAg ICAgICAgICBpZiAoIXN0cm9uZ1NlbGYpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgICAgICBbc3Ryb25nU2VsZiBlbnN1cmVDb250ZXh0TWVudUludGVyYWN0aW9uXTsKKyAgICAg ICAgICAgIFtzdHJvbmdTZWxmLT5fZG9jdW1lbnRDb250ZXh0TWVudUludGVyYWN0aW9uIF9wcmVz ZW50TWVudUF0TG9jYXRpb246c3Ryb25nU2VsZi0+X2ludGVyYWN0aW9uUG9pbnRdOworICAgICAg ICB9IGZvclJlcXVlc3Q6cG9zaXRpb25JbmZvcm1hdGlvblJlcXVlc3RdOwogICAgIH0gZWxzZSAv LyBJbWFnZSBhbmQgVmlkZW8gdHlwZXMgYXJlIG5vdCBhY2NlcHRlZCBzbyBieXBhc3MgdGhlIG1l bnUgYW5kIG9wZW4gdGhlIGZpbGUgcGlja2VyIGRpcmVjdGx5LgotI2VuZGlmCiAgICAgICAgIFtz ZWxmIHNob3dGaWxlUGlja2VyTWVudV07CiAKICAgICAvLyBDbGVhciBvdXQgdGhlIHZpZXcgY29u dHJvbGxlciB3ZSBqdXN0IHByZXNlbnRlZC4gRG9uJ3Qgc2F2ZSBhIHJlZmVyZW5jZSB0byB0aGUg VUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyIGFzIGl0IGlzIHNlbGYgZGlzbWlzc2luZy4K 437304 2021-09-03 13:00:13 -0700 2021-09-03 13:26:57 -0700 Patch bug-229885-20210903160012.patch text/plain 4202 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJhNjMxZGIxMzE1MGNjMzQ0 N2MzOThmMDdmMzM2M2NjZmYwNzBlZmUuLmQ0MzgzOWJhYWRlYzBjZWJhYmEwNmUxZmY4OWM5NDE4 ZjY1MjFlMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDktMDMgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNDYXRhbHlzdF0gU3Vw cG9ydCBwaG90byBwaWNrZXIgYW5kIGNhbWVyYSBhY3Rpb25zIGZvciBmaWxlIGlucHV0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5ODg1CisgICAg ICAgIHJkYXI6Ly80OTk2MTU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE9uIGlPUywgbWVkaWEtYWNjZXB0aW5nIGZpbGUgaW5wdXRzIHN1cHBvcnQg dHdvIGFkZGl0aW9uYWwgYWN0aW9uczoKKyAgICAgICAgIkNob29zZSBQaG90byBvciBWaWRlbyIg YW5kICJUYWtlIFBob3RvIG9yIFZpZGVvIi4gVGhlIGZvcm1lciBwcmVzZW50cworICAgICAgICBh IHBpY2tlciB0aGF0IGxldHMgdXNlcnMgdXBsb2FkIHBob3Rvcy92aWRlb3MgZnJvbSB0aGVpciBQ aG90byBMaWJyYXJ5LAorICAgICAgICB3aGlsZSB0aGUgbGF0dGVyIGxldHMgdXNlcnMgY2FwdHVy ZSBhbmQgdXBsb2FkIHBob3RvL3ZpZGVvLgorCisgICAgICAgIFRoZXNlIGFjdGlvbnMgd2VyZSB1 bnN1cHBvcnRlZCBvbiBtYWNDYXRhbHlzdCBkdWUgdG8gaXNzdWVzIHdpdGggVUlLaXQKKyAgICAg ICAgY29udGV4dCBtZW51cyBhbmQgVUlJbWFnZVBpY2tlckNvbnRyb2xsZXIuIE5vdyB0aGF0IHRo ZSBpc3N1ZXMgaGF2ZQorICAgICAgICBiZWVuIHJlc29sdmVkLCB0aGUgYWN0aW9ucyBjYW4gYmUg c3VwcG9ydGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQ YW5lbC5tbToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgY29udGV4dE1lbnVJbnRlcmFj dGlvbjp3aWxsRW5kRm9yQ29uZmlndXJhdGlvbjphbmltYXRvcjpdKToKKworICAgICAgICBtYWND YXRhbHlzdCBkb2VzIG5vdCBhbmltYXRlIHRoZSBkaXNtaXNzYWwgb2YgY29udGV4dCBtZW51cy4g SGVuY2UsIHRoZQorICAgICAgICBhbmltYXRvciBpcyBuaWwuIEhvd2V2ZXIsIHdlIG5lZWQgdG8g ZW5zdXJlIHRoZSBjb21wbGV0aW9uIGJsb2NrIGlzCisgICAgICAgIGNhbGxlZCB3aGVuIHRoZSBt ZW51IGlzIGRpc21pc3NlZCwgdG8gZW5zdXJlIHRoZSBvYmplY3QgaXMgbGVmdCBpbiBhCisgICAg ICAgIGNvbnNpc3RlbnQgc3RhdGUuCisKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgc2hv d0RvY3VtZW50UGlja2VyTWVudV0pOgorCisgICAgICAgIFByZXNlbnQgdGhlIGNvbnRleHQgbWVu dSBhZnRlciBnZXR0aW5nIGEgcG9zaXRpb24gaW5mb3JtYXRpb24gdXBkYXRlLgorICAgICAgICBU aGUgZWxlbWVudCByZWN0IGlzIG5lY2Vzc2FyeSB0byBwcmVzZW50IHRoZSBtZW51IGF0IHRoZSBy aWdodCBsb2NhdGlvbi4KKwogMjAyMS0wOS0wMyAgUGVyIEFybmUgIDxwdm9sbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbR1BVUF0gVGVtcG9yYXJpbHkgYWxsb3cgYWNjZXNzIHRvIHBvd2VyIGxv Z2dpbmcgc2VydmljZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zv cm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zv cm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCmluZGV4IGFhM2ZlN2MwMjA4MzA0NTZhMDFhOWQ1ZjI2 ZDA5OWY3ZjdjMTNlMmUuLjY4YzMzZTYxZmUzOTQ3MTBhYzE2NTFlOGY5N2EyM2YzMzA5NTRmYWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxv YWRQYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxl VXBsb2FkUGFuZWwubW0KQEAgLTQ4NiwxMSArNDg2LDE2IEBAIHN0YXRpYyBOU1NldDxOU1N0cmlu ZyAqPiAqVVRJc0Zvck1JTUVUeXBlcyhOU0FycmF5ICptaW1lVHlwZXMpCiAKIC0gKHZvaWQpY29u dGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rp b24gd2lsbEVuZEZvckNvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICop Y29uZmlndXJhdGlvbiBhbmltYXRvcjooaWQ8VUlDb250ZXh0TWVudUludGVyYWN0aW9uQW5pbWF0 aW5nPilhbmltYXRvcgogewotICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOl57CisgICAgYXV0 byBjb21wbGV0aW9uQmxvY2sgPSBeewogICAgICAgICBbc2VsZiByZW1vdmVDb250ZXh0TWVudUlu dGVyYWN0aW9uXTsKICAgICAgICAgaWYgKCFzZWxmLT5faXNQcmVzZW50aW5nU3ViTWVudSkKICAg ICAgICAgICAgIFtzZWxmIF9jYW5jZWxdOwotICAgIH1dOworICAgIH07CisKKyAgICBpZiAoYW5p bWF0b3IpCisgICAgICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOmNvbXBsZXRpb25CbG9ja107 CisgICAgZWxzZQorICAgICAgICBjb21wbGV0aW9uQmxvY2soKTsKIH0KIAogLSAodm9pZClyZW1v dmVDb250ZXh0TWVudUludGVyYWN0aW9uCkBAIC01MjksMTMgKzUzNCwxNyBAQCBzdGF0aWMgTlNT ZXQ8TlNTdHJpbmcgKj4gKlVUSXNGb3JNSU1FVHlwZXMoTlNBcnJheSAqbWltZVR5cGVzKQogCiAt ICh2b2lkKXNob3dEb2N1bWVudFBpY2tlck1lbnUKIHsKLSAgICAvLyBGSVhNRSA0OTk2MTU4OTog U3VwcG9ydCBwaWNraW5nIG1lZGlhIHdpdGggVUlJbWFnZVBpY2tlckNvbnRyb2xsZXIKLSNpZiBI QVZFKFVJQ09OVEVYVE1FTlVfTE9DQVRJT04pCiAgICAgaWYgKF9hbGxvd2VkSW1hZ2VQaWNrZXJU eXBlcy5jb250YWluc0FueSh7IFdLRmlsZVVwbG9hZFBhbmVsSW1hZ2VQaWNrZXJUeXBlOjpJbWFn ZSwgV0tGaWxlVXBsb2FkUGFuZWxJbWFnZVBpY2tlclR5cGU6OlZpZGVvIH0pKSB7Ci0gICAgICAg IFtzZWxmIGVuc3VyZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dOwotICAgICAgICBbX3ZpZXcgcHJl c2VudENvbnRleHRNZW51Ol9kb2N1bWVudENvbnRleHRNZW51SW50ZXJhY3Rpb24uZ2V0KCkgYXRM b2NhdGlvbjpfaW50ZXJhY3Rpb25Qb2ludF07CisgICAgICAgIFdlYktpdDo6SW50ZXJhY3Rpb25J bmZvcm1hdGlvblJlcXVlc3QgcG9zaXRpb25JbmZvcm1hdGlvblJlcXVlc3QgeyBXZWJDb3JlOjpJ bnRQb2ludChfaW50ZXJhY3Rpb25Qb2ludCkgfTsKKyAgICAgICAgW192aWV3IGRvQWZ0ZXJQb3Np dGlvbkluZm9ybWF0aW9uVXBkYXRlOlt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLRmlsZVVwbG9h ZFBhbmVsPihzZWxmKV0gKFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24g aW5mb3JtYXRpb24pIHsKKyAgICAgICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdl dCgpOworICAgICAgICAgICAgaWYgKCFzdHJvbmdTZWxmKQorICAgICAgICAgICAgICAgIHJldHVy bjsKKworICAgICAgICAgICAgW3N0cm9uZ1NlbGYgZW5zdXJlQ29udGV4dE1lbnVJbnRlcmFjdGlv bl07CisgICAgICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcgcHJlc2VudENvbnRleHRNZW51OnN0 cm9uZ1NlbGYtPl9kb2N1bWVudENvbnRleHRNZW51SW50ZXJhY3Rpb24uZ2V0KCkgYXRMb2NhdGlv bjpzdHJvbmdTZWxmLT5faW50ZXJhY3Rpb25Qb2ludF07CisgICAgICAgIH0gZm9yUmVxdWVzdDpw b3NpdGlvbkluZm9ybWF0aW9uUmVxdWVzdF07CiAgICAgfSBlbHNlIC8vIEltYWdlIGFuZCBWaWRl byB0eXBlcyBhcmUgbm90IGFjY2VwdGVkIHNvIGJ5cGFzcyB0aGUgbWVudSBhbmQgb3BlbiB0aGUg ZmlsZSBwaWNrZXIgZGlyZWN0bHkuCi0jZW5kaWYKICAgICAgICAgW3NlbGYgc2hvd0ZpbGVQaWNr ZXJNZW51XTsKIAogICAgIC8vIENsZWFyIG91dCB0aGUgdmlldyBjb250cm9sbGVyIHdlIGp1c3Qg cHJlc2VudGVkLiBEb24ndCBzYXZlIGEgcmVmZXJlbmNlIHRvIHRoZSBVSURvY3VtZW50UGlja2Vy Vmlld0NvbnRyb2xsZXIgYXMgaXQgaXMgc2VsZiBkaXNtaXNzaW5nLgo= 437306 2021-09-03 13:34:43 -0700 2021-09-03 13:34:43 -0700 Patch for landing bug-229885-20210903163442.patch text/plain 4076 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJhNjMxZGIxMzE1MGNjMzQ0 N2MzOThmMDdmMzM2M2NjZmYwNzBlZmUuLjgzNjQwOWM0MTQ0ODQxOGM4MmM1YWY4ZDgyOTE2NmMx ZmRkZDU2MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDktMDMgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFttYWNDYXRhbHlzdF0gU3Vw cG9ydCBwaG90byBwaWNrZXIgYW5kIGNhbWVyYSBhY3Rpb25zIGZvciBmaWxlIGlucHV0cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5ODg1CisgICAg ICAgIHJkYXI6Ly80OTk2MTU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisK KyAgICAgICAgT24gaU9TLCBtZWRpYS1hY2NlcHRpbmcgZmlsZSBpbnB1dHMgc3VwcG9ydCB0d28g YWRkaXRpb25hbCBhY3Rpb25zOgorICAgICAgICAiQ2hvb3NlIFBob3RvIG9yIFZpZGVvIiBhbmQg IlRha2UgUGhvdG8gb3IgVmlkZW8iLiBUaGUgZm9ybWVyIHByZXNlbnRzCisgICAgICAgIGEgcGlj a2VyIHRoYXQgbGV0cyB1c2VycyB1cGxvYWQgcGhvdG9zL3ZpZGVvcyBmcm9tIHRoZWlyIFBob3Rv IExpYnJhcnksCisgICAgICAgIHdoaWxlIHRoZSBsYXR0ZXIgbGV0cyB1c2VycyBjYXB0dXJlIGFu ZCB1cGxvYWQgcGhvdG8vdmlkZW8uCisKKyAgICAgICAgVGhlc2UgYWN0aW9ucyB3ZXJlIHVuc3Vw cG9ydGVkIG9uIG1hY0NhdGFseXN0IGR1ZSB0byBpc3N1ZXMgd2l0aCBVSUtpdAorICAgICAgICBj b250ZXh0IG1lbnVzIGFuZCBVSUltYWdlUGlja2VyQ29udHJvbGxlci4gTm93IHRoYXQgdGhlIGlz c3VlcyBoYXZlCisgICAgICAgIGJlZW4gcmVzb2x2ZWQsIHRoZSBhY3Rpb25zIGNhbiBiZSBzdXBw b3J0ZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVs Lm1tOgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBjb250ZXh0TWVudUludGVyYWN0aW9u OndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFuaW1hdG9yOl0pOgorCisgICAgICAgIG1hY0NhdGFs eXN0IGRvZXMgbm90IGFuaW1hdGUgdGhlIGRpc21pc3NhbCBvZiBjb250ZXh0IG1lbnVzLiBIZW5j ZSwgdGhlCisgICAgICAgIGFuaW1hdG9yIGlzIG5pbC4gSG93ZXZlciwgd2UgbmVlZCB0byBlbnN1 cmUgdGhlIGNvbXBsZXRpb24gYmxvY2sgaXMKKyAgICAgICAgY2FsbGVkIHdoZW4gdGhlIG1lbnUg aXMgZGlzbWlzc2VkLCB0byBlbnN1cmUgdGhlIG9iamVjdCBpcyBsZWZ0IGluIGEKKyAgICAgICAg Y29uc2lzdGVudCBzdGF0ZS4KKworICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBzaG93RG9j dW1lbnRQaWNrZXJNZW51XSk6CisKKyAgICAgICAgUHJlc2VudCB0aGUgY29udGV4dCBtZW51IGFm dGVyIGdldHRpbmcgYSBwb3NpdGlvbiBpbmZvcm1hdGlvbiB1cGRhdGUuCisgICAgICAgIFRoZSBl bGVtZW50IHJlY3QgaXMgbmVjZXNzYXJ5IHRvIHByZXNlbnQgdGhlIG1lbnUgYXQgdGhlIHJpZ2h0 IGxvY2F0aW9uLgorCiAyMDIxLTA5LTAzICBQZXIgQXJuZSAgPHB2b2xsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtHUFVQXSBUZW1wb3JhcmlseSBhbGxvdyBhY2Nlc3MgdG8gcG93ZXIgbG9nZ2lu ZyBzZXJ2aWNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMv V0tGaWxlVXBsb2FkUGFuZWwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMv V0tGaWxlVXBsb2FkUGFuZWwubW0KaW5kZXggYWEzZmU3YzAyMDgzMDQ1NmEwMWE5ZDVmMjZkMDk5 ZjdmN2MxM2UyZS4uNjc3ZjNjMTJhNTg3M2QwMDE2ZThiNGZlODkxMTk4YjQ5OWFlMGE4OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBh bmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxv YWRQYW5lbC5tbQpAQCAtNDg2LDExICs0ODYsMTYgQEAgc3RhdGljIE5TU2V0PE5TU3RyaW5nICo+ ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVUeXBlcykKIAogLSAodm9pZCljb250ZXh0 TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3 aWxsRW5kRm9yQ29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25m aWd1cmF0aW9uIGFuaW1hdG9yOihpZDxVSUNvbnRleHRNZW51SW50ZXJhY3Rpb25BbmltYXRpbmc+ KWFuaW1hdG9yCiB7Ci0gICAgW2FuaW1hdG9yIGFkZENvbXBsZXRpb246XnsKKyAgICBhdXRvIGNv bXBsZXRpb25CbG9jayA9IF57CiAgICAgICAgIFtzZWxmIHJlbW92ZUNvbnRleHRNZW51SW50ZXJh Y3Rpb25dOwogICAgICAgICBpZiAoIXNlbGYtPl9pc1ByZXNlbnRpbmdTdWJNZW51KQogICAgICAg ICAgICAgW3NlbGYgX2NhbmNlbF07Ci0gICAgfV07CisgICAgfTsKKworICAgIGlmIChhbmltYXRv cikKKyAgICAgICAgW2FuaW1hdG9yIGFkZENvbXBsZXRpb246Y29tcGxldGlvbkJsb2NrXTsKKyAg ICBlbHNlCisgICAgICAgIGNvbXBsZXRpb25CbG9jaygpOwogfQogCiAtICh2b2lkKXJlbW92ZUNv bnRleHRNZW51SW50ZXJhY3Rpb24KQEAgLTUyOSwxMSArNTM0LDE3IEBAIHN0YXRpYyBOU1NldDxO U1N0cmluZyAqPiAqVVRJc0Zvck1JTUVUeXBlcyhOU0FycmF5ICptaW1lVHlwZXMpCiAKIC0gKHZv aWQpc2hvd0RvY3VtZW50UGlja2VyTWVudQogewotICAgIC8vIEZJWE1FIDQ5OTYxNTg5OiBTdXBw b3J0IHBpY2tpbmcgbWVkaWEgd2l0aCBVSUltYWdlUGlja2VyQ29udHJvbGxlcgotI2lmIEhBVkUo VUlDT05URVhUTUVOVV9MT0NBVElPTikKKyNpZiBVU0UoVUlDT05URVhUTUVOVSkKICAgICBpZiAo X2FsbG93ZWRJbWFnZVBpY2tlclR5cGVzLmNvbnRhaW5zQW55KHsgV0tGaWxlVXBsb2FkUGFuZWxJ bWFnZVBpY2tlclR5cGU6OkltYWdlLCBXS0ZpbGVVcGxvYWRQYW5lbEltYWdlUGlja2VyVHlwZTo6 VmlkZW8gfSkpIHsKLSAgICAgICAgW3NlbGYgZW5zdXJlQ29udGV4dE1lbnVJbnRlcmFjdGlvbl07 Ci0gICAgICAgIFtfdmlldyBwcmVzZW50Q29udGV4dE1lbnU6X2RvY3VtZW50Q29udGV4dE1lbnVJ bnRlcmFjdGlvbi5nZXQoKSBhdExvY2F0aW9uOl9pbnRlcmFjdGlvblBvaW50XTsKKyAgICAgICAg V2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCBwb3NpdGlvbkluZm9ybWF0aW9u UmVxdWVzdCB7IFdlYkNvcmU6OkludFBvaW50KF9pbnRlcmFjdGlvblBvaW50KSB9OworICAgICAg ICBbX3ZpZXcgZG9BZnRlclBvc2l0aW9uSW5mb3JtYXRpb25VcGRhdGU6W3dlYWtTZWxmID0gV2Vh a09iakNQdHI8V0tGaWxlVXBsb2FkUGFuZWw+KHNlbGYpXSAoV2ViS2l0OjpJbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbiBpbmZvcm1hdGlvbikgeworICAgICAgICAgICAgYXV0byBzdHJv bmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7CisgICAgICAgICAgICBpZiAoIXN0cm9uZ1NlbGYpCisg ICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBbc3Ryb25nU2VsZiBlbnN1cmVD b250ZXh0TWVudUludGVyYWN0aW9uXTsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldyBw cmVzZW50Q29udGV4dE1lbnU6c3Ryb25nU2VsZi0+X2RvY3VtZW50Q29udGV4dE1lbnVJbnRlcmFj dGlvbi5nZXQoKSBhdExvY2F0aW9uOnN0cm9uZ1NlbGYtPl9pbnRlcmFjdGlvblBvaW50XTsKKyAg ICAgICAgfSBmb3JSZXF1ZXN0OnBvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0XTsKICAgICB9IGVs c2UgLy8gSW1hZ2UgYW5kIFZpZGVvIHR5cGVzIGFyZSBub3QgYWNjZXB0ZWQgc28gYnlwYXNzIHRo ZSBtZW51IGFuZCBvcGVuIHRoZSBmaWxlIHBpY2tlciBkaXJlY3RseS4KICNlbmRpZgogICAgICAg ICBbc2VsZiBzaG93RmlsZVBpY2tlck1lbnVdOwo=