225709 2021-05-12 11:58:50 -0700 Plumb some more metadata to QuickLook when revealing images 2021-05-12 14:08:43 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh hi webkit-bug-importer oldest_to_newest 1759337 0 wenson_hsieh 2021-05-12 11:58:50 -0700 rdar://77864866 1759350 1 428401 wenson_hsieh 2021-05-12 12:19:46 -0700 Created attachment 428401 Patch 1759354 2 428401 hi 2021-05-12 12:31:52 -0700 Comment on attachment 428401 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428401&action=review r=me > Source/WebKit/ChangeLog:26 > + Rename the `URL` argument to `fileURL`, to avoid confusion with the new `imageURL` that's passed in. Note that > + this is temporary, since we'll adopt new QuickLook SPI on macOS once the fix for rdar://74299451 is available. NIT: Should we put `FIXME` comments in the actual code for <rdar://74299451> so somebody else knows where to look if needed? 1759357 3 wenson_hsieh 2021-05-12 12:44:12 -0700 Thanks for the review! (In reply to Devin Rousso from comment #2) > Comment on attachment 428401 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=428401&action=review > > r=me > > > Source/WebKit/ChangeLog:26 > > + Rename the `URL` argument to `fileURL`, to avoid confusion with the new `imageURL` that's passed in. Note that > > + this is temporary, since we'll adopt new QuickLook SPI on macOS once the fix for rdar://74299451 is available. > > NIT: Should we put `FIXME` comments in the actual code for <rdar://74299451> > so somebody else knows where to look if needed? Makes sense — I'll add an inline FIXME referencing this radar in `WKImageExtractionPreviewController.mm`. 1759366 4 428406 wenson_hsieh 2021-05-12 13:09:21 -0700 Created attachment 428406 Patch for landing 1759400 5 ews-feeder 2021-05-12 14:08:43 -0700 Committed r277389 (237645@main): <https://commits.webkit.org/237645@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428406. 428401 2021-05-12 12:19:46 -0700 2021-05-12 12:31:52 -0700 Patch bug-225709-20210512121946.patch text/plain 8936 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVjNDcwYWQzOThhMDgxYzk5 MWNlMzRlZjBkZDU4YjQ3YzlmZWY2MDcuLjYzZWYxNTMxMGQ4MjNmMzQ1N2UyYmZlOGI2MmM0YzM1 ZTAzNThkODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDUtMTIgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUGx1bWIgc29tZSBtb3Jl IG1ldGFkYXRhIHRvIFF1aWNrTG9vayB3aGVuIHJldmVhbGluZyBpbWFnZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTcwOQorICAgICAgICByZGFy Oi8vNzc4NjQ4NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgcGx1bWJpbmcgdG8gc3VwcGx5IFF1aWNrTG9vayB3aXRoIHNvbWUgYWRkaXRpb25h bCBpbmZvcm1hdGlvbiBhYm91dCB0aGUgaW1hZ2UgVVJMIGFuZCBjdXJyZW50IHBhZ2UgVVJMIHdo ZW4KKyAgICAgICAgcmV2ZWFsaW5nIGltYWdlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9XZWJQYWdlUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpo YW5kbGVDb250ZXh0TWVudVJldmVhbEltYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9u U2hlZXRBc3Npc3RhbnQubW06CisgICAgICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgaGFu ZGxlRWxlbWVudEFjdGlvbldpdGhUeXBlOmVsZW1lbnQ6bmVlZHNJbnRlcmFjdGlvbjpdKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRy b2xsZXIubW06CisgICAgICAgICgtW1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0l0ZW0gaW5pdFdp dGhGaWxlVVJMOnRpdGxlOmltYWdlVVJMOnBhZ2VVUkw6XSk6CisgICAgICAgICgtW1dLSW1hZ2VF eHRyYWN0aW9uUHJldmlld0l0ZW0gZGVhbGxvY10pOgorICAgICAgICAoLVtXS0ltYWdlRXh0cmFj dGlvblByZXZpZXdJdGVtIHByZXZpZXdJdGVtVVJMXSk6CisgICAgICAgICgtW1dLSW1hZ2VFeHRy YWN0aW9uUHJldmlld0l0ZW0gcHJldmlld09wdGlvbnNdKToKKyAgICAgICAgKC1bV0tJbWFnZUV4 dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciBpbml0V2l0aFBhZ2U6ZmlsZVVSTDp0aXRsZTppbWFn ZVVSTDpdKToKKworICAgICAgICBSZW5hbWUgdGhlIGBVUkxgIGFyZ3VtZW50IHRvIGBmaWxlVVJM YCwgdG8gYXZvaWQgY29uZnVzaW9uIHdpdGggdGhlIG5ldyBgaW1hZ2VVUkxgIHRoYXQncyBwYXNz ZWQgaW4uIE5vdGUgdGhhdAorICAgICAgICB0aGlzIGlzIHRlbXBvcmFyeSwgc2luY2Ugd2UnbGwg YWRvcHQgbmV3IFF1aWNrTG9vayBTUEkgb24gbWFjT1Mgb25jZSB0aGUgZml4IGZvciByZGFyOi8v NzQyOTk0NTEgaXMgYXZhaWxhYmxlLgorCisgICAgICAgICgtW1dLSW1hZ2VFeHRyYWN0aW9uUHJl dmlld0l0ZW0gaW5pdFdpdGhVUkw6dGl0bGU6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLSW1h Z2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgaW5pdFdpdGhQYWdlOnVybDp0aXRsZTpdKTog RGVsZXRlZC4KKwogMjAyMS0wNS0xMSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIHRoZSBTdHJpbmc6OnRvSW50IGZhbWlseSBvZiBmdW5jdGlvbnMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29h Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0K aW5kZXggNGI1ZGIyMTUzMDc4NDI2Mzc4MzkzOGRiZmZjMjI1YjE4ZTljNjRmYi4uYzM4N2M4NjRj NmY1Yzg0MzkwNGQ1M2U2NWU2NDhhOTM1YjZhNjMyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0KQEAgLTYxNCw3ICs2MTQsNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlQ29udGV4dE1lbnVSZXZlYWxJbWFnZSgpCiAgICAg aWYgKCFyZXN1bHQuaW1hZ2VCaXRtYXApCiAgICAgICAgIHJldHVybjsKIAotICAgIHJldmVhbEV4 dHJhY3RlZEltYWdlSW5QcmV2aWV3UGFuZWwoKnJlc3VsdC5pbWFnZUJpdG1hcCwgcmVzdWx0LnRv b2xUaXBUZXh0KTsKKyAgICByZXZlYWxFeHRyYWN0ZWRJbWFnZUluUHJldmlld1BhbmVsKCpyZXN1 bHQuaW1hZ2VCaXRtYXAsIHJlc3VsdC50b29sVGlwVGV4dCwgVVJMIHsgVVJMIHsgfSwgcmVzdWx0 LmFic29sdXRlSW1hZ2VVUkwgfSk7CiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoSU1BR0VfRVhUUkFD VElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNo ZWV0QXNzaXN0YW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVl dEFzc2lzdGFudC5oCmluZGV4IDk3NjgzMDdiNmZlY2JjOWZlYTk3NGM0YjRlMjU3Y2I4YzlhZWNk ZTkuLmRmMmQ0MzM4Zjg3YTM3NmVjNTlhNTI1MzJhNGVjMWRhYmY5YTg3NjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaApA QCAtODEsOSArODEsOSBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tFbGVtZW50QWN0 aW9uVHlwZSk7CiAtICh2b2lkKWFjdGlvblNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNz aXN0YW50ICopYXNzaXN0YW50IHNoYXJlRWxlbWVudFdpdGhJbWFnZTooVUlJbWFnZSAqKWltYWdl IHJlY3Q6KENHUmVjdClib3VuZGluZ1JlY3Q7CiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04p CiAtIChCT09MKWFjdGlvblNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICop YXNzaXN0YW50IHNob3VsZEluY2x1ZGVJbWFnZUV4dHJhY3Rpb25BY3Rpb25Gb3JFbGVtZW50Oihf V0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnQ7Ci0tICh2b2lkKWFjdGlvblNoZWV0QXNz aXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50IGhhbmRsZUltYWdlRXh0 cmFjdGlvbjooVUlJbWFnZSAqKWltYWdlIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlOworLSAodm9p ZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFu dCBoYW5kbGVJbWFnZUV4dHJhY3Rpb246KFVJSW1hZ2UgKilpbWFnZSBpbWFnZVVSTDooTlNVUkwg KilpbWFnZVVSTCB0aXRsZTooTlNTdHJpbmcgKil0aXRsZTsKIC0gKEJPT0wpYWN0aW9uU2hlZXRB c3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQgc2hvdWxkSW5jbHVk ZVJldmVhbEltYWdlQWN0aW9uRm9yRWxlbWVudDooX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKill bGVtZW50OwotLSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lz dGFudCAqKWFzc2lzdGFudCBoYW5kbGVSZXZlYWxJbWFnZTooVUlJbWFnZSAqKWltYWdlIHRpdGxl OihOU1N0cmluZyAqKXRpdGxlOworLSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rp b25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCBoYW5kbGVSZXZlYWxJbWFnZTooVUlJbWFnZSAq KWltYWdlIGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIHRpdGxlOihOU1N0cmluZyAqKXRpdGxl OwogI2VuZGlmCiBAZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggYzI2ZTM4MWY5MmYyYThmNjYxN2M4NDg5 M2U0NGIyODM2NzRlNmFhMi4uZGIwNmJjNjcyNDE2ZDc4ZmY0N2ZkMmM0ZWU4NDJlYjUwYmQwYTZk NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRB c3Npc3RhbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQubW0KQEAgLTEwMTYsMTIgKzEwMTYsMTIgQEAgLSAodm9pZCloYW5kbGVFbGVt ZW50QWN0aW9uV2l0aFR5cGU6KF9XS0VsZW1lbnRBY3Rpb25UeXBlKXR5cGUgZWxlbWVudDooX1dL QWN0aXYKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBfV0tFbGVtZW50QWN0aW9uVHlwZUltYWdl RXh0cmFjdGlvbjoKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKLSAgICAgICAgW2RlbGVn YXRlIGFjdGlvblNoZWV0QXNzaXN0YW50OnNlbGYgaGFuZGxlSW1hZ2VFeHRyYWN0aW9uOmVsZW1l bnQuaW1hZ2UgdGl0bGU6ZWxlbWVudC50aXRsZV07CisgICAgICAgIFtkZWxlZ2F0ZSBhY3Rpb25T aGVldEFzc2lzdGFudDpzZWxmIGhhbmRsZUltYWdlRXh0cmFjdGlvbjplbGVtZW50LmltYWdlIGlt YWdlVVJMOmVsZW1lbnQuaW1hZ2VVUkwgdGl0bGU6ZWxlbWVudC50aXRsZV07CiAjZW5kaWYKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBfV0tFbGVtZW50QWN0aW9uVHlwZVJldmVhbEltYWdlOgog I2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQotICAgICAgICBbZGVsZWdhdGUgYWN0aW9uU2hl ZXRBc3Npc3RhbnQ6c2VsZiBoYW5kbGVSZXZlYWxJbWFnZTplbGVtZW50LmltYWdlIHRpdGxlOmVs ZW1lbnQudGl0bGVdOworICAgICAgICBbZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2Vs ZiBoYW5kbGVSZXZlYWxJbWFnZTplbGVtZW50LmltYWdlIGltYWdlVVJMOmVsZW1lbnQuaW1hZ2VV UkwgdGl0bGU6ZWxlbWVudC50aXRsZV07CiAjZW5kaWYKICAgICAgICAgYnJlYWs7CiAgICAgZGVm YXVsdDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0 cmFjdGlvblByZXZpZXdDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv V0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5oCmluZGV4IDZiNDA1YzFlYmFkNDQ1 ZTY3N2E3NWM1NmRhYzkxMTNmODRlNjM1YzIuLjY4NmU1NmY5MGRhNzUxMzdjZWY3ZDFhY2RkYjkz YTRhMzg0YjY3NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9XS0lt YWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIuaApAQCAtMzQsMTEg KzM0LDExIEBAIGNsYXNzIFdlYlBhZ2VQcm94eTsKIH0KIAogQGludGVyZmFjZSBXS0ltYWdlRXh0 cmFjdGlvblByZXZpZXdJdGVtIDogTlNPYmplY3QgPFFMUHJldmlld0l0ZW0+Ci0tIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhVUkw6KE5TVVJMICopdXJsIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlOwor LSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRmlsZVVSTDooTlNVUkwgKilmaWxlVVJMIHRpdGxlOihO U1N0cmluZyAqKXRpdGxlIGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIHBhZ2VVUkw6KE5TVVJM ICopcGFnZVVSTDsKIEBlbmQKIAogQGludGVyZmFjZSBXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdD b250cm9sbGVyIDogTlNPYmplY3QgPFFMUHJldmlld1BhbmVsRGVsZWdhdGUsIFFMUHJldmlld1Bh bmVsRGF0YVNvdXJjZT4KLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aFBhZ2U6KFdlYktpdDo6V2Vi UGFnZVByb3h5JilwYWdlIHVybDooTlNVUkwgKil1cmwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGU7 CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJLaXQ6OldlYlBhZ2VQcm94eSYpcGFn ZSBmaWxlVVJMOihOU1VSTCAqKWZpbGVVUkwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgaW1hZ2VV Ukw6KE5TVVJMICopaW1hZ2VVUkw7CiBAZW5kCiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpICYm IEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5t bQppbmRleCA2MWNhNjU5YjY3NGM5MzU5ZjlhMTgxNzkzZDE5NzA2YWE0MDQ4NTlmLi44MWIyNmRk NTg3ODdkOWMxMmEyMDliMThiZTIzNDUxMTg2NDhmMzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3 Q29udHJvbGxlci5tbQpAQCAtMzQsMjQgKzM0LDI4IEBACiAjaW1wb3J0IDx3dGYvV2Vha1B0ci5o PgogCiBAaW1wbGVtZW50YXRpb24gV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3SXRlbSB7Ci0gICAg UmV0YWluUHRyPE5TVVJMPiBfdXJsOworICAgIFJldGFpblB0cjxOU1VSTD4gX2ZpbGVVUkw7CiAg ICAgUmV0YWluUHRyPE5TU3RyaW5nPiBfdGl0bGU7CisgICAgUmV0YWluUHRyPE5TVVJMPiBfaW1h Z2VVUkw7CisgICAgUmV0YWluUHRyPE5TVVJMPiBfcGFnZVVSTDsKIH0KIAotLSAoaW5zdGFuY2V0 eXBlKWluaXRXaXRoVVJMOihOU1VSTCAqKXVybCB0aXRsZTooTlNTdHJpbmcgKil0aXRsZQorLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoRmlsZVVSTDooTlNVUkwgKilmaWxlVVJMIHRpdGxlOihOU1N0 cmluZyAqKXRpdGxlIGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIHBhZ2VVUkw6KE5TVVJMICop cGFnZVVSTAogewogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQogICAgICAgICByZXR1 cm4gbmlsOwogCi0gICAgX3VybCA9IHVybDsKKyAgICBfZmlsZVVSTCA9IGZpbGVVUkw7CiAgICAg X3RpdGxlID0gYWRvcHROUyhbdGl0bGUgY29weV0pOworICAgIF9pbWFnZVVSTCA9IGltYWdlVVJM OworICAgIF9wYWdlVVJMID0gcGFnZVVSTDsKIAogICAgIHJldHVybiBzZWxmOwogfQogCiAtICh2 b2lkKWRlYWxsb2MKIHsKLSAgICBGaWxlU3lzdGVtOjpkZWxldGVGaWxlKFtfdXJsIHBhdGhdKTsK KyAgICBGaWxlU3lzdGVtOjpkZWxldGVGaWxlKFtfZmlsZVVSTCBwYXRoXSk7CiAKICAgICBbc3Vw ZXIgZGVhbGxvY107CiB9CkBAIC02MCw3ICs2NCw3IEBAIC0gKHZvaWQpZGVhbGxvYwogCiAtIChO U1VSTCAqKXByZXZpZXdJdGVtVVJMCiB7Ci0gICAgcmV0dXJuIF91cmwuZ2V0KCk7CisgICAgcmV0 dXJuIF9maWxlVVJMLmdldCgpOwogfQogCiAtIChOU1N0cmluZyAqKXByZXZpZXdJdGVtVGl0bGUK QEAgLTY4LDYgKzcyLDE5IEBAIC0gKE5TU3RyaW5nICopcHJldmlld0l0ZW1UaXRsZQogICAgIHJl dHVybiBfdGl0bGUuZ2V0KCk7CiB9CiAKKy0gKE5TRGljdGlvbmFyeSAqKXByZXZpZXdPcHRpb25z Cit7CisgICAgaWYgKCFfaW1hZ2VVUkwgJiYgIV9wYWdlVVJMKQorICAgICAgICByZXR1cm4gbmls OworCisgICAgYXV0byBwcmV2aWV3T3B0aW9ucyA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9u YXJ5IGFsbG9jXSBpbml0V2l0aENhcGFjaXR5OjJdKTsKKyAgICBpZiAoX2ltYWdlVVJMKQorICAg ICAgICBbcHJldmlld09wdGlvbnMgc2V0T2JqZWN0Ol9pbWFnZVVSTC5nZXQoKSBmb3JLZXk6QCJp bWFnZVVSTCJdOworICAgIGlmIChfcGFnZVVSTCkKKyAgICAgICAgW3ByZXZpZXdPcHRpb25zIHNl dE9iamVjdDpfcGFnZVVSTC5nZXQoKSBmb3JLZXk6QCJwYWdlVVJMIl07CisgICAgcmV0dXJuIHBy ZXZpZXdPcHRpb25zLmF1dG9yZWxlYXNlKCk7Cit9CisKIEBlbmQKIAogQGltcGxlbWVudGF0aW9u IFdLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIgewpAQCAtNzUsMTMgKzkyLDEzIEBA IEBpbXBsZW1lbnRhdGlvbiBXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIHsKICAg ICBSZXRhaW5QdHI8V0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3SXRlbT4gX3ByZXZpZXdJdGVtOwog fQogCi0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJLaXQ6OldlYlBhZ2VQcm94eSYp cGFnZSB1cmw6KE5TVVJMICopdXJsIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlCistIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJLaXQ6OldlYlBhZ2VQcm94eSYpcGFnZSBmaWxlVVJMOihO U1VSTCAqKWZpbGVVUkwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgaW1hZ2VVUkw6KE5TVVJMICop aW1hZ2VVUkwKIHsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0 dXJuIG5pbDsKIAogICAgIF9wYWdlID0gbWFrZVdlYWtQdHIocGFnZSk7Ci0gICAgX3ByZXZpZXdJ dGVtID0gYWRvcHROUyhbW1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0l0ZW0gYWxsb2NdIGluaXRX aXRoVVJMOnVybCB0aXRsZTp0aXRsZV0pOworICAgIF9wcmV2aWV3SXRlbSA9IGFkb3B0TlMoW1tX S0ltYWdlRXh0cmFjdGlvblByZXZpZXdJdGVtIGFsbG9jXSBpbml0V2l0aEZpbGVVUkw6ZmlsZVVS TCB0aXRsZTp0aXRsZSBpbWFnZVVSTDppbWFnZVVSTCBwYWdlVVJMOlVSTCB7IFVSTCB7IH0sIHBh Z2UuY3VycmVudFVSTCgpIH1dKTsKIAogICAgIHJldHVybiBzZWxmOwogfQo= 428406 2021-05-12 13:09:21 -0700 2021-05-12 14:08:43 -0700 Patch for landing bug-225709-20210512130921.patch text/plain 9042 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVjNDcwYWQzOThhMDgxYzk5 MWNlMzRlZjBkZDU4YjQ3YzlmZWY2MDcuLmMzMGM3YTAyYWZlNjM1YzQ4NjE4YjhmNjBlMGEzMzBk ZDRjZDhiNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjEtMDUtMTIgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgUGx1bWIgc29tZSBtb3Jl IG1ldGFkYXRhIHRvIFF1aWNrTG9vayB3aGVuIHJldmVhbGluZyBpbWFnZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTcwOQorICAgICAgICByZGFy Oi8vNzc4NjQ4NjYKKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAg ICAgQWRkIHBsdW1iaW5nIHRvIHN1cHBseSBRdWlja0xvb2sgd2l0aCBzb21lIGFkZGl0aW9uYWwg aW5mb3JtYXRpb24gYWJvdXQgdGhlIGltYWdlIFVSTCBhbmQgY3VycmVudCBwYWdlIFVSTCB3aGVu CisgICAgICAgIHJldmVhbGluZyBpbWFnZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2Ev V2ViUGFnZVByb3h5Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aGFu ZGxlQ29udGV4dE1lbnVSZXZlYWxJbWFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0QXNzaXN0YW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNo ZWV0QXNzaXN0YW50Lm1tOgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGhhbmRs ZUVsZW1lbnRBY3Rpb25XaXRoVHlwZTplbGVtZW50Om5lZWRzSW50ZXJhY3Rpb246XSk6CisgICAg ICAgICogVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLmg6 CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9s bGVyLm1tOgorICAgICAgICAoLVtXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdJdGVtIGluaXRXaXRo RmlsZVVSTDp0aXRsZTppbWFnZVVSTDpwYWdlVVJMOl0pOgorICAgICAgICAoLVtXS0ltYWdlRXh0 cmFjdGlvblByZXZpZXdJdGVtIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV0tJbWFnZUV4dHJhY3Rp b25QcmV2aWV3SXRlbSBwcmV2aWV3SXRlbVVSTF0pOgorICAgICAgICAoLVtXS0ltYWdlRXh0cmFj dGlvblByZXZpZXdJdGVtIHByZXZpZXdPcHRpb25zXSk6CisgICAgICAgICgtW1dLSW1hZ2VFeHRy YWN0aW9uUHJldmlld0NvbnRyb2xsZXIgaW5pdFdpdGhQYWdlOmZpbGVVUkw6dGl0bGU6aW1hZ2VV Ukw6XSk6CisKKyAgICAgICAgUmVuYW1lIHRoZSBgVVJMYCBhcmd1bWVudCB0byBgZmlsZVVSTGAs IHRvIGF2b2lkIGNvbmZ1c2lvbiB3aXRoIHRoZSBuZXcgYGltYWdlVVJMYCB0aGF0J3MgcGFzc2Vk IGluLiBOb3RlIHRoYXQKKyAgICAgICAgdGhpcyBpcyB0ZW1wb3JhcnksIHNpbmNlIHdlJ2xsIGFk b3B0IG5ldyBRdWlja0xvb2sgU1BJIG9uIG1hY09TIG9uY2UgdGhlIGZpeCBmb3IgcmRhcjovLzc0 Mjk5NDUxIGlzIGF2YWlsYWJsZS4KKworICAgICAgICAoLVtXS0ltYWdlRXh0cmFjdGlvblByZXZp ZXdJdGVtIGluaXRXaXRoVVJMOnRpdGxlOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXS0ltYWdl RXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIGluaXRXaXRoUGFnZTp1cmw6dGl0bGU6XSk6IERl bGV0ZWQuCisKIDIwMjEtMDUtMTEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbW92ZSB0aGUgU3RyaW5nOjp0b0ludCBmYW1pbHkgb2YgZnVuY3Rpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1tCmlu ZGV4IDRiNWRiMjE1MzA3ODQyNjM3ODM5MzhkYmZmYzIyNWIxOGU5YzY0ZmIuLmMzODdjODY0YzZm NWM4NDM5MDRkNTNlNjVlNjQ4YTkzNWI2YTYzMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1tCkBAIC02MTQsNyArNjE0LDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZUNvbnRleHRNZW51UmV2ZWFsSW1hZ2UoKQogICAgIGlm ICghcmVzdWx0LmltYWdlQml0bWFwKQogICAgICAgICByZXR1cm47CiAKLSAgICByZXZlYWxFeHRy YWN0ZWRJbWFnZUluUHJldmlld1BhbmVsKCpyZXN1bHQuaW1hZ2VCaXRtYXAsIHJlc3VsdC50b29s VGlwVGV4dCk7CisgICAgcmV2ZWFsRXh0cmFjdGVkSW1hZ2VJblByZXZpZXdQYW5lbCgqcmVzdWx0 LmltYWdlQml0bWFwLCByZXN1bHQudG9vbFRpcFRleHQsIFVSTCB7IFVSTCB7IH0sIHJlc3VsdC5h YnNvbHV0ZUltYWdlVVJMIH0pOwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKElNQUdFX0VYVFJBQ1RJ T04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVl dEFzc2lzdGFudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRB c3Npc3RhbnQuaAppbmRleCA5NzY4MzA3YjZmZWNiYzlmZWE5NzRjNGI0ZTI1N2NiOGM5YWVjZGU5 Li5kZjJkNDMzOGY4N2EzNzZlYzU5YTUyNTMyYTRlYzFkYWJmOWE4NzYzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmgKQEAg LTgxLDkgKzgxLDkgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgX1dLRWxlbWVudEFjdGlv blR5cGUpOwogLSAodm9pZClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lz dGFudCAqKWFzc2lzdGFudCBzaGFyZUVsZW1lbnRXaXRoSW1hZ2U6KFVJSW1hZ2UgKilpbWFnZSBy ZWN0OihDR1JlY3QpYm91bmRpbmdSZWN0OwogI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQog LSAoQk9PTClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFz c2lzdGFudCBzaG91bGRJbmNsdWRlSW1hZ2VFeHRyYWN0aW9uQWN0aW9uRm9yRWxlbWVudDooX1dL QWN0aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50OwotLSAodm9pZClhY3Rpb25TaGVldEFzc2lz dGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCBoYW5kbGVJbWFnZUV4dHJh Y3Rpb246KFVJSW1hZ2UgKilpbWFnZSB0aXRsZTooTlNTdHJpbmcgKil0aXRsZTsKKy0gKHZvaWQp YWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQg aGFuZGxlSW1hZ2VFeHRyYWN0aW9uOihVSUltYWdlICopaW1hZ2UgaW1hZ2VVUkw6KE5TVVJMICop aW1hZ2VVUkwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGU7CiAtIChCT09MKWFjdGlvblNoZWV0QXNz aXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50IHNob3VsZEluY2x1ZGVS ZXZlYWxJbWFnZUFjdGlvbkZvckVsZW1lbnQ6KF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICopZWxl bWVudDsKLS0gKHZvaWQpYWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3Rh bnQgKilhc3Npc3RhbnQgaGFuZGxlUmV2ZWFsSW1hZ2U6KFVJSW1hZ2UgKilpbWFnZSB0aXRsZToo TlNTdHJpbmcgKil0aXRsZTsKKy0gKHZvaWQpYWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9u U2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQgaGFuZGxlUmV2ZWFsSW1hZ2U6KFVJSW1hZ2UgKilp bWFnZSBpbWFnZVVSTDooTlNVUkwgKilpbWFnZVVSTCB0aXRsZTooTlNTdHJpbmcgKil0aXRsZTsK ICNlbmRpZgogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv V0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IGMyNmUzODFmOTJmMmE4ZjY2MTdjODQ4OTNl NDRiMjgzNjc0ZTZhYTIuLmRiMDZiYzY3MjQxNmQ3OGZmNDdmZDJjNGVlODQyZWI1MGJkMGE2ZDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNz aXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0 QXNzaXN0YW50Lm1tCkBAIC0xMDE2LDEyICsxMDE2LDEyIEBAIC0gKHZvaWQpaGFuZGxlRWxlbWVu dEFjdGlvbldpdGhUeXBlOihfV0tFbGVtZW50QWN0aW9uVHlwZSl0eXBlIGVsZW1lbnQ6KF9XS0Fj dGl2CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgX1dLRWxlbWVudEFjdGlvblR5cGVJbWFnZUV4 dHJhY3Rpb246CiAjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCi0gICAgICAgIFtkZWxlZ2F0 ZSBhY3Rpb25TaGVldEFzc2lzdGFudDpzZWxmIGhhbmRsZUltYWdlRXh0cmFjdGlvbjplbGVtZW50 LmltYWdlIHRpdGxlOmVsZW1lbnQudGl0bGVdOworICAgICAgICBbZGVsZWdhdGUgYWN0aW9uU2hl ZXRBc3Npc3RhbnQ6c2VsZiBoYW5kbGVJbWFnZUV4dHJhY3Rpb246ZWxlbWVudC5pbWFnZSBpbWFn ZVVSTDplbGVtZW50LmltYWdlVVJMIHRpdGxlOmVsZW1lbnQudGl0bGVdOwogI2VuZGlmCiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgX1dLRWxlbWVudEFjdGlvblR5cGVSZXZlYWxJbWFnZToKICNp ZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKLSAgICAgICAgW2RlbGVnYXRlIGFjdGlvblNoZWV0 QXNzaXN0YW50OnNlbGYgaGFuZGxlUmV2ZWFsSW1hZ2U6ZWxlbWVudC5pbWFnZSB0aXRsZTplbGVt ZW50LnRpdGxlXTsKKyAgICAgICAgW2RlbGVnYXRlIGFjdGlvblNoZWV0QXNzaXN0YW50OnNlbGYg aGFuZGxlUmV2ZWFsSW1hZ2U6ZWxlbWVudC5pbWFnZSBpbWFnZVVSTDplbGVtZW50LmltYWdlVVJM IHRpdGxlOmVsZW1lbnQudGl0bGVdOwogI2VuZGlmCiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1 bHQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFnZUV4dHJh Y3Rpb25QcmV2aWV3Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dL SW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIuaAppbmRleCA2YjQwNWMxZWJhZDQ0NWU2 NzdhNzVjNTZkYWM5MTEzZjg0ZTYzNWMyLi42ODZlNTZmOTBkYTc1MTM3Y2VmN2QxYWNkZGI5M2E0 YTM4NGI2NzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV0tJbWFn ZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLmgKQEAgLTM0LDExICsz NCwxMSBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiB9CiAKIEBpbnRlcmZhY2UgV0tJbWFnZUV4dHJh Y3Rpb25QcmV2aWV3SXRlbSA6IE5TT2JqZWN0IDxRTFByZXZpZXdJdGVtPgotLSAoaW5zdGFuY2V0 eXBlKWluaXRXaXRoVVJMOihOU1VSTCAqKXVybCB0aXRsZTooTlNTdHJpbmcgKil0aXRsZTsKKy0g KGluc3RhbmNldHlwZSlpbml0V2l0aEZpbGVVUkw6KE5TVVJMICopZmlsZVVSTCB0aXRsZTooTlNT dHJpbmcgKil0aXRsZSBpbWFnZVVSTDooTlNVUkwgKilpbWFnZVVSTCBwYWdlVVJMOihOU1VSTCAq KXBhZ2VVUkw7CiBAZW5kCiAKIEBpbnRlcmZhY2UgV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29u dHJvbGxlciA6IE5TT2JqZWN0IDxRTFByZXZpZXdQYW5lbERlbGVnYXRlLCBRTFByZXZpZXdQYW5l bERhdGFTb3VyY2U+Ci0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhQYWdlOihXZWJLaXQ6OldlYlBh Z2VQcm94eSYpcGFnZSB1cmw6KE5TVVJMICopdXJsIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlOwor LSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZTooV2ViS2l0OjpXZWJQYWdlUHJveHkmKXBhZ2Ug ZmlsZVVSTDooTlNVUkwgKilmaWxlVVJMIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIGltYWdlVVJM OihOU1VSTCAqKWltYWdlVVJMOwogQGVuZAogCiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKSAmJiBF TkFCTEUoSU1BR0VfRVhUUkFDVElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL21hYy9XS0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIubW0K aW5kZXggNjFjYTY1OWI2NzRjOTM1OWY5YTE4MTc5M2QxOTcwNmFhNDA0ODU5Zi4uN2Q3NDYwNTk3 NjJiOWVkZjAwMTE2ODI2MDk4MTQxYmE2NTIzZjg5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0NvbnRyb2xsZXIubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0Nv bnRyb2xsZXIubW0KQEAgLTM0LDI0ICszNCwyOCBAQAogI2ltcG9ydCA8d3RmL1dlYWtQdHIuaD4K IAogQGltcGxlbWVudGF0aW9uIFdLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0l0ZW0gewotICAgIFJl dGFpblB0cjxOU1VSTD4gX3VybDsKKyAgICBSZXRhaW5QdHI8TlNVUkw+IF9maWxlVVJMOwogICAg IFJldGFpblB0cjxOU1N0cmluZz4gX3RpdGxlOworICAgIFJldGFpblB0cjxOU1VSTD4gX2ltYWdl VVJMOworICAgIFJldGFpblB0cjxOU1VSTD4gX3BhZ2VVUkw7CiB9CiAKLS0gKGluc3RhbmNldHlw ZSlpbml0V2l0aFVSTDooTlNVUkwgKil1cmwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGUKKy0gKGlu c3RhbmNldHlwZSlpbml0V2l0aEZpbGVVUkw6KE5TVVJMICopZmlsZVVSTCB0aXRsZTooTlNTdHJp bmcgKil0aXRsZSBpbWFnZVVSTDooTlNVUkwgKilpbWFnZVVSTCBwYWdlVVJMOihOU1VSTCAqKXBh Z2VVUkwKIHsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJu IG5pbDsKIAotICAgIF91cmwgPSB1cmw7CisgICAgX2ZpbGVVUkwgPSBmaWxlVVJMOwogICAgIF90 aXRsZSA9IGFkb3B0TlMoW3RpdGxlIGNvcHldKTsKKyAgICBfaW1hZ2VVUkwgPSBpbWFnZVVSTDsK KyAgICBfcGFnZVVSTCA9IHBhZ2VVUkw7CiAKICAgICByZXR1cm4gc2VsZjsKIH0KIAogLSAodm9p ZClkZWFsbG9jCiB7Ci0gICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShbX3VybCBwYXRoXSk7Cisg ICAgRmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShbX2ZpbGVVUkwgcGF0aF0pOwogCiAgICAgW3N1cGVy IGRlYWxsb2NdOwogfQpAQCAtNjAsNyArNjQsNyBAQCAtICh2b2lkKWRlYWxsb2MKIAogLSAoTlNV UkwgKilwcmV2aWV3SXRlbVVSTAogewotICAgIHJldHVybiBfdXJsLmdldCgpOworICAgIHJldHVy biBfZmlsZVVSTC5nZXQoKTsKIH0KIAogLSAoTlNTdHJpbmcgKilwcmV2aWV3SXRlbVRpdGxlCkBA IC02OCw2ICs3MiwxOSBAQCAtIChOU1N0cmluZyAqKXByZXZpZXdJdGVtVGl0bGUKICAgICByZXR1 cm4gX3RpdGxlLmdldCgpOwogfQogCistIChOU0RpY3Rpb25hcnkgKilwcmV2aWV3T3B0aW9ucwor eworICAgIGlmICghX2ltYWdlVVJMICYmICFfcGFnZVVSTCkKKyAgICAgICAgcmV0dXJuIG5pbDsK KworICAgIGF1dG8gcHJldmlld09wdGlvbnMgPSBhZG9wdE5TKFtbTlNNdXRhYmxlRGljdGlvbmFy eSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eToyXSk7CisgICAgaWYgKF9pbWFnZVVSTCkKKyAgICAg ICAgW3ByZXZpZXdPcHRpb25zIHNldE9iamVjdDpfaW1hZ2VVUkwuZ2V0KCkgZm9yS2V5OkAiaW1h Z2VVUkwiXTsKKyAgICBpZiAoX3BhZ2VVUkwpCisgICAgICAgIFtwcmV2aWV3T3B0aW9ucyBzZXRP YmplY3Q6X3BhZ2VVUkwuZ2V0KCkgZm9yS2V5OkAicGFnZVVSTCJdOworICAgIHJldHVybiBwcmV2 aWV3T3B0aW9ucy5hdXRvcmVsZWFzZSgpOworfQorCiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBX S0ltYWdlRXh0cmFjdGlvblByZXZpZXdDb250cm9sbGVyIHsKQEAgLTc1LDEzICs5MiwxNSBAQCBA aW1wbGVtZW50YXRpb24gV0tJbWFnZUV4dHJhY3Rpb25QcmV2aWV3Q29udHJvbGxlciB7CiAgICAg UmV0YWluUHRyPFdLSW1hZ2VFeHRyYWN0aW9uUHJldmlld0l0ZW0+IF9wcmV2aWV3SXRlbTsKIH0K IAotLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoUGFnZTooV2ViS2l0OjpXZWJQYWdlUHJveHkmKXBh Z2UgdXJsOihOU1VSTCAqKXVybCB0aXRsZTooTlNTdHJpbmcgKil0aXRsZQorLSAoaW5zdGFuY2V0 eXBlKWluaXRXaXRoUGFnZTooV2ViS2l0OjpXZWJQYWdlUHJveHkmKXBhZ2UgZmlsZVVSTDooTlNV UkwgKilmaWxlVVJMIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIGltYWdlVVJMOihOU1VSTCAqKWlt YWdlVVJMCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJldHVy biBuaWw7CiAKICAgICBfcGFnZSA9IG1ha2VXZWFrUHRyKHBhZ2UpOwotICAgIF9wcmV2aWV3SXRl bSA9IGFkb3B0TlMoW1tXS0ltYWdlRXh0cmFjdGlvblByZXZpZXdJdGVtIGFsbG9jXSBpbml0V2l0 aFVSTDp1cmwgdGl0bGU6dGl0bGVdKTsKKworICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgdHVybiBg X3ByZXZpZXdJdGVtYCBpbnRvIGEgUUxJdGVtIG9uY2UgdGhlIGZpeCBmb3IgcmRhcjovLzc0Mjk5 NDUxIGlzIGF2YWlsYWJsZS4KKyAgICBfcHJldmlld0l0ZW0gPSBhZG9wdE5TKFtbV0tJbWFnZUV4 dHJhY3Rpb25QcmV2aWV3SXRlbSBhbGxvY10gaW5pdFdpdGhGaWxlVVJMOmZpbGVVUkwgdGl0bGU6 dGl0bGUgaW1hZ2VVUkw6aW1hZ2VVUkwgcGFnZVVSTDpVUkwgeyBVUkwgeyB9LCBwYWdlLmN1cnJl bnRVUkwoKSB9XSk7CiAKICAgICByZXR1cm4gc2VsZjsKIH0K