205555 2019-12-23 03:38:22 -0800 ServiceWorkerJobData should have a move constructor 2020-01-01 05:05:09 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cdumez commit-queue darin webkit-bug-importer oldest_to_newest 1601227 0 youennf 2019-12-23 03:38:22 -0800 ServiceWorkerJobData should have a move constructor 1601228 1 youennf 2019-12-23 03:42:22 -0800 <rdar://problem/57853373> 1601229 2 386337 youennf 2019-12-23 03:48:39 -0800 Created attachment 386337 Patch 1601560 3 386337 darin 2019-12-26 20:45:24 -0800 Comment on attachment 386337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386337&action=review > Source/WebCore/workers/service/ServiceWorkerJobData.h:43 > - ServiceWorkerJobData(SWServerConnectionIdentifier, const DocumentOrWorkerIdentifier& sourceContext); > - ServiceWorkerJobData(const ServiceWorkerJobData&) = default; > - ServiceWorkerJobData() = default; > + static ServiceWorkerJobData withIdentifier(SWServerConnectionIdentifier, const DocumentOrWorkerIdentifier& sourceContext); I don’t understand why adding a move constructor requires changing the two item constructor to a named constructor. It should be as simple as removing the explicit copy constructor, or adding this: ServiceWorkerJobData(ServiceWorkerJobData&&) = default; Or did I miss something? > Source/WebCore/workers/service/ServiceWorkerJobData.h:95 > - ServiceWorkerJobData jobData { WTFMove(*identifier) }; > + ServiceWorkerJobData jobData; > + jobData.m_identifier = *identifier; Why no WTFMove? 1601842 4 386337 youennf 2019-12-30 02:56:56 -0800 Comment on attachment 386337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386337&action=review >> Source/WebCore/workers/service/ServiceWorkerJobData.h:43 >> + static ServiceWorkerJobData withIdentifier(SWServerConnectionIdentifier, const DocumentOrWorkerIdentifier& sourceContext); > > I don’t understand why adding a move constructor requires changing the two item constructor to a named constructor. It should be as simple as removing the explicit copy constructor, or adding this: > > ServiceWorkerJobData(ServiceWorkerJobData&&) = default; > > Or did I miss something? True, I could have kept ServiceWorkerJobData(SWServerConnectionIdentifier, const DocumentOrWorkerIdentifier& sourceContext). Will add it back. I wanted to have ServiceWorkerJobData() private so that we ensure ServiceWorkerJobData always has a valid identifier. >> Source/WebCore/workers/service/ServiceWorkerJobData.h:95 >> + jobData.m_identifier = *identifier; > > Why no WTFMove? identifier is a struct of two ObjectIdentifier so WTFMove does not bring anything. 1601843 5 386521 youennf 2019-12-30 03:03:35 -0800 Created attachment 386521 Patch 1601936 6 386521 darin 2019-12-30 13:30:14 -0800 Comment on attachment 386521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386521&action=review > Source/WebCore/workers/service/ServiceWorkerJobData.h:95 > + jobData.m_identifier = *identifier; Why no WTFMove? 1601937 7 darin 2019-12-30 13:30:42 -0800 Sorry I keep asking the same question. 1601960 8 youennf 2019-12-31 01:55:38 -0800 (In reply to Darin Adler from comment #7) > Sorry I keep asking the same question. I can add it back if it seems better. 1602065 9 commit-queue 2020-01-01 05:04:15 -0800 The commit-queue encountered the following flaky tests while processing attachment 386521: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1602066 10 386521 commit-queue 2020-01-01 05:05:08 -0800 Comment on attachment 386521 Patch Clearing flags on attachment: 386521 Committed r253967: <https://trac.webkit.org/changeset/253967> 1602067 11 commit-queue 2020-01-01 05:05:09 -0800 All reviewed patches have been landed. Closing bug. 386337 2019-12-23 03:48:39 -0800 2019-12-30 03:03:31 -0800 Patch bug-205555-20191223124837.patch text/plain 7839 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTUwMjFiNjAzYjVhN2Iz NDcyYTY5MjA4OTQyYTE2NGIxMTY3NDhkYi4uNmJkNGI1MDVkNGYxY2UyYTkwMGVmN2UyODljOWVh NTU2M2JhZjAzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEyLTIzICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTZXJ2aWNlV29ya2VySm9i RGF0YSBzaG91bGQgaGF2ZSBhIG1vdmUgY29uc3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTU1NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHksIFNlcnZpY2VXb3JrZXJKb2JE YXRhIGRpZCBub3QgaGF2ZSBhIG1vdmUgY29uc3RydWN0b3IuCisgICAgICAgIFJlZmFjdG9yIGNv ZGUgdG8gZW5hYmxlIGl0LgorICAgICAgICBUaGlzIGltcHJvdmVzIGVmZmljaWVuY3kgYW5kIGVu c3VyZXMgdGhhdCBzdHJpbmdzIGFuZCBvdGhlciByZWYgY291bnRlZCBmaWVsZHMgYXJlCisgICAg ICAgIHByb3Blcmx5IG1vdmVkIGFuZCBpc29sYXRlZC4KKyAgICAgICAgQ292ZXJlZCBieSBleGlz dGluZyB0ZXN0cy4KKworICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29u dGFpbmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3JrZXJDb250YWluZXI6OmFk ZFJlZ2lzdHJhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTZXJ2aWNlV29ya2VyQ29udGFpbmVy OjpyZW1vdmVSZWdpc3RyYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtlckNv bnRhaW5lcjo6dXBkYXRlUmVnaXN0cmF0aW9uKToKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uv U2VydmljZVdvcmtlckpvYkRhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtl ckpvYkRhdGE6OndpdGhJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcnZpY2VXb3Jr ZXJKb2JEYXRhOjppc29sYXRlZENvcHkgY29uc3QpOgorICAgICAgICAqIHdvcmtlcnMvc2Vydmlj ZS9TZXJ2aWNlV29ya2VySm9iRGF0YS5oOgorICAgICAgICAoV2ViQ29yZTo6U2VydmljZVdvcmtl ckpvYkRhdGE6OmRlY29kZSk6CisgICAgICAgICogd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlcjo6c29mdFVwZGF0ZSk6CisKIDIw MTktMTItMjAgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNX U2VydmVyIGNhbiBiZSBjcmVhdGVkIHdpdGhvdXQgYW55IHBhdGggdG8gc3RvcmUgcmVnaXN0cmF0 aW9ucyBpbiBub24gZXBoZW1lcmFsIHNlc3Npb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckNvbnRhaW5lci5jcHAKaW5kZXggOWQ3 MzU4NTUzYjhhNDM3MGNjOTZiYzA5Y2VkYzEyMzI3N2UwYzc5ZS4uOWU5NjgyOWFkOWQwZDdmZGJj ZTU0YjllM2M0MTVkYTA3Y2ZjNzA2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vy cy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJDb250YWluZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VyQ29udGFpbmVyLmNwcApAQCAtMTM3LDcgKzEz Nyw3IEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRhaW5lcjo6YWRkUmVnaXN0cmF0aW9uKGNvbnN0 IFN0cmluZyYgcmVsYXRpdmVTY3JpcHRVUkwsIGNvCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBTZXJ2aWNlV29ya2VySm9iRGF0YSBqb2JEYXRhKGVuc3VyZVNXQ2xpZW50Q29ubmVjdGlv bigpLnNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyKCksIGNvbnRleHRJZGVudGlmaWVyKCkpOwor ICAgIGF1dG8gam9iRGF0YSA9IFNlcnZpY2VXb3JrZXJKb2JEYXRhOjp3aXRoSWRlbnRpZmllcihl bnN1cmVTV0NsaWVudENvbm5lY3Rpb24oKS5zZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllcigpLCBj b250ZXh0SWRlbnRpZmllcigpKTsKIAogICAgIGpvYkRhdGEuc2NyaXB0VVJMID0gY29udGV4dC0+ Y29tcGxldGVVUkwocmVsYXRpdmVTY3JpcHRVUkwpOwogICAgIGlmICgham9iRGF0YS5zY3JpcHRV UkwuaXNWYWxpZCgpKSB7CkBAIC0yMDIsNyArMjAyLDcgQEAgdm9pZCBTZXJ2aWNlV29ya2VyQ29u dGFpbmVyOjpyZW1vdmVSZWdpc3RyYXRpb24oY29uc3QgVVJMJiBzY29wZVVSTCwgUmVmPERlZmVy cmUKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFNlcnZpY2VXb3JrZXJKb2JEYXRhIGpv YkRhdGEobV9zd0Nvbm5lY3Rpb24tPnNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyKCksIGNvbnRl eHRJZGVudGlmaWVyKCkpOworICAgIGF1dG8gam9iRGF0YSA9IFNlcnZpY2VXb3JrZXJKb2JEYXRh Ojp3aXRoSWRlbnRpZmllcihtX3N3Q29ubmVjdGlvbi0+c2VydmVyQ29ubmVjdGlvbklkZW50aWZp ZXIoKSwgY29udGV4dElkZW50aWZpZXIoKSk7CiAgICAgam9iRGF0YS5jbGllbnRDcmVhdGlvblVS TCA9IGNvbnRleHQtPnVybCgpOwogICAgIGpvYkRhdGEudG9wT3JpZ2luID0gY29udGV4dC0+dG9w T3JpZ2luKCkuZGF0YSgpOwogICAgIGpvYkRhdGEudHlwZSA9IFNlcnZpY2VXb3JrZXJKb2JUeXBl OjpVbnJlZ2lzdGVyOwpAQCAtMjI2LDcgKzIyNiw3IEBAIHZvaWQgU2VydmljZVdvcmtlckNvbnRh aW5lcjo6dXBkYXRlUmVnaXN0cmF0aW9uKGNvbnN0IFVSTCYgc2NvcGVVUkwsIGNvbnN0IFVSTCYK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFNlcnZpY2VXb3JrZXJKb2JEYXRhIGpvYkRh dGEobV9zd0Nvbm5lY3Rpb24tPnNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyKCksIGNvbnRleHRJ ZGVudGlmaWVyKCkpOworICAgIGF1dG8gam9iRGF0YSA9IFNlcnZpY2VXb3JrZXJKb2JEYXRhOjp3 aXRoSWRlbnRpZmllcihtX3N3Q29ubmVjdGlvbi0+c2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIo KSwgY29udGV4dElkZW50aWZpZXIoKSk7CiAgICAgam9iRGF0YS5jbGllbnRDcmVhdGlvblVSTCA9 IGNvbnRleHQudXJsKCk7CiAgICAgam9iRGF0YS50b3BPcmlnaW4gPSBjb250ZXh0LnRvcE9yaWdp bigpLmRhdGEoKTsKICAgICBqb2JEYXRhLnR5cGUgPSBTZXJ2aWNlV29ya2VySm9iVHlwZTo6VXBk YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VX b3JrZXJKb2JEYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNl V29ya2VySm9iRGF0YS5jcHAKaW5kZXggYTBmMzY0NThmYmY2ZDlkYjE2ZTY4MWIxOWY3MTA4MWFj YWY3ZGEwMC4uOWFlODY1ODk2MjEwNTVmOTMxOGFkYmE1MDViMjIyNjE5YWQ3NWQ4NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJKb2JEYXRh LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckpv YkRhdGEuY3BwCkBAIC0zMCwxOSArMzAsMTYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1T ZXJ2aWNlV29ya2VySm9iRGF0YTo6U2VydmljZVdvcmtlckpvYkRhdGEoY29uc3QgSWRlbnRpZmll ciYgaWRlbnRpZmllcikKLSAgICA6IG1faWRlbnRpZmllcihpZGVudGlmaWVyKQotewotfQotCi1T ZXJ2aWNlV29ya2VySm9iRGF0YTo6U2VydmljZVdvcmtlckpvYkRhdGEoU1dTZXJ2ZXJDb25uZWN0 aW9uSWRlbnRpZmllciBjb25uZWN0aW9uSWRlbnRpZmllciwgY29uc3QgRG9jdW1lbnRPcldvcmtl cklkZW50aWZpZXImIGxvY2FsU291cmNlQ29udGV4dCkKLSAgICA6IG1faWRlbnRpZmllciB7IGNv bm5lY3Rpb25JZGVudGlmaWVyLCBTZXJ2aWNlV29ya2VySm9iSWRlbnRpZmllcjo6Z2VuZXJhdGVU aHJlYWRTYWZlKCkgfQorU2VydmljZVdvcmtlckpvYkRhdGEgU2VydmljZVdvcmtlckpvYkRhdGE6 OndpdGhJZGVudGlmaWVyKFNXU2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIgY29ubmVjdGlvbklk ZW50aWZpZXIsIGNvbnN0IERvY3VtZW50T3JXb3JrZXJJZGVudGlmaWVyJiBsb2NhbFNvdXJjZUNv bnRleHQpCiB7CisgICAgU2VydmljZVdvcmtlckpvYkRhdGEgam9iRGF0YTsKKyAgICBqb2JEYXRh Lm1faWRlbnRpZmllciA9IHsgY29ubmVjdGlvbklkZW50aWZpZXIsIFNlcnZpY2VXb3JrZXJKb2JJ ZGVudGlmaWVyOjpnZW5lcmF0ZVRocmVhZFNhZmUoKSB9OwogICAgIFdURjo6c3dpdGNoT24obG9j YWxTb3VyY2VDb250ZXh0LCBbJl0oRG9jdW1lbnRJZGVudGlmaWVyIGRvY3VtZW50SWRlbnRpZmll cikgewotICAgICAgICBzb3VyY2VDb250ZXh0ID0gU2VydmljZVdvcmtlckNsaWVudElkZW50aWZp ZXIgeyBjb25uZWN0aW9uSWRlbnRpZmllciwgZG9jdW1lbnRJZGVudGlmaWVyIH07CisgICAgICAg IGpvYkRhdGEuc291cmNlQ29udGV4dCA9IFNlcnZpY2VXb3JrZXJDbGllbnRJZGVudGlmaWVyIHsg Y29ubmVjdGlvbklkZW50aWZpZXIsIGRvY3VtZW50SWRlbnRpZmllciB9OwogICAgIH0sIFsmXShT ZXJ2aWNlV29ya2VySWRlbnRpZmllciBzZXJ2aWNlV29ya2VySWRlbnRpZmllcikgewotICAgICAg ICBzb3VyY2VDb250ZXh0ID0gc2VydmljZVdvcmtlcklkZW50aWZpZXI7CisgICAgICAgIGpvYkRh dGEuc291cmNlQ29udGV4dCA9IHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyOwogICAgIH0pOworICAg IHJldHVybiBqb2JEYXRhOwogfQogCiBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5IFNlcnZp Y2VXb3JrZXJKb2JEYXRhOjpyZWdpc3RyYXRpb25LZXkoKSBjb25zdApAQCAtNTQsNyArNTEsOCBA QCBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uS2V5IFNlcnZpY2VXb3JrZXJKb2JEYXRhOjpyZWdp c3RyYXRpb25LZXkoKSBjb25zdAogCiBTZXJ2aWNlV29ya2VySm9iRGF0YSBTZXJ2aWNlV29ya2Vy Sm9iRGF0YTo6aXNvbGF0ZWRDb3B5KCkgY29uc3QKIHsKLSAgICBTZXJ2aWNlV29ya2VySm9iRGF0 YSByZXN1bHQgeyBpZGVudGlmaWVyKCkgfTsKKyAgICBTZXJ2aWNlV29ya2VySm9iRGF0YSByZXN1 bHQ7CisgICAgcmVzdWx0Lm1faWRlbnRpZmllciA9IGlkZW50aWZpZXIoKTsKICAgICByZXN1bHQu c291cmNlQ29udGV4dCA9IHNvdXJjZUNvbnRleHQ7CiAgICAgcmVzdWx0LnR5cGUgPSB0eXBlOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtl ckpvYkRhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2Vy Sm9iRGF0YS5oCmluZGV4IDVmMzM3Y2JhYTgzOTE2ZTVhZTMxZGMyNzA3NzlhMGE0MTFhMDljNDUu LmJiMjBmOTQ0NTIxM2ViZTRiMjQ3NGY3NGUwNTI2NWJlNWZhZThjZDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iRGF0YS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iRGF0YS5oCkBA IC00MCw5ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IFNlcnZpY2VXb3Jr ZXJKb2JEYXRhIHsKICAgICB1c2luZyBJZGVudGlmaWVyID0gU2VydmljZVdvcmtlckpvYkRhdGFJ ZGVudGlmaWVyOwotICAgIFNlcnZpY2VXb3JrZXJKb2JEYXRhKFNXU2VydmVyQ29ubmVjdGlvbklk ZW50aWZpZXIsIGNvbnN0IERvY3VtZW50T3JXb3JrZXJJZGVudGlmaWVyJiBzb3VyY2VDb250ZXh0 KTsKLSAgICBTZXJ2aWNlV29ya2VySm9iRGF0YShjb25zdCBTZXJ2aWNlV29ya2VySm9iRGF0YSYp ID0gZGVmYXVsdDsKLSAgICBTZXJ2aWNlV29ya2VySm9iRGF0YSgpID0gZGVmYXVsdDsKKyAgICBz dGF0aWMgU2VydmljZVdvcmtlckpvYkRhdGEgd2l0aElkZW50aWZpZXIoU1dTZXJ2ZXJDb25uZWN0 aW9uSWRlbnRpZmllciwgY29uc3QgRG9jdW1lbnRPcldvcmtlcklkZW50aWZpZXImIHNvdXJjZUNv bnRleHQpOwogCiAgICAgU1dTZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllciBjb25uZWN0aW9uSWRl bnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllci5jb25uZWN0aW9uSWRlbnRpZmll cjsgfQogCkBAIC02NSw3ICs2Myw3IEBAIHN0cnVjdCBTZXJ2aWNlV29ya2VySm9iRGF0YSB7CiAg ICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGljIE9wdGlvbmFsPFNlcnZpY2VXb3JrZXJK b2JEYXRhPiBkZWNvZGUoRGVjb2RlciYpOwogCiBwcml2YXRlOgotICAgIFdFQkNPUkVfRVhQT1JU IGV4cGxpY2l0IFNlcnZpY2VXb3JrZXJKb2JEYXRhKGNvbnN0IElkZW50aWZpZXImKTsKKyAgICBT ZXJ2aWNlV29ya2VySm9iRGF0YSgpID0gZGVmYXVsdDsKIAogICAgIElkZW50aWZpZXIgbV9pZGVu dGlmaWVyOwogfTsKQEAgLTkzLDcgKzkxLDggQEAgT3B0aW9uYWw8U2VydmljZVdvcmtlckpvYkRh dGE+IFNlcnZpY2VXb3JrZXJKb2JEYXRhOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKICAgICBp ZiAoIWlkZW50aWZpZXIpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKLSAgICBTZXJ2 aWNlV29ya2VySm9iRGF0YSBqb2JEYXRhIHsgV1RGTW92ZSgqaWRlbnRpZmllcikgfTsKKyAgICBT ZXJ2aWNlV29ya2VySm9iRGF0YSBqb2JEYXRhOworICAgIGpvYkRhdGEubV9pZGVudGlmaWVyID0g KmlkZW50aWZpZXI7CiAKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGpvYkRhdGEuc2NyaXB0VVJM KSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv d29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKaW5kZXggZmE0YzFkYmM5M2U4YWI2 Mjk4MWU2YTY3NDJjNmI2NTc4YTc4YzM3Mi4uOThjOWU5ZTM0OTgzYjljNjI1MzE0M2MwMGZlNmE5 NTgwNjkxMmM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3Nl cnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3Nl cnZlci9TV1NlcnZlci5jcHAKQEAgLTEwNTIsNyArMTA1Miw3IEBAIGJvb2wgU1dTZXJ2ZXI6OmNh bkhhbmRsZVNjaGVtZShTdHJpbmdWaWV3IHNjaGVtZSkgY29uc3QKIC8vIGh0dHBzOi8vdzNjLmdp dGh1Yi5pby9TZXJ2aWNlV29ya2VyLyNzb2Z0LXVwZGF0ZQogdm9pZCBTV1NlcnZlcjo6c29mdFVw ZGF0ZShTV1NlcnZlclJlZ2lzdHJhdGlvbiYgcmVnaXN0cmF0aW9uKQogewotICAgIFNlcnZpY2VX b3JrZXJKb2JEYXRhIGpvYkRhdGEoUHJvY2Vzczo6aWRlbnRpZmllcigpLCBTZXJ2aWNlV29ya2Vy SWRlbnRpZmllcjo6Z2VuZXJhdGUoKSk7CisgICAgYXV0byBqb2JEYXRhID0gU2VydmljZVdvcmtl ckpvYkRhdGE6OndpdGhJZGVudGlmaWVyKFByb2Nlc3M6OmlkZW50aWZpZXIoKSwgU2VydmljZVdv cmtlcklkZW50aWZpZXI6OmdlbmVyYXRlKCkpOwogICAgIGpvYkRhdGEuc2NyaXB0VVJMID0gcmVn aXN0cmF0aW9uLnNjcmlwdFVSTCgpOwogICAgIGpvYkRhdGEudG9wT3JpZ2luID0gcmVnaXN0cmF0 aW9uLmtleSgpLnRvcE9yaWdpbigpOwogICAgIGpvYkRhdGEuc2NvcGVVUkwgPSByZWdpc3RyYXRp b24uc2NvcGVVUkxXaXRob3V0RnJhZ21lbnQoKTsK 386521 2019-12-30 03:03:35 -0800 2020-01-01 05:05:08 -0800 Patch bug-205555-20191230120333.patch text/plain 3682 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4NGY0OWQ1NGFiZTdj YjZiNTc1ODE5ODE0YjgzNmEwNzUyNzQ4Ni4uNzVmODFjMWY1ODYzMjI5ZTY3ZTIzYjhjZWIyNDFi YmEyNzBkYWMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTEyLTMwICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTZXJ2aWNlV29ya2VySm9i RGF0YSBzaG91bGQgaGF2ZSBhIG1vdmUgY29uc3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTU1NQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNTc4NTMzNzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUHJldmlvdXNseSwgU2VydmljZVdvcmtlckpvYkRhdGEgZGlkIG5vdCBoYXZlIGEgbW92 ZSBjb25zdHJ1Y3Rvci4KKyAgICAgICAgUmVmYWN0b3IgY29kZSB0byBlbmFibGUgaXQuCisgICAg ICAgIFRoaXMgaW1wcm92ZXMgZWZmaWNpZW5jeSBhbmQgZW5zdXJlcyB0aGF0IHN0cmluZ3MgYW5k IG90aGVyIHJlZiBjb3VudGVkIGZpZWxkcyBhcmUKKyAgICAgICAgcHJvcGVybHkgbW92ZWQgYW5k IGlzb2xhdGVkLgorICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJKb2JEYXRhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNlcnZpY2VXb3JrZXJKb2JEYXRhOjppc29sYXRlZENvcHkgY29uc3QpOgorICAgICAg ICAqIHdvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iRGF0YS5oOgorICAgICAgICAoV2Vi Q29yZTo6U2VydmljZVdvcmtlckpvYkRhdGE6OmRlY29kZSk6CisKIDIwMTktMTItMzAgIHlvdWVu biBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIElnbm9yZSBVUkwgaG9zdCBm b3Igc2NoZW1lcyB0aGF0IGFyZSBub3QgdXNpbmcgaG9zdCBpbmZvcm1hdGlvbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJKb2JEYXRhLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9TZXJ2aWNlV29ya2VySm9iRGF0YS5j cHAKaW5kZXggYTBmMzY0NThmYmY2ZDlkYjE2ZTY4MWIxOWY3MTA4MWFjYWY3ZGEwMC4uMzY5N2Uw N2E3N2NmMGNmMThkMjQ3YTdlODY0ODExYmNiMWVmMmEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3JrZXJKb2JEYXRhLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2UvU2VydmljZVdvcmtlckpvYkRhdGEuY3BwCkBAIC0z MCwxMSArMzAsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVNlcnZpY2VXb3JrZXJKb2JE YXRhOjpTZXJ2aWNlV29ya2VySm9iRGF0YShjb25zdCBJZGVudGlmaWVyJiBpZGVudGlmaWVyKQot ICAgIDogbV9pZGVudGlmaWVyKGlkZW50aWZpZXIpCi17Ci19Ci0KIFNlcnZpY2VXb3JrZXJKb2JE YXRhOjpTZXJ2aWNlV29ya2VySm9iRGF0YShTV1NlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyIGNv bm5lY3Rpb25JZGVudGlmaWVyLCBjb25zdCBEb2N1bWVudE9yV29ya2VySWRlbnRpZmllciYgbG9j YWxTb3VyY2VDb250ZXh0KQogICAgIDogbV9pZGVudGlmaWVyIHsgY29ubmVjdGlvbklkZW50aWZp ZXIsIFNlcnZpY2VXb3JrZXJKb2JJZGVudGlmaWVyOjpnZW5lcmF0ZVRocmVhZFNhZmUoKSB9CiB7 CkBAIC01NCw3ICs0OSw4IEBAIFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXkgU2VydmljZVdv cmtlckpvYkRhdGE6OnJlZ2lzdHJhdGlvbktleSgpIGNvbnN0CiAKIFNlcnZpY2VXb3JrZXJKb2JE YXRhIFNlcnZpY2VXb3JrZXJKb2JEYXRhOjppc29sYXRlZENvcHkoKSBjb25zdAogewotICAgIFNl cnZpY2VXb3JrZXJKb2JEYXRhIHJlc3VsdCB7IGlkZW50aWZpZXIoKSB9OworICAgIFNlcnZpY2VX b3JrZXJKb2JEYXRhIHJlc3VsdDsKKyAgICByZXN1bHQubV9pZGVudGlmaWVyID0gaWRlbnRpZmll cigpOwogICAgIHJlc3VsdC5zb3VyY2VDb250ZXh0ID0gc291cmNlQ29udGV4dDsKICAgICByZXN1 bHQudHlwZSA9IHR5cGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2Vy dmljZS9TZXJ2aWNlV29ya2VySm9iRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2 aWNlL1NlcnZpY2VXb3JrZXJKb2JEYXRhLmgKaW5kZXggNWYzMzdjYmFhODM5MTZlNWFlMzFkYzI3 MDc3OWEwYTQxMWEwOWM0NS4uY2MwYjQxZGE2OTY4YzVlNTgxMTRmNzY2ZjRmMzhiODcwMWU4NDk5 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VXb3Jr ZXJKb2JEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL1NlcnZpY2VX b3JrZXJKb2JEYXRhLmgKQEAgLTQxLDggKzQxLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3Ry dWN0IFNlcnZpY2VXb3JrZXJKb2JEYXRhIHsKICAgICB1c2luZyBJZGVudGlmaWVyID0gU2Vydmlj ZVdvcmtlckpvYkRhdGFJZGVudGlmaWVyOwogICAgIFNlcnZpY2VXb3JrZXJKb2JEYXRhKFNXU2Vy dmVyQ29ubmVjdGlvbklkZW50aWZpZXIsIGNvbnN0IERvY3VtZW50T3JXb3JrZXJJZGVudGlmaWVy JiBzb3VyY2VDb250ZXh0KTsKLSAgICBTZXJ2aWNlV29ya2VySm9iRGF0YShjb25zdCBTZXJ2aWNl V29ya2VySm9iRGF0YSYpID0gZGVmYXVsdDsKLSAgICBTZXJ2aWNlV29ya2VySm9iRGF0YSgpID0g ZGVmYXVsdDsKIAogICAgIFNXU2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIgY29ubmVjdGlvbklk ZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2lkZW50aWZpZXIuY29ubmVjdGlvbklkZW50aWZp ZXI7IH0KIApAQCAtNjUsNyArNjMsNyBAQCBzdHJ1Y3QgU2VydmljZVdvcmtlckpvYkRhdGEgewog ICAgIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0YXRpYyBPcHRpb25hbDxTZXJ2aWNlV29ya2Vy Sm9iRGF0YT4gZGVjb2RlKERlY29kZXImKTsKIAogcHJpdmF0ZToKLSAgICBXRUJDT1JFX0VYUE9S VCBleHBsaWNpdCBTZXJ2aWNlV29ya2VySm9iRGF0YShjb25zdCBJZGVudGlmaWVyJik7CisgICAg U2VydmljZVdvcmtlckpvYkRhdGEoKSA9IGRlZmF1bHQ7CiAKICAgICBJZGVudGlmaWVyIG1faWRl bnRpZmllcjsKIH07CkBAIC05Myw3ICs5MSw4IEBAIE9wdGlvbmFsPFNlcnZpY2VXb3JrZXJKb2JE YXRhPiBTZXJ2aWNlV29ya2VySm9iRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiAgICAg aWYgKCFpZGVudGlmaWVyKQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAgU2Vy dmljZVdvcmtlckpvYkRhdGEgam9iRGF0YSB7IFdURk1vdmUoKmlkZW50aWZpZXIpIH07CisgICAg U2VydmljZVdvcmtlckpvYkRhdGEgam9iRGF0YTsKKyAgICBqb2JEYXRhLm1faWRlbnRpZmllciA9 ICppZGVudGlmaWVyOwogCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShqb2JEYXRhLnNjcmlwdFVS TCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Cg==