224725 2021-04-17 18:58:33 -0700 Use WebProcess::existingGPUProcessConnection() whenever possible 2021-04-24 15:06:36 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez darin eric.carlson ews-watchlist ggaren glenn jer.noble kkinnunen philipj sergio simon.fraser webkit-bug-importer oldest_to_newest 1751516 0 cdumez 2021-04-17 18:58:33 -0700 Use WebProcess::existingGPUProcessConnection() whenever possible, instead of WebProcess::ensureGPUProcessConnection(). This avoids relaunching the GPUProcess if it has already exited. 1751517 1 426360 cdumez 2021-04-17 18:59:54 -0700 Created attachment 426360 Patch 1751524 2 426360 darin 2021-04-17 20:04:40 -0700 Comment on attachment 426360 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426360&action=review > Source/WebKit/WebProcess/GPU/media/RemoteAudioHardwareListener.cpp:58 > + if (auto* gpuProcessConnection = WebProcess::singleton().existingGPUProcessConnection()) { I don’t think it’s an improvement to use the multi-word name for the local variable. Yes, it’s the GPU Process connection, but the name can just be connection in such tight if statements. You may not agree, but I really prefer simple single-word names when possible, even if there is some slight ambiguity. 1751525 3 426360 cdumez 2021-04-17 20:06:01 -0700 Comment on attachment 426360 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426360&action=review >> Source/WebKit/WebProcess/GPU/media/RemoteAudioHardwareListener.cpp:58 >> + if (auto* gpuProcessConnection = WebProcess::singleton().existingGPUProcessConnection()) { > > I don’t think it’s an improvement to use the multi-word name for the local variable. Yes, it’s the GPU Process connection, but the name can just be connection in such tight if statements. You may not agree, but I really prefer simple single-word names when possible, even if there is some slight ambiguity. Ok. I went this way because connection->connection() looks a bit weird. The ambiguity between IPC::Connection and GPUProcessConnection is a bit annoying. 1751526 4 426362 cdumez 2021-04-17 20:08:37 -0700 Created attachment 426362 Patch 1751528 5 cdumez 2021-04-17 20:11:14 -0700 (In reply to Chris Dumez from comment #4) > Created attachment 426362 [details] > Patch Renamed to "connection". 1751536 6 ews-feeder 2021-04-17 20:41:05 -0700 Committed r276218 (236700@main): <https://commits.webkit.org/236700@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426362. 1753922 7 webkit-bug-importer 2021-04-24 15:06:36 -0700 <rdar://problem/77110077> 426360 2021-04-17 18:59:54 -0700 2021-04-17 20:08:35 -0700 Patch bug-224725-20210417185953.patch text/plain 5453 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUwMDgxZWY4ODMzMGMxYjk2 MzkwOTNkZjVjZDE1ODI2YzM4YzMxZjguLjY3YmJjOWM1MmU4N2Y1ODg1N2Q0OGM5YmEwNjFiODI3 YWY2NDBhNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDQtMTcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgV2ViUHJvY2Vzczo6ZXhpc3Rp bmdHUFVQcm9jZXNzQ29ubmVjdGlvbigpIHdoZW5ldmVyIHBvc3NpYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MjUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgV2ViUHJvY2Vzczo6ZXhpc3Rp bmdHUFVQcm9jZXNzQ29ubmVjdGlvbigpIHdoZW5ldmVyIHBvc3NpYmxlLCBpbnN0ZWFkIG9mIFdl YlByb2Nlc3M6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCkuCisgICAgICAgIFRoaXMgYXZv aWRzIHJlbGF1bmNoaW5nIHRoZSBHUFVQcm9jZXNzIGlmIGl0IGhhcyBhbHJlYWR5IGV4aXRlZC4K KworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0 ZW5lci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5lcjo6 flJlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5lcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUv d2VicnRjL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXI6On5BdWRpb01lZGlhU3RyZWFtVHJhY2tS ZW5kZXJlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZUF1ZGlv U291cmNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVhbHRpbWVBdWRpb1NvdXJjZTo6 flJlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2Ev UmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJl YWx0aW1lVmlkZW9Tb3VyY2U6On5SZW1vdGVSZWFsdGltZVZpZGVvU291cmNlKToKKwogMjAyMS0w NC0xNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEdQVUNvbm5l Y3Rpb25Ub1dlYlByb2Nlc3M6OmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkgc2hvdWxk IGNoZWNrIGlmIGxpYldlYlJUQ0NvZGVjc1Byb3h5IGlzIHVzZWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlQXVkaW9IYXJkd2FyZUxpc3RlbmVy LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlQXVkaW9IYXJk d2FyZUxpc3RlbmVyLmNwcAppbmRleCAxN2U1OTFmZmRiM2YyMDIxYzVhMmI4ODA0OTZlMGE5NmU5 YzVjMjhkLi4xZjcwYjU4OWQ5ZDU3YWM0OWVmZjRjNGY3ODkyNTU1MTk5NDE2YjgzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZUF1ZGlvSGFyZHdh cmVMaXN0ZW5lci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9S ZW1vdGVBdWRpb0hhcmR3YXJlTGlzdGVuZXIuY3BwCkBAIC01NSw5ICs1NSwxMCBAQCBSZW1vdGVB dWRpb0hhcmR3YXJlTGlzdGVuZXI6OlJlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5lcihBdWRpb0hh cmR3YXJlTGlzdGVuZXI6OgogCiBSZW1vdGVBdWRpb0hhcmR3YXJlTGlzdGVuZXI6On5SZW1vdGVB dWRpb0hhcmR3YXJlTGlzdGVuZXIoKQogewotICAgIGF1dG8mIGNvbm5lY3Rpb24gPSBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpOwotICAgIGNvbm5l Y3Rpb24ubWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKCp0aGlzKTsK LSAgICBjb25uZWN0aW9uLmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9u VG9XZWJQcm9jZXNzOjpSZWxlYXNlQXVkaW9IYXJkd2FyZUxpc3RlbmVyKG1faWRlbnRpZmllciks IDApOworICAgIGlmIChhdXRvKiBncHVQcm9jZXNzQ29ubmVjdGlvbiA9IFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLmV4aXN0aW5nR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKSkgeworICAgICAgICBncHVQ cm9jZXNzQ29ubmVjdGlvbi0+bWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJlY2Vp dmVyKCp0aGlzKTsKKyAgICAgICAgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS5z ZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpSZWxlYXNlQXVkaW9IYXJk d2FyZUxpc3RlbmVyKG1faWRlbnRpZmllciksIDApOworICAgIH0KIH0KIAogdm9pZCBSZW1vdGVB dWRpb0hhcmR3YXJlTGlzdGVuZXI6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJv Y2Vzc0Nvbm5lY3Rpb24mKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQ VS93ZWJydGMvQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXIuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXIuY3Bw CmluZGV4IDA0NDlhNzgyODY5ODc3YmQ0ZWQ3NmEyOWZiYzY4NDZjOGJlNmU1ZjYuLjcwMzZjNjhm ZmFkNWI1MmZhM2EzNDM1YWQ4ODNmMzNkNDc2NjdhNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL3dlYnJ0Yy9BdWRpb01lZGlhU3Ry ZWFtVHJhY2tSZW5kZXJlci5jcHAKQEAgLTUzLDcgKzUzLDggQEAgQXVkaW9NZWRpYVN0cmVhbVRy YWNrUmVuZGVyZXI6OkF1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyKFJlZjxJUEM6OkNvbm5l Y3Rpb24KIAogQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXI6On5BdWRpb01lZGlhU3RyZWFt VHJhY2tSZW5kZXJlcigpCiB7Ci0gICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BV UHJvY2Vzc0Nvbm5lY3Rpb24oKS5yZW1vdmVDbGllbnQoKnRoaXMpOworICAgIGlmIChhdXRvKiBn cHVQcm9jZXNzQ29ubmVjdGlvbiA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmV4aXN0aW5nR1BV UHJvY2Vzc0Nvbm5lY3Rpb24oKSkKKyAgICAgICAgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24tPnJlbW92 ZUNsaWVudCgqdGhpcyk7CiAgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVB dWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlck1hbmFnZXI6OlJlbGVhc2VSZW5kZXJlciB7IG1f aWRlbnRpZmllciB9LCAwKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL2NvY29hL1JlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2UuY3BwIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2NvY29hL1JlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2UuY3BwCmluZGV4IDNiMmRk ZmEyODM3YWRkMTY3OGY2MDliMTQxYTcxYWExYmUyNDY2ZjguLjI3MmQyNjg2NGQ2NTlmODYxYzU3 NTc2YjYwZTE3OGM5OGY4NjVkMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9jb2NvYS9SZW1vdGVSZWFsdGltZUF1ZGlvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlUmVhbHRpbWVBdWRpb1NvdXJjZS5jcHAKQEAgLTg0LDgg Kzg0LDEwIEBAIHZvaWQgUmVtb3RlUmVhbHRpbWVBdWRpb1NvdXJjZTo6Y3JlYXRlUmVtb3RlTWVk aWFTb3VyY2UoKQogCiBSZW1vdGVSZWFsdGltZUF1ZGlvU291cmNlOjp+UmVtb3RlUmVhbHRpbWVB dWRpb1NvdXJjZSgpCiB7Ci0gICAgaWYgKG1fcHJveHkuc2hvdWxkQ2FwdHVyZUluR1BVUHJvY2Vz cygpKQotICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29u bmVjdGlvbigpLnJlbW92ZUNsaWVudCgqdGhpcyk7CisgICAgaWYgKG1fcHJveHkuc2hvdWxkQ2Fw dHVyZUluR1BVUHJvY2VzcygpKSB7CisgICAgICAgIGlmIChhdXRvKiBncHVQcm9jZXNzQ29ubmVj dGlvbiA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmV4aXN0aW5nR1BVUHJvY2Vzc0Nvbm5lY3Rp b24oKSkKKyAgICAgICAgICAgIGdwdVByb2Nlc3NDb25uZWN0aW9uLT5yZW1vdmVDbGllbnQoKnRo aXMpOworICAgIH0KIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgUmVhbHRpbWVNZWRp YVNvdXJjZUNlbnRlcjo6c2luZ2xldG9uKCkuYXVkaW9DYXB0dXJlRmFjdG9yeSgpLnVuc2V0QWN0 aXZlU291cmNlKCp0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j b2NvYS9SZW1vdGVSZWFsdGltZVZpZGVvU291cmNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCAyNDEwZjQ2ZTAy NDU5ZGYzNWFhYjJkOWVlNTFhYjYxMmNkNmYwNGU3Li5iYzY2MmI0MmEzZmYwZDBlM2YxZWI0MTc4 N2Q0YWQ3ZmY2OTEyMzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j b2EvUmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL2NvY29hL1JlbW90ZVJlYWx0aW1lVmlkZW9Tb3VyY2UuY3BwCkBAIC04OSw4ICs4OSwx MCBAQCB2b2lkIFJlbW90ZVJlYWx0aW1lVmlkZW9Tb3VyY2U6OmNyZWF0ZVJlbW90ZU1lZGlhU291 cmNlKCkKIAogUmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZTo6flJlbW90ZVJlYWx0aW1lVmlkZW9T b3VyY2UoKQogewotICAgIGlmIChtX3Byb3h5LnNob3VsZENhcHR1cmVJbkdQVVByb2Nlc3MoKSkK LSAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rp b24oKS5yZW1vdmVDbGllbnQoKnRoaXMpOworICAgIGlmIChtX3Byb3h5LnNob3VsZENhcHR1cmVJ bkdQVVByb2Nlc3MoKSkgeworICAgICAgICBpZiAoYXV0byogZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24g PSBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5leGlzdGluZ0dQVVByb2Nlc3NDb25uZWN0aW9uKCkp CisgICAgICAgICAgICBncHVQcm9jZXNzQ29ubmVjdGlvbi0+cmVtb3ZlQ2xpZW50KCp0aGlzKTsK KyAgICB9CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIGlmIChkZXZpY2VUeXBlKCkg PT0gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJhKQo= 426362 2021-04-17 20:08:37 -0700 2021-04-17 20:41:07 -0700 Patch bug-224725-20210417200836.patch text/plain 5360 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUwMDgxZWY4ODMzMGMxYjk2 MzkwOTNkZjVjZDE1ODI2YzM4YzMxZjguLmUyYjdkMzRkNjRmZDIwMjBhNjdlNGUzYWExNmRhZTg3 YzQ5ZDhmMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDQtMTcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgV2ViUHJvY2Vzczo6ZXhpc3Rp bmdHUFVQcm9jZXNzQ29ubmVjdGlvbigpIHdoZW5ldmVyIHBvc3NpYmxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MjUKKworICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBVc2UgV2ViUHJvY2Vzczo6ZXhpc3RpbmdH UFVQcm9jZXNzQ29ubmVjdGlvbigpIHdoZW5ldmVyIHBvc3NpYmxlLCBpbnN0ZWFkIG9mIFdlYlBy b2Nlc3M6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCkuCisgICAgICAgIFRoaXMgYXZvaWRz IHJlbGF1bmNoaW5nIHRoZSBHUFVQcm9jZXNzIGlmIGl0IGhhcyBhbHJlYWR5IGV4aXRlZC4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5l ci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5lcjo6flJl bW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5lcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvd2Vi cnRjL0F1ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 QXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXI6On5BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5k ZXJlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZUF1ZGlvU291 cmNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVhbHRpbWVBdWRpb1NvdXJjZTo6flJl bW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvUmVt b3RlUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlYWx0 aW1lVmlkZW9Tb3VyY2U6On5SZW1vdGVSZWFsdGltZVZpZGVvU291cmNlKToKKwogMjAyMS0wNC0x NyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEdQVUNvbm5lY3Rp b25Ub1dlYlByb2Nlc3M6OmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkgc2hvdWxkIGNo ZWNrIGlmIGxpYldlYlJUQ0NvZGVjc1Byb3h5IGlzIHVzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlQXVkaW9IYXJkd2FyZUxpc3RlbmVyLmNw cCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvUmVtb3RlQXVkaW9IYXJkd2Fy ZUxpc3RlbmVyLmNwcAppbmRleCAxN2U1OTFmZmRiM2YyMDIxYzVhMmI4ODA0OTZlMGE5NmU5YzVj MjhkLi4wYTg2OGU5NTFlNzU1OGIxYTIxNzI0NTgzMGE0YzllNGI5ZTNmZTdhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL1JlbW90ZUF1ZGlvSGFyZHdhcmVM aXN0ZW5lci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9SZW1v dGVBdWRpb0hhcmR3YXJlTGlzdGVuZXIuY3BwCkBAIC01NSw5ICs1NSwxMCBAQCBSZW1vdGVBdWRp b0hhcmR3YXJlTGlzdGVuZXI6OlJlbW90ZUF1ZGlvSGFyZHdhcmVMaXN0ZW5lcihBdWRpb0hhcmR3 YXJlTGlzdGVuZXI6OgogCiBSZW1vdGVBdWRpb0hhcmR3YXJlTGlzdGVuZXI6On5SZW1vdGVBdWRp b0hhcmR3YXJlTGlzdGVuZXIoKQogewotICAgIGF1dG8mIGNvbm5lY3Rpb24gPSBXZWJQcm9jZXNz OjpzaW5nbGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpOwotICAgIGNvbm5lY3Rp b24ubWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKCp0aGlzKTsKLSAg ICBjb25uZWN0aW9uLmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9X ZWJQcm9jZXNzOjpSZWxlYXNlQXVkaW9IYXJkd2FyZUxpc3RlbmVyKG1faWRlbnRpZmllciksIDAp OworICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZXhp c3RpbmdHUFVQcm9jZXNzQ29ubmVjdGlvbigpKSB7CisgICAgICAgIGNvbm5lY3Rpb24tPm1lc3Nh Z2VSZWNlaXZlck1hcCgpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcigqdGhpcyk7CisgICAgICAgIGNv bm5lY3Rpb24tPmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9XZWJQ cm9jZXNzOjpSZWxlYXNlQXVkaW9IYXJkd2FyZUxpc3RlbmVyKG1faWRlbnRpZmllciksIDApOwor ICAgIH0KIH0KIAogdm9pZCBSZW1vdGVBdWRpb0hhcmR3YXJlTGlzdGVuZXI6OmdwdVByb2Nlc3ND b25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVu ZGVyZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS93ZWJydGMvQXVkaW9NZWRp YVN0cmVhbVRyYWNrUmVuZGVyZXIuY3BwCmluZGV4IDA0NDlhNzgyODY5ODc3YmQ0ZWQ3NmEyOWZi YzY4NDZjOGJlNmU1ZjYuLjYyYTc4OTFlZmRiZjNlYTc5MjU0MDg0ZjgzODkzMmVmM2U5MzdmNGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvd2VicnRjL0F1ZGlvTWVk aWFTdHJlYW1UcmFja1JlbmRlcmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv R1BVL3dlYnJ0Yy9BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlci5jcHAKQEAgLTUzLDcgKzUz LDggQEAgQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXI6OkF1ZGlvTWVkaWFTdHJlYW1UcmFj a1JlbmRlcmVyKFJlZjxJUEM6OkNvbm5lY3Rpb24KIAogQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVu ZGVyZXI6On5BdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlcigpCiB7Ci0gICAgV2ViUHJvY2Vz czo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKS5yZW1vdmVDbGllbnQo KnRoaXMpOworICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gV2ViUHJvY2Vzczo6c2luZ2xldG9u KCkuZXhpc3RpbmdHUFVQcm9jZXNzQ29ubmVjdGlvbigpKQorICAgICAgICBjb25uZWN0aW9uLT5y ZW1vdmVDbGllbnQoKnRoaXMpOwogICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6UmVt b3RlQXVkaW9NZWRpYVN0cmVhbVRyYWNrUmVuZGVyZXJNYW5hZ2VyOjpSZWxlYXNlUmVuZGVyZXIg eyBtX2lkZW50aWZpZXIgfSwgMCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZUF1ZGlvU291cmNlLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZUF1ZGlvU291cmNlLmNwcAppbmRleCAz YjJkZGZhMjgzN2FkZDE2NzhmNjA5YjE0MWE3MWFhMWJlMjQ2NmY4Li5jMzIzYTZhNzhiNDUwMDVi Njc3NDA4NjJiNjI5YjE2ZmJiODBmNDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvY29jb2EvUmVtb3RlUmVhbHRpbWVBdWRpb1NvdXJjZS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2UuY3BwCkBAIC04 NCw4ICs4NCwxMCBAQCB2b2lkIFJlbW90ZVJlYWx0aW1lQXVkaW9Tb3VyY2U6OmNyZWF0ZVJlbW90 ZU1lZGlhU291cmNlKCkKIAogUmVtb3RlUmVhbHRpbWVBdWRpb1NvdXJjZTo6flJlbW90ZVJlYWx0 aW1lQXVkaW9Tb3VyY2UoKQogewotICAgIGlmIChtX3Byb3h5LnNob3VsZENhcHR1cmVJbkdQVVBy b2Nlc3MoKSkKLSAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJvY2Vz c0Nvbm5lY3Rpb24oKS5yZW1vdmVDbGllbnQoKnRoaXMpOworICAgIGlmIChtX3Byb3h5LnNob3Vs ZENhcHR1cmVJbkdQVVByb2Nlc3MoKSkgeworICAgICAgICBpZiAoYXV0byogY29ubmVjdGlvbiA9 IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmV4aXN0aW5nR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKSkK KyAgICAgICAgICAgIGNvbm5lY3Rpb24tPnJlbW92ZUNsaWVudCgqdGhpcyk7CisgICAgfQogCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBSZWFsdGltZU1lZGlhU291cmNlQ2VudGVyOjpz aW5nbGV0b24oKS5hdWRpb0NhcHR1cmVGYWN0b3J5KCkudW5zZXRBY3RpdmVTb3VyY2UoKnRoaXMp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90ZVJlYWx0 aW1lVmlkZW9Tb3VyY2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90 ZVJlYWx0aW1lVmlkZW9Tb3VyY2UuY3BwCmluZGV4IDI0MTBmNDZlMDI0NTlkZjM1YWFiMmQ5ZWU1 MWFiNjEyY2Q2ZjA0ZTcuLjQzZjNjMzc2NWM3MDk0NTMzYzdhN2E1MmY3NDFlMGIzMjIwMDZjMGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGlt ZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVt b3RlUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAKQEAgLTg5LDggKzg5LDEwIEBAIHZvaWQgUmVtb3Rl UmVhbHRpbWVWaWRlb1NvdXJjZTo6Y3JlYXRlUmVtb3RlTWVkaWFTb3VyY2UoKQogCiBSZW1vdGVS ZWFsdGltZVZpZGVvU291cmNlOjp+UmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZSgpCiB7Ci0gICAg aWYgKG1fcHJveHkuc2hvdWxkQ2FwdHVyZUluR1BVUHJvY2VzcygpKQotICAgICAgICBXZWJQcm9j ZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpLnJlbW92ZUNsaWVu dCgqdGhpcyk7CisgICAgaWYgKG1fcHJveHkuc2hvdWxkQ2FwdHVyZUluR1BVUHJvY2VzcygpKSB7 CisgICAgICAgIGlmIChhdXRvKiBjb25uZWN0aW9uID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCku ZXhpc3RpbmdHUFVQcm9jZXNzQ29ubmVjdGlvbigpKQorICAgICAgICAgICAgY29ubmVjdGlvbi0+ cmVtb3ZlQ2xpZW50KCp0aGlzKTsKKyAgICB9CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQog ICAgIGlmIChkZXZpY2VUeXBlKCkgPT0gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJh KQo=