187337 2018-07-05 01:39:19 -0700 [WebVR] Fix VRDisplayEvent implementation 2018-07-05 04:43:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 svillar svillar commit-queue dino svillar webkit-bug-importer zan oldest_to_newest 1439332 0 svillar 2018-07-05 01:39:19 -0700 [WebVR] Fix VRDisplayEvent implementation 1439333 1 344313 svillar 2018-07-05 01:42:11 -0700 Created attachment 344313 Patch 1439342 2 344313 zan 2018-07-05 02:56:14 -0700 Comment on attachment 344313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344313&action=review > Source/WebCore/Modules/webvr/VRDisplayEvent.h:36 > + static Ref<VRDisplayEvent> create(const AtomicString& type, const RefPtr<VRDisplay>& display, const std::optional<VRDisplayEventReason>& reason) Can display and reason arguments be rvalue references, enabling moving them down to the constructor and there into the member variables? > Source/WebCore/Modules/webvr/VRDisplayEvent.h:54 > + std::optional<VRDisplayEventReason> reason() const { return m_reason; } Can this return a const reference to the std::optional<>? It would then be up to the caller to copy it if necessary. 1439343 3 svillar 2018-07-05 02:58:34 -0700 (In reply to Zan Dobersek from comment #2) > Comment on attachment 344313 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=344313&action=review > > > Source/WebCore/Modules/webvr/VRDisplayEvent.h:36 > > + static Ref<VRDisplayEvent> create(const AtomicString& type, const RefPtr<VRDisplay>& display, const std::optional<VRDisplayEventReason>& reason) > > Can display and reason arguments be rvalue references, enabling moving them > down to the constructor and there into the member variables? The reason can, but the VRDisplay cannot as they belong to somewhere else > > Source/WebCore/Modules/webvr/VRDisplayEvent.h:54 > > + std::optional<VRDisplayEventReason> reason() const { return m_reason; } > > Can this return a const reference to the std::optional<>? It would then be > up to the caller to copy it if necessary. OK 1439349 4 344316 svillar 2018-07-05 03:32:23 -0700 Created attachment 344316 Patch for landing 1439350 5 svillar 2018-07-05 03:40:46 -0700 (In reply to Zan Dobersek from comment #2) > Comment on attachment 344313 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=344313&action=review > > > Source/WebCore/Modules/webvr/VRDisplayEvent.h:36 > > + static Ref<VRDisplayEvent> create(const AtomicString& type, const RefPtr<VRDisplay>& display, const std::optional<VRDisplayEventReason>& reason) > > Can display and reason arguments be rvalue references, enabling moving them > down to the constructor and there into the member variables? > > > Source/WebCore/Modules/webvr/VRDisplayEvent.h:54 > > + std::optional<VRDisplayEventReason> reason() const { return m_reason; } > > Can this return a const reference to the std::optional<>? It would then be > up to the caller to copy it if necessary. I forgot to add this last change, I'll add it to a follow-up patch 1439351 6 svillar 2018-07-05 04:42:07 -0700 Committed r233515: <https://trac.webkit.org/changeset/233515> 1439352 7 webkit-bug-importer 2018-07-05 04:43:20 -0700 <rdar://problem/41843918> 344313 2018-07-05 01:42:11 -0700 2018-07-05 03:32:19 -0700 Patch bug-187337-20180705104209.patch text/plain 3869 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJkMzkzODVmZGU3MmRh ZmJmNzM5YjM4MDEzNTNlYjMyOGMyYWMzYS4uN2I3ZTMzNGYwZGNiOGFkNTM1YTEwYWVlNWViYjMz NGU3MzdkNGE5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA3LTA1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXZWJWUl0g Rml4IFZSRGlzcGxheUV2ZW50IGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODczMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBWUkRpc3BsYXlFdmVudCBpbXBsZW1lbnRhdGlvbiBo YWQgdHdvIGlzc3Vlcy4gRmlyc3QgdGhlcmUgd2VyZSBubyBhdHRyaWJ1dGVzIHN0b3JpbmcgdGhl CisgICAgICAgIFZSRGlzcGxheSB0aGUgZXZlbnQgcmVmZXJzIHRvLiBTZWNvbmRseSB0aGUgVlJE aXNwbGF5RXZlbnRSZWFzb24gaXMgbm90IG1hbmRhdG9yeSBzbyBpdAorICAgICAgICBzaG91bGQg YmUgaGFuZGxlZCB2aWEgYW4gb3B0aW9uYWwuCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYnZyL1ZS RGlzcGxheUV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZSRGlzcGxheUV2ZW50OjpWUkRp c3BsYXlFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpWUkRpc3BsYXlFdmVudDo6ZGlzcGxheSBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpWUkRpc3BsYXlFdmVudDo6cmVhc29u IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL3dlYnZyL1ZSRGlzcGxheUV2ZW50 Lmg6CisKIDIwMTgtMDYtMzAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBGb2xsb3ctdXA6IEZpeCBjbGFuZyBzdGF0aWMgYW5hbHl6ZXIgd2FybmluZ3M6IEdh cmJhZ2UgcmV0dXJuIHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YnZyL1ZSRGlzcGxheUV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJE aXNwbGF5RXZlbnQuY3BwCmluZGV4IDkyMGQ3YTBmOTcwYTJlYTFjNzAzYmM1ZDFmNGZiY2NmMDgz OWJlNGMuLjVmMTllNzlhYjc0ODU5NTdhZDFhMjg5OTJiMTA0ZTJhNzliYWRlMzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJEaXNwbGF5RXZlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJEaXNwbGF5RXZlbnQuY3BwCkBAIC0zMSwy MCArMzEsMTkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBWUkRpc3BsYXlFdmVudDo6VlJEaXNw bGF5RXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBjb25zdCBJbml0JiBpbml0aWFsaXpl ciwgSXNUcnVzdGVkIGlzVHJ1c3RlZCkKICAgICA6IEV2ZW50KHR5cGUsIGluaXRpYWxpemVyLCBp c1RydXN0ZWQpCisgICAgLCBtX2Rpc3BsYXkoaW5pdGlhbGl6ZXIuZGlzcGxheSkKKyAgICAsIG1f cmVhc29uKGluaXRpYWxpemVyLnJlYXNvbikKIHsKIH0KIAotVlJEaXNwbGF5RXZlbnQ6On5WUkRp c3BsYXlFdmVudCgpID0gZGVmYXVsdDsKLQotUmVmUHRyPFZSRGlzcGxheT4gVlJEaXNwbGF5RXZl bnQ6OmRpc3BsYXkoKSBjb25zdAorVlJEaXNwbGF5RXZlbnQ6OlZSRGlzcGxheUV2ZW50KGNvbnN0 IEF0b21pY1N0cmluZyYgbmFtZSwgY29uc3QgUmVmUHRyPFZSRGlzcGxheT4mIGRpc3BsYXksIGNv bnN0IHN0ZDo6b3B0aW9uYWw8VlJEaXNwbGF5RXZlbnRSZWFzb24+JiByZWFzb24pCisgICAgOiBF dmVudChuYW1lLCBmYWxzZSAvKmNhbkJ1YmJsZSovLCBmYWxzZSAvKmNhbmNlbGFibGUqLykKKyAg ICAsIG1fZGlzcGxheShkaXNwbGF5KQorICAgICwgbV9yZWFzb24ocmVhc29uKQogewotICAgIHJl dHVybiBudWxscHRyOwogfQogCi1WUkRpc3BsYXlFdmVudFJlYXNvbiBWUkRpc3BsYXlFdmVudDo6 cmVhc29uKCkgY29uc3QKLXsKLSAgICByZXR1cm4gVlJEaXNwbGF5RXZlbnRSZWFzb246Ok1vdW50 ZWQ7Ci19CitWUkRpc3BsYXlFdmVudDo6flZSRGlzcGxheUV2ZW50KCkgPSBkZWZhdWx0OwogCiBF dmVudEludGVyZmFjZSBWUkRpc3BsYXlFdmVudDo6ZXZlbnRJbnRlcmZhY2UoKSBjb25zdAogewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJ2ci9WUkRpc3BsYXlFdmVudC5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJ2ci9WUkRpc3BsYXlFdmVudC5oCmluZGV4IDU5 Mjk5Y2E1N2FkOTBiZTA2ZDVjZGMwMDU3NGU1YTE5YjUyYWM4MmIuLjJlOGJkZGM5NzhiZGNlNWRj YjkzZDViMTI2MmFkNmE0OGNlMDFjY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2VidnIvVlJEaXNwbGF5RXZlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YnZyL1ZSRGlzcGxheUV2ZW50LmgKQEAgLTMzLDkgKzMzLDE0IEBAIGNsYXNzIFZSRGlzcGxheTsK IAogY2xhc3MgVlJEaXNwbGF5RXZlbnQgZmluYWwgOiBwdWJsaWMgRXZlbnQgewogcHVibGljOgor ICAgIHN0YXRpYyBSZWY8VlJEaXNwbGF5RXZlbnQ+IGNyZWF0ZShjb25zdCBBdG9taWNTdHJpbmcm IHR5cGUsIGNvbnN0IFJlZlB0cjxWUkRpc3BsYXk+JiBkaXNwbGF5LCBjb25zdCBzdGQ6Om9wdGlv bmFsPFZSRGlzcGxheUV2ZW50UmVhc29uPiYgcmVhc29uKQorICAgIHsKKyAgICAgICAgcmV0dXJu IGFkb3B0UmVmKCpuZXcgVlJEaXNwbGF5RXZlbnQodHlwZSwgZGlzcGxheSwgcmVhc29uKSk7Cisg ICAgfQorCiAgICAgc3RydWN0IEluaXQgOiBFdmVudEluaXQgewogICAgICAgICBSZWZQdHI8VlJE aXNwbGF5PiBkaXNwbGF5OwotICAgICAgICBWUkRpc3BsYXlFdmVudFJlYXNvbiByZWFzb247Cisg ICAgICAgIHN0ZDo6b3B0aW9uYWw8VlJEaXNwbGF5RXZlbnRSZWFzb24+IHJlYXNvbjsKICAgICB9 OwogCiAgICAgc3RhdGljIFJlZjxWUkRpc3BsYXlFdmVudD4gY3JlYXRlKGNvbnN0IEF0b21pY1N0 cmluZyYgdHlwZSwgY29uc3QgSW5pdCYgaW5pdGlhbGl6ZXIsIElzVHJ1c3RlZCBpc1RydXN0ZWQg PSBJc1RydXN0ZWQ6Ok5vKQpAQCAtNDUsMTQgKzUwLDE4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1 YWwgflZSRGlzcGxheUV2ZW50KCk7CiAKLSAgICBSZWZQdHI8VlJEaXNwbGF5PiBkaXNwbGF5KCkg Y29uc3Q7Ci0gICAgVlJEaXNwbGF5RXZlbnRSZWFzb24gcmVhc29uKCkgY29uc3Q7CisgICAgUmVm UHRyPFZSRGlzcGxheT4gZGlzcGxheSgpIGNvbnN0IHsgcmV0dXJuIG1fZGlzcGxheTsgfQorICAg IHN0ZDo6b3B0aW9uYWw8VlJEaXNwbGF5RXZlbnRSZWFzb24+IHJlYXNvbigpIGNvbnN0IHsgcmV0 dXJuIG1fcmVhc29uOyB9CiAKIHByaXZhdGU6CiAgICAgVlJEaXNwbGF5RXZlbnQoY29uc3QgQXRv bWljU3RyaW5nJiwgY29uc3QgSW5pdCYsIElzVHJ1c3RlZCk7CisgICAgVlJEaXNwbGF5RXZlbnQo Y29uc3QgQXRvbWljU3RyaW5nJiwgY29uc3QgUmVmUHRyPFZSRGlzcGxheT4mLCBjb25zdCBzdGQ6 Om9wdGlvbmFsPFZSRGlzcGxheUV2ZW50UmVhc29uPiYpOwogCiAgICAgLy8gRXZlbnQKICAgICBF dmVudEludGVyZmFjZSBldmVudEludGVyZmFjZSgpIGNvbnN0IG92ZXJyaWRlOworCisgICAgUmVm UHRyPFZSRGlzcGxheT4gbV9kaXNwbGF5OworICAgIHN0ZDo6b3B0aW9uYWw8VlJEaXNwbGF5RXZl bnRSZWFzb24+IG1fcmVhc29uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 344316 2018-07-05 03:32:23 -0700 2018-07-05 03:33:52 -0700 Patch for landing bug-187337-20180705123222.patch text/plain 3872 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJkMzkzODVmZGU3MmRh ZmJmNzM5YjM4MDEzNTNlYjMyOGMyYWMzYS4uOTliNmIxYTMzMjY5MzdlM2I1N2EwMmUwMGZiYTU0 NDliZDVkMmY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA3LTA1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXZWJWUl0g Rml4IFZSRGlzcGxheUV2ZW50IGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODczMzcKKworICAgICAgICBSZXZpZXdlZCBieSDF vWFuIERvYmVyxaFlay4KKworICAgICAgICBWUkRpc3BsYXlFdmVudCBpbXBsZW1lbnRhdGlvbiBo YWQgdHdvIGlzc3Vlcy4gRmlyc3QgdGhlcmUgd2VyZSBubyBhdHRyaWJ1dGVzIHN0b3JpbmcgdGhl CisgICAgICAgIFZSRGlzcGxheSB0aGUgZXZlbnQgcmVmZXJzIHRvLiBTZWNvbmRseSB0aGUgVlJE aXNwbGF5RXZlbnRSZWFzb24gaXMgbm90IG1hbmRhdG9yeSBzbyBpdAorICAgICAgICBzaG91bGQg YmUgaGFuZGxlZCB2aWEgYW4gb3B0aW9uYWwuCisKKyAgICAgICAgKiBNb2R1bGVzL3dlYnZyL1ZS RGlzcGxheUV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZSRGlzcGxheUV2ZW50OjpWUkRp c3BsYXlFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpWUkRpc3BsYXlFdmVudDo6ZGlzcGxheSBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpWUkRpc3BsYXlFdmVudDo6cmVhc29u IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL3dlYnZyL1ZSRGlzcGxheUV2ZW50 Lmg6CisKIDIwMTgtMDYtMzAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBGb2xsb3ctdXA6IEZpeCBjbGFuZyBzdGF0aWMgYW5hbHl6ZXIgd2FybmluZ3M6IEdh cmJhZ2UgcmV0dXJuIHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YnZyL1ZSRGlzcGxheUV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJE aXNwbGF5RXZlbnQuY3BwCmluZGV4IDkyMGQ3YTBmOTcwYTJlYTFjNzAzYmM1ZDFmNGZiY2NmMDgz OWJlNGMuLjQ5OWRjNGZmOTQxYjY3YTM2MmMzYmRkY2ZjMTFiYzBiYWRlNzMxYzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJEaXNwbGF5RXZlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJEaXNwbGF5RXZlbnQuY3BwCkBAIC0zMSwy MCArMzEsMTkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBWUkRpc3BsYXlFdmVudDo6VlJEaXNw bGF5RXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBjb25zdCBJbml0JiBpbml0aWFsaXpl ciwgSXNUcnVzdGVkIGlzVHJ1c3RlZCkKICAgICA6IEV2ZW50KHR5cGUsIGluaXRpYWxpemVyLCBp c1RydXN0ZWQpCisgICAgLCBtX2Rpc3BsYXkoaW5pdGlhbGl6ZXIuZGlzcGxheSkKKyAgICAsIG1f cmVhc29uKGluaXRpYWxpemVyLnJlYXNvbikKIHsKIH0KIAotVlJEaXNwbGF5RXZlbnQ6On5WUkRp c3BsYXlFdmVudCgpID0gZGVmYXVsdDsKLQotUmVmUHRyPFZSRGlzcGxheT4gVlJEaXNwbGF5RXZl bnQ6OmRpc3BsYXkoKSBjb25zdAorVlJEaXNwbGF5RXZlbnQ6OlZSRGlzcGxheUV2ZW50KGNvbnN0 IEF0b21pY1N0cmluZyYgbmFtZSwgY29uc3QgUmVmUHRyPFZSRGlzcGxheT4mIGRpc3BsYXksIHN0 ZDo6b3B0aW9uYWw8VlJEaXNwbGF5RXZlbnRSZWFzb24+JiYgcmVhc29uKQorICAgIDogRXZlbnQo bmFtZSwgZmFsc2UgLypjYW5CdWJibGUqLywgZmFsc2UgLypjYW5jZWxhYmxlKi8pCisgICAgLCBt X2Rpc3BsYXkoZGlzcGxheSkKKyAgICAsIG1fcmVhc29uKFdURk1vdmUocmVhc29uKSkKIHsKLSAg ICByZXR1cm4gbnVsbHB0cjsKIH0KIAotVlJEaXNwbGF5RXZlbnRSZWFzb24gVlJEaXNwbGF5RXZl bnQ6OnJlYXNvbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFZSRGlzcGxheUV2ZW50UmVhc29uOjpN b3VudGVkOwotfQorVlJEaXNwbGF5RXZlbnQ6On5WUkRpc3BsYXlFdmVudCgpID0gZGVmYXVsdDsK IAogRXZlbnRJbnRlcmZhY2UgVlJEaXNwbGF5RXZlbnQ6OmV2ZW50SW50ZXJmYWNlKCkgY29uc3QK IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJEaXNwbGF5RXZl bnQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2VidnIvVlJEaXNwbGF5RXZlbnQuaAppbmRl eCA1OTI5OWNhNTdhZDkwYmUwNmQ1Y2RjMDA1NzRlNWExOWI1MmFjODJiLi5hYzhhZjZiNGQ1MGI3 NmZiMDQ2ZmFkYWI0NjhiZGM0Mzk4OTNlMzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYnZyL1ZSRGlzcGxheUV2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJ2ci9WUkRpc3BsYXlFdmVudC5oCkBAIC0zMyw5ICszMywxNCBAQCBjbGFzcyBWUkRpc3Bs YXk7CiAKIGNsYXNzIFZSRGlzcGxheUV2ZW50IGZpbmFsIDogcHVibGljIEV2ZW50IHsKIHB1Ymxp YzoKKyAgICBzdGF0aWMgUmVmPFZSRGlzcGxheUV2ZW50PiBjcmVhdGUoY29uc3QgQXRvbWljU3Ry aW5nJiB0eXBlLCBjb25zdCBSZWZQdHI8VlJEaXNwbGF5PiYgZGlzcGxheSwgc3RkOjpvcHRpb25h bDxWUkRpc3BsYXlFdmVudFJlYXNvbj4mJiByZWFzb24pCisgICAgeworICAgICAgICByZXR1cm4g YWRvcHRSZWYoKm5ldyBWUkRpc3BsYXlFdmVudCh0eXBlLCBkaXNwbGF5LCBXVEZNb3ZlKHJlYXNv bikpKTsKKyAgICB9CisKICAgICBzdHJ1Y3QgSW5pdCA6IEV2ZW50SW5pdCB7CiAgICAgICAgIFJl ZlB0cjxWUkRpc3BsYXk+IGRpc3BsYXk7Ci0gICAgICAgIFZSRGlzcGxheUV2ZW50UmVhc29uIHJl YXNvbjsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxWUkRpc3BsYXlFdmVudFJlYXNvbj4gcmVhc29u OwogICAgIH07CiAKICAgICBzdGF0aWMgUmVmPFZSRGlzcGxheUV2ZW50PiBjcmVhdGUoY29uc3Qg QXRvbWljU3RyaW5nJiB0eXBlLCBjb25zdCBJbml0JiBpbml0aWFsaXplciwgSXNUcnVzdGVkIGlz VHJ1c3RlZCA9IElzVHJ1c3RlZDo6Tm8pCkBAIC00NSwxNCArNTAsMTggQEAgcHVibGljOgogCiAg ICAgdmlydHVhbCB+VlJEaXNwbGF5RXZlbnQoKTsKIAotICAgIFJlZlB0cjxWUkRpc3BsYXk+IGRp c3BsYXkoKSBjb25zdDsKLSAgICBWUkRpc3BsYXlFdmVudFJlYXNvbiByZWFzb24oKSBjb25zdDsK KyAgICBSZWZQdHI8VlJEaXNwbGF5PiBkaXNwbGF5KCkgY29uc3QgeyByZXR1cm4gbV9kaXNwbGF5 OyB9CisgICAgc3RkOjpvcHRpb25hbDxWUkRpc3BsYXlFdmVudFJlYXNvbj4gcmVhc29uKCkgY29u c3QgeyByZXR1cm4gbV9yZWFzb247IH0KIAogcHJpdmF0ZToKICAgICBWUkRpc3BsYXlFdmVudChj b25zdCBBdG9taWNTdHJpbmcmLCBjb25zdCBJbml0JiwgSXNUcnVzdGVkKTsKKyAgICBWUkRpc3Bs YXlFdmVudChjb25zdCBBdG9taWNTdHJpbmcmLCBjb25zdCBSZWZQdHI8VlJEaXNwbGF5PiYsIHN0 ZDo6b3B0aW9uYWw8VlJEaXNwbGF5RXZlbnRSZWFzb24+JiYpOwogCiAgICAgLy8gRXZlbnQKICAg ICBFdmVudEludGVyZmFjZSBldmVudEludGVyZmFjZSgpIGNvbnN0IG92ZXJyaWRlOworCisgICAg UmVmUHRyPFZSRGlzcGxheT4gbV9kaXNwbGF5OworICAgIHN0ZDo6b3B0aW9uYWw8VlJEaXNwbGF5 RXZlbnRSZWFzb24+IG1fcmVhc29uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=