119235 2013-07-30 00:05:51 -0700 EGLNativeWindowType/uint64_t compile error in GLContext 2013-07-30 14:18:15 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 achristensen webkit-unassigned commit-queue gtk-ews mrobinson rego+ews xan.lopez zan oldest_to_newest 912683 0 achristensen 2013-07-30 00:05:51 -0700 r117612 introduced using uint64_t as a native pointer type in Source/WebCore/platform/graphics/cairo/GLContext.h which is now Source/WebCore/platform/graphics/GLContext.h. This causes a compiler error on Windows because it can't convert from uint64_t to a 32-bit EGLNativeWindowType (which is a HWND which is a void*) without a reinterpret_cast. To avoid the evil that is reinterpret_cast, I propose a new typedef, GLNativeWindowType, which will be the same as EGLNativeWindowType if we're using EGL and it will be a uint64_t to not change any current behaviour. 912686 1 207694 achristensen 2013-07-30 00:10:32 -0700 Created attachment 207694 Patch 912687 2 207694 gtk-ews 2013-07-30 00:15:58 -0700 Comment on attachment 207694 Patch Attachment 207694 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/1279011 912693 3 zan 2013-07-30 00:35:22 -0700 I've struck the same problem while working on making GLContextEGL usable under the Wayland EGL platform. I have an RFC patch uploaded in bug #118944 that shows the approach, basically having platform-specific classes that extend GLContextEGL, provide platform-specific shared display and also define the native window type. I've only tested that patch on Wayland, X11 and the default EGL platforms (i.e. what's currently provided in that patch) but I believe a Windows-specific GLContextEGL could be introduced and used the same way. I've talked to Martin about the patch and he gave the go-ahead to split the patch up into reviewable pieces and land the changes. Can we coordinate on the work being done here? I'd like to start uploading patches up for review this week and can commit some time to that right away, but would like to reduce the clashing with your work. I can either wait for you to set up GLContextEGL functionality on the Windows port and incorporate these changes into the refactoring that's proposed in bug #118944, or get the refactoring into the tree and you can continue after that. What would work best for you? 912912 4 achristensen 2013-07-30 10:13:06 -0700 It looks like you're doing a lot more changes to this code than I am, Zan. Everything that was there before worked fine except it assumed the compiler would convert between a pointer and a uint64_t. Do you think your GLContextEGLDefault will work with the WinCairo port? I won't have a way to test your changes with the state of the JavaScriptCore on Windows right now. Go ahead and maybe you could fix this with your changes. 912915 5 achristensen 2013-07-30 10:17:26 -0700 By the way, I'm trying to get WebGL working using EGL on the AppleWin port, too. Do you think your changes will break that? 912940 6 zan 2013-07-30 10:50:04 -0700 The changes I'll be pushing through are meant to preserve the current behavior, that is keeping the X11 and the default EGL platforms functioning while also adding support for the Wayland EGL platform. I think the AppleWin should use its own GLContextEGL subclass, just so it could provide an appropriate typedef for the native window type, but it should probably mimic the GLContextEGLDefault class in other aspects. Anyway, while I still have to split my changes into smaller, reviewable patches, I'm still dependent on Martin who'll do all the reviewing. He's travelling at the moment, so I can't really guarantee that all the changes will get into trunk by e.g. tomorrow or the end of the week, even though I've been optimistic this would happen. So I don't want to block you - I can easily wait another week or two if you think you can make good progress in the meantime, and I can include the AppleWin-specific bits in my refactoring. 912942 7 achristensen 2013-07-30 10:55:05 -0700 This patch is not AppleWin specific. EGL already has a native window type, EGLNativeWindowType. I'm just using that for AppleWin and WinCairo. I'll try to get this in soon so you can incorporate my small change into yours. 912944 8 207748 achristensen 2013-07-30 10:58:43 -0700 Created attachment 207748 Patch 912950 9 zan 2013-07-30 11:13:40 -0700 (In reply to comment #7) > This patch is not AppleWin specific. EGL already has a native window type, EGLNativeWindowType. I'm just using that for AppleWin and WinCairo. I'll try to get this in soon so you can incorporate my small change into yours. I see. The problem is that this requires an inclusion of eglplatform.h. This causes problems for the GTK port which in future wants to support both the X11 and Wayland EGL platforms in the same build, but strictly setting the native window type makes this impossible. This was also the reason behind the refactoring of GLContextEGL I'm proposing, and I managed to solve that by defining the platform-specific native window type in the different GLContextEGL* headers. Maybe that specific approach should be scaled over the GLContext class as well. 912951 10 achristensen 2013-07-30 11:16:12 -0700 Do you think it would be better to put #if USE(EGL) && !PLATFORM(GTK) around my inclusion of eglplatform.h, teach GTK how to find eglplatform.h (which is in the ANGLE headers included in WebKit), or just wait for your changes? 912953 11 zan 2013-07-30 11:21:45 -0700 I think this patch is OK. I'd rather rebase and rework my changes with this already in the tree. So feel free to get this reviewed and landed. 912955 12 207751 achristensen 2013-07-30 11:23:03 -0700 Created attachment 207751 Patch 912956 13 207751 zan 2013-07-30 11:23:39 -0700 Comment on attachment 207751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207751&action=review > Source/WebCore/platform/graphics/GLContext.h:33 > +#if USE(EGL) && !PLATFORM(GTK) > +#include "eglplatform.h" > +typedef EGLNativeWindowType GLNativeWindowType; > +#else > +typedef uint64_t GLNativeWindowType; > +#endif Works as well. Thanks. 913020 14 207751 commit-queue 2013-07-30 14:18:12 -0700 Comment on attachment 207751 Patch Clearing flags on attachment: 207751 Committed r153492: <http://trac.webkit.org/changeset/153492> 913021 15 commit-queue 2013-07-30 14:18:15 -0700 All reviewed patches have been landed. Closing bug. 207694 2013-07-30 00:10:32 -0700 2013-07-30 10:58:40 -0700 Patch bug-119235-20130730001031.patch text/plain 2502 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzQ2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3LTMwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBDb21waWxlIGZp eCBmb3IgV2ViR0wgb24gMzItYml0IFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkyMzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHA6 CisgICAgICAgIENyZWF0ZWQgR0xOYXRpdmVXaW5kb3dUeXBlIHR5cGVkZWYuCisgICAgICAgIChX ZWJDb3JlOjpHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3cpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oOgorICAgICAgICBSZXBsYWNlZCB1aW50NjRfdCB3 aXRoIEdMTmF0aXZlV2luZG93VHlwZS4KKwogMjAxMy0wNy0yOSAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IG1ha2Ug ZGlzdGNoZWNrLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250 ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H TENvbnRleHQuY3BwCShyZXZpc2lvbiAxNTM0NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HTENvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcsNyArMTQ3LDcg QEAgdm9pZCBHTENvbnRleHQ6OmNsZWFudXBBY3RpdmVDb250ZXh0c0F0RQogCiAKIAotUGFzc093 blB0cjxHTENvbnRleHQ+IEdMQ29udGV4dDo6Y3JlYXRlQ29udGV4dEZvcldpbmRvdyh1aW50NjRf dCB3aW5kb3dIYW5kbGUsIEdMQ29udGV4dCogc2hhcmluZ0NvbnRleHQpCitQYXNzT3duUHRyPEdM Q29udGV4dD4gR0xDb250ZXh0OjpjcmVhdGVDb250ZXh0Rm9yV2luZG93KEdMTmF0aXZlV2luZG93 VHlwZSB3aW5kb3dIYW5kbGUsIEdMQ29udGV4dCogc2hhcmluZ0NvbnRleHQpCiB7CiAjaWYgUExB VEZPUk0oR1RLKSAmJiBkZWZpbmVkKEdES19XSU5ET1dJTkdfV0FZTEFORCkgJiYgVVNFKEVHTCkK ICAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXRfZGVmYXVs dF9kaXNwbGF5KGdka19kaXNwbGF5X21hbmFnZXJfZ2V0KCkpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmgJKHJldmlzaW9uIDE1MzQ1OSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNSw2ICsyNSwxMyBAQAogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2lu Y2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAKKyNpZiBVU0UoRUdMKQorI2luY2x1ZGUgPGVnbC9l Z2xwbGF0Zm9ybS5oPgordHlwZWRlZiBFR0xOYXRpdmVXaW5kb3dUeXBlIEdMTmF0aXZlV2luZG93 VHlwZTsKKyNlbHNlCit0eXBlZGVmIHVpbnQ2NF90IEdMTmF0aXZlV2luZG93VHlwZTsKKyNlbmRp ZgorCiAjaWYgVVNFKENBSVJPKQogdHlwZWRlZiBzdHJ1Y3QgX2NhaXJvX2RldmljZSBjYWlyb19k ZXZpY2VfdDsKICNlbmRpZgpAQCAtMzgsNyArNDUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBj bGFzcyBHTENvbnRleHQgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEdMQ29udGV4dCk7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8R0xDb250ZXh0PiBjcmVhdGVDb250ZXh0Rm9y V2luZG93KHVpbnQ2NF90IHdpbmRvd0hhbmRsZSwgR0xDb250ZXh0KiBzaGFyaW5nQ29udGV4dCk7 CisgICAgc3RhdGljIFBhc3NPd25QdHI8R0xDb250ZXh0PiBjcmVhdGVDb250ZXh0Rm9yV2luZG93 KEdMTmF0aXZlV2luZG93VHlwZSB3aW5kb3dIYW5kbGUsIEdMQ29udGV4dCogc2hhcmluZ0NvbnRl eHQpOwogICAgIHN0YXRpYyBQYXNzT3duUHRyPEdMQ29udGV4dD4gY3JlYXRlT2Zmc2NyZWVuQ29u dGV4dChHTENvbnRleHQqIHNoYXJpbmcgPSAwKTsKICAgICBzdGF0aWMgR0xDb250ZXh0KiBnZXRD dXJyZW50KCk7CiAgICAgc3RhdGljIEdMQ29udGV4dCogc2hhcmluZ0NvbnRleHQoKTsK 207748 2013-07-30 10:58:43 -0700 2013-07-30 11:23:00 -0700 Patch bug-119235-20130730105850.patch text/plain 2554 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzQ4MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3LTMwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBDb21waWxlIGZp eCBmb3IgV2ViR0wgb24gMzItYml0IFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkyMzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHA6 CisgICAgICAgIENyZWF0ZWQgR0xOYXRpdmVXaW5kb3dUeXBlIHR5cGVkZWYuCisgICAgICAgIChX ZWJDb3JlOjpHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3cpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oOgorICAgICAgICBSZXBsYWNlZCB1aW50NjRfdCB3 aXRoIEdMTmF0aXZlV2luZG93VHlwZS4KKwogMjAxMy0wNy0zMCAgQ2hyaXN0b3BoZSBEdW1leiAg PGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUGFzcyBjb2x1bW4gYXMgNHRo IGFyZ3VtZW50IHRvIFdvcmtlckdsb2JhbFNjb3BlLm9uZXJyb3IgYW5kIFdpbmRvdy5vbmVycm9y IGhhbmRsZXJzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRl eHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dM Q29udGV4dC5jcHAJKHJldmlzaW9uIDE1MzQ4MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dMQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0Nyw3ICsxNDcsNyBA QCB2b2lkIEdMQ29udGV4dDo6Y2xlYW51cEFjdGl2ZUNvbnRleHRzQXRFCiAKIAogCi1QYXNzT3du UHRyPEdMQ29udGV4dD4gR0xDb250ZXh0OjpjcmVhdGVDb250ZXh0Rm9yV2luZG93KHVpbnQ2NF90 IHdpbmRvd0hhbmRsZSwgR0xDb250ZXh0KiBzaGFyaW5nQ29udGV4dCkKK1Bhc3NPd25QdHI8R0xD b250ZXh0PiBHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3coR0xOYXRpdmVXaW5kb3dU eXBlIHdpbmRvd0hhbmRsZSwgR0xDb250ZXh0KiBzaGFyaW5nQ29udGV4dCkKIHsKICNpZiBQTEFU Rk9STShHVEspICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19XQVlMQU5EKSAmJiBVU0UoRUdMKQog ICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZhdWx0 X2Rpc3BsYXkoZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXQoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaAkocmV2aXNpb24gMTUzNDgxKQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTI1LDYgKzI1LDEzIEBACiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5j bHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAorI2lmIFVTRShFR0wpCisjaW5jbHVkZSAiZWdscGxh dGZvcm0uaCIKK3R5cGVkZWYgRUdMTmF0aXZlV2luZG93VHlwZSBHTE5hdGl2ZVdpbmRvd1R5cGU7 CisjZWxzZQordHlwZWRlZiB1aW50NjRfdCBHTE5hdGl2ZVdpbmRvd1R5cGU7CisjZW5kaWYKKwog I2lmIFVTRShDQUlSTykKIHR5cGVkZWYgc3RydWN0IF9jYWlyb19kZXZpY2UgY2Fpcm9fZGV2aWNl X3Q7CiAjZW5kaWYKQEAgLTM4LDcgKzQ1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3Mg R0xDb250ZXh0IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShHTENvbnRleHQpOwogcHVibGlj OgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEdMQ29udGV4dD4gY3JlYXRlQ29udGV4dEZvcldpbmRv dyh1aW50NjRfdCB3aW5kb3dIYW5kbGUsIEdMQ29udGV4dCogc2hhcmluZ0NvbnRleHQpOworICAg IHN0YXRpYyBQYXNzT3duUHRyPEdMQ29udGV4dD4gY3JlYXRlQ29udGV4dEZvcldpbmRvdyhHTE5h dGl2ZVdpbmRvd1R5cGUgd2luZG93SGFuZGxlLCBHTENvbnRleHQqIHNoYXJpbmdDb250ZXh0KTsK ICAgICBzdGF0aWMgUGFzc093blB0cjxHTENvbnRleHQ+IGNyZWF0ZU9mZnNjcmVlbkNvbnRleHQo R0xDb250ZXh0KiBzaGFyaW5nID0gMCk7CiAgICAgc3RhdGljIEdMQ29udGV4dCogZ2V0Q3VycmVu dCgpOwogICAgIHN0YXRpYyBHTENvbnRleHQqIHNoYXJpbmdDb250ZXh0KCk7Cg== 207751 2013-07-30 11:23:03 -0700 2013-07-30 14:18:12 -0700 Patch bug-119235-20130730112310.patch text/plain 2572 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzQ4MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA3LTMwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KKworICAgICAgICBDb21waWxlIGZp eCBmb3IgV2ViR0wgb24gMzItYml0IFdpbmRvd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkyMzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHA6 CisgICAgICAgIENyZWF0ZWQgR0xOYXRpdmVXaW5kb3dUeXBlIHR5cGVkZWYuCisgICAgICAgIChX ZWJDb3JlOjpHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3cpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oOgorICAgICAgICBSZXBsYWNlZCB1aW50NjRfdCB3 aXRoIEdMTmF0aXZlV2luZG93VHlwZS4KKwogMjAxMy0wNy0zMCAgQ2hyaXN0b3BoZSBEdW1leiAg PGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUGFzcyBjb2x1bW4gYXMgNHRo IGFyZ3VtZW50IHRvIFdvcmtlckdsb2JhbFNjb3BlLm9uZXJyb3IgYW5kIFdpbmRvdy5vbmVycm9y IGhhbmRsZXJzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRl eHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dM Q29udGV4dC5jcHAJKHJldmlzaW9uIDE1MzQ4MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dMQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0Nyw3ICsxNDcsNyBA QCB2b2lkIEdMQ29udGV4dDo6Y2xlYW51cEFjdGl2ZUNvbnRleHRzQXRFCiAKIAogCi1QYXNzT3du UHRyPEdMQ29udGV4dD4gR0xDb250ZXh0OjpjcmVhdGVDb250ZXh0Rm9yV2luZG93KHVpbnQ2NF90 IHdpbmRvd0hhbmRsZSwgR0xDb250ZXh0KiBzaGFyaW5nQ29udGV4dCkKK1Bhc3NPd25QdHI8R0xD b250ZXh0PiBHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3coR0xOYXRpdmVXaW5kb3dU eXBlIHdpbmRvd0hhbmRsZSwgR0xDb250ZXh0KiBzaGFyaW5nQ29udGV4dCkKIHsKICNpZiBQTEFU Rk9STShHVEspICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19XQVlMQU5EKSAmJiBVU0UoRUdMKQog ICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZhdWx0 X2Rpc3BsYXkoZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXQoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaAkocmV2aXNpb24gMTUzNDgxKQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTI1LDYgKzI1LDEzIEBACiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5j bHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KIAorI2lmIFVTRShFR0wpICYmICFQTEFURk9STShHVEsp CisjaW5jbHVkZSAiZWdscGxhdGZvcm0uaCIKK3R5cGVkZWYgRUdMTmF0aXZlV2luZG93VHlwZSBH TE5hdGl2ZVdpbmRvd1R5cGU7CisjZWxzZQordHlwZWRlZiB1aW50NjRfdCBHTE5hdGl2ZVdpbmRv d1R5cGU7CisjZW5kaWYKKwogI2lmIFVTRShDQUlSTykKIHR5cGVkZWYgc3RydWN0IF9jYWlyb19k ZXZpY2UgY2Fpcm9fZGV2aWNlX3Q7CiAjZW5kaWYKQEAgLTM4LDcgKzQ1LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogY2xhc3MgR0xDb250ZXh0IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShH TENvbnRleHQpOwogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEdMQ29udGV4dD4gY3Jl YXRlQ29udGV4dEZvcldpbmRvdyh1aW50NjRfdCB3aW5kb3dIYW5kbGUsIEdMQ29udGV4dCogc2hh cmluZ0NvbnRleHQpOworICAgIHN0YXRpYyBQYXNzT3duUHRyPEdMQ29udGV4dD4gY3JlYXRlQ29u dGV4dEZvcldpbmRvdyhHTE5hdGl2ZVdpbmRvd1R5cGUgd2luZG93SGFuZGxlLCBHTENvbnRleHQq IHNoYXJpbmdDb250ZXh0KTsKICAgICBzdGF0aWMgUGFzc093blB0cjxHTENvbnRleHQ+IGNyZWF0 ZU9mZnNjcmVlbkNvbnRleHQoR0xDb250ZXh0KiBzaGFyaW5nID0gMCk7CiAgICAgc3RhdGljIEdM Q29udGV4dCogZ2V0Q3VycmVudCgpOwogICAgIHN0YXRpYyBHTENvbnRleHQqIHNoYXJpbmdDb250 ZXh0KCk7Cg==