224516 2021-04-13 16:07:22 -0700 RemoteRenderingBackendProxy should only relaunch the GPUProcess if it actually needs it 2021-04-19 12:21:59 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224461 https://bugs.webkit.org/show_bug.cgi?id=224566 https://bugs.webkit.org/show_bug.cgi?id=224778 InRadar P2 Normal --- 224556 224751 1 cdumez cdumez ggaren kkinnunen sabouhallawa simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1749918 0 cdumez 2021-04-13 16:07:22 -0700 RemoteRenderingBackendProxy should only relaunch the GPUProcess is it actually needs it. 1749931 1 425930 cdumez 2021-04-13 16:41:35 -0700 Created attachment 425930 Patch 1749936 2 425930 ggaren 2021-04-13 16:46:39 -0700 Comment on attachment 425930 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425930&action=review r=me > Source/WebKit/ChangeLog:3 > + RemoteRenderingBackendProxy should only relaunch the GPUProcess is it actually needs it is => if > Source/WebKit/ChangeLog:14 > + This patch is a pre-requirement for terminate the GPUProcess on memory pressure when terminate => terminating 1749939 3 425932 cdumez 2021-04-13 16:48:32 -0700 Created attachment 425932 Patch 1749960 4 ews-feeder 2021-04-13 18:00:32 -0700 Committed r275922 (236485@main): <https://commits.webkit.org/236485@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425932. 1749961 5 webkit-bug-importer 2021-04-13 18:01:15 -0700 <rdar://problem/76620286> 425930 2021-04-13 16:41:35 -0700 2021-04-13 16:48:30 -0700 Patch bug-224516-20210413164135.patch text/plain 8731 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE1YjUyZmYzMTkzZDU0NWQ3 NDJkNGQ4NWYyYzRiNTQ5YmI3NGU2NWQuLmRlOTdjZjVkNTAyZWZjOWUwNzUzMDhmNjc5YjM4MWNh ZmI1NmM1ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDQtMTMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkgc2hvdWxkIG9ubHkgcmVsYXVuY2ggdGhlIEdQVVByb2Nlc3MgaXMgaXQgYWN0dWFsbHkg bmVlZHMgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDUxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFByZXZpb3VzbHksIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSB3b3VsZCBsYXVuY2ggdGhl IEdQVVByb2Nlc3MgYXMgc29vbiBhcyBpdCB3YXMKKyAgICAgICAgY29uc3RydWN0ZWQuIFRoaXMg d2VudCBhZ2FpbnN0IHRoZSBnb2FscyBvZiByMjc1ODg3IHRvIGRlbGF5IHRoZSBHUFVQcm9jZXNz IGxhdW5jaAorICAgICAgICB1bnRpbCBpdCBpcyBhY3R1YWxseSBuZWVkZWQuIEFsc28sIGluIGNh c2UgYSBhIEdQVVByb2Nlc3MgY3Jhc2gvdGVybWluYXRpb24sCisgICAgICAgIFJlbW90ZVJlbmRl cmluZ0JhY2tlbmRQcm94eSB3b3VsZCByZWxhdW5jaCB0aGUgR1BVUHJvY2VzcyByaWdodCBhd2F5 LCBldmVuIGlmIGl0CisgICAgICAgIGRpZCBub3QgbmVlZCBpdCAoTm8gbGl2ZSBJbWFnZUJ1ZmZl cnMpLiBUaGlzIHBhdGNoIGFkZHJlc3NlcyBib3RoIGlzc3Vlcy4KKworICAgICAgICBUaGlzIHBh dGNoIGlzIGEgcHJlLXJlcXVpcmVtZW50IGZvciB0ZXJtaW5hdGUgdGhlIEdQVVByb2Nlc3Mgb24g bWVtb3J5IHByZXNzdXJlIHdoZW4KKyAgICAgICAgaXQgaXMgbm90IHVzZWQgYnkgYW55IHRhYnMu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHk6On5SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpncHVQcm9jZXNzQ29u bmVjdGlvbkRpZENsb3NlKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFByb3h5OjptZXNzYWdlU2VuZGVyQ29ubmVjdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6 OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6d2FpdEZvckRpZENyZWF0ZUltYWdlQnVmZmVy QmFja2VuZCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6 d2FpdEZvckRpZEZsdXNoKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuaDoKKwogMjAyMS0wNC0xMyAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFN0b3AgcmVxdWlyaW5nIGEgUmVtb3RlUmVuZGVy aW5nQmFja2VuZCBmb3IgdmlzaWJpbGl0eSBwcm9wYWdhdGlvbiB2aWV3cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCmluZGV4IDczOGQ0ZmJhMDg4OGE0ZmMwZTFmOTUy MDQ0MGE4Nzk4MmY3OGU2N2YuLmQwZGNhNjNkMmQ5ODNkNzIyYjVhOTEyYTdiNTUzNDEyMDIwOTUy YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVt b3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKQEAgLTU1LDQy ICs1NSwzNiBAQCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OlJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eShXZWJQYWdlJiB3ZWJQYWdlKQogICAgICAgICB3ZWJQYWdlLmlkZW50aWZpZXIo KQogICAgIH0KIHsKLSAgICBjb25uZWN0VG9HUFVQcm9jZXNzKCk7CiB9CiAKIFJlbW90ZVJlbmRl cmluZ0JhY2tlbmRQcm94eTo6flJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSgpCiB7CisgICAg aWYgKCFtX2dwdVByb2Nlc3NDb25uZWN0aW9uKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBV bi1yZWdpc3RlciBpdHNlbGYgYXMgYSBNZXNzYWdlUmVjZWl2ZXIuCi0gICAgSVBDOjpNZXNzYWdl UmVjZWl2ZXJNYXAmIG1lc3NhZ2VSZWNlaXZlck1hcCA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCkubWVzc2FnZVJlY2VpdmVyTWFwKCk7Ci0gICAg bWVzc2FnZVJlY2VpdmVyTWFwLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcigqdGhpcyk7CisgICAgbV9n cHVQcm9jZXNzQ29ubmVjdGlvbi0+bWVzc2FnZVJlY2VpdmVyTWFwKCkucmVtb3ZlTWVzc2FnZVJl Y2VpdmVyKCp0aGlzKTsKIAogICAgIC8vIFJlbGVhc2UgdGhlIFJlbW90ZVJlbmRlcmluZ0JhY2tl bmQuCiAgICAgc2VuZChNZXNzYWdlczo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6UmVsZWFz ZVJlbmRlcmluZ0JhY2tlbmQocmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIoKSksIDAsIElQQzo6 U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsK IH0KIAotdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmNvbm5lY3RUb0dQVVByb2Nl c3MoKQotewotICAgIGF1dG8mIGNvbm5lY3Rpb24gPSBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5l bnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpOwotICAgIGNvbm5lY3Rpb24uYWRkQ2xpZW50KCp0 aGlzKTsKLSAgICBjb25uZWN0aW9uLm1lc3NhZ2VSZWNlaXZlck1hcCgpLmFkZE1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIHJlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKCkudG9VSW50NjQoKSwgKnRoaXMp OwotICAgIHNlbmQoTWVzc2FnZXM6OkdQVUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OkNyZWF0ZVJl bmRlcmluZ0JhY2tlbmQobV9wYXJhbWV0ZXJzKSwgMCwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRj aE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwotfQotCi12b2lkIFJlbW90ZVJl bmRlcmluZ0JhY2tlbmRQcm94eTo6cmVlc3RhYmxpc2hHUFVQcm9jZXNzQ29ubmVjdGlvbigpCitH UFVQcm9jZXNzQ29ubmVjdGlvbiYgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjplbnN1cmVH UFVQcm9jZXNzQ29ubmVjdGlvbigpCiB7Ci0gICAgY29ubmVjdFRvR1BVUHJvY2VzcygpOwotCi0g ICAgZm9yIChhdXRvJiBpbWFnZUJ1ZmZlciA6IG1fcmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5Lmlt YWdlQnVmZmVycygpLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmICghaW1hZ2VCdWZmZXIpCi0gICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5n QmFja2VuZDo6Q3JlYXRlSW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXItPmxvZ2ljYWxTaXplKCksIGlt YWdlQnVmZmVyLT5yZW5kZXJpbmdNb2RlKCksIGltYWdlQnVmZmVyLT5yZXNvbHV0aW9uU2NhbGUo KSwgaW1hZ2VCdWZmZXItPmNvbG9yU3BhY2UoKSwgaW1hZ2VCdWZmZXItPnBpeGVsRm9ybWF0KCks IGltYWdlQnVmZmVyLT5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSksIHJlbmRlcmluZ0Jh Y2tlbmRJZGVudGlmaWVyKCksIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hNZXNzYWdlRXZlbldo ZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKLSAgICAgICAgaW1hZ2VCdWZmZXItPmNsZWFyQmFja2Vu ZCgpOworICAgIGlmICghbV9ncHVQcm9jZXNzQ29ubmVjdGlvbikgeworICAgICAgICBhdXRvJiBn cHVQcm9jZXNzQ29ubmVjdGlvbiA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZUdQVVBy b2Nlc3NDb25uZWN0aW9uKCk7CisgICAgICAgIGdwdVByb2Nlc3NDb25uZWN0aW9uLmFkZENsaWVu dCgqdGhpcyk7CisgICAgICAgIGdwdVByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VSZWNlaXZlck1h cCgpLmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIHJlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKCku dG9VSW50NjQoKSwgKnRoaXMpOworICAgICAgICBncHVQcm9jZXNzQ29ubmVjdGlvbi5jb25uZWN0 aW9uKCkuc2VuZChNZXNzYWdlczo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Q3JlYXRlUmVu ZGVyaW5nQmFja2VuZChtX3BhcmFtZXRlcnMpLCAwLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNo TWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CisgICAgICAgIG1fZ3B1UHJvY2Vz c0Nvbm5lY3Rpb24gPSBtYWtlV2Vha1B0cihncHVQcm9jZXNzQ29ubmVjdGlvbik7CiAgICAgfQor ICAgIHJldHVybiAqbV9ncHVQcm9jZXNzQ29ubmVjdGlvbjsKIH0KIAogdm9pZCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHk6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vz c0Nvbm5lY3Rpb24mIHByZXZpb3VzQ29ubmVjdGlvbikKIHsKICAgICBwcmV2aW91c0Nvbm5lY3Rp b24ucmVtb3ZlQ2xpZW50KCp0aGlzKTsKKyAgICBtX2dwdVByb2Nlc3NDb25uZWN0aW9uID0gbnVs bHB0cjsKIAogICAgIG1faWRlbnRpZmllcnNPZlJldXNhYmxlSGFuZGxlcy5jbGVhcigpOwogICAg IG1fc2hhcmVkRGlzcGxheUxpc3RIYW5kbGVzLmNsZWFyKCk7CkBAIC05OCwxMiArOTIsMTcgQEAg dm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmdwdVByb2Nlc3NDb25uZWN0aW9uRGlk Q2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3QKICAgICBtX2RlZmVycmVkV2FrZXVwTWVzc2FnZUFyZ3Vt ZW50cyA9IFdURjo6bnVsbG9wdDsKICAgICBtX3JlbWFpbmluZ0l0ZW1zVG9BcHBlbmRCZWZvcmVT ZW5kaW5nV2FrZXVwID0gMDsKIAotICAgIHJlZXN0YWJsaXNoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24o KTsKKyAgICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9yZW1vdGVSZXNvdXJjZUNhY2hlUHJv eHkuaW1hZ2VCdWZmZXJzKCkudmFsdWVzKCkpIHsKKyAgICAgICAgaWYgKCFpbWFnZUJ1ZmZlcikK KyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kOjpDcmVhdGVJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlci0+bG9naWNhbFNpemUo KSwgaW1hZ2VCdWZmZXItPnJlbmRlcmluZ01vZGUoKSwgaW1hZ2VCdWZmZXItPnJlc29sdXRpb25T Y2FsZSgpLCBpbWFnZUJ1ZmZlci0+Y29sb3JTcGFjZSgpLCBpbWFnZUJ1ZmZlci0+cGl4ZWxGb3Jt YXQoKSwgaW1hZ2VCdWZmZXItPnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKSwgcmVuZGVy aW5nQmFja2VuZElkZW50aWZpZXIoKSwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VF dmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOworICAgICAgICBpbWFnZUJ1ZmZlci0+Y2xlYXJC YWNrZW5kKCk7CisgICAgfQogfQogCiBJUEM6OkNvbm5lY3Rpb24qIFJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eTo6bWVzc2FnZVNlbmRlckNvbm5lY3Rpb24oKSBjb25zdAogewotICAgIHJldHVy biAmV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKS5j b25uZWN0aW9uKCk7CisgICAgcmV0dXJuICZjb25zdF9jYXN0PFJlbW90ZVJlbmRlcmluZ0JhY2tl bmRQcm94eSY+KCp0aGlzKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24o KTsKIH0KIAogdWludDY0X3QgUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjptZXNzYWdlU2Vu ZGVyRGVzdGluYXRpb25JRCgpIGNvbnN0CkBAIC0xMTMsNyArMTEyLDcgQEAgdWludDY0X3QgUmVt b3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjptZXNzYWdlU2VuZGVyRGVzdGluYXRpb25JRCgpIGNv bnN0CiAKIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlkUmVjZWl2ZUJhY2tlbmRDcmVh dGlvblJlc3VsdCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OndhaXRGb3JEaWRDcmVhdGVJ bWFnZUJ1ZmZlckJhY2tlbmQoKQogewotICAgIFJlZjxJUEM6OkNvbm5lY3Rpb24+IGNvbm5lY3Rp b24gPSBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigp LmNvbm5lY3Rpb24oKTsKKyAgICBhdXRvIGNvbm5lY3Rpb24gPSBtYWtlUmVmUHRyKG1lc3NhZ2VT ZW5kZXJDb25uZWN0aW9uKCkpOwogICAgIGlmICghY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3Bh dGNoSW1tZWRpYXRlbHk8TWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlk Q3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kPihyZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcigpLCAx X3MsIElQQzo6V2FpdEZvck9wdGlvbjo6SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJp dmVzKSkKICAgICAgICAgcmV0dXJuIERpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25SZXN1bHQ6OlRp bWVvdXRPcklQQ0ZhaWx1cmU7CiAgICAgcmV0dXJuIERpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25S ZXN1bHQ6OlJlY2VpdmVkQW55UmVzcG9uc2U7CkBAIC0xMjEsNyArMTIwLDcgQEAgUmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5OjpEaWRSZWNlaXZlQmFja2VuZENyZWF0aW9uUmVzdWx0IFJlbW90 ZVJlbmRlcmluZ0JhY2sKIAogYm9vbCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OndhaXRG b3JEaWRGbHVzaCgpCiB7Ci0gICAgUmVmPElQQzo6Q29ubmVjdGlvbj4gY29ubmVjdGlvbiA9IFdl YlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVj dGlvbigpOworICAgIGF1dG8gY29ubmVjdGlvbiA9IG1ha2VSZWZQdHIobWVzc2FnZVNlbmRlckNv bm5lY3Rpb24oKSk7CiAgICAgcmV0dXJuIGNvbm5lY3Rpb24tPndhaXRGb3JBbmREaXNwYXRjaElt bWVkaWF0ZWx5PE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OkRpZEZsdXNo PihyZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcigpLCAxX3MsIElQQzo6V2FpdEZvck9wdGlvbjo6 SW50ZXJydXB0V2FpdGluZ0lmU3luY01lc3NhZ2VBcnJpdmVzKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3Rl UmVuZGVyaW5nQmFja2VuZFByb3h5LmgKaW5kZXggODVlYmZiOWI4NTVmNWZiZjkyZjVhZGE2NDFi YmJiNDViZDE0ZDk1OS4uMDJjZjc2M2U3YjU0NzNiODBkMGFmYTBiZmE5MTM2NjQ1M2Y3OTE3OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oCkBAIC0xMTYsOCArMTE2LDcg QEAgcHJpdmF0ZToKICAgICAvLyBHUFVQcm9jZXNzQ29ubmVjdGlvbjo6Q2xpZW50CiAgICAgdm9p ZCBncHVQcm9jZXNzQ29ubmVjdGlvbkRpZENsb3NlKEdQVVByb2Nlc3NDb25uZWN0aW9uJikgZmlu YWw7CiAKLSAgICB2b2lkIGNvbm5lY3RUb0dQVVByb2Nlc3MoKTsKLSAgICB2b2lkIHJlZXN0YWJs aXNoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKTsKKyAgICBHUFVQcm9jZXNzQ29ubmVjdGlvbiYgZW5z dXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKTsKIAogICAgIC8vIE1lc3NhZ2VzIHRvIGJlIHJlY2Vp dmVkLgogICAgIHZvaWQgZGlkQ3JlYXRlSW1hZ2VCdWZmZXJCYWNrZW5kKEltYWdlQnVmZmVyQmFj a2VuZEhhbmRsZSwgV2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKQEAgLTEz OSw2ICsxMzgsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxTaGFyZWRNZW1vcnk+IG1fZ2V0SW1h Z2VEYXRhU2hhcmVkTWVtb3J5OwogICAgIHVpbnQ2NF90IG1fZ2V0SW1hZ2VEYXRhU2hhcmVkTWVt b3J5TGVuZ3RoIHsgMCB9OwogICAgIFdlYkNvcmU6OlRpbWVyIG1fZGVzdHJveUdldEltYWdlRGF0 YVNoYXJlZE1lbW9yeVRpbWVyIHsgKnRoaXMsICZSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6 OmRlc3Ryb3lHZXRJbWFnZURhdGFTaGFyZWRNZW1vcnkgfTsKKyAgICBXZWFrUHRyPEdQVVByb2Nl c3NDb25uZWN0aW9uPiBtX2dwdVByb2Nlc3NDb25uZWN0aW9uOwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0Cg== 425932 2021-04-13 16:48:32 -0700 2021-04-13 19:51:23 -0700 Patch bug-224516-20210413164831.patch text/plain 8730 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDE1YjUyZmYzMTkzZDU0NWQ3 NDJkNGQ4NWYyYzRiNTQ5YmI3NGU2NWQuLjU2YTBiODVkMjdjNTY3ODliOGEzNGQ3NTBiODhjOGM0 ZDM4MDdhZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDQtMTMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkgc2hvdWxkIG9ubHkgcmVsYXVuY2ggdGhlIEdQVVByb2Nlc3MgaWYgaXQgYWN0dWFsbHkg bmVlZHMgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDUxNgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgIFBy ZXZpb3VzbHksIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSB3b3VsZCBsYXVuY2ggdGhlIEdQ VVByb2Nlc3MgYXMgc29vbiBhcyBpdCB3YXMKKyAgICAgICAgY29uc3RydWN0ZWQuIFRoaXMgd2Vu dCBhZ2FpbnN0IHRoZSBnb2FscyBvZiByMjc1ODg3IHRvIGRlbGF5IHRoZSBHUFVQcm9jZXNzIGxh dW5jaAorICAgICAgICB1bnRpbCBpdCBpcyBhY3R1YWxseSBuZWVkZWQuIEFsc28sIGluIGNhc2Ug YSBhIEdQVVByb2Nlc3MgY3Jhc2gvdGVybWluYXRpb24sCisgICAgICAgIFJlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eSB3b3VsZCByZWxhdW5jaCB0aGUgR1BVUHJvY2VzcyByaWdodCBhd2F5LCBl dmVuIGlmIGl0CisgICAgICAgIGRpZCBub3QgbmVlZCBpdCAoTm8gbGl2ZSBJbWFnZUJ1ZmZlcnMp LiBUaGlzIHBhdGNoIGFkZHJlc3NlcyBib3RoIGlzc3Vlcy4KKworICAgICAgICBUaGlzIHBhdGNo IGlzIGEgcHJlLXJlcXVpcmVtZW50IGZvciB0ZXJtaW5hdGluZyB0aGUgR1BVUHJvY2VzcyBvbiBt ZW1vcnkgcHJlc3N1cmUgd2hlbgorICAgICAgICBpdCBpcyBub3QgdXNlZCBieSBhbnkgdGFicy4K KworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tl bmRQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eTo6flJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6ZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24pOgorICAg ICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmdwdVByb2Nlc3NDb25u ZWN0aW9uRGlkQ2xvc2UpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHk6Om1lc3NhZ2VTZW5kZXJDb25uZWN0aW9uIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3YWl0Rm9yRGlkQ3JlYXRlSW1hZ2VCdWZmZXJC YWNrZW5kKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Ojp3 YWl0Rm9yRGlkRmx1c2gpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oOgorCiAyMDIxLTA0LTEzICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCByZXF1aXJpbmcgYSBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kIGZvciB2aXNpYmlsaXR5IHByb3BhZ2F0aW9uIHZpZXdzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tl bmRQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcHAKaW5kZXggNzM4ZDRmYmEwODg4YTRmYzBlMWY5NTIw NDQwYTg3OTgyZjc4ZTY3Zi4uZDBkY2E2M2QyZDk4M2Q3MjJiNWE5MTJhN2I1NTM0MTIwMjA5NTJh MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNwcApAQCAtNTUsNDIg KzU1LDM2IEBAIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6UmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5KFdlYlBhZ2UmIHdlYlBhZ2UpCiAgICAgICAgIHdlYlBhZ2UuaWRlbnRpZmllcigp CiAgICAgfQogewotICAgIGNvbm5lY3RUb0dQVVByb2Nlc3MoKTsKIH0KIAogUmVtb3RlUmVuZGVy aW5nQmFja2VuZFByb3h5Ojp+UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KCkKIHsKKyAgICBp ZiAoIW1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24pCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIFVu LXJlZ2lzdGVyIGl0c2VsZiBhcyBhIE1lc3NhZ2VSZWNlaXZlci4KLSAgICBJUEM6Ok1lc3NhZ2VS ZWNlaXZlck1hcCYgbWVzc2FnZVJlY2VpdmVyTWFwID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCku ZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKS5tZXNzYWdlUmVjZWl2ZXJNYXAoKTsKLSAgICBt ZXNzYWdlUmVjZWl2ZXJNYXAucmVtb3ZlTWVzc2FnZVJlY2VpdmVyKCp0aGlzKTsKKyAgICBtX2dw dVByb2Nlc3NDb25uZWN0aW9uLT5tZXNzYWdlUmVjZWl2ZXJNYXAoKS5yZW1vdmVNZXNzYWdlUmVj ZWl2ZXIoKnRoaXMpOwogCiAgICAgLy8gUmVsZWFzZSB0aGUgUmVtb3RlUmVuZGVyaW5nQmFja2Vu ZC4KICAgICBzZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpSZWxlYXNl UmVuZGVyaW5nQmFja2VuZChyZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllcigpKSwgMCwgSVBDOjpT ZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hlbldhaXRpbmdGb3JTeW5jUmVwbHkpOwog fQogCi12b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Y29ubmVjdFRvR1BVUHJvY2Vz cygpCi17Ci0gICAgYXV0byYgY29ubmVjdGlvbiA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVu c3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCk7Ci0gICAgY29ubmVjdGlvbi5hZGRDbGllbnQoKnRo aXMpOwotICAgIGNvbm5lY3Rpb24ubWVzc2FnZVJlY2VpdmVyTWFwKCkuYWRkTWVzc2FnZVJlY2Vp dmVyKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCAqdGhpcyk7 Ci0gICAgc2VuZChNZXNzYWdlczo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Q3JlYXRlUmVu ZGVyaW5nQmFja2VuZChtX3BhcmFtZXRlcnMpLCAwLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNo TWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7Ci19Ci0KLXZvaWQgUmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5OjpyZWVzdGFibGlzaEdQVVByb2Nlc3NDb25uZWN0aW9uKCkKK0dQ VVByb2Nlc3NDb25uZWN0aW9uJiBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmVuc3VyZUdQ VVByb2Nlc3NDb25uZWN0aW9uKCkKIHsKLSAgICBjb25uZWN0VG9HUFVQcm9jZXNzKCk7Ci0KLSAg ICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9yZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaW1h Z2VCdWZmZXJzKCkudmFsdWVzKCkpIHsKLSAgICAgICAgaWYgKCFpbWFnZUJ1ZmZlcikKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICBzZW5kKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdC YWNrZW5kOjpDcmVhdGVJbWFnZUJ1ZmZlcihpbWFnZUJ1ZmZlci0+bG9naWNhbFNpemUoKSwgaW1h Z2VCdWZmZXItPnJlbmRlcmluZ01vZGUoKSwgaW1hZ2VCdWZmZXItPnJlc29sdXRpb25TY2FsZSgp LCBpbWFnZUJ1ZmZlci0+Y29sb3JTcGFjZSgpLCBpbWFnZUJ1ZmZlci0+cGl4ZWxGb3JtYXQoKSwg aW1hZ2VCdWZmZXItPnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKSwgcmVuZGVyaW5nQmFj a2VuZElkZW50aWZpZXIoKSwgSVBDOjpTZW5kT3B0aW9uOjpEaXNwYXRjaE1lc3NhZ2VFdmVuV2hl bldhaXRpbmdGb3JTeW5jUmVwbHkpOwotICAgICAgICBpbWFnZUJ1ZmZlci0+Y2xlYXJCYWNrZW5k KCk7CisgICAgaWYgKCFtX2dwdVByb2Nlc3NDb25uZWN0aW9uKSB7CisgICAgICAgIGF1dG8mIGdw dVByb2Nlc3NDb25uZWN0aW9uID0gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJv Y2Vzc0Nvbm5lY3Rpb24oKTsKKyAgICAgICAgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24uYWRkQ2xpZW50 KCp0aGlzKTsKKyAgICAgICAgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24ubWVzc2FnZVJlY2VpdmVyTWFw KCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIoKS50 b1VJbnQ2NCgpLCAqdGhpcyk7CisgICAgICAgIGdwdVByb2Nlc3NDb25uZWN0aW9uLmNvbm5lY3Rp b24oKS5zZW5kKE1lc3NhZ2VzOjpHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpDcmVhdGVSZW5k ZXJpbmdCYWNrZW5kKG1fcGFyYW1ldGVycyksIDAsIElQQzo6U2VuZE9wdGlvbjo6RGlzcGF0Y2hN ZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKKyAgICAgICAgbV9ncHVQcm9jZXNz Q29ubmVjdGlvbiA9IG1ha2VXZWFrUHRyKGdwdVByb2Nlc3NDb25uZWN0aW9uKTsKICAgICB9Cisg ICAgcmV0dXJuICptX2dwdVByb2Nlc3NDb25uZWN0aW9uOwogfQogCiB2b2lkIFJlbW90ZVJlbmRl cmluZ0JhY2tlbmRQcm94eTo6Z3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZShHUFVQcm9jZXNz Q29ubmVjdGlvbiYgcHJldmlvdXNDb25uZWN0aW9uKQogewogICAgIHByZXZpb3VzQ29ubmVjdGlv bi5yZW1vdmVDbGllbnQoKnRoaXMpOworICAgIG1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb24gPSBudWxs cHRyOwogCiAgICAgbV9pZGVudGlmaWVyc09mUmV1c2FibGVIYW5kbGVzLmNsZWFyKCk7CiAgICAg bV9zaGFyZWREaXNwbGF5TGlzdEhhbmRsZXMuY2xlYXIoKTsKQEAgLTk4LDEyICs5MiwxNyBAQCB2 b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6Z3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRD bG9zZShHUFVQcm9jZXNzQ29ubmVjdAogICAgIG1fZGVmZXJyZWRXYWtldXBNZXNzYWdlQXJndW1l bnRzID0gV1RGOjpudWxsb3B0OwogICAgIG1fcmVtYWluaW5nSXRlbXNUb0FwcGVuZEJlZm9yZVNl bmRpbmdXYWtldXAgPSAwOwogCi0gICAgcmVlc3RhYmxpc2hHUFVQcm9jZXNzQ29ubmVjdGlvbigp OworICAgIGZvciAoYXV0byYgaW1hZ2VCdWZmZXIgOiBtX3JlbW90ZVJlc291cmNlQ2FjaGVQcm94 eS5pbWFnZUJ1ZmZlcnMoKS52YWx1ZXMoKSkgeworICAgICAgICBpZiAoIWltYWdlQnVmZmVyKQor ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRl cmluZ0JhY2tlbmQ6OkNyZWF0ZUltYWdlQnVmZmVyKGltYWdlQnVmZmVyLT5sb2dpY2FsU2l6ZSgp LCBpbWFnZUJ1ZmZlci0+cmVuZGVyaW5nTW9kZSgpLCBpbWFnZUJ1ZmZlci0+cmVzb2x1dGlvblNj YWxlKCksIGltYWdlQnVmZmVyLT5jb2xvclNwYWNlKCksIGltYWdlQnVmZmVyLT5waXhlbEZvcm1h dCgpLCBpbWFnZUJ1ZmZlci0+cmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKCkpLCByZW5kZXJp bmdCYWNrZW5kSWRlbnRpZmllcigpLCBJUEM6OlNlbmRPcHRpb246OkRpc3BhdGNoTWVzc2FnZUV2 ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CisgICAgICAgIGltYWdlQnVmZmVyLT5jbGVhckJh Y2tlbmQoKTsKKyAgICB9CiB9CiAKIElQQzo6Q29ubmVjdGlvbiogUmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5OjptZXNzYWdlU2VuZGVyQ29ubmVjdGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJu ICZXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpLmNv bm5lY3Rpb24oKTsKKyAgICByZXR1cm4gJmNvbnN0X2Nhc3Q8UmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFByb3h5Jj4oKnRoaXMpLmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCkuY29ubmVjdGlvbigp OwogfQogCiB1aW50NjRfdCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6Om1lc3NhZ2VTZW5k ZXJEZXN0aW5hdGlvbklEKCkgY29uc3QKQEAgLTExMyw3ICsxMTIsNyBAQCB1aW50NjRfdCBSZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6Om1lc3NhZ2VTZW5kZXJEZXN0aW5hdGlvbklEKCkgY29u c3QKIAogUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpEaWRSZWNlaXZlQmFja2VuZENyZWF0 aW9uUmVzdWx0IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6d2FpdEZvckRpZENyZWF0ZUlt YWdlQnVmZmVyQmFja2VuZCgpCiB7Ci0gICAgUmVmPElQQzo6Q29ubmVjdGlvbj4gY29ubmVjdGlv biA9IFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZUdQVVByb2Nlc3NDb25uZWN0aW9uKCku Y29ubmVjdGlvbigpOworICAgIGF1dG8gY29ubmVjdGlvbiA9IG1ha2VSZWZQdHIobWVzc2FnZVNl bmRlckNvbm5lY3Rpb24oKSk7CiAgICAgaWYgKCFjb25uZWN0aW9uLT53YWl0Rm9yQW5kRGlzcGF0 Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpEaWRD cmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmQ+KHJlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKCksIDFf cywgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJbnRlcnJ1cHRXYWl0aW5nSWZTeW5jTWVzc2FnZUFycml2 ZXMpKQogICAgICAgICByZXR1cm4gRGlkUmVjZWl2ZUJhY2tlbmRDcmVhdGlvblJlc3VsdDo6VGlt ZW91dE9ySVBDRmFpbHVyZTsKICAgICByZXR1cm4gRGlkUmVjZWl2ZUJhY2tlbmRDcmVhdGlvblJl c3VsdDo6UmVjZWl2ZWRBbnlSZXNwb25zZTsKQEAgLTEyMSw3ICsxMjAsNyBAQCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHk6OkRpZFJlY2VpdmVCYWNrZW5kQ3JlYXRpb25SZXN1bHQgUmVtb3Rl UmVuZGVyaW5nQmFjawogCiBib29sIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6d2FpdEZv ckRpZEZsdXNoKCkKIHsKLSAgICBSZWY8SVBDOjpDb25uZWN0aW9uPiBjb25uZWN0aW9uID0gV2Vi UHJvY2Vzczo6c2luZ2xldG9uKCkuZW5zdXJlR1BVUHJvY2Vzc0Nvbm5lY3Rpb24oKS5jb25uZWN0 aW9uKCk7CisgICAgYXV0byBjb25uZWN0aW9uID0gbWFrZVJlZlB0cihtZXNzYWdlU2VuZGVyQ29u bmVjdGlvbigpKTsKICAgICByZXR1cm4gY29ubmVjdGlvbi0+d2FpdEZvckFuZERpc3BhdGNoSW1t ZWRpYXRlbHk8TWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlkRmx1c2g+ KHJlbmRlcmluZ0JhY2tlbmRJZGVudGlmaWVyKCksIDFfcywgSVBDOjpXYWl0Rm9yT3B0aW9uOjpJ bnRlcnJ1cHRXYWl0aW5nSWZTeW5jTWVzc2FnZUFycml2ZXMpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tl bmRQcm94eS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuaAppbmRleCA4NWViZmI5Yjg1NWY1ZmJmOTJmNWFkYTY0MWJi YmI0NWJkMTRkOTU5Li4wMmNmNzYzZTdiNTQ3M2I4MGQwYWZhMGJmYTkxMzY2NDUzZjc5MTc5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJl bmRlcmluZ0JhY2tlbmRQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv Z3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmgKQEAgLTExNiw4ICsxMTYsNyBA QCBwcml2YXRlOgogICAgIC8vIEdQVVByb2Nlc3NDb25uZWN0aW9uOjpDbGllbnQKICAgICB2b2lk IGdwdVByb2Nlc3NDb25uZWN0aW9uRGlkQ2xvc2UoR1BVUHJvY2Vzc0Nvbm5lY3Rpb24mKSBmaW5h bDsKIAotICAgIHZvaWQgY29ubmVjdFRvR1BVUHJvY2VzcygpOwotICAgIHZvaWQgcmVlc3RhYmxp c2hHUFVQcm9jZXNzQ29ubmVjdGlvbigpOworICAgIEdQVVByb2Nlc3NDb25uZWN0aW9uJiBlbnN1 cmVHUFVQcm9jZXNzQ29ubmVjdGlvbigpOwogCiAgICAgLy8gTWVzc2FnZXMgdG8gYmUgcmVjZWl2 ZWQuCiAgICAgdm9pZCBkaWRDcmVhdGVJbWFnZUJ1ZmZlckJhY2tlbmQoSW1hZ2VCdWZmZXJCYWNr ZW5kSGFuZGxlLCBXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpOwpAQCAtMTM5 LDYgKzEzOCw3IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPFNoYXJlZE1lbW9yeT4gbV9nZXRJbWFn ZURhdGFTaGFyZWRNZW1vcnk7CiAgICAgdWludDY0X3QgbV9nZXRJbWFnZURhdGFTaGFyZWRNZW1v cnlMZW5ndGggeyAwIH07CiAgICAgV2ViQ29yZTo6VGltZXIgbV9kZXN0cm95R2V0SW1hZ2VEYXRh U2hhcmVkTWVtb3J5VGltZXIgeyAqdGhpcywgJlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6 ZGVzdHJveUdldEltYWdlRGF0YVNoYXJlZE1lbW9yeSB9OworICAgIFdlYWtQdHI8R1BVUHJvY2Vz c0Nvbm5lY3Rpb24+IG1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb247CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQK