213229 2020-06-15 21:12:04 -0700 Provide alternatively-named WKBrowsingContextGroup SPI 2020-06-16 10:58:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 213092 1 achristensen achristensen cdumez thorton webkit-bug-importer youennf oldest_to_newest 1662968 0 achristensen 2020-06-15 21:12:04 -0700 Provide alternatively-named WKBrowsingContextGroup SPI 1662969 1 401977 achristensen 2020-06-15 21:14:36 -0700 Created attachment 401977 Patch 1662970 2 401978 achristensen 2020-06-15 21:15:02 -0700 Created attachment 401978 Patch 1663156 3 401978 thorton 2020-06-16 10:44:31 -0700 Comment on attachment 401978 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401978&action=review > Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.h:44 > +- (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly; Not sure "include match pattern strings" quite reads as a parseable phrase to me. 1663160 4 ews-feeder 2020-06-16 10:57:23 -0700 Committed r263099: <https://trac.webkit.org/changeset/263099> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401978. 1663162 5 webkit-bug-importer 2020-06-16 10:58:20 -0700 <rdar://problem/64413468> 401977 2020-06-15 21:14:36 -0700 2020-06-15 21:14:55 -0700 Patch bug-213229-20200615211435.patch text/plain 7455 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjMwNzQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIwLTA2LTE1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJvdmlkZSBhbHRl cm5hdGl2ZWx5LW5hbWVkIFdLQnJvd3NpbmdDb250ZXh0R3JvdXAgU1BJCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMyMjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHVuZm9ydHVuYXRlbHkg c3RpbGwgdXNlZC4gSW4gb3JkZXIgdG8gdHJ5IHRvIGNvbnZpbmNlIHRoZSB1c2VyIHRvIG1ha2Ug dGhlIHNtYWxsZXN0IGNoYW5nZSBwb3NzaWJsZSwgbWFrZSBuZXdseSBuYW1lZCBTUEkgdGhhdCBi ZWhhdmVzIGlkZW50aWNhbGx5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jy b3dzaW5nQ29udGV4dEdyb3VwLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jy b3dzaW5nQ29udGV4dEdyb3VwLm1tOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3Vw IGFkZFVzZXJTdHlsZVNoZWV0OmJhc2VVUkw6d2hpdGVsaXN0ZWRVUkxQYXR0ZXJuczpibGFja2xp c3RlZFVSTFBhdHRlcm5zOm1haW5GcmFtZU9ubHk6XSk6CisgICAgICAgICgtW1dLQnJvd3NpbmdD b250ZXh0R3JvdXAgYWRkVXNlclN0eWxlU2hlZXQ6YmFzZVVSTDppbmNsdWRlTWF0Y2hQYXR0ZXJu U3RyaW5nczpleGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczptYWluRnJhbWVPbmx5Ol0pOgorICAg ICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFkZFVzZXJTY3JpcHQ6YmFzZVVSTDp3aGl0 ZWxpc3RlZFVSTFBhdHRlcm5zOmJsYWNrbGlzdGVkVVJMUGF0dGVybnM6aW5qZWN0aW9uVGltZTpt YWluRnJhbWVPbmx5Ol0pOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFkZFVz ZXJTY3JpcHQ6YmFzZVVSTDppbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczpleGNsdWRlTWF0Y2hQ YXR0ZXJuU3RyaW5nczppbmplY3Rpb25UaW1lOm1haW5GcmFtZU9ubHk6XSk6CisKIDIwMjAtMDYt MTUgIFBhdmVsIEZlbGRtYW4gIDxwYXZlbC5mZWxkbWFuQGdtYWlsLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBpbnRyb2R1Y2UgcmVxdWVzdCBpbnRlcmNlcHRpb24KSW5kZXg6IFNvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdD b250ZXh0R3JvdXAuaAkocmV2aXNpb24gMjYzMDY2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAuaAkod29ya2luZyBjb3B5KQpAQCAt MzUsMTAgKzM1LDEzIEBAIFdLX0NMQVNTX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiV0sK IAogLyogVXNlciBDb250ZW50ICovCiAKLS0gKHZvaWQpYWRkVXNlclN0eWxlU2hlZXQ6KE5TU3Ry aW5nICopc291cmNlIGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTCB3aGl0ZWxpc3RlZFVSTFBhdHRl cm5zOihOU0FycmF5ICopd2hpdGVsaXN0IGJsYWNrbGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkg KilibGFja2xpc3QgbWFpbkZyYW1lT25seTooQk9PTCltYWluRnJhbWVPbmx5OworLSAodm9pZClh ZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNl VVJMIHdoaXRlbGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkgKil3aGl0ZWxpc3QgYmxhY2tsaXN0 ZWRVUkxQYXR0ZXJuczooTlNBcnJheSAqKWJsYWNrbGlzdCBtYWluRnJhbWVPbmx5OihCT09MKW1h aW5GcmFtZU9ubHkgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiYWRkVXNlclN0 eWxlU2hlZXQ6YmFzZVVSTDppbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczpleGNsdWRlTWF0Y2hQ YXR0ZXJuU3RyaW5nczptYWluRnJhbWVPbmx5OiIsIG1hY29zKDEwLjEwLCBXS19NQUNfVEJBKSwg aW9zKDguMCwgV0tfSU9TX1RCQSkpOworLSAodm9pZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJp bmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5T dHJpbmdzOihOU0FycmF5PE5TU3RyaW5nICo+ICopaW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3Mg ZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3M6KE5TQXJyYXk8TlNTdHJpbmcgKj4gKilleGNsdWRl TWF0Y2hQYXR0ZXJuU3RyaW5ncyBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHk7CisK IC0gKHZvaWQpcmVtb3ZlQWxsVXNlclN0eWxlU2hlZXRzOwogCi0tICh2b2lkKWFkZFVzZXJTY3Jp cHQ6KE5TU3RyaW5nICopc291cmNlIGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTCB3aGl0ZWxpc3Rl ZFVSTFBhdHRlcm5zOihOU0FycmF5ICopd2hpdGVsaXN0IGJsYWNrbGlzdGVkVVJMUGF0dGVybnM6 KE5TQXJyYXkgKilibGFja2xpc3QgaW5qZWN0aW9uVGltZTooX1dLVXNlclNjcmlwdEluamVjdGlv blRpbWUpaW5qZWN0aW9uVGltZSBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHk7Cist ICh2b2lkKWFkZFVzZXJTY3JpcHQ6KE5TU3RyaW5nICopc291cmNlIGJhc2VVUkw6KE5TVVJMICop YmFzZVVSTCB3aGl0ZWxpc3RlZFVSTFBhdHRlcm5zOihOU0FycmF5ICopd2hpdGVsaXN0IGJsYWNr bGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkgKilibGFja2xpc3QgaW5qZWN0aW9uVGltZTooX1dL VXNlclNjcmlwdEluamVjdGlvblRpbWUpaW5qZWN0aW9uVGltZSBtYWluRnJhbWVPbmx5OihCT09M KW1haW5GcmFtZU9ubHkgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiYWRkVXNl clNjcmlwdDpiYXNlVVJMOmluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzOmV4Y2x1ZGVNYXRjaFBh dHRlcm5TdHJpbmdzOmluamVjdGlvblRpbWU6bWFpbkZyYW1lT25seToiLCBtYWNvcygxMC4xMCwg V0tfTUFDX1RCQSksIGlvcyg4LjAsIFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpYWRkVXNlclNjcmlw dDooTlNTdHJpbmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIGluY2x1ZGVNYXRj aFBhdHRlcm5TdHJpbmdzOihOU0FycmF5PE5TU3RyaW5nICo+ICopaW5jbHVkZU1hdGNoUGF0dGVy blN0cmluZ3MgZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3M6KE5TQXJyYXk8TlNTdHJpbmcgKj4g KilleGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyBpbmplY3Rpb25UaW1lOihfV0tVc2VyU2NyaXB0 SW5qZWN0aW9uVGltZSlpbmplY3Rpb25UaW1lIG1haW5GcmFtZU9ubHk6KEJPT0wpbWFpbkZyYW1l T25seTsKIC0gKHZvaWQpcmVtb3ZlQWxsVXNlclNjcmlwdHM7CiAKIApJbmRleDogU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250 ZXh0R3JvdXAubW0JKHJldmlzaW9uIDI2MzA2NikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0x MzAsMTYgKzEzMCwyMSBAQCBzdGF0aWMgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gY3JlYXRlV0tB CiAKIC0odm9pZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcgKilzb3VyY2UgYmFzZVVSTDoo TlNVUkwgKiliYXNlVVJMIHdoaXRlbGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkgKil3aGl0ZWxp c3QgYmxhY2tsaXN0ZWRVUkxQYXR0ZXJuczooTlNBcnJheSAqKWJsYWNrbGlzdCBtYWluRnJhbWVP bmx5OihCT09MKW1haW5GcmFtZU9ubHkKIHsKKyAgICBbc2VsZiBhZGRVc2VyU3R5bGVTaGVldDpz b3VyY2UgYmFzZVVSTDpiYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzOndoaXRlbGlz dCBleGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczpibGFja2xpc3QgbWFpbkZyYW1lT25seTptYWlu RnJhbWVPbmx5XTsKK30KKworLSAodm9pZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcgKilz b3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdz OihOU0FycmF5PE5TU3RyaW5nICo+ICopaW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MgZXhjbHVk ZU1hdGNoUGF0dGVyblN0cmluZ3M6KE5TQXJyYXk8TlNTdHJpbmcgKj4gKilleGNsdWRlTWF0Y2hQ YXR0ZXJuU3RyaW5ncyBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHkKK3sKICAgICBp ZiAoIXNvdXJjZSkKICAgICAgICAgQ1JBU0goKTsKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5n UmVmPiB3a1NvdXJjZSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJp ZGdlIENGU3RyaW5nUmVmKXNvdXJjZSkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a0Jh c2VVUkwgPSBhZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aENGVVJMKChfX2JyaWRnZSBDRlVSTFJlZili YXNlVVJMKSk7Ci0gICAgYXV0byB3a1doaXRlbGlzdCA9IGNyZWF0ZVdLQXJyYXkod2hpdGVsaXN0 KTsKLSAgICBhdXRvIHdrQmxhY2tsaXN0ID0gY3JlYXRlV0tBcnJheShibGFja2xpc3QpOworICAg IGF1dG8gd2tJbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyA9IGNyZWF0ZVdLQXJyYXkoaW5jbHVk ZU1hdGNoUGF0dGVyblN0cmluZ3MpOworICAgIGF1dG8gd2tFeGNsdWRlTWF0Y2hQYXR0ZXJuU3Ry aW5ncyA9IGNyZWF0ZVdLQXJyYXkoZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MpOwogICAgIFdL VXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcyA9IG1haW5GcmFtZU9ubHkg PyBrV0tJbmplY3RJblRvcEZyYW1lT25seSA6IGtXS0luamVjdEluQWxsRnJhbWVzOwogCi0gICAg V0tQYWdlR3JvdXBBZGRVc2VyU3R5bGVTaGVldChXZWJLaXQ6OnRvQVBJKF9wYWdlR3JvdXAuZ2V0 KCkpLCB3a1NvdXJjZS5nZXQoKSwgd2tCYXNlVVJMLmdldCgpLCB3a1doaXRlbGlzdC5nZXQoKSwg d2tCbGFja2xpc3QuZ2V0KCksIGluamVjdGVkRnJhbWVzKTsKKyAgICBXS1BhZ2VHcm91cEFkZFVz ZXJTdHlsZVNoZWV0KFdlYktpdDo6dG9BUEkoX3BhZ2VHcm91cC5nZXQoKSksIHdrU291cmNlLmdl dCgpLCB3a0Jhc2VVUkwuZ2V0KCksIHdrSW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MuZ2V0KCks IHdrRXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MuZ2V0KCksIGluamVjdGVkRnJhbWVzKTsKIH0K IAogLSAodm9pZClyZW1vdmVBbGxVc2VyU3R5bGVTaGVldHMKQEAgLTE0OSwxNiArMTU0LDIxIEBA IC0gKHZvaWQpcmVtb3ZlQWxsVXNlclN0eWxlU2hlZXRzCiAKIC0gKHZvaWQpYWRkVXNlclNjcmlw dDooTlNTdHJpbmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIHdoaXRlbGlzdGVk VVJMUGF0dGVybnM6KE5TQXJyYXkgKil3aGl0ZWxpc3QgYmxhY2tsaXN0ZWRVUkxQYXR0ZXJuczoo TlNBcnJheSAqKWJsYWNrbGlzdCBpbmplY3Rpb25UaW1lOihfV0tVc2VyU2NyaXB0SW5qZWN0aW9u VGltZSlpbmplY3Rpb25UaW1lIG1haW5GcmFtZU9ubHk6KEJPT0wpbWFpbkZyYW1lT25seQogewor ICAgIFtzZWxmIGFkZFVzZXJTY3JpcHQ6c291cmNlIGJhc2VVUkw6YmFzZVVSTCBpbmNsdWRlTWF0 Y2hQYXR0ZXJuU3RyaW5nczp3aGl0ZWxpc3QgZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3M6Ymxh Y2tsaXN0IGluamVjdGlvblRpbWU6aW5qZWN0aW9uVGltZSBtYWluRnJhbWVPbmx5Om1haW5GcmFt ZU9ubHldOworfQorCistICh2b2lkKWFkZFVzZXJTY3JpcHQ6KE5TU3RyaW5nICopc291cmNlIGJh c2VVUkw6KE5TVVJMICopYmFzZVVSTCBpbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczooTlNBcnJh eTxOU1N0cmluZyAqPiAqKWluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzIGV4Y2x1ZGVNYXRjaFBh dHRlcm5TdHJpbmdzOihOU0FycmF5PE5TU3RyaW5nICo+ICopZXhjbHVkZU1hdGNoUGF0dGVyblN0 cmluZ3MgaW5qZWN0aW9uVGltZTooX1dLVXNlclNjcmlwdEluamVjdGlvblRpbWUpaW5qZWN0aW9u VGltZSBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHkKK3sKICAgICBpZiAoIXNvdXJj ZSkKICAgICAgICAgQ1JBU0goKTsKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1Nv dXJjZSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJpZGdlIENGU3Ry aW5nUmVmKXNvdXJjZSkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a0Jhc2VVUkwgPSBh ZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aENGVVJMKChfX2JyaWRnZSBDRlVSTFJlZiliYXNlVVJMKSk7 Ci0gICAgYXV0byB3a1doaXRlbGlzdCA9IGNyZWF0ZVdLQXJyYXkod2hpdGVsaXN0KTsKLSAgICBh dXRvIHdrQmxhY2tsaXN0ID0gY3JlYXRlV0tBcnJheShibGFja2xpc3QpOworICAgIGF1dG8gd2tJ bmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyA9IGNyZWF0ZVdLQXJyYXkoaW5jbHVkZU1hdGNoUGF0 dGVyblN0cmluZ3MpOworICAgIGF1dG8gd2tFeGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyA9IGNy ZWF0ZVdLQXJyYXkoZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MpOwogICAgIFdLVXNlckNvbnRl bnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcyA9IG1haW5GcmFtZU9ubHkgPyBrV0tJbmpl Y3RJblRvcEZyYW1lT25seSA6IGtXS0luamVjdEluQWxsRnJhbWVzOwogCi0gICAgV0tQYWdlR3Jv dXBBZGRVc2VyU2NyaXB0KFdlYktpdDo6dG9BUEkoX3BhZ2VHcm91cC5nZXQoKSksIHdrU291cmNl LmdldCgpLCB3a0Jhc2VVUkwuZ2V0KCksIHdrV2hpdGVsaXN0LmdldCgpLCB3a0JsYWNrbGlzdC5n ZXQoKSwgaW5qZWN0ZWRGcmFtZXMsIGluamVjdGlvblRpbWUpOworICAgIFdLUGFnZUdyb3VwQWRk VXNlclNjcmlwdChXZWJLaXQ6OnRvQVBJKF9wYWdlR3JvdXAuZ2V0KCkpLCB3a1NvdXJjZS5nZXQo KSwgd2tCYXNlVVJMLmdldCgpLCB3a0luY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzLmdldCgpLCB3 a0V4Y2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzLmdldCgpLCBpbmplY3RlZEZyYW1lcywgaW5qZWN0 aW9uVGltZSk7CiB9CiAKIC0gKHZvaWQpcmVtb3ZlQWxsVXNlclNjcmlwdHMK 401978 2020-06-15 21:15:02 -0700 2020-06-16 10:57:23 -0700 Patch bug-213229-20200615211501.patch text/plain 7560 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjMwNzQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA2LTE1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJvdmlkZSBhbHRl cm5hdGl2ZWx5LW5hbWVkIFdLQnJvd3NpbmdDb250ZXh0R3JvdXAgU1BJCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMyMjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHVuZm9ydHVuYXRlbHkg c3RpbGwgdXNlZC4gSW4gb3JkZXIgdG8gdHJ5IHRvIGNvbnZpbmNlIHRoZSB1c2VyIHRvIG1ha2Ug dGhlIHNtYWxsZXN0IGNoYW5nZSBwb3NzaWJsZSwgbWFrZSBuZXdseSBuYW1lZCBTUEkgdGhhdCBi ZWhhdmVzIGlkZW50aWNhbGx5LgorICAgICAgICBEb3VibHktZGVwcmVjYXRlIHRoZSBvbGQgU1BJ IGFuZCBpbXBsZW1lbnQgaXQgaW4gdGVybXMgb2YgdGhlIG5ldyBkdXJpbmcgdGhlIHRyYW5zaXRp b24gcGVyaW9kLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29u dGV4dEdyb3VwLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29u dGV4dEdyb3VwLm1tOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFkZFVzZXJT dHlsZVNoZWV0OmJhc2VVUkw6d2hpdGVsaXN0ZWRVUkxQYXR0ZXJuczpibGFja2xpc3RlZFVSTFBh dHRlcm5zOm1haW5GcmFtZU9ubHk6XSk6CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0R3Jv dXAgYWRkVXNlclN0eWxlU2hlZXQ6YmFzZVVSTDppbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczpl eGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczptYWluRnJhbWVPbmx5Ol0pOgorICAgICAgICAoLVtX S0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFkZFVzZXJTY3JpcHQ6YmFzZVVSTDp3aGl0ZWxpc3RlZFVS TFBhdHRlcm5zOmJsYWNrbGlzdGVkVVJMUGF0dGVybnM6aW5qZWN0aW9uVGltZTptYWluRnJhbWVP bmx5Ol0pOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dEdyb3VwIGFkZFVzZXJTY3JpcHQ6 YmFzZVVSTDppbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczpleGNsdWRlTWF0Y2hQYXR0ZXJuU3Ry aW5nczppbmplY3Rpb25UaW1lOm1haW5GcmFtZU9ubHk6XSk6CisKIDIwMjAtMDYtMTUgIFBhdmVs IEZlbGRtYW4gIDxwYXZlbC5mZWxkbWFuQGdtYWlsLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBpbnRyb2R1Y2UgcmVxdWVzdCBpbnRlcmNlcHRpb24KSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0R3Jv dXAuaAkocmV2aXNpb24gMjYzMDY2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTAgKzM1 LDEzIEBAIFdLX0NMQVNTX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiV0sKIAogLyogVXNl ciBDb250ZW50ICovCiAKLS0gKHZvaWQpYWRkVXNlclN0eWxlU2hlZXQ6KE5TU3RyaW5nICopc291 cmNlIGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTCB3aGl0ZWxpc3RlZFVSTFBhdHRlcm5zOihOU0Fy cmF5ICopd2hpdGVsaXN0IGJsYWNrbGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkgKilibGFja2xp c3QgbWFpbkZyYW1lT25seTooQk9PTCltYWluRnJhbWVPbmx5OworLSAodm9pZClhZGRVc2VyU3R5 bGVTaGVldDooTlNTdHJpbmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIHdoaXRl bGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkgKil3aGl0ZWxpc3QgYmxhY2tsaXN0ZWRVUkxQYXR0 ZXJuczooTlNBcnJheSAqKWJsYWNrbGlzdCBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9u bHkgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiYWRkVXNlclN0eWxlU2hlZXQ6 YmFzZVVSTDppbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczpleGNsdWRlTWF0Y2hQYXR0ZXJuU3Ry aW5nczptYWluRnJhbWVPbmx5OiIsIG1hY29zKDEwLjEwLCBXS19NQUNfVEJBKSwgaW9zKDguMCwg V0tfSU9TX1RCQSkpOworLSAodm9pZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcgKilzb3Vy Y2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzOihO U0FycmF5PE5TU3RyaW5nICo+ICopaW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MgZXhjbHVkZU1h dGNoUGF0dGVyblN0cmluZ3M6KE5TQXJyYXk8TlNTdHJpbmcgKj4gKilleGNsdWRlTWF0Y2hQYXR0 ZXJuU3RyaW5ncyBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHk7CisKIC0gKHZvaWQp cmVtb3ZlQWxsVXNlclN0eWxlU2hlZXRzOwogCi0tICh2b2lkKWFkZFVzZXJTY3JpcHQ6KE5TU3Ry aW5nICopc291cmNlIGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTCB3aGl0ZWxpc3RlZFVSTFBhdHRl cm5zOihOU0FycmF5ICopd2hpdGVsaXN0IGJsYWNrbGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkg KilibGFja2xpc3QgaW5qZWN0aW9uVGltZTooX1dLVXNlclNjcmlwdEluamVjdGlvblRpbWUpaW5q ZWN0aW9uVGltZSBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHk7CistICh2b2lkKWFk ZFVzZXJTY3JpcHQ6KE5TU3RyaW5nICopc291cmNlIGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTCB3 aGl0ZWxpc3RlZFVSTFBhdHRlcm5zOihOU0FycmF5ICopd2hpdGVsaXN0IGJsYWNrbGlzdGVkVVJM UGF0dGVybnM6KE5TQXJyYXkgKilibGFja2xpc3QgaW5qZWN0aW9uVGltZTooX1dLVXNlclNjcmlw dEluamVjdGlvblRpbWUpaW5qZWN0aW9uVGltZSBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFt ZU9ubHkgV0tfQVBJX0RFUFJFQ0FURURfV0lUSF9SRVBMQUNFTUVOVCgiYWRkVXNlclNjcmlwdDpi YXNlVVJMOmluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzOmV4Y2x1ZGVNYXRjaFBhdHRlcm5TdHJp bmdzOmluamVjdGlvblRpbWU6bWFpbkZyYW1lT25seToiLCBtYWNvcygxMC4xMCwgV0tfTUFDX1RC QSksIGlvcyg4LjAsIFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpYWRkVXNlclNjcmlwdDooTlNTdHJp bmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5T dHJpbmdzOihOU0FycmF5PE5TU3RyaW5nICo+ICopaW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3Mg ZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3M6KE5TQXJyYXk8TlNTdHJpbmcgKj4gKilleGNsdWRl TWF0Y2hQYXR0ZXJuU3RyaW5ncyBpbmplY3Rpb25UaW1lOihfV0tVc2VyU2NyaXB0SW5qZWN0aW9u VGltZSlpbmplY3Rpb25UaW1lIG1haW5GcmFtZU9ubHk6KEJPT0wpbWFpbkZyYW1lT25seTsKIC0g KHZvaWQpcmVtb3ZlQWxsVXNlclNjcmlwdHM7CiAKIApJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQnJvd3NpbmdDb250ZXh0R3JvdXAu bW0JKHJldmlzaW9uIDI2MzA2NikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMzAsMTYgKzEz MCwyMSBAQCBzdGF0aWMgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gY3JlYXRlV0tBCiAKIC0odm9p ZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKili YXNlVVJMIHdoaXRlbGlzdGVkVVJMUGF0dGVybnM6KE5TQXJyYXkgKil3aGl0ZWxpc3QgYmxhY2ts aXN0ZWRVUkxQYXR0ZXJuczooTlNBcnJheSAqKWJsYWNrbGlzdCBtYWluRnJhbWVPbmx5OihCT09M KW1haW5GcmFtZU9ubHkKIHsKKyAgICBbc2VsZiBhZGRVc2VyU3R5bGVTaGVldDpzb3VyY2UgYmFz ZVVSTDpiYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzOndoaXRlbGlzdCBleGNsdWRl TWF0Y2hQYXR0ZXJuU3RyaW5nczpibGFja2xpc3QgbWFpbkZyYW1lT25seTptYWluRnJhbWVPbmx5 XTsKK30KKworLSAodm9pZClhZGRVc2VyU3R5bGVTaGVldDooTlNTdHJpbmcgKilzb3VyY2UgYmFz ZVVSTDooTlNVUkwgKiliYXNlVVJMIGluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzOihOU0FycmF5 PE5TU3RyaW5nICo+ICopaW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MgZXhjbHVkZU1hdGNoUGF0 dGVyblN0cmluZ3M6KE5TQXJyYXk8TlNTdHJpbmcgKj4gKilleGNsdWRlTWF0Y2hQYXR0ZXJuU3Ry aW5ncyBtYWluRnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHkKK3sKICAgICBpZiAoIXNvdXJj ZSkKICAgICAgICAgQ1JBU0goKTsKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1Nv dXJjZSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJpZGdlIENGU3Ry aW5nUmVmKXNvdXJjZSkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a0Jhc2VVUkwgPSBh ZG9wdFdLKFdLVVJMQ3JlYXRlV2l0aENGVVJMKChfX2JyaWRnZSBDRlVSTFJlZiliYXNlVVJMKSk7 Ci0gICAgYXV0byB3a1doaXRlbGlzdCA9IGNyZWF0ZVdLQXJyYXkod2hpdGVsaXN0KTsKLSAgICBh dXRvIHdrQmxhY2tsaXN0ID0gY3JlYXRlV0tBcnJheShibGFja2xpc3QpOworICAgIGF1dG8gd2tJ bmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyA9IGNyZWF0ZVdLQXJyYXkoaW5jbHVkZU1hdGNoUGF0 dGVyblN0cmluZ3MpOworICAgIGF1dG8gd2tFeGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyA9IGNy ZWF0ZVdLQXJyYXkoZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MpOwogICAgIFdLVXNlckNvbnRl bnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcyA9IG1haW5GcmFtZU9ubHkgPyBrV0tJbmpl Y3RJblRvcEZyYW1lT25seSA6IGtXS0luamVjdEluQWxsRnJhbWVzOwogCi0gICAgV0tQYWdlR3Jv dXBBZGRVc2VyU3R5bGVTaGVldChXZWJLaXQ6OnRvQVBJKF9wYWdlR3JvdXAuZ2V0KCkpLCB3a1Nv dXJjZS5nZXQoKSwgd2tCYXNlVVJMLmdldCgpLCB3a1doaXRlbGlzdC5nZXQoKSwgd2tCbGFja2xp c3QuZ2V0KCksIGluamVjdGVkRnJhbWVzKTsKKyAgICBXS1BhZ2VHcm91cEFkZFVzZXJTdHlsZVNo ZWV0KFdlYktpdDo6dG9BUEkoX3BhZ2VHcm91cC5nZXQoKSksIHdrU291cmNlLmdldCgpLCB3a0Jh c2VVUkwuZ2V0KCksIHdrSW5jbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MuZ2V0KCksIHdrRXhjbHVk ZU1hdGNoUGF0dGVyblN0cmluZ3MuZ2V0KCksIGluamVjdGVkRnJhbWVzKTsKIH0KIAogLSAodm9p ZClyZW1vdmVBbGxVc2VyU3R5bGVTaGVldHMKQEAgLTE0OSwxNiArMTU0LDIxIEBAIC0gKHZvaWQp cmVtb3ZlQWxsVXNlclN0eWxlU2hlZXRzCiAKIC0gKHZvaWQpYWRkVXNlclNjcmlwdDooTlNTdHJp bmcgKilzb3VyY2UgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMIHdoaXRlbGlzdGVkVVJMUGF0dGVy bnM6KE5TQXJyYXkgKil3aGl0ZWxpc3QgYmxhY2tsaXN0ZWRVUkxQYXR0ZXJuczooTlNBcnJheSAq KWJsYWNrbGlzdCBpbmplY3Rpb25UaW1lOihfV0tVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSlpbmpl Y3Rpb25UaW1lIG1haW5GcmFtZU9ubHk6KEJPT0wpbWFpbkZyYW1lT25seQogeworICAgIFtzZWxm IGFkZFVzZXJTY3JpcHQ6c291cmNlIGJhc2VVUkw6YmFzZVVSTCBpbmNsdWRlTWF0Y2hQYXR0ZXJu U3RyaW5nczp3aGl0ZWxpc3QgZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3M6YmxhY2tsaXN0IGlu amVjdGlvblRpbWU6aW5qZWN0aW9uVGltZSBtYWluRnJhbWVPbmx5Om1haW5GcmFtZU9ubHldOwor fQorCistICh2b2lkKWFkZFVzZXJTY3JpcHQ6KE5TU3RyaW5nICopc291cmNlIGJhc2VVUkw6KE5T VVJMICopYmFzZVVSTCBpbmNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5nczooTlNBcnJheTxOU1N0cmlu ZyAqPiAqKWluY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzIGV4Y2x1ZGVNYXRjaFBhdHRlcm5TdHJp bmdzOihOU0FycmF5PE5TU3RyaW5nICo+ICopZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MgaW5q ZWN0aW9uVGltZTooX1dLVXNlclNjcmlwdEluamVjdGlvblRpbWUpaW5qZWN0aW9uVGltZSBtYWlu RnJhbWVPbmx5OihCT09MKW1haW5GcmFtZU9ubHkKK3sKICAgICBpZiAoIXNvdXJjZSkKICAgICAg ICAgQ1JBU0goKTsKIAogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1NvdXJjZSA9IGFk b3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKF9fYnJpZGdlIENGU3RyaW5nUmVmKXNv dXJjZSkpOwogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a0Jhc2VVUkwgPSBhZG9wdFdLKFdL VVJMQ3JlYXRlV2l0aENGVVJMKChfX2JyaWRnZSBDRlVSTFJlZiliYXNlVVJMKSk7Ci0gICAgYXV0 byB3a1doaXRlbGlzdCA9IGNyZWF0ZVdLQXJyYXkod2hpdGVsaXN0KTsKLSAgICBhdXRvIHdrQmxh Y2tsaXN0ID0gY3JlYXRlV0tBcnJheShibGFja2xpc3QpOworICAgIGF1dG8gd2tJbmNsdWRlTWF0 Y2hQYXR0ZXJuU3RyaW5ncyA9IGNyZWF0ZVdLQXJyYXkoaW5jbHVkZU1hdGNoUGF0dGVyblN0cmlu Z3MpOworICAgIGF1dG8gd2tFeGNsdWRlTWF0Y2hQYXR0ZXJuU3RyaW5ncyA9IGNyZWF0ZVdLQXJy YXkoZXhjbHVkZU1hdGNoUGF0dGVyblN0cmluZ3MpOwogICAgIFdLVXNlckNvbnRlbnRJbmplY3Rl ZEZyYW1lcyBpbmplY3RlZEZyYW1lcyA9IG1haW5GcmFtZU9ubHkgPyBrV0tJbmplY3RJblRvcEZy YW1lT25seSA6IGtXS0luamVjdEluQWxsRnJhbWVzOwogCi0gICAgV0tQYWdlR3JvdXBBZGRVc2Vy U2NyaXB0KFdlYktpdDo6dG9BUEkoX3BhZ2VHcm91cC5nZXQoKSksIHdrU291cmNlLmdldCgpLCB3 a0Jhc2VVUkwuZ2V0KCksIHdrV2hpdGVsaXN0LmdldCgpLCB3a0JsYWNrbGlzdC5nZXQoKSwgaW5q ZWN0ZWRGcmFtZXMsIGluamVjdGlvblRpbWUpOworICAgIFdLUGFnZUdyb3VwQWRkVXNlclNjcmlw dChXZWJLaXQ6OnRvQVBJKF9wYWdlR3JvdXAuZ2V0KCkpLCB3a1NvdXJjZS5nZXQoKSwgd2tCYXNl VVJMLmdldCgpLCB3a0luY2x1ZGVNYXRjaFBhdHRlcm5TdHJpbmdzLmdldCgpLCB3a0V4Y2x1ZGVN YXRjaFBhdHRlcm5TdHJpbmdzLmdldCgpLCBpbmplY3RlZEZyYW1lcywgaW5qZWN0aW9uVGltZSk7 CiB9CiAKIC0gKHZvaWQpcmVtb3ZlQWxsVXNlclNjcmlwdHMK