204437 2019-11-20 19:16:21 -0800 [MSVC] error C2039: 'weakPtrFactory': is not a member of 'WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add>' 2019-11-20 22:27:56 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=204443 InRadar P2 Normal --- 1 fujii fujii cdumez dbates esprehn+autocc ews-watchlist kangil.han rniwa webkit-bug-importer oldest_to_newest 1592258 0 fujii 2019-11-20 19:16:21 -0800 [MSVC] error C2039: 'weakPtrFactory': is not a member of 'WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add>' WinCairo can't compile since r252723 (Bug 204397). https://build.webkit.org/builders/WinCairo%2064-bit%20WKL%20Release%20%28Build%29/builds/13581 > FAILED: Source/WebCore/CMakeFiles/WebCore.dir/__/__/WebCore/DerivedSources/unified-sources/UnifiedSource-be65d27a-7.cpp.obj > C:\MSVS\VC\Tools\MSVC\14.20.27508\bin\Hostx64\x64\cl.exe (...) -c WebCore\DerivedSources\unified-sources\UnifiedSource-be65d27a-7.cpp > C:\WebKit-BuildWorker\wincairo-wkl-release\build\WebKitBuild\Release\WTF\Headers\wtf/WeakPtr.h(252): error C2039: 'weakPtrFactory': is not a member of 'WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add>' > C:\WebKit-BuildWorker\wincairo-wkl-release\build\Source\WebCore\dom/DocumentStorageAccess.cpp(205): note: see declaration of 'WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add>' > C:\WebKit-BuildWorker\wincairo-wkl-release\build\Source\WebCore\dom/DocumentStorageAccess.cpp(185): note: see reference to function template instantiation 'WTF::WeakPtr<WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add>> WTF::makeWeakPtr<WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add>>(T &)' being compiled > with > [ > T=WebCore::DocumentStorageAccess::requestStorageAccess::<lambda_3f2cfd7704f93d8fe19d5b5f064f8add> > ] 1592259 1 fujii 2019-11-20 19:16:45 -0800 This is a similar issue with r251999. 1592260 2 384020 fujii 2019-11-20 19:34:28 -0800 Created attachment 384020 Patch 1592266 3 384020 fujii 2019-11-20 20:02:16 -0800 Comment on attachment 384020 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384020&action=review > Source/WebCore/ChangeLog:11 > + the inner lambda. It seems that the outer lambda is executed in the main thread. It's safe to dereference the weak ptr in the outer lambda. I don't need to create two weak ptrs. Will fix. 1592270 4 384023 fujii 2019-11-20 20:12:23 -0800 Created attachment 384023 WIP patch 1592274 5 fujii 2019-11-20 20:19:44 -0800 [MSConnect 3128879] C++: 'this' in capture expression of nested lambda resolves to the enclosing closure rather than the enclosing class instance - Developer Community https://developercommunity.visualstudio.com/content/problem/30060/c-this-in-capture-expression-of-nested-lambda-reso.html This captured in nested lambda when used in capture list results in this being an instance of lambda but not of the surrounding class - Developer Community https://developercommunity.visualstudio.com/content/problem/292128/this-captured-in-nested-lambda-when-used-in-captur.html 1592275 6 fujii 2019-11-20 20:23:02 -0800 https://developercommunity.visualstudio.com/solutions/809339/view.html > Please try to use /std:c++latest instead of /std:c++17 as it’s about new lambda processor. It also works with /experimental:newLambdaProcessor. 1592276 7 384024 fujii 2019-11-20 20:32:22 -0800 Created attachment 384024 Patch for landing 1592278 8 fujii 2019-11-20 20:36:04 -0800 Committed r252726: <https://trac.webkit.org/changeset/252726> 1592280 9 webkit-bug-importer 2019-11-20 20:37:24 -0800 <rdar://problem/57383131> 1592285 10 rniwa 2019-11-20 20:44:08 -0800 Oh, thanks for the fix. 1592286 11 fujii 2019-11-20 20:51:54 -0800 Bug 187035 – [Win] 'deref': is not a member of 'WebKit::WebResourceLoadStatisticsStore::updateCookiePartitioningForDomains::<lambda_9d761a6dc12d95db7fa2d6f3f5aa26fa>' Bug 184120 – [Win] MSVC can't compile WebResourceLoadStatisticsStore::scheduleClearInMemoryAndPersistent These were also same. 384020 2019-11-20 19:34:28 -0800 2019-11-20 20:23:13 -0800 Patch bug-204437-20191121123427.patch text/plain 3197 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVjN2FkN2YzZDg3YTUz ZWU1MjY4MDlmODc3ZGQ3OWY3YTY1ZDVlOS4uNzllZGQ4ZmUxNjE4ZWM3YzY5MmQ0YTk3OGFiYzYy ZjU0ODlkNzcyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTExLTIwICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtNU1ZDXSBl cnJvciBDMjAzOTogJ3dlYWtQdHJGYWN0b3J5JzogaXMgbm90IGEgbWVtYmVyIG9mICdXZWJDb3Jl OjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9yYWdlQWNjZXNzOjo8bGFtYmRhXzNm MmNmZDc3MDRmOTNkOGZlMTlkNWI1ZjA2NGY4YWRkPicKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDQzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9yYWdl QWNjZXNzKTogQ3JlYXRlZAorICAgICAgICB0d28gd2VhayBwdHJzIG9mIHRoaXMgYW5kIGp1c3Qg bW92ZSB0aGVtIGZyb20gdGhlIG91dGVyIGxhbWJkYSB0bworICAgICAgICB0aGUgaW5uZXIgbGFt YmRhLgorCiAyMDE5LTExLTIwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIGdldENvbXB1dGVkU3R5bGUgcmV0dXJucyAiYXV0byIgZm9yIHpJbmRleCBw cm9wZXJ0eSBldmVuIGFmdGVyIGl0IGhhcyBiZWVuIHNldCwgb24gbm9uLXBvc2l0aW9uZWQgZWxl bWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFN0b3JhZ2VBY2Nl c3MuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAKaW5k ZXggYmU2OTQ0ZDYzOGNiYTJmMDZkNWVmZGIzZTE5ZjY5ZWIxNjRkOTczZC4uOWJkNWIyNDg1NjFh ODYwOTQxYWE0YTkxMzY1YzU2ZjYxYTI1NGRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAKQEAgLTE3NCw3ICsxNzQsNyBAQCB2b2lkIERvY3VtZW50 U3RvcmFnZUFjY2Vzczo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoUmVmPERlZmVycmVkUHJvbWlzZT4m JiBwcm9taXNlKQogICAgIGF1dG8gc3ViRnJhbWVEb21haW4gPSBSZWdpc3RyYWJsZURvbWFpbjo6 dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3Qoc2VjdXJpdHlPcmlnaW4uaG9zdCgpKTsKICAgICBhdXRv IHRvcEZyYW1lRG9tYWluID0gUmVnaXN0cmFibGVEb21haW46OnVuY2hlY2tlZENyZWF0ZUZyb21I b3N0KHRvcFNlY3VyaXR5T3JpZ2luLmhvc3QoKSk7CiAgICAgCi0gICAgcGFnZS0+Y2hyb21lKCku Y2xpZW50KCkucmVxdWVzdFN0b3JhZ2VBY2Nlc3MoV1RGTW92ZShzdWJGcmFtZURvbWFpbiksIFdU Rk1vdmUodG9wRnJhbWVEb21haW4pLCAqZnJhbWUsIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFr UHRyKCp0aGlzKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldIChTdG9yYWdlQWNjZXNzV2Fz R3JhbnRlZCB3YXNHcmFudGVkLCBTdG9yYWdlQWNjZXNzUHJvbXB0V2FzU2hvd24gcHJvbXB0V2Fz U2hvd24pIG11dGFibGUgeworICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnJlcXVlc3RTdG9y YWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVEb21haW4pLCBXVEZNb3ZlKHRvcEZyYW1lRG9tYWlu KSwgKmZyYW1lLCBbdGhpcywgd2Vha1RoaXMxID0gbWFrZVdlYWtQdHIoKnRoaXMpLCB3ZWFrVGhp czIgPSBtYWtlV2Vha1B0cigqdGhpcyksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpXSAoU3Rv cmFnZUFjY2Vzc1dhc0dyYW50ZWQgd2FzR3JhbnRlZCwgU3RvcmFnZUFjY2Vzc1Byb21wdFdhc1No b3duIHByb21wdFdhc1Nob3duKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAg ICAgICAgICAgIHJldHVybjsKIApAQCAtMTgyLDcgKzE4Miw3IEBAIHZvaWQgRG9jdW1lbnRTdG9y YWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHBy b21pc2UpCiAgICAgICAgIGJvb2wgc2hvdWxkUHJlc2VydmVVc2VyR2VzdHVyZSA9IHdhc0dyYW50 ZWQgPT0gU3RvcmFnZUFjY2Vzc1dhc0dyYW50ZWQ6OlllcyB8fCBwcm9tcHRXYXNTaG93biA9PSBT dG9yYWdlQWNjZXNzUHJvbXB0V2FzU2hvd246Ok5vOwogCiAgICAgICAgIGlmIChzaG91bGRQcmVz ZXJ2ZVVzZXJHZXN0dXJlKSB7Ci0gICAgICAgICAgICBtX2RvY3VtZW50LmV2ZW50TG9vcCgpLnF1 ZXVlTWljcm90YXNrKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAg ICAgICAgICAgbV9kb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZU1pY3JvdGFzayhbdGhpcywgd2Vh a1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlzMSldIHsKICAgICAgICAgICAgICAgICBpZiAod2Vha1Ro aXMpCiAgICAgICAgICAgICAgICAgICAgIGVuYWJsZVRlbXBvcmFyeVRpbWVVc2VyR2VzdHVyZSgp OwogICAgICAgICAgICAgfSk7CkBAIC0xOTcsNyArMTk3LDcgQEAgdm9pZCBEb2N1bWVudFN0b3Jh Z2VBY2Nlc3M6OnJlcXVlc3RTdG9yYWdlQWNjZXNzKFJlZjxEZWZlcnJlZFByb21pc2U+JiYgcHJv bWlzZSkKICAgICAgICAgfQogCiAgICAgICAgIGlmIChzaG91bGRQcmVzZXJ2ZVVzZXJHZXN0dXJl KSB7Ci0gICAgICAgICAgICBtX2RvY3VtZW50LmV2ZW50TG9vcCgpLnF1ZXVlTWljcm90YXNrKFt0 aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgICAgICAgICAgbV9kb2N1 bWVudC5ldmVudExvb3AoKS5xdWV1ZU1pY3JvdGFzayhbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3Zl KHdlYWtUaGlzMildIHsKICAgICAgICAgICAgICAgICBpZiAod2Vha1RoaXMpCiAgICAgICAgICAg ICAgICAgICAgIGNvbnN1bWVUZW1wb3JhcnlUaW1lVXNlckdlc3R1cmUoKTsKICAgICAgICAgICAg IH0pOwo= 384023 2019-11-20 20:12:23 -0800 2019-11-20 20:32:06 -0800 WIP patch a.diff text/plain 1264 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudFN0b3JhZ2VBY2Nlc3MuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAKaW5kZXggYmU2 OTQ0ZDYzOGMuLjBmNTJkNjAxZTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnRTdG9yYWdlQWNjZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRT dG9yYWdlQWNjZXNzLmNwcApAQCAtMTgyLDcgKzE4Miw3IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdl QWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21p c2UpCiAgICAgICAgIGJvb2wgc2hvdWxkUHJlc2VydmVVc2VyR2VzdHVyZSA9IHdhc0dyYW50ZWQg PT0gU3RvcmFnZUFjY2Vzc1dhc0dyYW50ZWQ6OlllcyB8fCBwcm9tcHRXYXNTaG93biA9PSBTdG9y YWdlQWNjZXNzUHJvbXB0V2FzU2hvd246Ok5vOwogCiAgICAgICAgIGlmIChzaG91bGRQcmVzZXJ2 ZVVzZXJHZXN0dXJlKSB7Ci0gICAgICAgICAgICBtX2RvY3VtZW50LmV2ZW50TG9vcCgpLnF1ZXVl TWljcm90YXNrKFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgICAg ICAgICAgbV9kb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZU1pY3JvdGFzayhbdGhpcywgd2Vha1Ro aXMgPSBtYWtlV2Vha1B0cigqd2Vha1RoaXMpXSB7CiAgICAgICAgICAgICAgICAgaWYgKHdlYWtU aGlzKQogICAgICAgICAgICAgICAgICAgICBlbmFibGVUZW1wb3JhcnlUaW1lVXNlckdlc3R1cmUo KTsKICAgICAgICAgICAgIH0pOwpAQCAtMTk3LDcgKzE5Nyw3IEBAIHZvaWQgRG9jdW1lbnRTdG9y YWdlQWNjZXNzOjpyZXF1ZXN0U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHBy b21pc2UpCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoc2hvdWxkUHJlc2VydmVVc2VyR2VzdHVy ZSkgewotICAgICAgICAgICAgbV9kb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZU1pY3JvdGFzayhb dGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldIHsKKyAgICAgICAgICAgIG1fZG9j dW1lbnQuZXZlbnRMb29wKCkucXVldWVNaWNyb3Rhc2soW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdl YWtQdHIoKndlYWtUaGlzKV0gewogICAgICAgICAgICAgICAgIGlmICh3ZWFrVGhpcykKICAgICAg ICAgICAgICAgICAgICAgY29uc3VtZVRlbXBvcmFyeVRpbWVVc2VyR2VzdHVyZSgpOwogICAgICAg ICAgICAgfSk7Cg== 384024 2019-11-20 20:32:22 -0800 2019-11-20 20:32:22 -0800 Patch for landing bug-204437-20191121133221.patch text/plain 2386 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVjN2FkN2YzZDg3YTUz ZWU1MjY4MDlmODc3ZGQ3OWY3YTY1ZDVlOS4uYTZmMTNmMjU5YTFkYTM2YWZlZDg0YWI5NWFmZDJk YWM0MWIzNjI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTExLTIwICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtNU1ZDXSBl cnJvciBDMjAzOTogJ3dlYWtQdHJGYWN0b3J5JzogaXMgbm90IGEgbWVtYmVyIG9mICdXZWJDb3Jl OjpEb2N1bWVudFN0b3JhZ2VBY2Nlc3M6OnJlcXVlc3RTdG9yYWdlQWNjZXNzOjo8bGFtYmRhXzNm MmNmZDc3MDRmOTNkOGZlMTlkNWI1ZjA2NGY4YWRkPicKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDQzNworCisgICAgICAgIFVucmV2aWV3ZWQgYnVp bGQgZml4LgorCisgICAgICAgIE1TVkMgaGFzIGEgYnVnIG9mIGEgb3V0ZXIgbGFtYmRhJ3MgY2Fw dHVyZWQgJ3RoaXMnIGNhbid0IGJlIHVzZWQgYXMKKyAgICAgICAgYSBsYW1iZGEgY2FwdHVyZSBp bml0aWFsaXplciBvZiBhIGlubmVyIGxhbWJkYS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudFN0 b3JhZ2VBY2Nlc3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRTdG9yYWdlQWNjZXNz OjpyZXF1ZXN0U3RvcmFnZUFjY2Vzcyk6IFJlcGxhY2VkICcqdGhpcycgaW4gdGhlIGxhbWJkYSBj YXB0dXJlIGluaXRpYWxpemVyIHdpdGggJyp3ZWFrVGhpcycuCisKIDIwMTktMTEtMjAgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgZ2V0Q29tcHV0ZWRT dHlsZSByZXR1cm5zICJhdXRvIiBmb3IgekluZGV4IHByb3BlcnR5IGV2ZW4gYWZ0ZXIgaXQgaGFz IGJlZW4gc2V0LCBvbiBub24tcG9zaXRpb25lZCBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50U3RvcmFnZUFjY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcAppbmRleCBiZTY5NDRkNjM4Y2JhMmYwNmQ1ZWZk YjNlMTlmNjllYjE2NGQ5NzNkLi4wZjUyZDYwMWU2MDA0NzM1ZTJlMDNmNDIyNmI0NTg0ZDM4ZjBj YjIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdG9yYWdlQWNjZXNzLmNwcApA QCAtMTgyLDcgKzE4Miw3IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0U3Rv cmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAgICAgICAgIGJvb2wg c2hvdWxkUHJlc2VydmVVc2VyR2VzdHVyZSA9IHdhc0dyYW50ZWQgPT0gU3RvcmFnZUFjY2Vzc1dh c0dyYW50ZWQ6OlllcyB8fCBwcm9tcHRXYXNTaG93biA9PSBTdG9yYWdlQWNjZXNzUHJvbXB0V2Fz U2hvd246Ok5vOwogCiAgICAgICAgIGlmIChzaG91bGRQcmVzZXJ2ZVVzZXJHZXN0dXJlKSB7Ci0g ICAgICAgICAgICBtX2RvY3VtZW50LmV2ZW50TG9vcCgpLnF1ZXVlTWljcm90YXNrKFt0aGlzLCB3 ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0geworICAgICAgICAgICAgbV9kb2N1bWVudC5l dmVudExvb3AoKS5xdWV1ZU1pY3JvdGFzayhbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigq d2Vha1RoaXMpXSB7CiAgICAgICAgICAgICAgICAgaWYgKHdlYWtUaGlzKQogICAgICAgICAgICAg ICAgICAgICBlbmFibGVUZW1wb3JhcnlUaW1lVXNlckdlc3R1cmUoKTsKICAgICAgICAgICAgIH0p OwpAQCAtMTk3LDcgKzE5Nyw3IEBAIHZvaWQgRG9jdW1lbnRTdG9yYWdlQWNjZXNzOjpyZXF1ZXN0 U3RvcmFnZUFjY2VzcyhSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCiAgICAgICAgIH0K IAogICAgICAgICBpZiAoc2hvdWxkUHJlc2VydmVVc2VyR2VzdHVyZSkgewotICAgICAgICAgICAg bV9kb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZU1pY3JvdGFzayhbdGhpcywgd2Vha1RoaXMgPSBt YWtlV2Vha1B0cigqdGhpcyldIHsKKyAgICAgICAgICAgIG1fZG9jdW1lbnQuZXZlbnRMb29wKCku cXVldWVNaWNyb3Rhc2soW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKndlYWtUaGlzKV0g ewogICAgICAgICAgICAgICAgIGlmICh3ZWFrVGhpcykKICAgICAgICAgICAgICAgICAgICAgY29u c3VtZVRlbXBvcmFyeVRpbWVVc2VyR2VzdHVyZSgpOwogICAgICAgICAgICAgfSk7Cg==