174174 2017-07-05 14:12:17 -0700 [WK2] WebsiteDataStore::setResourceLoadStatisticsEnabled() updates processPools the store is not associated with 2017-07-05 15:27:52 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez achristensen beidson bfulgham commit-queue ggaren wilander oldest_to_newest 1325767 0 cdumez 2017-07-05 14:12:17 -0700 WebsiteDataStore::setResourceLoadStatisticsEnabled() updates processPools the store is not associated with. 1325770 1 314655 cdumez 2017-07-05 14:15:39 -0700 Created attachment 314655 Patch 1325774 2 314655 bfulgham 2017-07-05 14:25:20 -0700 Comment on attachment 314655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314655&action=review > Source/WebKit2/ChangeLog:15 > + as well as corresponding methods as those appear to be unused. Yikes! Good catch. 1325788 3 314655 bfulgham 2017-07-05 14:59:05 -0700 Comment on attachment 314655 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314655&action=review Looks good. r=me. > Source/WebKit2/UIProcess/WebProcessPool.cpp:1117 > + sendToAllProcesses(Messages::WebProcess::SetResourceLoadStatisticsEnabled(enabled)); This is much tidier! > Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:1271 > + for (auto& processPool : processPools()) Idea: processPools() should have a method that takes a lambda and applies it to each process in the pool. > Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp:1281 > + m_resourceLoadStatistics->registerSharedResourceLoadObserver([this] (const Vector<String>& domainsToRemove, const Vector<String>& domainsToAdd, bool shouldClearFirst) { I noticed that 'this' is refcounted. Do we need to capture it in this lambda? 1325796 4 314655 commit-queue 2017-07-05 15:27:50 -0700 Comment on attachment 314655 Patch Clearing flags on attachment: 314655 Committed r219161: <http://trac.webkit.org/changeset/219161> 1325797 5 commit-queue 2017-07-05 15:27:52 -0700 All reviewed patches have been landed. Closing bug. 314655 2017-07-05 14:15:39 -0700 2017-07-05 15:27:50 -0700 Patch bug-174174-20170705141538.patch text/plain 14155 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDYyNGY1MGVmODIzYzZh ZGY0ZTlmODI4ZWFhMDAwOTQwNjVjZWJjMC4uOTIyM2Y2ZWQyYmE4NDBiNGRlMTFhZjcxOWMxMTRm ZGM5NmQ3ZWFiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE3LTA3LTA1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1dLMl0gV2Vic2l0ZURhdGFT dG9yZTo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSB1cGRhdGVzIHByb2Nlc3NQ b29scyB0aGUgc3RvcmUgaXMgbm90IGFzc29jaWF0ZWQgd2l0aAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MTc0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Vic2l0ZURhdGFTdG9yZTo6c2V0UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSB1cGRhdGVzIHByb2Nlc3NQb29scyB0aGUgc3RvcmUg aXMgbm90IGFzc29jaWF0ZWQgd2l0aC4KKyAgICAgICAgRml4IHRoaXMgYnkgaXRlcmF0aW5nIG92 ZXIgV2Vic2l0ZURhdGFTdG9yZTo6cHJvY2Vzc1Bvb2xzKCkgaW5zdGVhZCBvZiBXZWJQcm9jZXNz UG9vbDo6YWxsUHJvY2Vzc1Bvb2xzKCkuCisKKyAgICAgICAgQWxzbyByZW5hbWUgc2hvdWxkUGFy dGl0aW9uQ29va2llc0ZvclRvcFByaXZhdGVseU93bmVkRG9tYWlucyBtZXRob2RzIC8gSVBDIG1l c3NhZ2VzIHRvCisgICAgICAgIHVwZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0ZvclRvcFByaXZhdGVs eU93bmVkRG9tYWlucyBzaW5jZSB0aGlzIGlzIGEgc2V0dGVyLCBub3QgYSBnZXR0ZXIuCisKKyAg ICAgICAgRmluYWxseSwgZHJvcCBTaG91bGRQYXJ0aXRpb25Db29raWVzRm9yVG9wUHJpdmF0ZWx5 T3duZWREb21haW5zIElQQyBtZXNzYWdlIHRvIHRoZSBOZXR3b3JrUHJvY2Vzc1Byb3h5CisgICAg ICAgIGFzIHdlbGwgYXMgY29ycmVzcG9uZGluZyBtZXRob2RzIGFzIHRob3NlIGFwcGVhciB0byBi ZSB1bnVzZWQuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp1cGRhdGVDb29raWVQYXJ0aXRpb25p bmdGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr UHJvY2Vzczo6c2hvdWxkUGFydGl0aW9uQ29va2llc0ZvclRvcFByaXZhdGVseU93bmVkRG9tYWlu cyk6IERlbGV0ZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaDoK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbjoKKyAg ICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6c2hvdWxkUGFydGl0aW9uQ29va2llc0Zv clRvcFByaXZhdGVseU93bmVkRG9tYWlucyk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNz L05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3 b3JrL05ldHdvcmtQcm9jZXNzUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnVwZGF0ZUNv b2tpZVBhcnRpdGlvbmluZ0ZvclRvcFByaXZhdGVseU93bmVkRG9tYWlucyk6CisgICAgICAgIChX ZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVk KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVnaXN0ZXJTaGFyZWRSZXNv dXJjZUxvYWRPYnNlcnZlcik6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnNo b3VsZFBhcnRpdGlvbkNvb2tpZXNGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMpOiBEZWxldGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmg6CisK KzIwMTctMDctMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAgICAgICBS ZWdyZXNzaW9uKHIyMTg4MjEpOiBCYWQgY2FzdCB0byBXZWJLaXQ6OkRpYWdub3N0aWNMb2dnaW5n Q2xpZW50IGluIFdLV2ViVmlldydzIF9zZXREaWFnbm9zdGljTG9nZ2luZ0RlbGVnYXRlCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQxNjMKICAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzMzMDY3NTE4PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IDA4ZjJlMjIxZDE4Yjk5NDk4ZGU2ODg1 ZDAxMDBmODNhMDA3MzA4YzMuLmE1OWUyNzEwZWE2OGZiN2QxYTRkYTJkMDg3NzAyODZhMGEwZDhi NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz cy5jcHAKQEAgLTMxOSw5ICszMTksOSBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpkaWRHcmFudFNh bmRib3hFeHRlbnNpb25zVG9EYXRhYmFzZVByb2Nlc3NGb3JCbG9icyh1aW50NjRfdAogfQogCiAj aWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCi12b2lkIE5ldHdvcmtQcm9j ZXNzOjpzaG91bGRQYXJ0aXRpb25Db29raWVzRm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKGNv bnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBkb21haW5zVG9BZGQsICBib29sIGNsZWFyRmlyc3QpCit2b2lkIE5ldHdvcmtQcm9jZXNzOjp1 cGRhdGVDb29raWVQYXJ0aXRpb25pbmdGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMoY29uc3Qg VmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb1JlbW92ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRv bWFpbnNUb0FkZCwgIGJvb2wgc2hvdWxkQ2xlYXJGaXJzdCkKIHsKLSAgICBOZXR3b3JrU3RvcmFn ZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpLnNldFNob3VsZFBhcnRpdGlvbkNvb2tp ZXNGb3JIb3N0cyhkb21haW5zVG9SZW1vdmUsIGRvbWFpbnNUb0FkZCwgY2xlYXJGaXJzdCk7Cisg ICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFnZVNlc3Npb24oKS5zZXRTaG91 bGRQYXJ0aXRpb25Db29raWVzRm9ySG9zdHMoZG9tYWluc1RvUmVtb3ZlLCBkb21haW5zVG9BZGQs IHNob3VsZENsZWFyRmlyc3QpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCmluZGV4IDI5MGYxZTYxZDg1OWMxYzdhNTViMmUz MmE5MGE5ZDk0OTkzOWRkMzkuLmY3MWZhMjcxMWExMDg4YTg0ZjUyMjBiN2QyZTM2OWVkYzU1MWI2 NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu aApAQCAtMTE4LDcgKzExOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGdyYW50U2FuZGJveEV4dGVu c2lvbnNUb0RhdGFiYXNlUHJvY2Vzc0ZvckJsb2JzKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBmaWxl bmFtZXMsIEZ1bmN0aW9uPHZvaWQgKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpOwogCiAjaWYgSEFW RShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCi0gICAgdm9pZCBzaG91bGRQYXJ0aXRp b25Db29raWVzRm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBkb21haW5zVG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9BZGQsIGJv b2wgY2xlYXJGaXJzdCk7CisgICAgdm9pZCB1cGRhdGVDb29raWVQYXJ0aXRpb25pbmdGb3JUb3BQ cml2YXRlbHlPd25lZERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb1JlbW92 ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0FkZCwgYm9vbCBzaG91bGRDbGVhckZp cnN0KTsKICNlbmRpZgogCiAgICAgU2Vjb25kcyBsb2FkVGhyb3R0bGVMYXRlbmN5KCkgY29uc3Qg eyByZXR1cm4gbV9sb2FkVGhyb3R0bGVMYXRlbmN5OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5tZXNzYWdlcy5pbiBiL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCmluZGV4IGEy YmNkMmYxNzQ0ZjI5MjhmZGYwZWUxMmIyODdjZjQ2ZTBiZmMwNTMuLjIwY2U2NGI4MzUwMTA2ZmI4 YmY1ZDlkNjQyOGE1NzcyZThkMzllY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLm1lc3NhZ2VzLmluCkBAIC04Myw2ICs4Myw2 IEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNzIExlZ2FjeVJlY2VpdmVyIHsKICAgICBEaWRH cmFudFNhbmRib3hFeHRlbnNpb25zVG9EYXRhYmFzZVByb2Nlc3NGb3JCbG9icyh1aW50NjRfdCBy ZXF1ZXN0SUQpCiAKICNpZiBIQVZFKENGTkVUV09SS19TVE9SQUdFX1BBUlRJVElPTklORykKLSAg ICBTaG91bGRQYXJ0aXRpb25Db29raWVzRm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKFZlY3Rv cjxTdHJpbmc+IGRvbWFpbnNUb1JlbW92ZSwgVmVjdG9yPFN0cmluZz4gZG9tYWluc1RvQWRkLCBi b29sIGNsZWFyRmlyc3QpCisgICAgVXBkYXRlQ29va2llUGFydGl0aW9uaW5nRm9yVG9wUHJpdmF0 ZWx5T3duZWREb21haW5zKFZlY3RvcjxTdHJpbmc+IGRvbWFpbnNUb1JlbW92ZSwgVmVjdG9yPFN0 cmluZz4gZG9tYWluc1RvQWRkLCBib29sIHNob3VsZENsZWFyRmlyc3QpCiAjZW5kaWYKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5jcHAKaW5kZXggOGEyMTRkMTgzODAyNTliMjk5Y2E1YzAzZWZhMzgxNWY3M2IxZjk0 ZC4uMmNiODMzODRlZjNkZjNlYWMwNTQ5NjA2NDc1NjQxNjYzNzM2NDNmMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94 eS5jcHAKQEAgLTMwNiwxMyArMzA2LDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpncmFu dFNhbmRib3hFeHRlbnNpb25zVG9EYXRhYmFzZVByb2Nlc3NGb3JCbG9icyh1aW50NjQKICNlbmRp ZgogfQogCi0jaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCi12b2lkIE5l dHdvcmtQcm9jZXNzUHJveHk6OnNob3VsZFBhcnRpdGlvbkNvb2tpZXNGb3JUb3BQcml2YXRlbHlP d25lZERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb1JlbW92ZSwgY29uc3Qg VmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0FkZCwgYm9vbCBjbGVhckZpcnN0KQotewotICAgIGNv bm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNob3VsZFBhcnRpdGlv bkNvb2tpZXNGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMoZG9tYWluc1RvUmVtb3ZlLCBkb21h aW5zVG9BZGQsIGNsZWFyRmlyc3QpLCAwKTsKLX0KLSNlbmRpZgotCiB2b2lkIE5ldHdvcmtQcm9j ZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJ UEM6OkNvbm5lY3Rpb246OklkZW50aWZpZXIgY29ubmVjdGlvbklkZW50aWZpZXIpCiB7CiAgICAg Q2hpbGRQcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaGluZyhsYXVuY2hlciwgY29ubmVjdGlv bklkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCmluZGV4IDM2YjhjYTE5YWEzYmQ0MjE2NjU1OTRhODVj ZmRkMTIyMjhlMTUxZWUuLjU1ZDU4ZTgxNWYxMzU1YzZkYThmZWJlMzE5ODUyZGEwYzBiNGYwMWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9j ZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3Jr UHJvY2Vzc1Byb3h5LmgKQEAgLTExMSw5ICsxMTEsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlk RGVsZXRlV2Vic2l0ZURhdGEodWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCBkaWREZWxl dGVXZWJzaXRlRGF0YUZvck9yaWdpbnModWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCBn cmFudFNhbmRib3hFeHRlbnNpb25zVG9EYXRhYmFzZVByb2Nlc3NGb3JCbG9icyh1aW50NjRfdCBy ZXF1ZXN0SUQsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXRocyk7Ci0jaWYgSEFWRShDRk5FVFdP UktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCi0gICAgdm9pZCBzaG91bGRQYXJ0aXRpb25Db29raWVz Rm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5z VG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9BZGQsIGJvb2wgY2xlYXJG aXJzdCk7Ci0jZW5kaWYKICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlKHVpbnQ2NF90IHBh Z2VJRCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJpbmcmIGRlc2NyaXB0aW9uLCBX ZWJDb3JlOjpTaG91bGRTYW1wbGUpOwogICAgIHZvaWQgbG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRo UmVzdWx0KHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBjb25zdCBTdHJp bmcmIGRlc2NyaXB0aW9uLCB1aW50MzJfdCByZXN1bHQsIFdlYkNvcmU6OlNob3VsZFNhbXBsZSk7 CiAgICAgdm9pZCBsb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZSh1aW50NjRfdCBwYWdlSUQs IGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbiwgZG91Ymxl IHZhbHVlLCB1bnNpZ25lZCBzaWduaWZpY2FudEZpZ3VyZXMsIFdlYkNvcmU6OlNob3VsZFNhbXBs ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3Jr UHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5tZXNzYWdlcy5pbgppbmRleCAzYWJiYzEwYmE2NmRiMGYz MDkzZjUzNTVkYTc4ZjE5YzZlYmQwMjk1Li4wYzkwMmVkN2FjMGM2OWZjZmZjNTkyOWZjYzZhZjNl ZDdiNGZjZWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9O ZXR3b3JrUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkubWVzc2FnZXMuaW4KQEAgLTMxLDEwICsz MSw2IEBAIG1lc3NhZ2VzIC0+IE5ldHdvcmtQcm9jZXNzUHJveHkgTGVnYWN5UmVjZWl2ZXIgewog CiAgICAgR3JhbnRTYW5kYm94RXh0ZW5zaW9uc1RvRGF0YWJhc2VQcm9jZXNzRm9yQmxvYnModWlu dDY0X3QgcmVxdWVzdElELCBWZWN0b3I8U3RyaW5nPiBwYXRocykKIAotI2lmIEhBVkUoQ0ZORVRX T1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKQotICAgIFNob3VsZFBhcnRpdGlvbkNvb2tpZXNGb3JU b3BQcml2YXRlbHlPd25lZERvbWFpbnMoVmVjdG9yPFN0cmluZz4gZG9tYWluc1RvUmVtb3ZlLCBW ZWN0b3I8U3RyaW5nPiBkb21haW5zVG9BZGQsIGJvb2wgY2xlYXJGaXJzdCkKLSNlbmRpZgotCiAg ICAgUHJvY2Vzc1JlYWR5VG9TdXNwZW5kKCkKICAgICBTZXRJc0hvbGRpbmdMb2NrZWRGaWxlcyhi b29sIGlzSG9sZGluZ0xvY2tlZEZpbGVzKQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAppbmRleCBjMjllMmEwMzhhYjkzNGZjYTMxYjZkMzJkNTAxNmJhNDk2 NzAxZjUyLi42MWM1YmQ5Njk1NmQwODQ5YWJlZGE2YzA3N2ZhN2RmNGY0NDE1ZTk2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTExMTEsNiArMTEx MSwxMiBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpzZXRTaG91bGRVc2VGb250U21vb3RoaW5nKGJv b2wgdXNlRm9udFNtb290aGluZykKICAgICBzZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6Oldl YlByb2Nlc3M6OlNldFNob3VsZFVzZUZvbnRTbW9vdGhpbmcodXNlRm9udFNtb290aGluZykpOwog fQogCit2b2lkIFdlYlByb2Nlc3NQb29sOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxl ZChib29sIGVuYWJsZWQpCit7CisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCA9 IGVuYWJsZWQ7CisgICAgc2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpT ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChlbmFibGVkKSk7Cit9CisKIHZvaWQgV2Vi UHJvY2Vzc1Bvb2w6OnJlZ2lzdGVyVVJMU2NoZW1lQXNFbXB0eURvY3VtZW50KGNvbnN0IFN0cmlu ZyYgdXJsU2NoZW1lKQogewogICAgIG1fc2NoZW1lc1RvUmVnaXN0ZXJBc0VtcHR5RG9jdW1lbnQu YWRkKHVybFNjaGVtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5o CmluZGV4IGMxNGI1M2E0NDhjMjVkZjI4ZDhiYTNlZjhkNTEzMGM0ZjQwZTA2ZGQuLjk0ZGVlYTMx ZjRmZjZmM2FhNWU0ZjdlNGE4ZTU3YjBjZDI1YTE0ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5oCkBAIC0zOTcsNyArMzk3LDcgQEAgcHVibGljOgogICAgIHN0 YXRpYyBib29sIGlzTmV0d29ya0NhY2hlRW5hYmxlZCgpOwogCiAgICAgYm9vbCByZXNvdXJjZUxv YWRTdGF0aXN0aWNzRW5hYmxlZCgpIHsgcmV0dXJuIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0Vu YWJsZWQ7IH0KLSAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGJvb2wg ZW5hYmxlZCkgeyBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkID0gZW5hYmxlZDsgfQor ICAgIHZvaWQgc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCk7CiAKICAgICBi b29sIGFsd2F5c1J1bnNBdEJhY2tncm91bmRQcmlvcml0eSgpIGNvbnN0IHsgcmV0dXJuIG1fYWx3 YXlzUnVuc0F0QmFja2dyb3VuZFByaW9yaXR5OyB9CiAgICAgYm9vbCBzaG91bGRUYWtlVUlCYWNr Z3JvdW5kQXNzZXJ0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRUYWtlVUlCYWNrZ3JvdW5k QXNzZXJ0aW9uOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0 ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggMTY4NDVmNmNhMDkwMzJkNWNkMTUw YzM4Y2E2NmI5NGE1NGYyOTIxMS4uZTU5MDZhODU1OWE4MTQzNjkwZGI5MWIyY2Y0ZTkxZjYyMTNk NThmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl YnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMTEwMCwxMCArMTEwMCwxMCBAQCB2b2lkIFdl YnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGFGb3JUb3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlu cyhPcHRpb25TZXQ8V2VicwogfQogCiAjaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJ T05JTkcpCi12b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnNob3VsZFBhcnRpdGlvbkNvb2tpZXNGb3JU b3BQcml2YXRlbHlPd25lZERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb1Jl bW92ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0FkZCwgYm9vbCBjbGVhckZpcnN0 KQordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjp1cGRhdGVDb29raWVQYXJ0aXRpb25pbmdGb3JUb3BQ cml2YXRlbHlPd25lZERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb1JlbW92 ZSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb0FkZCwgYm9vbCBzaG91bGRDbGVhckZp cnN0KQogewotICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBXZWJQcm9jZXNzUG9vbDo6YWxs UHJvY2Vzc1Bvb2xzKCkpCi0gICAgICAgIHByb2Nlc3NQb29sLT5zZW5kVG9OZXR3b3JraW5nUHJv Y2VzcyhNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlNob3VsZFBhcnRpdGlvbkNvb2tpZXNGb3JU b3BQcml2YXRlbHlPd25lZERvbWFpbnMoZG9tYWluc1RvUmVtb3ZlLCBkb21haW5zVG9BZGQsIGNs ZWFyRmlyc3QpKTsKKyAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29sIDogcHJvY2Vzc1Bvb2xzKCkp CisgICAgICAgIHByb2Nlc3NQb29sLT5zZW5kVG9OZXR3b3JraW5nUHJvY2VzcyhNZXNzYWdlczo6 TmV0d29ya1Byb2Nlc3M6OlVwZGF0ZUNvb2tpZVBhcnRpdGlvbmluZ0ZvclRvcFByaXZhdGVseU93 bmVkRG9tYWlucyhkb21haW5zVG9SZW1vdmUsIGRvbWFpbnNUb0FkZCwgc2hvdWxkQ2xlYXJGaXJz dCkpOwogfQogI2VuZGlmCiAKQEAgLTEyNjUsMTIgKzEyNjUsMTEgQEAgdm9pZCBXZWJzaXRlRGF0 YVN0b3JlOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZWQpCiAg ICAgaWYgKGVuYWJsZWQgPT0gcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSBvbmx5IGluaXRp YWxpemUgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzIHdoZW4gcmVzb3VyY2UgbG9hZCBzdGF0aXN0 aWNzIGdldCBlbmFibGVkLgogICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+c2V0UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZW5hYmxlZCk7CiAKLSAgICBmb3IgKGF1dG8mIHByb2Nl c3NQb29sIDogV2ViUHJvY2Vzc1Bvb2w6OmFsbFByb2Nlc3NQb29scygpKSB7CisgICAgZm9yIChh dXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKQogICAgICAgICBwcm9jZXNzUG9vbC0+ c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoZW5hYmxlZCk7Ci0gICAgICAgIHByb2Nl c3NQb29sLT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKGVuYWJsZWQpKTsKLSAgICB9CiB9CiAKIHZvaWQgV2Vi c2l0ZURhdGFTdG9yZTo6cmVnaXN0ZXJTaGFyZWRSZXNvdXJjZUxvYWRPYnNlcnZlcigpCkBAIC0x Mjc5LDEwICsxMjc4LDkgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZWdpc3RlclNoYXJlZFJl c291cmNlTG9hZE9ic2VydmVyKCkKICAgICAgICAgcmV0dXJuOwogICAgIAogI2lmIEhBVkUoQ0ZO RVRXT1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKQotICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGlj cy0+cmVnaXN0ZXJTaGFyZWRSZXNvdXJjZUxvYWRPYnNlcnZlcigKLSAgICAgICAgW3RoaXNdIChj b25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvUmVtb3ZlLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgZG9tYWluc1RvQWRkLCBib29sIGNsZWFyRmlyc3QpIHsKLSAgICAgICAgICAgIHRoaXMtPnNo b3VsZFBhcnRpdGlvbkNvb2tpZXNGb3JUb3BQcml2YXRlbHlPd25lZERvbWFpbnMoZG9tYWluc1Rv UmVtb3ZlLCBkb21haW5zVG9BZGQsIGNsZWFyRmlyc3QpOwotICAgICAgICB9KTsKKyAgICBtX3Jl c291cmNlTG9hZFN0YXRpc3RpY3MtPnJlZ2lzdGVyU2hhcmVkUmVzb3VyY2VMb2FkT2JzZXJ2ZXIo W3RoaXNdIChjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvUmVtb3ZlLCBjb25zdCBWZWN0 b3I8U3RyaW5nPiYgZG9tYWluc1RvQWRkLCBib29sIHNob3VsZENsZWFyRmlyc3QpIHsKKyAgICAg ICAgdXBkYXRlQ29va2llUGFydGl0aW9uaW5nRm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKGRv bWFpbnNUb1JlbW92ZSwgZG9tYWluc1RvQWRkLCBzaG91bGRDbGVhckZpcnN0KTsKKyAgICB9KTsK ICNlbHNlCiAgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5yZWdpc3RlclNoYXJlZFJlc291 cmNlTG9hZE9ic2VydmVyKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IGU3NjM5NjA1ZmJh MzY0Y2ZjZTQ4YThiZDQxZjI1YmQ5MjY4YjE2YjYuLjNkNjcxOTE1MjdmYzUzYmM1OGI2MzQ0OTk4 MzUyZjhhN2FhYTJhN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaApAQCAtMTAyLDcgKzEwMiw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHJlbW92ZURhdGFGb3JUb3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlucyhP cHRpb25TZXQ8V2Vic2l0ZURhdGFUeXBlPiwgT3B0aW9uU2V0PFdlYnNpdGVEYXRhRmV0Y2hPcHRp b24+LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnMs IEZ1bmN0aW9uPHZvaWQoSGFzaFNldDxTdHJpbmc+JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsK IAogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKQotICAgIHZvaWQgc2hv dWxkUGFydGl0aW9uQ29va2llc0ZvclRvcFByaXZhdGVseU93bmVkRG9tYWlucyhjb25zdCBWZWN0 b3I8U3RyaW5nPiYgZG9tYWluc1RvUmVtb3ZlLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWlu c1RvQWRkLCBib29sIGNsZWFyRmlyc3QpOworICAgIHZvaWQgdXBkYXRlQ29va2llUGFydGl0aW9u aW5nRm9yVG9wUHJpdmF0ZWx5T3duZWREb21haW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21h aW5zVG9SZW1vdmUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9BZGQsIGJvb2wgc2hv dWxkQ2xlYXJGaXJzdCk7CiAjZW5kaWYKICAgICB2b2lkIHJlc29sdmVEaXJlY3Rvcmllc0lmTmVj ZXNzYXJ5KCk7CiAgICAgY29uc3QgU3RyaW5nJiByZXNvbHZlZEFwcGxpY2F0aW9uQ2FjaGVEaXJl Y3RvcnkoKSBjb25zdCB7IHJldHVybiBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi5hcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5OyB9Cg==