163333 2016-10-12 08:59:58 -0700 Prefer eglGetPlatformDisplay to eglGetDisplay 2016-10-20 09:00:53 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 161958 1 ajax webkit-unassigned bugs-noreply cgarcia clopez commit-queue mcatanzaro tpopela oldest_to_newest 1239293 0 291358 ajax 2016-10-12 08:59:58 -0700 Created attachment 291358 eglGetPlatformDisplay.patch eglGetDisplay forces the implementation to guess what kind of void* it's been handed. Different implementations do different things, in particular glvnd and Mesa behave differently. Fortunately there exists API to tell EGL what kind of display it is, so let's use it. Patch is against webkitgtk since that's where I hit this first. Probably this should be made a single utility function somewhere instead, but I don't know the webkit source well enough to know where to put it. 1239676 1 291358 mcatanzaro 2016-10-12 21:14:08 -0700 Comment on attachment 291358 eglGetPlatformDisplay.patch View in context: https://bugs.webkit.org/attachment.cgi?id=291358&action=review Hi, thanks for the patch. A couple of comments on submitting patches to WebKit in general: * Be sure to select the WebKit Gtk Bugzilla component, or us Linux folks may not notice your patch for a very long time. I found this by luck, because I happened to check the Fedora git repo to see if Tom had packaged 2.14.1 yet. :) * Also be sure to set the r? and cq? Bugzilla flags for patches if you want them to be reviewed or committed. * The patch requires a changelog entry ('Tools/Scripts/PrepareChangeLog -b 291358'). * The patch must be prepared against a git checkout rather than a release tarball. * Easiest way to submit the patch is to use 'Tools/Scripts/webkit-patch upload --request-commit', it will pick the bug number automatically from your changelog entry 'webkit-patch upload' would have warned you about dozens of code style errors, including: * The pointer star always goes on the type, not the variable name. "const char* client_extensions" rather than "const char *client_extensions" * No space before opening parentheses in function calls. "eglQueryString(" not "eglQueryString (" * Use nullptr rather than NULL * Use C++ casts, never C style casts. Prefer static_cast and use reinterpret_cast when that fails. * Always indent four spaces, no tabs. As for how to deduplicate the code, I think the best option would be to use a protected static function in PlatformDisplay. The child class would pass either EGL_PLATFORM_WAYLAND_KHR or EGL_PLATFORM_X11_KHR and get back a value that can be assigned to m_eglDisplay. Lastly, we have another open bug #161958 about how strstr is not the correct way to check for EGL extensions; seems like now would be a good time to tighten that up. > webkitgtk-2.14.0/Source/WebCore/platform/graphics/egl/GLContextEGL.h:27 > +#include <EGL/eglext.h> Is this an accident? You don't change anything else in this file, so I presume this include was meant to be added to PlatformDisplayWayland.cpp instead. It's important to minimize the number of include statements in header files since they can dramatically increase build time. 1239679 2 mcatanzaro 2016-10-12 21:19:44 -0700 (In reply to comment #1) > * The patch requires a changelog entry ('Tools/Scripts/PrepareChangeLog -b > 291358'). Whoops, it's late, that's supposed to be the bug number (163333) not the attachment number. 1242333 3 292171 cgarcia 2016-10-20 05:13:29 -0700 Created attachment 292171 Patch for landing 1242340 4 292171 commit-queue 2016-10-20 06:20:53 -0700 Comment on attachment 292171 Patch for landing Clearing flags on attachment: 292171 Committed r207616: <http://trac.webkit.org/changeset/207616> 1242341 5 commit-queue 2016-10-20 06:20:56 -0700 All reviewed patches have been landed. Closing bug. 1242413 6 clopez 2016-10-20 09:00:16 -0700 Committed r207619: <http://trac.webkit.org/changeset/207619> 1242414 7 ossy 2016-10-20 09:00:53 -0700 (In reply to comment #4) > Comment on attachment 292171 [details] > Patch for landing > > Clearing flags on attachment: 292171 > > Committed r207616: <http://trac.webkit.org/changeset/207616> It broke the GTK build, see build.webkit.org for details. It would be great to have same config on EWS and buildbots. 291358 2016-10-12 08:59:58 -0700 2016-10-20 05:13:29 -0700 eglGetPlatformDisplay.patch eglGetPlatformDisplay.patch text/plain 3658 ajax ZGlmZiAtdXAgd2Via2l0Z3RrLTIuMTQuMC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9lZ2wvR0xDb250ZXh0RUdMLmguanggd2Via2l0Z3RrLTIuMTQuMC9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmgKLS0tIHdlYmtpdGd0ay0yLjE0LjAv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5oLmp4CTIw MTYtMDktMTkgMDg6MTg6MDYuMDAwMDAwMDAwIC0wNDAwCisrKyB3ZWJraXRndGstMi4xNC4wL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9HTENvbnRleHRFR0wuaAkyMDE2LTEw LTExIDE4OjQ1OjQ4LjQ5NzMyMDk0NSAtMDQwMApAQCAtMjQsNiArMjQsNyBAQAogCiAjaW5jbHVk ZSAiR0xDb250ZXh0LmgiCiAjaW5jbHVkZSA8RUdML2VnbC5oPgorI2luY2x1ZGUgPEVHTC9lZ2xl eHQuaD4KIAogI2lmIFBMQVRGT1JNKFgxMSkKICNpbmNsdWRlICJYVW5pcXVlUmVzb3VyY2UuaCIK ZGlmZiAtdXAgd2Via2l0Z3RrLTIuMTQuMC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwLmp4IHdlYmtpdGd0ay0yLjE0LjAv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlX YXlsYW5kLmNwcAotLS0gd2Via2l0Z3RrLTIuMTQuMC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwLmp4CTIwMTYtMDktMTkg MDg6MTg6MDYuMDAwMDAwMDAwIC0wNDAwCisrKyB3ZWJraXRndGstMi4xNC4wL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dheWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAJ MjAxNi0xMC0xMSAxODo0NTo0OC40OTczMjA5NDUgLTA0MDAKQEAgLTYyLDcgKzYyLDI2IEBAIHZv aWQgUGxhdGZvcm1EaXNwbGF5V2F5bGFuZDo6aW5pdGlhbGl6ZSgKICAgICB3bF9yZWdpc3RyeV9h ZGRfbGlzdGVuZXIobV9yZWdpc3RyeS5nZXQoKSwgJnNfcmVnaXN0cnlMaXN0ZW5lciwgdGhpcyk7 CiAgICAgd2xfZGlzcGxheV9yb3VuZHRyaXAobV9kaXNwbGF5KTsKIAotICAgIG1fZWdsRGlzcGxh eSA9IGVnbEdldERpc3BsYXkobV9kaXNwbGF5KTsKKyAgICBjb25zdCBjaGFyICpjbGllbnRfZXh0 ZW5zaW9ucyA9IGVnbFF1ZXJ5U3RyaW5nIChOVUxMLCBFR0xfRVhURU5TSU9OUyk7CisKKyAgICBp ZiAoc3Ryc3RyIChjbGllbnRfZXh0ZW5zaW9ucywgIkVHTF9LSFJfcGxhdGZvcm1fYmFzZSIpKSB7 CisJUEZORUdMR0VUUExBVEZPUk1ESVNQTEFZRVhUUFJPQyBnZXRfcGxhdGZvcm1fZGlzcGxheSA9 CisJICAgICAoUEZORUdMR0VUUExBVEZPUk1ESVNQTEFZRVhUUFJPQykgZWdsR2V0UHJvY0FkZHJl c3MgKCJlZ2xHZXRQbGF0Zm9ybURpc3BsYXkiKTsKKworCWlmIChnZXRfcGxhdGZvcm1fZGlzcGxh eSkKKwkgICAgIG1fZWdsRGlzcGxheSA9IGdldF9wbGF0Zm9ybV9kaXNwbGF5IChFR0xfUExBVEZP Uk1fV0FZTEFORF9LSFIsCisJCQkJCQkgIG1fZGlzcGxheSwgTlVMTCk7CisgICAgfSBlbHNlIGlm IChzdHJzdHIgKGNsaWVudF9leHRlbnNpb25zLCAiRUdMX0VYVF9wbGF0Zm9ybV9iYXNlIikpIHsK KwlQRk5FR0xHRVRQTEFURk9STURJU1BMQVlFWFRQUk9DIGdldF9wbGF0Zm9ybV9kaXNwbGF5ID0K KwkgICAgIChQRk5FR0xHRVRQTEFURk9STURJU1BMQVlFWFRQUk9DKSBlZ2xHZXRQcm9jQWRkcmVz cyAoImVnbEdldFBsYXRmb3JtRGlzcGxheUVYVCIpOworCisJaWYgKGdldF9wbGF0Zm9ybV9kaXNw bGF5KQorCSAgICAgbV9lZ2xEaXNwbGF5ID0gZ2V0X3BsYXRmb3JtX2Rpc3BsYXkgKEVHTF9QTEFU Rk9STV9XQVlMQU5EX0tIUiwKKwkJCQkJCSAgbV9kaXNwbGF5LCBOVUxMKTsKKyAgICB9IGVsc2Ug eworCW1fZWdsRGlzcGxheSA9IGVnbEdldERpc3BsYXkgKChFR0xOYXRpdmVEaXNwbGF5VHlwZSkg bV9kaXNwbGF5KTsKKyAgICB9CisKICAgICBQbGF0Zm9ybURpc3BsYXk6OmluaXRpYWxpemVFR0xE aXNwbGF5KCk7CiB9CiAKZGlmZiAtdXAgd2Via2l0Z3RrLTIuMTQuMC9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy94MTEvUGxhdGZvcm1EaXNwbGF5WDExLmNwcC5qeCB3ZWJraXRndGst Mi4xNC4wL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3Bs YXlYMTEuY3BwCi0tLSB3ZWJraXRndGstMi4xNC4wL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwLmp4CTIwMTYtMDktMTkgMDg6MTg6MDYu MDAwMDAwMDAwIC0wNDAwCisrKyB3ZWJraXRndGstMi4xNC4wL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwCTIwMTYtMTAtMTEgMTg6NDY6 MDcuNTAxNjI3Mzc4IC0wNDAwCkBAIC0zNSw2ICszNSw3IEBACiAKICNpZiBVU0UoRUdMKQogI2lu Y2x1ZGUgPEVHTC9lZ2wuaD4KKyNpbmNsdWRlIDxFR0wvZWdsZXh0Lmg+CiAjaW5jbHVkZSA8RUdM L2VnbHBsYXRmb3JtLmg+CiAjZW5kaWYKIApAQCAtNjgsNyArNjksMjYgQEAgUGxhdGZvcm1EaXNw bGF5WDExOjp+UGxhdGZvcm1EaXNwbGF5WDExKAogI2lmIFVTRShFR0wpCiB2b2lkIFBsYXRmb3Jt RGlzcGxheVgxMTo6aW5pdGlhbGl6ZUVHTERpc3BsYXkoKQogewotICAgIG1fZWdsRGlzcGxheSA9 IGVnbEdldERpc3BsYXkobV9kaXNwbGF5KTsKKyAgICBjb25zdCBjaGFyICpjbGllbnRfZXh0ZW5z aW9ucyA9IGVnbFF1ZXJ5U3RyaW5nIChOVUxMLCBFR0xfRVhURU5TSU9OUyk7CisKKyAgICBpZiAo c3Ryc3RyIChjbGllbnRfZXh0ZW5zaW9ucywgIkVHTF9LSFJfcGxhdGZvcm1fYmFzZSIpKSB7CisJ UEZORUdMR0VUUExBVEZPUk1ESVNQTEFZRVhUUFJPQyBnZXRfcGxhdGZvcm1fZGlzcGxheSA9CisJ ICAgICAoUEZORUdMR0VUUExBVEZPUk1ESVNQTEFZRVhUUFJPQykgZWdsR2V0UHJvY0FkZHJlc3Mg KCJlZ2xHZXRQbGF0Zm9ybURpc3BsYXkiKTsKKworCWlmIChnZXRfcGxhdGZvcm1fZGlzcGxheSkK KwkgICAgIG1fZWdsRGlzcGxheSA9IGdldF9wbGF0Zm9ybV9kaXNwbGF5IChFR0xfUExBVEZPUk1f WDExX0tIUiwKKwkJCQkJCSAgbV9kaXNwbGF5LCBOVUxMKTsKKyAgICB9IGVsc2UgaWYgKHN0cnN0 ciAoY2xpZW50X2V4dGVuc2lvbnMsICJFR0xfRVhUX3BsYXRmb3JtX2Jhc2UiKSkgeworCVBGTkVH TEdFVFBMQVRGT1JNRElTUExBWUVYVFBST0MgZ2V0X3BsYXRmb3JtX2Rpc3BsYXkgPQorCSAgICAg KFBGTkVHTEdFVFBMQVRGT1JNRElTUExBWUVYVFBST0MpIGVnbEdldFByb2NBZGRyZXNzICgiZWds R2V0UGxhdGZvcm1EaXNwbGF5RVhUIik7CisKKwlpZiAoZ2V0X3BsYXRmb3JtX2Rpc3BsYXkpCisJ ICAgICBtX2VnbERpc3BsYXkgPSBnZXRfcGxhdGZvcm1fZGlzcGxheSAoRUdMX1BMQVRGT1JNX1gx MV9LSFIsCisJCQkJCQkgIG1fZGlzcGxheSwgTlVMTCk7CisgICAgfSBlbHNlIHsKKwltX2VnbERp c3BsYXkgPSBlZ2xHZXREaXNwbGF5ICgoRUdMTmF0aXZlRGlzcGxheVR5cGUpIG1fZGlzcGxheSk7 CisgICAgfQorCiAgICAgUGxhdGZvcm1EaXNwbGF5Ojppbml0aWFsaXplRUdMRGlzcGxheSgpOwog fQogI2VuZGlmCg== 292171 2016-10-20 05:13:29 -0700 2016-10-20 06:20:53 -0700 Patch for landing egl-platform-display.diff text/plain 4034 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YjgzN2UzLi5jZDc3MWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTYtMTAtMjAgIEFkYW0gSmFja3NvbiAgPGFqYXhAcmVkaGF0LmNvbT4KKworICAgICAg ICBQcmVmZXIgZWdsR2V0UGxhdGZvcm1EaXNwbGF5IHRvIGVnbEdldERpc3BsYXkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MzMzMworCisgICAgICAg IFJldmlld2VkIGJ5IENhcmxvcyBHYXJjaWEgQ2FtcG9zLgorCisgICAgICAgIGVnbEdldERpc3Bs YXkgZm9yY2VzIHRoZSBpbXBsZW1lbnRhdGlvbiB0byBndWVzcyB3aGF0IGtpbmQgb2Ygdm9pZCog aXQncyBiZWVuIGhhbmRlZC4gRGlmZmVyZW50IGltcGxlbWVudGF0aW9ucworICAgICAgICBkbyBk aWZmZXJlbnQgdGhpbmdzLCBpbiBwYXJ0aWN1bGFyIGdsdm5kIGFuZCBNZXNhIGJlaGF2ZSBkaWZm ZXJlbnRseS4gRm9ydHVuYXRlbHkgdGhlcmUgZXhpc3RzIEFQSSB0byB0ZWxsIEVHTAorICAgICAg ICB3aGF0IGtpbmQgb2YgZGlzcGxheSBpdCBpcywgc28gbGV0J3MgdXNlIGl0LgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtRGlzcGxheVdheWxhbmQ6OmluaXRpYWxpemUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1EaXNwbGF5WDExOjppbml0aWFsaXplRUdMRGlzcGxh eSk6CisKIDIwMTYtMTAtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIEF2b2lkIGluY2x1ZGluZyBlZ2wuaCBoZWFkZXJzIGluIGlu dGVybmFsIGhlYWRlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dheWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93YXlsYW5kL1BsYXRmb3JtRGlzcGxheVdheWxhbmQuY3BwCmluZGV4 IDZjNTAwNGEuLjNkYjAyYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dheWxhbmQvUGxhdGZvcm1EaXNwbGF5V2F5bGFuZC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2F5bGFuZC9QbGF0Zm9ybURpc3BsYXlXYXlsYW5kLmNw cApAQCAtMzQsNiArMzQsNyBAQAogLy8gYW5kIGVnbC5oIGNoZWNrcyB0aGF0IHRvIGRlY2lkZSB3 aGV0aGVyIGl0J3MgV2F5bGFuZCBwbGF0Zm9ybS4KICNpbmNsdWRlIDx3YXlsYW5kLWVnbC5oPgog I2luY2x1ZGUgPEVHTC9lZ2wuaD4KKyNpbmNsdWRlIDxFR0wvZWdsZXh0Lmg+CiAjaW5jbHVkZSA8 d3RmL0Fzc2VydGlvbnMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjUsNyArNjYsMTYg QEAgdm9pZCBQbGF0Zm9ybURpc3BsYXlXYXlsYW5kOjppbml0aWFsaXplKHdsX2Rpc3BsYXkqIGRp c3BsYXkpCiAgICAgd2xfcmVnaXN0cnlfYWRkX2xpc3RlbmVyKG1fcmVnaXN0cnkuZ2V0KCksICZz X3JlZ2lzdHJ5TGlzdGVuZXIsIHRoaXMpOwogICAgIHdsX2Rpc3BsYXlfcm91bmR0cmlwKG1fZGlz cGxheSk7CiAKLSAgICBtX2VnbERpc3BsYXkgPSBlZ2xHZXREaXNwbGF5KG1fZGlzcGxheSk7Cisg ICAgY29uc3QgY2hhciogZXh0ZW5zaW9ucyA9IGVnbFF1ZXJ5U3RyaW5nKG51bGxwdHIsIEVHTF9F WFRFTlNJT05TKTsKKyAgICBpZiAoR0xDb250ZXh0Ojppc0V4dGVuc2lvblN1cHBvcnRlZChleHRl bnNpb25zLCAiRUdMX0tIUl9wbGF0Zm9ybV9iYXNlIikpIHsKKyAgICAgICAgaWYgKGF1dG8qIGdl dFBsYXRmb3JtRGlzcGxheSA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZORUdMR0VUUExBVEZPUk1ESVNQ TEFZRVhUUFJPQz4oZWdsR2V0UHJvY0FkZHJlc3MoImVnbEdldFBsYXRmb3JtRGlzcGxheSIpKSkK KyAgICAgICAgICAgIG1fZWdsRGlzcGxheSA9IGdldFBsYXRmb3JtRGlzcGxheShFR0xfUExBVEZP Uk1fV0FZTEFORF9LSFIsIG1fZGlzcGxheSwgbnVsbHB0cik7CisgICAgfSBlbHNlIGlmIChHTENv bnRleHQ6OmlzRXh0ZW5zaW9uU3VwcG9ydGVkKGV4dGVuc2lvbnMsICJFR0xfRVhUX3BsYXRmb3Jt X2Jhc2UiKSkgeworICAgICAgICBpZiAoYXV0byogZ2V0UGxhdGZvcm1EaXNwbGF5ID0gcmVpbnRl cnByZXRfY2FzdDxQRk5FR0xHRVRQTEFURk9STURJU1BMQVlFWFRQUk9DPihlZ2xHZXRQcm9jQWRk cmVzcygiZWdsR2V0UGxhdGZvcm1EaXNwbGF5RVhUIikpKQorICAgICAgICAgICAgbV9lZ2xEaXNw bGF5ID0gZ2V0UGxhdGZvcm1EaXNwbGF5KEVHTF9QTEFURk9STV9XQVlMQU5EX0tIUiwgbV9kaXNw bGF5LCBudWxscHRyKTsKKyAgICB9IGVsc2UKKyAgICAgICAgbV9lZ2xEaXNwbGF5ID0gZWdsR2V0 RGlzcGxheShtX2Rpc3BsYXkpOworCiAgICAgUGxhdGZvcm1EaXNwbGF5Ojppbml0aWFsaXplRUdM RGlzcGxheSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy94MTEvUGxhdGZvcm1EaXNwbGF5WDExLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwCmluZGV4IDFhYjg1NmIuLjA1NDM4 YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gxMS9QbGF0 Zm9ybURpc3BsYXlYMTEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwCkBAIC0zNyw2ICszNyw3IEBACiAKICNpZiBVU0Uo RUdMKQogI2luY2x1ZGUgPEVHTC9lZ2wuaD4KKyNpbmNsdWRlIDxFR0wvZWdsZXh0Lmg+CiAjZW5k aWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjQsNyArNjUsMTYgQEAgUGxhdGZvcm1EaXNw bGF5WDExOjp+UGxhdGZvcm1EaXNwbGF5WDExKCkKICNpZiBVU0UoRUdMKQogdm9pZCBQbGF0Zm9y bURpc3BsYXlYMTE6OmluaXRpYWxpemVFR0xEaXNwbGF5KCkKIHsKLSAgICBtX2VnbERpc3BsYXkg PSBlZ2xHZXREaXNwbGF5KG1fZGlzcGxheSk7CisgICAgY29uc3QgY2hhciogZXh0ZW5zaW9ucyA9 IGVnbFF1ZXJ5U3RyaW5nKG51bGxwdHIsIEVHTF9FWFRFTlNJT05TKTsKKyAgICBpZiAoR0xDb250 ZXh0Ojppc0V4dGVuc2lvblN1cHBvcnRlZChleHRlbnNpb25zLCAiRUdMX0tIUl9wbGF0Zm9ybV9i YXNlIikpIHsKKyAgICAgICAgaWYgKGF1dG8qIGdldFBsYXRmb3JtRGlzcGxheSA9IHJlaW50ZXJw cmV0X2Nhc3Q8UEZORUdMR0VUUExBVEZPUk1ESVNQTEFZRVhUUFJPQz4oZWdsR2V0UHJvY0FkZHJl c3MoImVnbEdldFBsYXRmb3JtRGlzcGxheSIpKSkKKyAgICAgICAgICAgIG1fZWdsRGlzcGxheSA9 IGdldFBsYXRmb3JtRGlzcGxheShFR0xfUExBVEZPUk1fWDExX0tIUiwgbV9kaXNwbGF5LCBudWxs cHRyKTsKKyAgICB9IGVsc2UgaWYgKEdMQ29udGV4dDo6aXNFeHRlbnNpb25TdXBwb3J0ZWQoZXh0 ZW5zaW9ucywgIkVHTF9FWFRfcGxhdGZvcm1fYmFzZSIpKSB7CisgICAgICAgIGlmIChhdXRvKiBn ZXRQbGF0Zm9ybURpc3BsYXkgPSByZWludGVycHJldF9jYXN0PFBGTkVHTEdFVFBMQVRGT1JNRElT UExBWUVYVFBST0M+KGVnbEdldFByb2NBZGRyZXNzKCJlZ2xHZXRQbGF0Zm9ybURpc3BsYXlFWFQi KSkpCisgICAgICAgICAgICBtX2VnbERpc3BsYXkgPSBnZXRQbGF0Zm9ybURpc3BsYXkoRUdMX1BM QVRGT1JNX1gxMV9LSFIsIG1fZGlzcGxheSwgbnVsbHB0cik7CisgICAgfSBlbHNlCisgICAgICAg IG1fZWdsRGlzcGxheSA9IGVnbEdldERpc3BsYXkobV9kaXNwbGF5KTsKKwogICAgIFBsYXRmb3Jt RGlzcGxheTo6aW5pdGlhbGl6ZUVHTERpc3BsYXkoKTsKIH0KICNlbmRpZgo=