232934 2021-11-10 02:52:54 -0800 [GTK] Fix build without USE_OPENGL_OR_ES 2022-09-07 03:29:11 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 244811 InRadar P2 Normal --- 1 alex.kanavin webkit-unassigned alicem bugs-noreply cmarcelo don.olmstead echassiers.09-regards ews-watchlist fujii gyuyoung.kim luiz mcatanzaro ryuan.choi sergio webkit-bug-importer zeno oldest_to_newest 1813522 0 alex.kanavin 2021-11-10 02:52:54 -0800 Fix build without opengl-or-es 1813523 1 443790 alex.kanavin 2021-11-10 02:53:41 -0800 Created attachment 443790 Patch 1815883 2 webkit-bug-importer 2021-11-17 02:53:19 -0800 <rdar://problem/85497037> 1842458 3 443790 don.olmstead 2022-02-16 12:44:08 -0800 Comment on attachment 443790 Patch I don't think this is the right fix. These files shouldn't be included at all if coordinated graphics isnt enabled. 1889865 4 echassiers.09-regards 2022-08-08 17:31:03 -0700 Don, I think this is the right fix. We already have USE(COORDINATED_GRAPHICS) at the beginning of LayerTreeHost.cpp to decide which headers to include, this should therefore also apply for the functions. I tested the patch, and it works well, it just needs to be rebased. 1889879 5 fujii 2022-08-08 18:24:47 -0700 This change looks confusing. Since bug#195094, GTK port is assuming COORDINATED_GRAPHICS is defined. However, there has been some requests of building GTK port without OpenGL. How about an idea reviving TextureMapperImageBuffer that was removed by bug#143561? Then, it can compile with COORDINATED_GRAPHICS defined. But, the accelerated compositing mode should be disabled because TextureMapperImageBuffer might be poor performance and poor rendering results. Anyway, we should revert bug#195094 or bug#143561 if GTK port has to support no OpenGL builds. 1889896 6 mcatanzaro 2022-08-08 19:45:08 -0700 GTK supports USE_OPENGL_OR_ES=OFF. It's a public build option. But if it's been broken for three years, maybe we should remove it. 1889945 7 alex.kanavin 2022-08-09 01:28:20 -0700 I do not have any particularly strong feelings about this patch. I didn't write it, just trying to reduce the amount of custom patches the Yocto project carries. If it's rejected, I'm ok with that. Here's the original: https://git.yoctoproject.org/poky/tree/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-without-opengl-or-es.patch and here the commit that added it: https://git.yoctoproject.org/poky/commit/?id=e736b200a0129747d35f1f8e4b406b9215937baf 1889946 8 echassiers.09-regards 2022-08-09 01:41:14 -0700 Anyway, thanks for your patch, which is really helpful for porting recent versions of WebKitGTK to macOS. 1889970 9 mcatanzaro 2022-08-09 06:05:24 -0700 (In reply to Don Olmstead from comment #3) > I don't think this is the right fix. These files shouldn't be included at > all if coordinated graphics isnt enabled. This is slightly annoying to do, because you can't add conditionals to Sources.txt to control what gets compiled. It's easier to guard the entire files with #if USE(COORDINATED_GRAPHICS). But of course we don't want USE(COORDINATED_GRAPHICS) guards in the middle of a file with CoordinatedGraphics in its name. Does USE(COORDINATED_GRAPHICS) depends on OpenGL? If so, we need to talk to Carlos Garcia about either reverting the change from bug #195094 or, more likely, removing the public build option. 1896715 10 fujii 2022-09-07 03:29:11 -0700 *** This bug has been marked as a duplicate of bug 244811 *** 443790 2021-11-10 02:53:41 -0800 2022-02-16 12:44:08 -0800 Patch bug-232934-20211110115340.patch text/plain 7932 alex.kanavin U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFiODk4ZmQ3NDFmYWQwZmQ4 NzIxMGQxNGQ2MzdmZWE0NzJmOTBlMDAuLjg1ZTk2ZjYyZWUzMjQ2MWY5MzEwNjk5MTRiZjQyYmZi NzU3OTk2MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMjEtMTEtMTAgIEFsZXhhbmRl ciBLYW5hdmluICA8YWxleEBsaW51dHJvbml4LmRlPgorCisgICAgICAgIEZpeCBidWlsZCB3aXRo b3V0IG9wZW5nbC1vci1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMyOTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKworKiBmaXggYnVpbGQgZmFpbHVyZSB3 aGVuIG9wZW5nbC1vci1lcyBpcyBkaXNhYmxlZDoKKyAgSW4gZmlsZSBpbmNsdWRlZCBmcm9tIC9P RS9idWlsZC9vZS1jb3JlL3RtcC1nbGliYy93b3JrL2NvcmUyLTY0LW9lLWxpbnV4L3dlYmtpdGd0 ay8yLjM0LjAtcjAvd2Via2l0Z3RrLTIuMzQuMC9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0xheWVyVHJlZUhvc3QuY3BwOjMwLAorICAgICAgICAg ICAgICAgICAgIGZyb20gL09FL2J1aWxkL29lLWNvcmUvdG1wLWdsaWJjL3dvcmsvY29yZTItNjQt b2UtbGludXgvd2Via2l0Z3RrLzIuMzQuMC1yMC9idWlsZC9EZXJpdmVkU291cmNlcy9XZWJLaXQv dW5pZmllZC1zb3VyY2VzL1VuaWZpZWRTb3VyY2UtNTQ5MjhhMmItMzYuY3BwOjE6CisgIC9PRS9i dWlsZC9vZS1jb3JlL3RtcC1nbGliYy93b3JrL2NvcmUyLTY0LW9lLWxpbnV4L3dlYmtpdGd0ay8y LjM0LjAtcjAvd2Via2l0Z3RrLTIuMzQuMC9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9Db29yZGluYXRlZEdyYXBoaWNzL0xheWVyVHJlZUhvc3QuaDo0MToxMDogZmF0YWwgZXJyb3I6 IFdlYkNvcmUvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmg6IE5vIHN1Y2ggZmlsZSBvciBkaXJl Y3RvcnkKKyAgICAgNDEgfCAjaW5jbHVkZSA8V2ViQ29yZS9Db29yZGluYXRlZEdyYXBoaWNzTGF5 ZXIuaD4KKyAgICAgICAgfCAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn4KKyAgY29tcGlsYXRpb24gdGVybWluYXRlZC4KKworKiB0aGUgQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyLmggaGVhZGVyIGluc3RhbGxhdGlvbiBpcyBjb250cm9sZWQgYnkKKyAgVVNFX0NP T1JESU5BVEVEX0dSQVBISUNTIGluIHdlYmtpdGd0ay0yLjM0LjAvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vVGV4dHVyZU1hcHBlci5jbWFrZQorICBidXQgaW4gU291cmNlL2NtYWtlL09wdGlvbnNH VEsuY21ha2UgVVNFX0NPT1JESU5BVEVEX0dSQVBISUNTIHdhcyBlbmFibGVkIG9ubHkgaW5zaWRl CisgIGlmIChVU0VfT1BFTkdMX09SX0VTKQorCisKKworICAgICAgICAqIFVJUHJvY2Vzcy9Db29y ZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhUHJveHlDb29yZGluYXRlZEdyYXBoaWNzLmNwcDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5nQXJlYVByb3h5 Q29vcmRpbmF0ZWRHcmFwaGljcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9Db29y ZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5jcHA6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFD b29yZGluYXRlZEdyYXBoaWNzLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvTGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVy VHJlZUhvc3Q6OmxheWVyRmx1c2hUaW1lckZpcmVkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9MYXllclRyZWVIb3N0Lmg6CisKIDIwMjEtMDktMjEg IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuc3VyZSB0aGF0 IGNhcHR1cmUgYXR0cmlidXRpb24gd29ya3MgZXZlbiBmb3IgVVJMUyB3aXRob3V0IGhvc3RuYW1l cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGlj cy9EcmF3aW5nQXJlYVByb3h5Q29vcmRpbmF0ZWRHcmFwaGljcy5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhUHJveHlDb29yZGluYXRl ZEdyYXBoaWNzLmNwcAppbmRleCAwMzhkOWVlMmY0MWNkZWJhNGFlN2I1OTczMTFiNjYzYTU4YjZk NjI5Li41ZTgyOGExMDFjMDMyMWE4NzFiODY0ODA1YWQ4N2MxNTg4MjcxYjAxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVh UHJveHlDb29yZGluYXRlZEdyYXBoaWNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhUHJveHlDb29yZGluYXRlZEdyYXBoaWNz LmNwcApAQCAtMTUyLDcgKzE1Miw3IEBAIHZvaWQgRHJhd2luZ0FyZWFQcm94eUNvb3JkaW5hdGVk R3JhcGhpY3M6OnNldEJhY2tpbmdTdG9yZUlzRGlzY2FyZGFibGUoYm9vbCBpc0JhCiAjZW5kaWYK IH0KIAotI2lmIFBMQVRGT1JNKEdUSykKKyNpZiBQTEFURk9STShHVEspICYmIFVTRShDT09SRElO QVRFRF9HUkFQSElDUykKIHZvaWQgRHJhd2luZ0FyZWFQcm94eUNvb3JkaW5hdGVkR3JhcGhpY3M6 OmFkanVzdFRyYW5zaWVudFpvb20oZG91YmxlIHNjYWxlLCBGbG9hdFBvaW50IG9yaWdpbikKIHsK ICAgICBzZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6QWRqdXN0VHJhbnNpZW50Wm9vbShzY2Fs ZSwgb3JpZ2luKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db29yZGlu YXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhUHJveHlDb29yZGluYXRlZEdyYXBoaWNzLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdpbmdBcmVhUHJveHlD b29yZGluYXRlZEdyYXBoaWNzLmgKaW5kZXggYjIzYTQ1ZmY3ZDMxMzMxN2Q4YmE2NGZiNDMwZWJi YTNiNmFkZWY3MS4uY2QyNjM0MDI3NTQ0ZDllNjE1Y2ZiMGFjMzk2MmZmYmI5N2MxM2JmYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3 aW5nQXJlYVByb3h5Q29vcmRpbmF0ZWRHcmFwaGljcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFQcm94eUNvb3JkaW5hdGVkR3Jh cGhpY3MuaApAQCAtNTcsNyArNTcsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgd2FpdEZvckJhY2tp bmdTdG9yZVVwZGF0ZU9uTmV4dFBhaW50KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzZXRCYWNraW5n U3RvcmVJc0Rpc2NhcmRhYmxlKGJvb2wpIG92ZXJyaWRlOwogCi0jaWYgUExBVEZPUk0oR1RLKQor I2lmIFBMQVRGT1JNKEdUSykgJiYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogICAgIHZvaWQg YWRqdXN0VHJhbnNpZW50Wm9vbShkb3VibGUgc2NhbGUsIFdlYkNvcmU6OkZsb2F0UG9pbnQgb3Jp Z2luKSBvdmVycmlkZTsKICAgICB2b2lkIGNvbW1pdFRyYW5zaWVudFpvb20oZG91YmxlIHNjYWxl LCBXZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbikgb3ZlcnJpZGU7CiAjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv RHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdy YXBoaWNzLmNwcAppbmRleCAzM2FjMmUxZDc2MzEwNWI4MjQ0MmFiMzRmNWJjMzU0MDY0MDdiZDg5 Li40MjM3NTc4NDhlZjMwODFhYzlhZWU3NzEwYmQxZDU2YWYwNDkwYmY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0RyYXdp bmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3Jh cGhpY3MuY3BwCkBAIC00ODYsNyArNDg2LDcgQEAgdm9pZCBEcmF3aW5nQXJlYUNvb3JkaW5hdGVk R3JhcGhpY3M6OmRpZFVwZGF0ZSgpCiAgICAgZGlzcGxheVRpbWVyRmlyZWQoKTsKIH0KIAotI2lm IFBMQVRGT1JNKEdUSykKKyNpZiBQTEFURk9STShHVEspICYmIFVTRShDT09SRElOQVRFRF9HUkFQ SElDUykKIHZvaWQgRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzOjphZGp1c3RUcmFuc2ll bnRab29tKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2ludCBvcmlnaW4pCiB7CiAgICAgaWYgKCFtX3Ry YW5zaWVudFpvb20pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzLmgg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Ry YXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5oCmluZGV4IGQ4ZGM2ZGY3ZDRkMmFjNmFlN2U5 ZWVmZmI4YmFhZGVmODU5MGNiMTYuLmM4MzIyMzY0MjBjZWQ3ZTE1MDU0ZTljY2M2NDlhODU1Nzhh YTllMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzLmgKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5n QXJlYUNvb3JkaW5hdGVkR3JhcGhpY3MuaApAQCAtODQsNyArODQsNyBAQCBwcml2YXRlOgogICAg IHZvaWQgdXBkYXRlQmFja2luZ1N0b3JlU3RhdGUodWludDY0X3QgYmFja2luZ1N0b3JlU3RhdGVJ RCwgYm9vbCByZXNwb25kSW1tZWRpYXRlbHksIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25z dCBXZWJDb3JlOjpJbnRTaXplJiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0 KSBvdmVycmlkZTsKICAgICB2b2lkIGRpZFVwZGF0ZSgpIG92ZXJyaWRlOwogCi0jaWYgUExBVEZP Uk0oR1RLKQorI2lmIFBMQVRGT1JNKEdUSykgJiYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQog ICAgIHZvaWQgYWRqdXN0VHJhbnNpZW50Wm9vbShkb3VibGUgc2NhbGUsIFdlYkNvcmU6OkZsb2F0 UG9pbnQgb3JpZ2luKSBvdmVycmlkZTsKICAgICB2b2lkIGNvbW1pdFRyYW5zaWVudFpvb20oZG91 YmxlIHNjYWxlLCBXZWJDb3JlOjpGbG9hdFBvaW50IG9yaWdpbikgb3ZlcnJpZGU7CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVk R3JhcGhpY3MvTGF5ZXJUcmVlSG9zdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0xheWVyVHJlZUhvc3QuY3BwCmluZGV4IGYzMzA0ZDEw ZjcyODEyODY1MmMzMzQyNjU1OGU0ZGM0ZjZiNjU5YjUuLmNhMDQ3NmZmOGEwMzk1NTE5ZmIzMmRh MDUzZTE1MTlkNGM5NTc4NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvTGF5ZXJUcmVlSG9zdC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9MYXllclRyZWVI b3N0LmNwcApAQCAtMTU2LDcgKzE1Niw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdDo6bGF5ZXJGbHVz aFRpbWVyRmlyZWQoKQogCiAgICAgYm9vbCBkaWRTeW5jID0gbV9jb29yZGluYXRvci5mbHVzaFBl bmRpbmdMYXllckNoYW5nZXMoZmxhZ3MpOwogCi0jaWYgUExBVEZPUk0oR1RLKQorI2lmIFBMQVRG T1JNKEdUSykgJiYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogICAgIC8vIElmIHdlIGhhdmUg YW4gYWN0aXZlIHRyYW5zaWVudCB6b29tLCB3ZSB3YW50IHRoZSB6b29tIHRvIHdpbiBvdmVyIGFu eSBjaGFuZ2VzCiAgICAgLy8gdGhhdCBXZWJDb3JlIG1ha2VzIHRvIHRoZSByZWxldmFudCBsYXll cnMsIHNvIHJlLWFwcGx5IG91ciBjaGFuZ2VzIGFmdGVyIGZsdXNoaW5nLgogICAgIGlmIChtX3Ry YW5zaWVudFpvb20pCkBAIC00NTMsNyArNDUzLDcgQEAgdm9pZCBMYXllclRyZWVIb3N0OjpyZW5k ZXJOZXh0RnJhbWUoYm9vbCBmb3JjZVJlcGFpbnQpCiAgICAgfQogfQogCi0jaWYgUExBVEZPUk0o R1RLKQorI2lmIFBMQVRGT1JNKEdUSykgJiYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogRmxv YXRQb2ludCBMYXllclRyZWVIb3N0Ojpjb25zdHJhaW5UcmFuc2llbnRab29tT3JpZ2luKGRvdWJs ZSBzY2FsZSwgRmxvYXRQb2ludCBvcmlnaW4pIGNvbnN0CiB7CiAgICAgRnJhbWVWaWV3JiBmcmFt ZVZpZXcgPSAqbV93ZWJQYWdlLm1haW5GcmFtZVZpZXcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvTGF5ZXJUcmVlSG9z dC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9MYXllclRyZWVIb3N0LmgKaW5kZXggNGY3MjdlNDE4YjA4MmVlYmU4NjcxMTI5NGJiMGYyNmY5 Yzc0ZDdkMS4uYjA3MDI2NmU5YTZkNDZlOWU0OTc5YmU4MTgyMmQ5MWNlMTIwMzA1ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9MYXllclRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv Q29vcmRpbmF0ZWRHcmFwaGljcy9MYXllclRyZWVIb3N0LmgKQEAgLTM3LDcgKzM3LDcgQEAKICNp bmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25TZXQuaD4KICNpbmNs dWRlIDx3dGYvUnVuTG9vcC5oPgotI2lmIFBMQVRGT1JNKEdUSykKKyNpZiBQTEFURk9STShHVEsp ICYmIFVTRShDT09SRElOQVRFRF9HUkFQSElDUykKICNpbmNsdWRlIDxXZWJDb3JlL0Nvb3JkaW5h dGVkR3JhcGhpY3NMYXllci5oPgogI2VuZGlmCiAKQEAgLTEwMCw3ICsxMDAsNyBAQCBwdWJsaWM6 CiAKICAgICBXZWJDb3JlOjpQbGF0Zm9ybURpc3BsYXlJRCBkaXNwbGF5SUQoKSBjb25zdCB7IHJl dHVybiBtX2Rpc3BsYXlJRDsgfQogCi0jaWYgUExBVEZPUk0oR1RLKQorI2lmIFBMQVRGT1JNKEdU SykgJiYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQogICAgIHZvaWQgYWRqdXN0VHJhbnNpZW50 Wm9vbShkb3VibGUsIFdlYkNvcmU6OkZsb2F0UG9pbnQpOwogICAgIHZvaWQgY29tbWl0VHJhbnNp ZW50Wm9vbShkb3VibGUsIFdlYkNvcmU6OkZsb2F0UG9pbnQpOwogI2VuZGlmCkBAIC0yMTMsNyAr MjEzLDcgQEAgcHJpdmF0ZToKICNlbmRpZiAvLyBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCiAg ICAgV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5SUQgbV9kaXNwbGF5SUQ7CiAKLSNpZiBQTEFURk9S TShHVEspCisjaWYgUExBVEZPUk0oR1RLKSAmJiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCiAg ICAgYm9vbCBtX3RyYW5zaWVudFpvb20geyBmYWxzZSB9OwogICAgIGRvdWJsZSBtX3RyYW5zaWVu dFpvb21TY2FsZSB7IDEgfTsKICAgICBXZWJDb3JlOjpGbG9hdFBvaW50IG1fdHJhbnNpZW50Wm9v bU9yaWdpbjsK