236664 2022-02-15 13:06:50 -0800 [GTK][WPE] Make proper ANGLE context configuration for some of the expected features 2022-02-17 13:16:15 -0800 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=236769 InRadar P2 Normal --- 1 alex alex clord cmarcelo dino ews-watchlist kbr kkinnunen kondapallykalyan luiz webkit-bug-importer zan zdobersek oldest_to_newest 1841895 0 alex 2022-02-15 13:06:50 -0800 This solves multiple layout tests and makes some other pass that were not expected to pass in the previous situation, we are already in better shape than current OpenGL context. Some of the failing test is because expected result files are wrong and expecting some failures that now are passing. 1842425 1 452223 alex 2022-02-16 11:49:51 -0800 Created attachment 452223 Patch 1842739 2 452223 zan 2022-02-16 23:38:37 -0800 Comment on attachment 452223 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452223&action=review > Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp:124 > +std::unique_ptr<GCGLANGLELayer::ANGLEContext> GCGLANGLELayer::ANGLEContext::createContext(const WebCore::GraphicsContextGLANGLE& webkitContext) Could just receive the GraphicsContextGLWebGLVersion value. > Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp:166 > + if (webkitContext.m_isForWebGL2) { Not the scope of this patch, but what happens when WebGL2 context is requested but the underlying GL library doesn't support it? > Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:59 > + // We require this extension for the COORDINATED_GRAPHICS texture rendering. More correct phrasing is we require this to render into the dmabuf-backed EGLImage. Doesn't mean COORDINATED_GRAPHICS will be using it exclusively. > Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:61 > + getExtensions().ensureEnabled("GL_OES_EGL_image"); This was removed in bug #236490. GL_RequestExtensionANGLE() should be used directly anyway, but you need to use it after the context is made current below. 1842770 3 alex 2022-02-17 01:01:22 -0800 Thanks for the review! (In reply to Zan Dobersek from comment #2) > Comment on attachment 452223 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452223&action=review > > > Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp:124 > > +std::unique_ptr<GCGLANGLELayer::ANGLEContext> GCGLANGLELayer::ANGLEContext::createContext(const WebCore::GraphicsContextGLANGLE& webkitContext) > > Could just receive the GraphicsContextGLWebGLVersion value. > I think so. > > Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp:166 > > + if (webkitContext.m_isForWebGL2) { > > Not the scope of this patch, but what happens when WebGL2 context is > requested but the underlying GL library doesn't support it? > It is a good question, I'm not sure what ANGLE does in that situation, we have to find out. > > Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:59 > > + // We require this extension for the COORDINATED_GRAPHICS texture rendering. > > More correct phrasing is we require this to render into the dmabuf-backed > EGLImage. Doesn't mean COORDINATED_GRAPHICS will be using it exclusively. > Right. > > Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:61 > > + getExtensions().ensureEnabled("GL_OES_EGL_image"); > > This was removed in bug #236490. GL_RequestExtensionANGLE() should be used > directly anyway, but you need to use it after the context is made current > below. Wow, last Friday :-), thanks for pointing it out, I'll replace the call with whatever they used as replacement. 1842772 4 452223 zan 2022-02-17 01:12:08 -0800 Comment on attachment 452223 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452223&action=review >>> Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapperANGLE.cpp:61 >>> + getExtensions().ensureEnabled("GL_OES_EGL_image"); >> >> This was removed in bug #236490. GL_RequestExtensionANGLE() should be used directly anyway, but you need to use it after the context is made current below. > > Wow, last Friday :-), thanks for pointing it out, I'll replace the call with whatever they used as replacement. Again, just use GL_RequestExtensionANGLE() after the context is made current. GraphicsContextGLCVCocoa does this already. getExtensions().ensureEnabled() did the equivalent of it, with some overhead. 1842814 5 kkinnunen 2022-02-17 04:10:01 -0800 Alex, I see you're copying the Cocoa properties. If you have time, I filed bug 236769 so that we would work on merging the different code-paths as much as possible. ATM it's a bit hard for me since I don't have a WPE/WC compile environment yet. 1842815 6 alex 2022-02-17 04:16:59 -0800 (In reply to Kimmo Kinnunen from comment #5) > Alex, I see you're copying the Cocoa properties. > If you have time, I filed bug 236769 so that we would work on merging the > different code-paths as much as possible. ATM it's a bit hard for me since I > don't have a WPE/WC compile environment yet. That would be great! I'm interested, we did not spend the time to check each one in detail so it would help a lot to make sure we are doing the same thing. We just want to land this patch this week because we have some release milestone but I'll help with the refactor in out side. 1842839 7 452355 alex 2022-02-17 05:23:19 -0800 Created attachment 452355 Patch 1842852 8 452355 zdobersek 2022-02-17 05:48:04 -0800 Comment on attachment 452355 Patch LGTM. 1843092 9 ews-feeder 2022-02-17 13:15:13 -0800 Committed r290064 (247426@main): <https://commits.webkit.org/247426@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452355. 1843093 10 webkit-bug-importer 2022-02-17 13:16:15 -0800 <rdar://problem/89104959> 452223 2022-02-16 11:49:51 -0800 2022-02-17 05:23:14 -0800 Patch bug-236664-20220216204950.patch text/plain 6765 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhlNzY1MzFlZjkzZWIw YzlmMWIxNmM1MzUwOTlkMWUwNzUxNjU4Zi4uYTlkNTcxYzFhOGRkZDQ0NmNjMGEyOTU0MWI0NjI4 OTcwZjZmYTMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTE2ICBBbGVq YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0g TWFrZSBwcm9wZXIgQU5HTEUgY29udGV4dCBjb25maWd1cmF0aW9uIGZvciBzb21lIG9mIHRoZSBl eHBlY3RlZCBmZWF0dXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM2NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIHNvbWUgbWlzc2luZyBBTkdMRSBHTCBjb250ZXh0IGNvbmZpZ3VyYXRpb24g b3B0aW9ucyB0byByZXNwZWN0CisgICAgICAgIHNvbWUgb2YgdGhlIGV4cGVjdGVkIHJlcXVpcmVt ZW50cyBvZiB0aGUgV2ViR0wgc3RhbmRhcmQuCisKKyAgICAgICAgRml4aW5nIG11bHRpcGxlIGxh eW91dCB0ZXN0cyBmb3IgdGhlIEFOR0xFIGJhY2tlbmQsIHdlIGNhbiBub3QKKyAgICAgICAgbW9k aWZ5IHRoZW0gZm9yIHRoZSBtb21lbnQgYmVjYXVzZSB0aGlzIGlzIG5vdCB0aGUgZGVmYXVsdCBv cHRpb24KKyAgICAgICAgaW4gdGhlIGNvbXBpbGF0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xBTkdMRUxheWVyLmNwcDoKKyAgICAg ICAgKE5pY29zaWE6OkdDR0xBTkdMRUxheWVyOjpBTkdMRUNvbnRleHQ6OmNyZWF0ZUNvbnRleHQp OiBBZGQgYSBuZXcKKyAgICAgICAgcGFyYW1ldGVyIHRvIGRldGVjdCBXZWJHTDIgY29udGV4dCBh bmQgbW9kaWZ5IGNvbnRleHQgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKE5pY29zaWE6OkdDR0xB TkdMRUxheWVyOjpHQ0dMQU5HTEVMYXllcik6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFHQ0dMQU5HTEVMYXllci5oOiBEaXR0by4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NDb250ZXh0R0xUZXh0dXJl TWFwcGVyQU5HTEUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0R0xBTkdM RTo6R3JhcGhpY3NDb250ZXh0R0xBTkdMRSk6IEVuYWJsZQorICAgICAgICBHTF9PRVNfRUdMX2lt YWdlIHJlcXVpcmVkIGZvciB0aGUgY29vcmRpbmF0ZWQgZ3JhcGhpY3MgdGV4dHVyZSByZW5kZXJp bmcuCisKIDIwMjItMDItMTQgIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAK ICAgICAgICAgTnVsbHB0ciBjcmFzaCBpbiBDb21wb3NpdGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVl VG9Ob2RlIHZpYSBJbnNlcnRQYXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kOjpkb0FwcGx5CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9O aWNvc2lhR0NHTEFOR0xFTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xBTkdMRUxheWVyLmNwcAppbmRleCAzOGMwNGQx ZTZkZWUzNmYxZDIwMmE5Zjg5YjI0MjU3Y2I2NTQ0ZTA4Li45YmY0MWE0Njc2NTYyZGIzNmJkZGJk NGVmNmExN2Y1YWNhMjk4MDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFHQ0dM QU5HTEVMYXllci5jcHAKQEAgLTEyMSw5ICsxMjEsOSBAQCBjb25zdCBjaGFyKiBHQ0dMQU5HTEVM YXllcjo6QU5HTEVDb250ZXh0OjpsYXN0RXJyb3JTdHJpbmcoKQogICAgIHJldHVybiBlcnJvclN0 cmluZyhFR0xfR2V0RXJyb3IoKSk7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxHQ0dMQU5HTEVMYXll cjo6QU5HTEVDb250ZXh0PiBHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0OjpjcmVhdGVDb250 ZXh0KCkKK3N0ZDo6dW5pcXVlX3B0cjxHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0PiBHQ0dM QU5HTEVMYXllcjo6QU5HTEVDb250ZXh0OjpjcmVhdGVDb250ZXh0KGNvbnN0IFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dEdMQU5HTEUmIHdlYmtpdENvbnRleHQpCiB7Ci0gICAgRUdMRGlzcGxheSBk aXNwbGF5ID0gRUdMX0dldERpc3BsYXkoRUdMX0RFRkFVTFRfRElTUExBWSk7CisgICAgRUdMRGlz cGxheSBkaXNwbGF5ID0gRUdMX0dldERpc3BsYXkoR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6ZGVm YXVsdERpc3BsYXkpOwogICAgIGlmIChkaXNwbGF5ID09IEVHTF9OT19ESVNQTEFZKQogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKIApAQCAtMTQ0LDYgKzE0NCw4IEBAIHN0ZDo6dW5pcXVlX3B0cjxH Q0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0PiBHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0 OjpjcmVhCiAgICAgICAgIEVHTF9HUkVFTl9TSVpFLCA4LAogICAgICAgICBFR0xfQkxVRV9TSVpF LCA4LAogICAgICAgICBFR0xfQUxQSEFfU0laRSwgOCwKKyAgICAgICAgRUdMX0RFUFRIX1NJWkUs IDAsCisgICAgICAgIEVHTF9TVEVOQ0lMX1NJWkUsIDAsCiAgICAgICAgIEVHTF9OT05FCiAgICAg fTsKICAgICBFR0xpbnQgbnVtYmVyQ29uZmlnc1JldHVybmVkID0gMDsKQEAgLTE2MSwxMiArMTYz LDMxIEBAIHN0ZDo6dW5pcXVlX3B0cjxHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0PiBHQ0dM QU5HTEVMYXllcjo6QU5HTEVDb250ZXh0OjpjcmVhCiAgICAgfQogCiAgICAgc3RkOjp2ZWN0b3I8 RUdMaW50PiBjb250ZXh0QXR0cmlidXRlczsKLSAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2Jh Y2soRUdMX0NPTlRFWFRfQ0xJRU5UX1ZFUlNJT04pOwotICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1 c2hfYmFjaygyKTsKKyAgICBpZiAod2Via2l0Q29udGV4dC5tX2lzRm9yV2ViR0wyKSB7CisgICAg ICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xfQ09OVEVYVF9DTElFTlRfVkVSU0lP Tik7CisgICAgICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjaygzKTsKKyAgICB9IGVsc2Ug eworICAgICAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soRUdMX0NPTlRFWFRfQ0xJRU5U X1ZFUlNJT04pOworICAgICAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soMik7CisgICAg ICAgIC8vIEFOR0xFIHdpbGwgdXBncmFkZSB0aGUgY29udGV4dCB0byBFUzMgYXV0b21hdGljYWxs eSB1bmxlc3MgdGhpcyBpcyBzcGVjaWZpZWQuCisgICAgICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1 c2hfYmFjayhFR0xfQ09OVEVYVF9PUEVOR0xfQkFDS1dBUkRTX0NPTVBBVElCTEVfQU5HTEUpOwor ICAgICAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soRUdMX0ZBTFNFKTsKKyAgICB9CiAg ICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9iYWNrKEVHTF9DT05URVhUX1dFQkdMX0NPTVBBVElC SUxJVFlfQU5HTEUpOwogICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xfVFJVRSk7 Ci0gICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9iYWNrKEVHTF9FWFRFTlNJT05TX0VOQUJMRURf QU5HTEUpOworCisgICAgLy8gV2ViR0wgcmVxdWlyZXMgdGhhdCBhbGwgcmVzb3VyY2VzIGFyZSBj bGVhcmVkIGF0IGNyZWF0aW9uLgorICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xf Uk9CVVNUX1JFU09VUkNFX0lOSVRJQUxJWkFUSU9OX0FOR0xFKTsKICAgICBjb250ZXh0QXR0cmli dXRlcy5wdXNoX2JhY2soRUdMX1RSVUUpOworCisgICAgLy8gV2ViR0wgZG9lc24ndCBhbGxvdyBj bGllbnQgYXJyYXlzLgorICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xfQ09OVEVY VF9DTElFTlRfQVJSQVlTX0VOQUJMRURfQU5HTEUpOworICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1 c2hfYmFjayhFR0xfRkFMU0UpOworCisgICAgLy8gV2ViR0wgZG9lc24ndCBhbGxvdyBpbXBsaWNp dCBjcmVhdGlvbiBvZiBvYmplY3RzIG9uIGJpbmQuCisgICAgY29udGV4dEF0dHJpYnV0ZXMucHVz aF9iYWNrKEVHTF9DT05URVhUX0JJTkRfR0VORVJBVEVTX1JFU09VUkNFX0NIUk9NSVVNKTsKKyAg ICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soRUdMX0ZBTFNFKTsKKwogICAgIGlmIChzdHJz dHIoZGlzcGxheUV4dGVuc2lvbnMsICJFR0xfQU5HTEVfcG93ZXJfcHJlZmVyZW5jZSIpKSB7CiAg ICAgICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xfUE9XRVJfUFJFRkVSRU5DRV9B TkdMRSk7CiAgICAgICAgIC8vIEVHTF9MT1dfUE9XRVJfQU5HTEUgaXMgdGhlIGRlZmF1bHQuIENo YW5nZSB0bwpAQCAtMjMxLDcgKzI1Miw3IEBAIFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0R0xDb25m aWcgR0NHTEFOR0xFTGF5ZXI6OkFOR0xFQ29udGV4dDo6cGxhdGZvcm1Db25maWcoKSBjCiAKIEdD R0xBTkdMRUxheWVyOjpHQ0dMQU5HTEVMYXllcihHcmFwaGljc0NvbnRleHRHTEFOR0xFJiBjb250 ZXh0KQogICAgIDogbV9jb250ZXh0KGNvbnRleHQpCi0gICAgLCBtX2FuZ2xlQ29udGV4dChBTkdM RUNvbnRleHQ6OmNyZWF0ZUNvbnRleHQoKSkKKyAgICAsIG1fYW5nbGVDb250ZXh0KEFOR0xFQ29u dGV4dDo6Y3JlYXRlQ29udGV4dChjb250ZXh0KSkKICAgICAsIG1fY29udGVudExheWVyKE5pY29z aWE6OkNvbnRlbnRMYXllcjo6Y3JlYXRlKE5pY29zaWE6OkNvbnRlbnRMYXllclRleHR1cmVNYXBw ZXJJbXBsOjpjcmVhdGVGYWN0b3J5KCp0aGlzKSkpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xF TGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFw L05pY29zaWFHQ0dMQU5HTEVMYXllci5oCmluZGV4IDRmOGRmNmVjZTA2YTU3NDJlZDNhN2I4Zjdl YTBlNTBkMGNiMDQ2NDIuLjg1MDk4NDM2MjMzZTZlOWI1YjU4YzFhMWNkZGU1OTY4MTdjOWViM2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4 bWFwL05pY29zaWFHQ0dMQU5HTEVMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFHQ0dMQU5HTEVMYXllci5oCkBAIC01Nyw3 ICs1Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGVycm9yU3RyaW5n KGludCBzdGF0dXNDb2RlKTsKICAgICAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGxhc3RFcnJvclN0 cmluZygpOwogCi0gICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8QU5HTEVDb250ZXh0PiBj cmVhdGVDb250ZXh0KCk7CisgICAgICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8QU5HTEVDb250 ZXh0PiBjcmVhdGVDb250ZXh0KGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUm KTsKICAgICAgICAgdmlydHVhbCB+QU5HTEVDb250ZXh0KCk7CiAKICAgICAgICAgYm9vbCBtYWtl Q29udGV4dEN1cnJlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9HcmFwaGljc0NvbnRleHRHTFRleHR1cmVNYXBwZXJBTkdMRS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NDb250ZXh0R0xU ZXh0dXJlTWFwcGVyQU5HTEUuY3BwCmluZGV4IGRmZGFjNTg3NTcyMjU0MmVkYzQwMDVjZjUxNGI2 N2E4MDQwNjExYzYuLjE0YWMzNGVmM2JiZjFhNDE5NmExMTdmYjQ1NTM3MzZmYjY4ZWY0YTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0NvbnRleHRHTFRleHR1cmVNYXBwZXJBTkdMRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzQ29udGV4dEdMVGV4dHVyZU1hcHBlckFOR0xF LmNwcApAQCAtNTYsNiArNTYsMTAgQEAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3ND b250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgYXR0cmkKICNpZiBVU0Uo TklDT1NJQSkKICAgICBtX25pY29zaWFMYXllciA9IG1ha2VVbmlxdWU8Tmljb3NpYTo6R0NHTEFO R0xFTGF5ZXI+KCp0aGlzKTsKIAorICAgIC8vIFdlIHJlcXVpcmUgdGhpcyBleHRlbnNpb24gZm9y IHRoZSBDT09SRElOQVRFRF9HUkFQSElDUyB0ZXh0dXJlIHJlbmRlcmluZy4KKyAgICBSRUxFQVNF X0FTU0VSVChnZXRFeHRlbnNpb25zKCkuc3VwcG9ydHMoIkdMX09FU19FR0xfaW1hZ2UiKSk7Cisg ICAgZ2V0RXh0ZW5zaW9ucygpLmVuc3VyZUVuYWJsZWQoIkdMX09FU19FR0xfaW1hZ2UiKTsKKwog ICAgIGNvbnN0IGF1dG8mIGdibURldmljZSA9IEdCTURldmljZTo6Z2V0KCk7CiAgICAgaWYgKGdi bURldmljZS5kZXZpY2UoKSkgewogICAgICAgICBtX3RleHR1cmVCYWNraW5nID0gbWFrZVVuaXF1 ZTxFR0xJbWFnZUJhY2tpbmc+KHBsYXRmb3JtRGlzcGxheSgpKTsK 452355 2022-02-17 05:23:19 -0800 2022-02-17 13:15:16 -0800 Patch bug-236664-20220217142318.patch text/plain 6458 alex U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNlMTFlMzgzYjdhNDQw YzQyN2I3YmNiZmVhODA1NzMzMDM5YzVmNS4uZjcwMWVkMzUyMDIzOWNlZDFkNTQ4OGMyNzQ2ZDEw ZTcyMWEzNGUzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTE2ICBBbGVq YW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0g TWFrZSBwcm9wZXIgQU5HTEUgY29udGV4dCBjb25maWd1cmF0aW9uIGZvciBzb21lIG9mIHRoZSBl eHBlY3RlZCBmZWF0dXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM2NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIHNvbWUgbWlzc2luZyBBTkdMRSBHTCBjb250ZXh0IGNvbmZpZ3VyYXRpb24g b3B0aW9ucyB0byByZXNwZWN0CisgICAgICAgIHNvbWUgb2YgdGhlIGV4cGVjdGVkIHJlcXVpcmVt ZW50cyBvZiB0aGUgV2ViR0wgc3RhbmRhcmQuCisKKyAgICAgICAgRml4aW5nIG11bHRpcGxlIGxh eW91dCB0ZXN0cyBmb3IgdGhlIEFOR0xFIGJhY2tlbmQsIHdlIGNhbiBub3QKKyAgICAgICAgbW9k aWZ5IHRoZW0gZm9yIHRoZSBtb21lbnQgYmVjYXVzZSB0aGlzIGlzIG5vdCB0aGUgZGVmYXVsdCBv cHRpb24KKyAgICAgICAgaW4gdGhlIGNvbXBpbGF0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xBTkdMRUxheWVyLmNwcDoKKyAgICAg ICAgKE5pY29zaWE6OkdDR0xBTkdMRUxheWVyOjpBTkdMRUNvbnRleHQ6OmNyZWF0ZUNvbnRleHQp OiBBZGQgYSBuZXcKKyAgICAgICAgcGFyYW1ldGVyIHRvIGRldGVjdCBXZWJHTDIgY29udGV4dCBh bmQgbW9kaWZ5IGNvbnRleHQgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKE5pY29zaWE6OkdDR0xB TkdMRUxheWVyOjpHQ0dMQU5HTEVMYXllcik6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFHQ0dMQU5HTEVMYXllci5oOiBEaXR0by4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NDb250ZXh0R0xUZXh0dXJl TWFwcGVyQU5HTEUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0R0xBTkdM RTo6R3JhcGhpY3NDb250ZXh0R0xBTkdMRSk6IEVuYWJsZQorICAgICAgICBHTF9PRVNfRUdMX2lt YWdlIHJlcXVpcmVkIGZvciB0aGUgY29vcmRpbmF0ZWQgZ3JhcGhpY3MgdGV4dHVyZSByZW5kZXJp bmcuCisKIDIwMjItMDItMTYgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4K IAogICAgICAgICBBTkdMRSBpbmNsdWRlcyBpbnRlcmZlcmUgd2l0aCBzeXN0ZW0gaGVhZGVyIGlu Y2x1ZGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNv c2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90ZXhtYXAvTmljb3NpYUdDR0xBTkdMRUxheWVyLmNwcApp bmRleCAyNWUyYjkxY2NjNGI5OGYzOTM0MGExNWVkMDY0NTEyMWYxNGVmMDJmLi40ZmVkZWM1ZDQ5 NDZhNmU4MmJkMDY1YTJjZjU5NGNkNTY5ZTk2NTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFw L05pY29zaWFHQ0dMQU5HTEVMYXllci5jcHAKQEAgLTEyMSw3ICsxMjEsNyBAQCBjb25zdCBjaGFy KiBHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0OjpsYXN0RXJyb3JTdHJpbmcoKQogICAgIHJl dHVybiBlcnJvclN0cmluZyhFR0xfR2V0RXJyb3IoKSk7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxH Q0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0PiBHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0 OjpjcmVhdGVDb250ZXh0KCkKK3N0ZDo6dW5pcXVlX3B0cjxHQ0dMQU5HTEVMYXllcjo6QU5HTEVD b250ZXh0PiBHQ0dMQU5HTEVMYXllcjo6QU5HTEVDb250ZXh0OjpjcmVhdGVDb250ZXh0KGJvb2wg aXNGb3JXZWJHTDIpCiB7CiAgICAgRUdMRGlzcGxheSBkaXNwbGF5ID0gRUdMX0dldERpc3BsYXko RUdMX0RFRkFVTFRfRElTUExBWSk7CiAgICAgaWYgKGRpc3BsYXkgPT0gRUdMX05PX0RJU1BMQVkp CkBAIC0xNDQsNiArMTQ0LDggQEAgc3RkOjp1bmlxdWVfcHRyPEdDR0xBTkdMRUxheWVyOjpBTkdM RUNvbnRleHQ+IEdDR0xBTkdMRUxheWVyOjpBTkdMRUNvbnRleHQ6OmNyZWEKICAgICAgICAgRUdM X0dSRUVOX1NJWkUsIDgsCiAgICAgICAgIEVHTF9CTFVFX1NJWkUsIDgsCiAgICAgICAgIEVHTF9B TFBIQV9TSVpFLCA4LAorICAgICAgICBFR0xfREVQVEhfU0laRSwgMCwKKyAgICAgICAgRUdMX1NU RU5DSUxfU0laRSwgMCwKICAgICAgICAgRUdMX05PTkUKICAgICB9OwogICAgIEVHTGludCBudW1i ZXJDb25maWdzUmV0dXJuZWQgPSAwOwpAQCAtMTYxLDEyICsxNjMsMzEgQEAgc3RkOjp1bmlxdWVf cHRyPEdDR0xBTkdMRUxheWVyOjpBTkdMRUNvbnRleHQ+IEdDR0xBTkdMRUxheWVyOjpBTkdMRUNv bnRleHQ6OmNyZWEKICAgICB9CiAKICAgICBzdGQ6OnZlY3RvcjxFR0xpbnQ+IGNvbnRleHRBdHRy aWJ1dGVzOwotICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xfQ09OVEVYVF9DTElF TlRfVkVSU0lPTik7Ci0gICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9iYWNrKDIpOworICAgIGlm IChpc0ZvcldlYkdMMikgeworICAgICAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soRUdM X0NPTlRFWFRfQ0xJRU5UX1ZFUlNJT04pOworICAgICAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNo X2JhY2soMyk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9i YWNrKEVHTF9DT05URVhUX0NMSUVOVF9WRVJTSU9OKTsKKyAgICAgICAgY29udGV4dEF0dHJpYnV0 ZXMucHVzaF9iYWNrKDIpOworICAgICAgICAvLyBBTkdMRSB3aWxsIHVwZ3JhZGUgdGhlIGNvbnRl eHQgdG8gRVMzIGF1dG9tYXRpY2FsbHkgdW5sZXNzIHRoaXMgaXMgc3BlY2lmaWVkLgorICAgICAg ICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soRUdMX0NPTlRFWFRfT1BFTkdMX0JBQ0tXQVJE U19DT01QQVRJQkxFX0FOR0xFKTsKKyAgICAgICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9iYWNr KEVHTF9GQUxTRSk7CisgICAgfQogICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xf Q09OVEVYVF9XRUJHTF9DT01QQVRJQklMSVRZX0FOR0xFKTsKICAgICBjb250ZXh0QXR0cmlidXRl cy5wdXNoX2JhY2soRUdMX1RSVUUpOwotICAgIGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhF R0xfRVhURU5TSU9OU19FTkFCTEVEX0FOR0xFKTsKKworICAgIC8vIFdlYkdMIHJlcXVpcmVzIHRo YXQgYWxsIHJlc291cmNlcyBhcmUgY2xlYXJlZCBhdCBjcmVhdGlvbi4KKyAgICBjb250ZXh0QXR0 cmlidXRlcy5wdXNoX2JhY2soRUdMX1JPQlVTVF9SRVNPVVJDRV9JTklUSUFMSVpBVElPTl9BTkdM RSk7CiAgICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9iYWNrKEVHTF9UUlVFKTsKKworICAgIC8v IFdlYkdMIGRvZXNuJ3QgYWxsb3cgY2xpZW50IGFycmF5cy4KKyAgICBjb250ZXh0QXR0cmlidXRl cy5wdXNoX2JhY2soRUdMX0NPTlRFWFRfQ0xJRU5UX0FSUkFZU19FTkFCTEVEX0FOR0xFKTsKKyAg ICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2soRUdMX0ZBTFNFKTsKKworICAgIC8vIFdlYkdM IGRvZXNuJ3QgYWxsb3cgaW1wbGljaXQgY3JlYXRpb24gb2Ygb2JqZWN0cyBvbiBiaW5kLgorICAg IGNvbnRleHRBdHRyaWJ1dGVzLnB1c2hfYmFjayhFR0xfQ09OVEVYVF9CSU5EX0dFTkVSQVRFU19S RVNPVVJDRV9DSFJPTUlVTSk7CisgICAgY29udGV4dEF0dHJpYnV0ZXMucHVzaF9iYWNrKEVHTF9G QUxTRSk7CisKICAgICBpZiAoc3Ryc3RyKGRpc3BsYXlFeHRlbnNpb25zLCAiRUdMX0FOR0xFX3Bv d2VyX3ByZWZlcmVuY2UiKSkgewogICAgICAgICBjb250ZXh0QXR0cmlidXRlcy5wdXNoX2JhY2so RUdMX1BPV0VSX1BSRUZFUkVOQ0VfQU5HTEUpOwogICAgICAgICAvLyBFR0xfTE9XX1BPV0VSX0FO R0xFIGlzIHRoZSBkZWZhdWx0LiBDaGFuZ2UgdG8KQEAgLTIzMSw3ICsyNTIsNyBAQCBHQ0dMQ29u ZmlnIEdDR0xBTkdMRUxheWVyOjpBTkdMRUNvbnRleHQ6OnBsYXRmb3JtQ29uZmlnKCkgY29uc3QK IAogR0NHTEFOR0xFTGF5ZXI6OkdDR0xBTkdMRUxheWVyKEdyYXBoaWNzQ29udGV4dEdMQU5HTEUm IGNvbnRleHQpCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKLSAgICAsIG1fYW5nbGVDb250ZXh0 KEFOR0xFQ29udGV4dDo6Y3JlYXRlQ29udGV4dCgpKQorICAgICwgbV9hbmdsZUNvbnRleHQoQU5H TEVDb250ZXh0OjpjcmVhdGVDb250ZXh0KGNvbnRleHQubV9pc0ZvcldlYkdMMikpCiAgICAgLCBt X2NvbnRlbnRMYXllcihOaWNvc2lhOjpDb250ZW50TGF5ZXI6OmNyZWF0ZShOaWNvc2lhOjpDb250 ZW50TGF5ZXJUZXh0dXJlTWFwcGVySW1wbDo6Y3JlYXRlRmFjdG9yeSgqdGhpcykpKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS90ZXht YXAvTmljb3NpYUdDR0xBTkdMRUxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIuaAppbmRleCBkZjgzYTg5 NGRkNTA2MDE4NWFjOTk2Y2Y3MTRlYWJkYjc2NWVkMDMzLi5iYWE5NjdlM2RiYjhhMmU3YmIwMjQy YTNjZTRlYjI2MDYyYWY1ZDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFOR0xFTGF5ZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhR0NHTEFO R0xFTGF5ZXIuaApAQCAtNTcsNyArNTcsNyBAQCBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBjb25z dCBjaGFyKiBlcnJvclN0cmluZyhpbnQgc3RhdHVzQ29kZSk7CiAgICAgICAgIHN0YXRpYyBjb25z dCBjaGFyKiBsYXN0RXJyb3JTdHJpbmcoKTsKIAotICAgICAgICBzdGF0aWMgc3RkOjp1bmlxdWVf cHRyPEFOR0xFQ29udGV4dD4gY3JlYXRlQ29udGV4dCgpOworICAgICAgICBzdGF0aWMgc3RkOjp1 bmlxdWVfcHRyPEFOR0xFQ29udGV4dD4gY3JlYXRlQ29udGV4dChib29sIGlzRm9yV2ViR0wyKTsK ICAgICAgICAgdmlydHVhbCB+QU5HTEVDb250ZXh0KCk7CiAKICAgICAgICAgYm9vbCBtYWtlQ29u dGV4dEN1cnJlbnQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9HcmFwaGljc0NvbnRleHRHTFRleHR1cmVNYXBwZXJBTkdMRS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NDb250ZXh0R0xUZXh0 dXJlTWFwcGVyQU5HTEUuY3BwCmluZGV4IDIwMjhhOTU4NjYzNTdmMGQ5NDAwNGJhZjg2ZTA1NWUy NTVmMTc3Y2MuLjFmNGQxOTYzMjhmOTg0ZGIyZDA0NzI0ZmRkMDE2MjNhZjJkOWM0MDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0Nv bnRleHRHTFRleHR1cmVNYXBwZXJBTkdMRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzQ29udGV4dEdMVGV4dHVyZU1hcHBlckFOR0xFLmNw cApAQCAtNjksNiArNjksMTAgQEAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3NDb250 ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgYXR0cmkKICAgICBzdWNjZXNz ID0gaW5pdGlhbGl6ZSgpOwogICAgIEFTU0VSVF9VTlVTRUQoc3VjY2Vzcywgc3VjY2Vzcyk7CiAK KyAgICAvLyBXZSByZXF1aXJlIHRoaXMgZXh0ZW5zaW9uIHRvIHJlbmRlciBpbnRvIHRoZSBkbWFi dWYtYmFja2VkIEVHTEltYWdlLgorICAgIFJFTEVBU0VfQVNTRVJUKHN1cHBvcnRzRXh0ZW5zaW9u KCJHTF9PRVNfRUdMX2ltYWdlIikpOworICAgIEdMX1JlcXVlc3RFeHRlbnNpb25BTkdMRSgiR0xf T0VTX0VHTF9pbWFnZSIpOworCiAgICAgdmFsaWRhdGVBdHRyaWJ1dGVzKCk7CiAgICAgYXR0cmli dXRlcyA9IGNvbnRleHRBdHRyaWJ1dGVzKCk7IC8vIFRoZXkgbWF5IGhhdmUgY2hhbmdlZCBkdXJp bmcgdmFsaWRhdGlvbi4KIAo=