223577 2021-03-22 08:35:09 -0700 [GTK] X11 build fixes 2021-03-24 04:01:46 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=223684 P2 Normal --- 1 pnormand pnormand aperez bugs-noreply cmarcelo ews-watchlist gyuyoung.kim luiz psaavedra ryuan.choi sergio zeno oldest_to_newest 1742238 0 pnormand 2021-03-22 08:35:09 -0700 It is this time of the year when X11 macros leak everywhere again. 1742241 1 423888 pnormand 2021-03-22 08:40:31 -0700 Created attachment 423888 Patch 1742322 2 pnormand 2021-03-22 11:39:54 -0700 EWS fails: ThreadedCompositor.cpp:89:51: error: invalid ‘static_cast’ from type ‘uint64_t’ {aka ‘long unsigned int’} to type ‘GLNativeWindowType’ {aka ‘void*’} 1742775 3 424013 pnormand 2021-03-23 06:51:50 -0700 Created attachment 424013 Patch 1742799 4 ews-feeder 2021-03-23 08:17:13 -0700 Committed r274869: <https://commits.webkit.org/r274869> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424013. 1743247 5 psaavedra 2021-03-24 02:48:17 -0700 (In reply to Philippe Normand from comment #2) > EWS fails: > > ThreadedCompositor.cpp:89:51: error: invalid ‘static_cast’ from type > ‘uint64_t’ {aka ‘long unsigned int’} to type ‘GLNativeWindowType’ {aka > ‘void*’} I'm getting a similar issue building wpewebkit (main) for ARMv7 (raspberry-pi using mesa driver). Based on https://bug-178090-attachments.webkit.org/attachment.cgi?id=323356 I have created a patch for this in https://bugs.webkit.org/show_bug.cgi?id=223684. 1743251 6 424013 pnormand 2021-03-24 03:00:10 -0700 Comment on attachment 424013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424013&action=review > Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:94 > +#if CPU(ADDRESS64) > + auto windowType = reinterpret_cast<GLNativeWindowType>(m_nativeSurfaceHandle); > +#else > + // On 32-bit platforms GLNativeWindowType is an integer type, which cannot be casted with reinterpret_cast. > + auto windowType = static_cast<GLNativeWindowType>(m_nativeSurfaceHandle); > +#endif So this doesn't work for you? 1743267 7 psaavedra 2021-03-24 04:01:46 -0700 (In reply to Philippe Normand from comment #6) > Comment on attachment 424013 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=424013&action=review > > > Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:94 > > +#if CPU(ADDRESS64) > > + auto windowType = reinterpret_cast<GLNativeWindowType>(m_nativeSurfaceHandle); > > +#else > > + // On 32-bit platforms GLNativeWindowType is an integer type, which cannot be casted with reinterpret_cast. > > + auto windowType = static_cast<GLNativeWindowType>(m_nativeSurfaceHandle); > > +#endif > > So this doesn't work for you? No. it doesn't works. you can see my proposal based on a previous solution did by Adrián in a previous patch. 423888 2021-03-22 08:40:31 -0700 2021-03-23 06:51:45 -0700 Patch bug-223577-20210322084029.patch text/plain 7573 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ5MjI2OTk4MWQ3OWQy YjFmZjcwMjhmZGUyOGEwMGU3YzQ0MzdmMi4uNTZlMTRlZWI4MThhNDQ3YzRiNGVlYTE2MjZhZWMy MjQ0Nzg0ZTE5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBYMTEg YnVpbGQgZml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyMzU3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFgxMSBoZWFkZXJzIGRlZmluZSBhIGJ1bmNoIG9mIG1hY3JvcyB3aXRoIGNvbW1vbiB0ZXJt cywgaW50ZXJmZXJpbmcgd2l0aCBXZWJDb3JlIGFuZCBXVEYKKyAgICAgICAgZW51bSB2YWx1ZXMu IEFzIGEgd29ya2Fyb3VuZCwgd2UgZXhwbGljaXRseSB1bmRlZiB0aGVtLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0Lmg6CisKIDIwMjEtMDMtMTkgIERlYW4gSmFja3NvbiAgPGRpbm9A YXBwbGUuY29tPgogCiAgICAgICAgIExpbmsgYWdhaW5zdCB0aGUgQU5HTEUgU2hhcmVkIExpYnJh cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggZTlmNzc5NGM5NWViMzBlZDZkZTRkMDRiMjM0NmI4MjU0OTJkNzM3My4u MGI1OWUwNGZkM2RiOGJhYmRhOWRiZjEyYWRhZjcxYWIzYjM1ZThiZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMS0wMy0yMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0dUS10gWDExIGJ1aWxkIGZpeGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM1NzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9Db29yZGluYXRlZEdyYXBo aWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwOgorICAgICAgICAo V2ViS2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6OmNyZWF0ZUdMQ29udGV4dCk6IEdMTmF0aXZlV2lu ZG93VHlwZSBtaWdodCBiZSBhIGxvbmcgdW5zaWduZWQKKyAgICAgICAgaW50LCB3aGljaCBjYW4n dCBiZSByZWludGVycHJldCBjYXN0ZWQgdG8gdWluNjRfdCBvbiAzMi1iaXQgcGxhdGZvcm1zLgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdB cmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5jcHA6IFVzZQorICAgICAgICBXZWJDb3JlOjpSZWdpb24g dG8gcHJldmVudCBjbGFzaGVzIHdpdGggWDExJ3MgUmVnaW9uLgorICAgICAgICAoV2ViS2l0OjpE cmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3M6OnNjcm9sbCk6CisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljczo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZSk6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGlj czo6ZGlzcGxheSk6CisKIDIwMjEtMDMtMTkgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l eUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2Fubm90IGxvZ2luIHRvIG1pY3Jvc29mdG9ubGluZS5j b20gd2l0aG91dCBhbGxvd2luZyBzdG9yYWdlIGFjY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaAppbmRleCBjYTQ4NTMzMDVkMjQ5N2U3MDFmMTliNjJh YTgzZTE4MjBhMWQ3ZGQ3Li5kZWQ1MzYxMDQzY2U3ODRjYzdmZDgyMjJkODhkYzlmMzk1MDc2NTVj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaApAQCAt NDgsNiArNDgsNDIgQEAgdHlwZWRlZiBzdHJ1Y3QgX2NhaXJvX2RldmljZSBjYWlyb19kZXZpY2Vf dDsKIAogdHlwZWRlZiB2b2lkKiBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dEdMOwogCisvLyBYMTEg aGVhZGVycyBkZWZpbmUgYSBidW5jaCBvZiBtYWNyb3Mgd2l0aCBjb21tb24gdGVybXMsIGludGVy ZmVyaW5nIHdpdGggV2ViQ29yZSBhbmQgV1RGIGVudW0gdmFsdWVzLgorLy8gQXMgYSB3b3JrYXJv dW5kLCB3ZSBleHBsaWNpdGx5IHVuZGVmIHRoZW0gaGVyZS4KKyNpZiBkZWZpbmVkKE5vbmUpCisj dW5kZWYgTm9uZQorI2VuZGlmCisjaWYgZGVmaW5lZChBYm92ZSkKKyN1bmRlZiBBYm92ZQorI2Vu ZGlmCisjaWYgZGVmaW5lZChCZWxvdykKKyN1bmRlZiBCZWxvdworI2VuZGlmCisjaWYgZGVmaW5l ZChTdWNjZXNzKQorI3VuZGVmIFN1Y2Nlc3MKKyNlbmRpZgorI2lmIGRlZmluZWQoRmFsc2UpCisj dW5kZWYgRmFsc2UKKyNlbmRpZgorI2lmIGRlZmluZWQoVHJ1ZSkKKyN1bmRlZiBUcnVlCisjZW5k aWYKKyNpZiBkZWZpbmVkKEJvb2wpCisjdW5kZWYgQm9vbAorI2VuZGlmCisjaWYgZGVmaW5lZChB bHdheXMpCisjdW5kZWYgQWx3YXlzCisjZW5kaWYKKyNpZiBkZWZpbmVkKFN0YXR1cykKKyN1bmRl ZiBTdGF0dXMKKyNlbmRpZgorI2lmIGRlZmluZWQoQ29udGludWUpCisjdW5kZWYgQ29udGludWUK KyNlbmRpZgorI2lmIGRlZmluZWQoUmVnaW9uKQorI3VuZGVmIFJlZ2lvbgorI2VuZGlmCisKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgSW50U2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggYmIzMmJmMzU5NzQy NGI3ZTlhYTBkYmNjMTA5NzRkYzkxMTEwZTI3NS4uZGJjZWZiMjJkMmFmZmM5NjAyZmRiYjdjNDA3 MmMxOWQ5MDM0NThjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmgKQEAgLTY5LDExICs2OSwxNyBAQCB0eXBlZGVmIHVuc2lnbmVk IGNoYXIgVUludDg7CiAjZW5kaWYKICNlbmRpZgogCi0vLyBYMTEgaGVhZGVyIGRlZmluZXMgIk5v bmUiIGFzIGNvbnN0YW50IGluIG1hY3JvIGFuZCBicmVha2VzIHRoZSBQYWludEludmFsaWRhdGlv blJlYXNvbnMgZW51bSdzICJOb25lIi4KLS8vIEFzIGEgd29ya2Fyb3VuZCwgd2UgZXhwbGljaXRs eSB1bmRlZiBYMTEncyBOb25lIGhlcmUuCisvLyBYMTEgaGVhZGVycyBkZWZpbmUgYSBidW5jaCBv ZiBtYWNyb3Mgd2l0aCBjb21tb24gdGVybXMsIGludGVyZmVyaW5nIHdpdGggV2ViQ29yZSBhbmQg V1RGIGVudW0gdmFsdWVzLgorLy8gQXMgYSB3b3JrYXJvdW5kLCB3ZSBleHBsaWNpdGx5IHVuZGVm IHRoZW0gaGVyZS4KICNpZiBkZWZpbmVkKE5vbmUpCiAjdW5kZWYgTm9uZQogI2VuZGlmCisjaWYg ZGVmaW5lZChCZWxvdykKKyN1bmRlZiBCZWxvdworI2VuZGlmCisjaWYgZGVmaW5lZChTdWNjZXNz KQorI3VuZGVmIFN1Y2Nlc3MKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRj b21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9D b29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3Iu Y3BwCmluZGV4IDBiYjAwYmU0ZTZlNThiZWU1MTdhZDk4MWNmYWNkNjBkMGFiZDg5NWYuLjhmNTAy NDQwMmI0ZjM4YTcyMjJlODMyYzdhN2E4NTZlMWQ3YzAyZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVh ZGVkQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29vcmRpbmF0ZWRH cmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmNwcApAQCAtODYs NyArODYsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6Y3JlYXRlR0xDb250ZXh0KCkKIAog ICAgIEFTU0VSVChtX25hdGl2ZVN1cmZhY2VIYW5kbGUpOwogCi0gICAgbV9jb250ZXh0ID0gR0xD b250ZXh0OjpjcmVhdGVDb250ZXh0Rm9yV2luZG93KHJlaW50ZXJwcmV0X2Nhc3Q8R0xOYXRpdmVX aW5kb3dUeXBlPihtX25hdGl2ZVN1cmZhY2VIYW5kbGUpLCAmUGxhdGZvcm1EaXNwbGF5OjpzaGFy ZWREaXNwbGF5Rm9yQ29tcG9zaXRpbmcoKSk7CisgICAgbV9jb250ZXh0ID0gR0xDb250ZXh0Ojpj cmVhdGVDb250ZXh0Rm9yV2luZG93KHN0YXRpY19jYXN0PEdMTmF0aXZlV2luZG93VHlwZT4obV9u YXRpdmVTdXJmYWNlSGFuZGxlKSwgJlBsYXRmb3JtRGlzcGxheTo6c2hhcmVkRGlzcGxheUZvckNv bXBvc2l0aW5nKCkpOwogICAgIGlmIChtX2NvbnRleHQpCiAgICAgICAgIG1fY29udGV4dC0+bWFr ZUNvbnRleHRDdXJyZW50KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFw aGljcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdy YXBoaWNzL0RyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5jcHAKaW5kZXggOTc0NDI3YjNk ZTI4MDVkMTNkNjMxZWZlMWU0N2MyMDkyMzk1MjkzOC4uNWVjZDZlODYyZTNlYTM5MmM4ZWMwZGI5 ZGYyOGU4YjAyNTMxNjk0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzLmNwcApAQCAtMzksNiArMzksNyBA QAogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaD4KKyNp bmNsdWRlIDxXZWJDb3JlL1JlZ2lvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4K IAogI2lmIFVTRShESVJFQ1QyRCkKQEAgLTE1MCwyMSArMTUxLDIxIEBAIHZvaWQgRHJhd2luZ0Fy ZWFDb29yZGluYXRlZEdyYXBoaWNzOjpzY3JvbGwoY29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwg Y29uc3QgSW50CiAgICAgfQogCiAgICAgLy8gR2V0IHRoZSBwYXJ0IG9mIHRoZSBkaXJ0eSByZWdp b24gdGhhdCBpcyBpbiB0aGUgc2Nyb2xsIHJlY3QuCi0gICAgUmVnaW9uIGRpcnR5UmVnaW9uSW5T Y3JvbGxSZWN0ID0gaW50ZXJzZWN0KHNjcm9sbFJlY3QsIG1fZGlydHlSZWdpb24pOworICAgIFdl YkNvcmU6OlJlZ2lvbiBkaXJ0eVJlZ2lvbkluU2Nyb2xsUmVjdCA9IGludGVyc2VjdChzY3JvbGxS ZWN0LCBtX2RpcnR5UmVnaW9uKTsKICAgICBpZiAoIWRpcnR5UmVnaW9uSW5TY3JvbGxSZWN0Lmlz RW1wdHkoKSkgewogICAgICAgICAvLyBUaGVyZSBhcmUgcGFydHMgb2YgdGhlIGRpcnR5IHJlZ2lv biB0aGF0IGFyZSBpbnNpZGUgdGhlIHNjcm9sbCByZWN0LgogICAgICAgICAvLyBXZSBuZWVkIHRv IHN1YnRyYWN0IHRoZW0gZnJvbSB0aGUgcmVnaW9uLCBtb3ZlIHRoZW0gYW5kIHJlLWFkZCB0aGVt LgogICAgICAgICBtX2RpcnR5UmVnaW9uLnN1YnRyYWN0KHNjcm9sbFJlY3QpOwogCiAgICAgICAg IC8vIE1vdmUgdGhlIGRpcnR5IHBhcnRzLgotICAgICAgICBSZWdpb24gbW92ZWREaXJ0eVJlZ2lv bkluU2Nyb2xsUmVjdCA9IGludGVyc2VjdCh0cmFuc2xhdGUoZGlydHlSZWdpb25JblNjcm9sbFJl Y3QsIHNjcm9sbERlbHRhKSwgc2Nyb2xsUmVjdCk7CisgICAgICAgIFdlYkNvcmU6OlJlZ2lvbiBt b3ZlZERpcnR5UmVnaW9uSW5TY3JvbGxSZWN0ID0gaW50ZXJzZWN0KHRyYW5zbGF0ZShkaXJ0eVJl Z2lvbkluU2Nyb2xsUmVjdCwgc2Nyb2xsRGVsdGEpLCBzY3JvbGxSZWN0KTsKIAogICAgICAgICAv LyBBbmQgYWRkIHRoZW0gYmFjay4KICAgICAgICAgbV9kaXJ0eVJlZ2lvbi51bml0ZShtb3ZlZERp cnR5UmVnaW9uSW5TY3JvbGxSZWN0KTsKICAgICB9CiAKICAgICAvLyBDb21wdXRlIHRoZSBzY3Jv bGwgcmVwYWludCByZWdpb24uCi0gICAgUmVnaW9uIHNjcm9sbFJlcGFpbnRSZWdpb24gPSBzdWJ0 cmFjdChzY3JvbGxSZWN0LCB0cmFuc2xhdGUoc2Nyb2xsUmVjdCwgc2Nyb2xsRGVsdGEpKTsKKyAg ICBXZWJDb3JlOjpSZWdpb24gc2Nyb2xsUmVwYWludFJlZ2lvbiA9IHN1YnRyYWN0KHNjcm9sbFJl Y3QsIHRyYW5zbGF0ZShzY3JvbGxSZWN0LCBzY3JvbGxEZWx0YSkpOwogCiAgICAgbV9kaXJ0eVJl Z2lvbi51bml0ZShzY3JvbGxSZXBhaW50UmVnaW9uKTsKICAgICBzY2hlZHVsZURpc3BsYXkoKTsK QEAgLTYyMSw3ICs2MjIsNyBAQCB2b2lkIERyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljczo6 ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShHcmFwaGljc0xheQogICAgIG1fbGF5ZXJU cmVlSG9zdC0+c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoZ3JhcGhpY3NMYXllcik7CiAKICAgICAv LyBOb24tY29tcG9zaXRlZCBjb250ZW50IHdpbGwgbm93IGJlIGhhbmRsZWQgZXhjbHVzaXZlbHkg YnkgdGhlIGxheWVyIHRyZWUgaG9zdC4KLSAgICBtX2RpcnR5UmVnaW9uID0gUmVnaW9uKCk7Cisg ICAgbV9kaXJ0eVJlZ2lvbiA9IFdlYkNvcmU6OlJlZ2lvbigpOwogICAgIG1fc2Nyb2xsUmVjdCA9 IEludFJlY3QoKTsKICAgICBtX3Njcm9sbE9mZnNldCA9IEludFNpemUoKTsKICAgICBtX2Rpc3Bs YXlUaW1lci5zdG9wKCk7CkBAIC03OTcsNyArNzk4LDcgQEAgdm9pZCBEcmF3aW5nQXJlYUNvb3Jk aW5hdGVkR3JhcGhpY3M6OmRpc3BsYXkoVXBkYXRlSW5mbyYgdXBkYXRlSW5mbykKICAgICB1cGRh dGVJbmZvLnNjcm9sbFJlY3QgPSBtX3Njcm9sbFJlY3Q7CiAgICAgdXBkYXRlSW5mby5zY3JvbGxP ZmZzZXQgPSBtX3Njcm9sbE9mZnNldDsKIAotICAgIG1fZGlydHlSZWdpb24gPSBSZWdpb24oKTsK KyAgICBtX2RpcnR5UmVnaW9uID0gV2ViQ29yZTo6UmVnaW9uKCk7CiAgICAgbV9zY3JvbGxSZWN0 ID0gSW50UmVjdCgpOwogICAgIG1fc2Nyb2xsT2Zmc2V0ID0gSW50U2l6ZSgpOwogCg== 424013 2021-03-23 06:51:50 -0700 2021-03-23 08:17:14 -0700 Patch bug-223577-20210323065148.patch text/plain 8689 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0ODYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzMzN2ZiZmI1OThkZWRl ZjBkYmM4MmFiMTgyODExNmNjNjdlZDQ2Yy4uMTI1ZjJhMmI1ZThkOTUxMDA0ZGM2MmZlMjU3MGZm OTA2Yzc2YWNjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTIyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBYMTEg YnVpbGQgZml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyMzU3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFgxMSBoZWFkZXJzIGRlZmluZSBhIGJ1bmNoIG9mIG1hY3JvcyB3aXRoIGNvbW1vbiB0ZXJt cywgaW50ZXJmZXJpbmcgd2l0aCBXZWJDb3JlIGFuZCBXVEYKKyAgICAgICAgZW51bSB2YWx1ZXMu IEFzIGEgd29ya2Fyb3VuZCwgd2UgZXhwbGljaXRseSB1bmRlZiB0aGVtLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0Lmg6CisKIDIwMjEtMDMtMjMgIEtpbW1vIEtpbm51bmVuICA8a2tp bm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzQ4NjApOiBlcnJvcjog 4oCYY2xhc3MgV2ViQ29yZTo6RXh0ZW5zaW9uc0dMT3BlbkdMQ29tbW9u4oCZIGhhcyBubyBtZW1i ZXIgbmFtZWQg4oCYZHJhd0FycmF5c0luc3RhbmNlZEFOR0xF4oCZCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDJjNjZh YTU3NDA5NjYzZWQ5MTI1ZGIyZmNkYmU5YThmMzgzNTVkZjYuLmVhMGYxNWJmNDRmYWU0MmVmYzg3 ODRjMjFjYjU1NDMzOTgzNjNiYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDMt MjIgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIFgxMSBidWlsZCBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzNTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0 b3IvVGhyZWFkZWRDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21w b3NpdG9yOjpjcmVhdGVHTENvbnRleHQpOiBHTE5hdGl2ZVdpbmRvd1R5cGUgbWlnaHQgYmUgYSBs b25nIHVuc2lnbmVkCisgICAgICAgIGludCwgd2hpY2ggY2FuJ3QgYmUgcmVpbnRlcnByZXQgY2Fz dGVkIHRvIHVpbjY0X3Qgb24gMzItYml0IHBsYXRmb3Jtcy4KKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhp Y3MuY3BwOiBVc2UKKyAgICAgICAgV2ViQ29yZTo6UmVnaW9uIHRvIHByZXZlbnQgY2xhc2hlcyB3 aXRoIFgxMSdzIFJlZ2lvbi4KKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFDb29yZGluYXRl ZEdyYXBoaWNzOjpzY3JvbGwpOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYUNvb3JkaW5h dGVkR3JhcGhpY3M6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpOgorICAgICAgICAo V2ViS2l0OjpEcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3M6OmRpc3BsYXkpOgorCiAyMDIx LTAzLTIzICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAg TW92ZSBpbnN0YW5jZWQgZHJhd2luZyBmdW5jdGlvbmFsaXR5IGZyb20gRXh0ZW5zaW9uc0dMIHRv IEdyYXBoaWNzQ29udGV4dEdMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HTENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dM Q29udGV4dC5oCmluZGV4IGNhNDg1MzMwNWQyNDk3ZTcwMWYxOWI2MmFhODNlMTgyMGExZDdkZDcu LmRlZDUzNjEwNDNjZTc4NGNjN2ZkODIyMmQ4OGRjOWYzOTUwNzY1NWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCkBAIC00OCw2ICs0OCw0MiBAQCB0 eXBlZGVmIHN0cnVjdCBfY2Fpcm9fZGV2aWNlIGNhaXJvX2RldmljZV90OwogCiB0eXBlZGVmIHZv aWQqIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0R0w7CiAKKy8vIFgxMSBoZWFkZXJzIGRlZmluZSBh IGJ1bmNoIG9mIG1hY3JvcyB3aXRoIGNvbW1vbiB0ZXJtcywgaW50ZXJmZXJpbmcgd2l0aCBXZWJD b3JlIGFuZCBXVEYgZW51bSB2YWx1ZXMuCisvLyBBcyBhIHdvcmthcm91bmQsIHdlIGV4cGxpY2l0 bHkgdW5kZWYgdGhlbSBoZXJlLgorI2lmIGRlZmluZWQoTm9uZSkKKyN1bmRlZiBOb25lCisjZW5k aWYKKyNpZiBkZWZpbmVkKEFib3ZlKQorI3VuZGVmIEFib3ZlCisjZW5kaWYKKyNpZiBkZWZpbmVk KEJlbG93KQorI3VuZGVmIEJlbG93CisjZW5kaWYKKyNpZiBkZWZpbmVkKFN1Y2Nlc3MpCisjdW5k ZWYgU3VjY2VzcworI2VuZGlmCisjaWYgZGVmaW5lZChGYWxzZSkKKyN1bmRlZiBGYWxzZQorI2Vu ZGlmCisjaWYgZGVmaW5lZChUcnVlKQorI3VuZGVmIFRydWUKKyNlbmRpZgorI2lmIGRlZmluZWQo Qm9vbCkKKyN1bmRlZiBCb29sCisjZW5kaWYKKyNpZiBkZWZpbmVkKEFsd2F5cykKKyN1bmRlZiBB bHdheXMKKyNlbmRpZgorI2lmIGRlZmluZWQoU3RhdHVzKQorI3VuZGVmIFN0YXR1cworI2VuZGlm CisjaWYgZGVmaW5lZChDb250aW51ZSkKKyN1bmRlZiBDb250aW51ZQorI2VuZGlmCisjaWYgZGVm aW5lZChSZWdpb24pCisjdW5kZWYgUmVnaW9uCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBjbGFzcyBJbnRTaXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCBiYjMyYmYzNTk3NDI0YjdlOWFhMGRiY2MxMDk3 NGRjOTExMTBlMjc1Li5kYmNlZmIyMmQyYWZmYzk2MDJmZGJiN2M0MDcyYzE5ZDkwMzQ1OGM2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaApAQCAtNjksMTEgKzY5LDE3IEBAIHR5cGVkZWYgdW5zaWduZWQgY2hhciBVSW50ODsKICNl bmRpZgogI2VuZGlmCiAKLS8vIFgxMSBoZWFkZXIgZGVmaW5lcyAiTm9uZSIgYXMgY29uc3RhbnQg aW4gbWFjcm8gYW5kIGJyZWFrZXMgdGhlIFBhaW50SW52YWxpZGF0aW9uUmVhc29ucyBlbnVtJ3Mg Ik5vbmUiLgotLy8gQXMgYSB3b3JrYXJvdW5kLCB3ZSBleHBsaWNpdGx5IHVuZGVmIFgxMSdzIE5v bmUgaGVyZS4KKy8vIFgxMSBoZWFkZXJzIGRlZmluZSBhIGJ1bmNoIG9mIG1hY3JvcyB3aXRoIGNv bW1vbiB0ZXJtcywgaW50ZXJmZXJpbmcgd2l0aCBXZWJDb3JlIGFuZCBXVEYgZW51bSB2YWx1ZXMu CisvLyBBcyBhIHdvcmthcm91bmQsIHdlIGV4cGxpY2l0bHkgdW5kZWYgdGhlbSBoZXJlLgogI2lm IGRlZmluZWQoTm9uZSkKICN1bmRlZiBOb25lCiAjZW5kaWYKKyNpZiBkZWZpbmVkKEJlbG93KQor I3VuZGVmIEJlbG93CisjZW5kaWYKKyNpZiBkZWZpbmVkKFN1Y2Nlc3MpCisjdW5kZWYgU3VjY2Vz cworI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFk ZWRDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHAKaW5kZXggMGJiMDBi ZTRlNmU1OGJlZTUxN2FkOTgxY2ZhY2Q2MGQwYWJkODk1Zi4uZjU2Y2I5Y2U4MGY5OTU3NjU3Y2Yx ZTFhYTYwM2Q2MmEzNzVmNmM4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29v cmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVk Y29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCkBAIC04Niw3ICs4NiwxMyBAQCB2b2lk IFRocmVhZGVkQ29tcG9zaXRvcjo6Y3JlYXRlR0xDb250ZXh0KCkKIAogICAgIEFTU0VSVChtX25h dGl2ZVN1cmZhY2VIYW5kbGUpOwogCi0gICAgbV9jb250ZXh0ID0gR0xDb250ZXh0OjpjcmVhdGVD b250ZXh0Rm9yV2luZG93KHJlaW50ZXJwcmV0X2Nhc3Q8R0xOYXRpdmVXaW5kb3dUeXBlPihtX25h dGl2ZVN1cmZhY2VIYW5kbGUpLCAmUGxhdGZvcm1EaXNwbGF5OjpzaGFyZWREaXNwbGF5Rm9yQ29t cG9zaXRpbmcoKSk7CisjaWYgQ1BVKEFERFJFU1M2NCkKKyAgICBhdXRvIHdpbmRvd1R5cGUgPSBy ZWludGVycHJldF9jYXN0PEdMTmF0aXZlV2luZG93VHlwZT4obV9uYXRpdmVTdXJmYWNlSGFuZGxl KTsKKyNlbHNlCisgICAgLy8gT24gMzItYml0IHBsYXRmb3JtcyBHTE5hdGl2ZVdpbmRvd1R5cGUg aXMgYW4gaW50ZWdlciB0eXBlLCB3aGljaCBjYW5ub3QgYmUgY2FzdGVkIHdpdGggcmVpbnRlcnBy ZXRfY2FzdC4KKyAgICBhdXRvIHdpbmRvd1R5cGUgPSBzdGF0aWNfY2FzdDxHTE5hdGl2ZVdpbmRv d1R5cGU+KG1fbmF0aXZlU3VyZmFjZUhhbmRsZSk7CisjZW5kaWYKKyAgICBtX2NvbnRleHQgPSBH TENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3cod2luZG93VHlwZSwgJlBsYXRmb3JtRGlz cGxheTo6c2hhcmVkRGlzcGxheUZvckNvbXBvc2l0aW5nKCkpOwogICAgIGlmIChtX2NvbnRleHQp CiAgICAgICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5h dGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oCmluZGV4 IGVkNmRjYjkwZDhiZjVlN2FiNDFlNjhlZDM0MTBhMDYyM2UwN2FkNmIuLmMxMjc5NjRhMGJkYTUy MDc5MjFhODE0ZWU3MzZjZWY1YWRhZWE2NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9z aXRvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhy ZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oCkBAIC05NCw3ICs5NCw3IEBAIHBy aXZhdGU6CiAgICAgUmVmUHRyPENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4gbV9zY2VuZTsKICAg ICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6R0xDb250ZXh0PiBtX2NvbnRleHQ7CiAKLSAgICB1 aW50NjRfdCBtX25hdGl2ZVN1cmZhY2VIYW5kbGU7CisgICAgdWludHB0cl90IG1fbmF0aXZlU3Vy ZmFjZUhhbmRsZTsKICAgICBXZWJDb3JlOjpUZXh0dXJlTWFwcGVyOjpQYWludEZsYWdzIG1fcGFp bnRGbGFncyB7IDAgfTsKICAgICB1bnNpZ25lZCBtX3N1c3BlbmRlZENvdW50IHsgMCB9OwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdy YXBoaWNzL0RyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhQ29vcmRp bmF0ZWRHcmFwaGljcy5jcHAKaW5kZXggOTc0NDI3YjNkZTI4MDVkMTNkNjMxZWZlMWU0N2MyMDky Mzk1MjkzOC4uNWVjZDZlODYyZTNlYTM5MmM4ZWMwZGI5ZGYyOGU4YjAyNTMxNjk0MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGlu YXRlZEdyYXBoaWNzLmNwcApAQCAtMzksNiArMzksNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvR3Jh cGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1JlZ2lvbi5o PgogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KIAogI2lmIFVTRShESVJFQ1QyRCkKQEAg LTE1MCwyMSArMTUxLDIxIEBAIHZvaWQgRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzOjpz Y3JvbGwoY29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50CiAgICAgfQogCiAgICAg Ly8gR2V0IHRoZSBwYXJ0IG9mIHRoZSBkaXJ0eSByZWdpb24gdGhhdCBpcyBpbiB0aGUgc2Nyb2xs IHJlY3QuCi0gICAgUmVnaW9uIGRpcnR5UmVnaW9uSW5TY3JvbGxSZWN0ID0gaW50ZXJzZWN0KHNj cm9sbFJlY3QsIG1fZGlydHlSZWdpb24pOworICAgIFdlYkNvcmU6OlJlZ2lvbiBkaXJ0eVJlZ2lv bkluU2Nyb2xsUmVjdCA9IGludGVyc2VjdChzY3JvbGxSZWN0LCBtX2RpcnR5UmVnaW9uKTsKICAg ICBpZiAoIWRpcnR5UmVnaW9uSW5TY3JvbGxSZWN0LmlzRW1wdHkoKSkgewogICAgICAgICAvLyBU aGVyZSBhcmUgcGFydHMgb2YgdGhlIGRpcnR5IHJlZ2lvbiB0aGF0IGFyZSBpbnNpZGUgdGhlIHNj cm9sbCByZWN0LgogICAgICAgICAvLyBXZSBuZWVkIHRvIHN1YnRyYWN0IHRoZW0gZnJvbSB0aGUg cmVnaW9uLCBtb3ZlIHRoZW0gYW5kIHJlLWFkZCB0aGVtLgogICAgICAgICBtX2RpcnR5UmVnaW9u LnN1YnRyYWN0KHNjcm9sbFJlY3QpOwogCiAgICAgICAgIC8vIE1vdmUgdGhlIGRpcnR5IHBhcnRz LgotICAgICAgICBSZWdpb24gbW92ZWREaXJ0eVJlZ2lvbkluU2Nyb2xsUmVjdCA9IGludGVyc2Vj dCh0cmFuc2xhdGUoZGlydHlSZWdpb25JblNjcm9sbFJlY3QsIHNjcm9sbERlbHRhKSwgc2Nyb2xs UmVjdCk7CisgICAgICAgIFdlYkNvcmU6OlJlZ2lvbiBtb3ZlZERpcnR5UmVnaW9uSW5TY3JvbGxS ZWN0ID0gaW50ZXJzZWN0KHRyYW5zbGF0ZShkaXJ0eVJlZ2lvbkluU2Nyb2xsUmVjdCwgc2Nyb2xs RGVsdGEpLCBzY3JvbGxSZWN0KTsKIAogICAgICAgICAvLyBBbmQgYWRkIHRoZW0gYmFjay4KICAg ICAgICAgbV9kaXJ0eVJlZ2lvbi51bml0ZShtb3ZlZERpcnR5UmVnaW9uSW5TY3JvbGxSZWN0KTsK ICAgICB9CiAKICAgICAvLyBDb21wdXRlIHRoZSBzY3JvbGwgcmVwYWludCByZWdpb24uCi0gICAg UmVnaW9uIHNjcm9sbFJlcGFpbnRSZWdpb24gPSBzdWJ0cmFjdChzY3JvbGxSZWN0LCB0cmFuc2xh dGUoc2Nyb2xsUmVjdCwgc2Nyb2xsRGVsdGEpKTsKKyAgICBXZWJDb3JlOjpSZWdpb24gc2Nyb2xs UmVwYWludFJlZ2lvbiA9IHN1YnRyYWN0KHNjcm9sbFJlY3QsIHRyYW5zbGF0ZShzY3JvbGxSZWN0 LCBzY3JvbGxEZWx0YSkpOwogCiAgICAgbV9kaXJ0eVJlZ2lvbi51bml0ZShzY3JvbGxSZXBhaW50 UmVnaW9uKTsKICAgICBzY2hlZHVsZURpc3BsYXkoKTsKQEAgLTYyMSw3ICs2MjIsNyBAQCB2b2lk IERyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljczo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZShHcmFwaGljc0xheQogICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0Um9vdENvbXBvc2l0 aW5nTGF5ZXIoZ3JhcGhpY3NMYXllcik7CiAKICAgICAvLyBOb24tY29tcG9zaXRlZCBjb250ZW50 IHdpbGwgbm93IGJlIGhhbmRsZWQgZXhjbHVzaXZlbHkgYnkgdGhlIGxheWVyIHRyZWUgaG9zdC4K LSAgICBtX2RpcnR5UmVnaW9uID0gUmVnaW9uKCk7CisgICAgbV9kaXJ0eVJlZ2lvbiA9IFdlYkNv cmU6OlJlZ2lvbigpOwogICAgIG1fc2Nyb2xsUmVjdCA9IEludFJlY3QoKTsKICAgICBtX3Njcm9s bE9mZnNldCA9IEludFNpemUoKTsKICAgICBtX2Rpc3BsYXlUaW1lci5zdG9wKCk7CkBAIC03OTcs NyArNzk4LDcgQEAgdm9pZCBEcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3M6OmRpc3BsYXko VXBkYXRlSW5mbyYgdXBkYXRlSW5mbykKICAgICB1cGRhdGVJbmZvLnNjcm9sbFJlY3QgPSBtX3Nj cm9sbFJlY3Q7CiAgICAgdXBkYXRlSW5mby5zY3JvbGxPZmZzZXQgPSBtX3Njcm9sbE9mZnNldDsK IAotICAgIG1fZGlydHlSZWdpb24gPSBSZWdpb24oKTsKKyAgICBtX2RpcnR5UmVnaW9uID0gV2Vi Q29yZTo6UmVnaW9uKCk7CiAgICAgbV9zY3JvbGxSZWN0ID0gSW50UmVjdCgpOwogICAgIG1fc2Ny b2xsT2Zmc2V0ID0gSW50U2l6ZSgpOwogCg==