144909 2015-05-12 06:19:29 -0700 [EGL][X11] XPixmap created in GLContextEGL::createPixmapContext() is leaked 2015-05-12 23:19:56 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned yoon zan oldest_to_newest 1094140 0 cgarcia 2015-05-12 06:19:29 -0700 The pixmap is created and passed to eglCreatePixmapSurface(), but never released. eglCreatePixmapSurface() doesn't take the ownership of the pixmap, so we should explicitly free it when the GLContextEGL is destroyed. 1094142 1 252959 cgarcia 2015-05-12 06:23:24 -0700 Created attachment 252959 Patch 1094143 2 252959 svillar 2015-05-12 06:30:33 -0700 Comment on attachment 252959 Patch Makes total sense to me. 1094241 3 252959 zan 2015-05-12 12:50:52 -0700 Comment on attachment 252959 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252959&action=review > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:66 > + static EGLint attributeList[] = { This is a bit unusual, since in the project we don't normally modify static data (apart from initialization steps). > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:220 > +GLContextEGL::GLContextEGL(EGLContext context, EGLSurface surface, XUniquePixmap&& pixmap) This constructor should be guarded with PLATFORM(X11). > Source/WebCore/platform/graphics/egl/GLContextEGL.h:42 > + GLContextEGL(EGLContext, EGLSurface, XUniquePixmap&&); Ditto for the PLATFORM(X11) guards. 1094424 4 cgarcia 2015-05-12 23:16:25 -0700 (In reply to comment #3) > Comment on attachment 252959 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=252959&action=review > > > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:66 > > + static EGLint attributeList[] = { > > This is a bit unusual, since in the project we don't normally modify static > data (apart from initialization steps). Ok, it's also a bit unrelated to this patch anyway. > > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:220 > > +GLContextEGL::GLContextEGL(EGLContext context, EGLSurface surface, XUniquePixmap&& pixmap) > > This constructor should be guarded with PLATFORM(X11). Right! > > Source/WebCore/platform/graphics/egl/GLContextEGL.h:42 > > + GLContextEGL(EGLContext, EGLSurface, XUniquePixmap&&); > > Ditto for the PLATFORM(X11) guards. Sure. 1094425 5 cgarcia 2015-05-12 23:19:56 -0700 Committed r184273: <http://trac.webkit.org/changeset/184273> 252959 2015-05-12 06:23:24 -0700 2015-05-12 06:30:33 -0700 Patch egl-pixmap-leak.diff text/plain 6134 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjZWIwZGZiLi4zMzVjNDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTUtMDUtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtFR0xdW1gxMV0gWFBpeG1hcCBjcmVhdGVkIGluIEdMQ29udGV4dEVHTDo6 Y3JlYXRlUGl4bWFwQ29udGV4dCgpIGlzIGxlYWtlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0OTA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBpeG1hcCBpcyBjcmVhdGVkIGFuZCBwYXNzZWQg dG8gZWdsQ3JlYXRlUGl4bWFwU3VyZmFjZSgpLCBidXQKKyAgICAgICAgbmV2ZXIgcmVsZWFzZWQu IGVnbENyZWF0ZVBpeG1hcFN1cmZhY2UoKSBkb2Vzbid0IHRha2UgdGhlCisgICAgICAgIG93bmVy c2hpcCBvZiB0aGUgcGl4bWFwLCBzbyB3ZSBzaG91bGQgZXhwbGljaXRseSBmcmVlIGl0IHdoZW4g dGhlCisgICAgICAgIEdMQ29udGV4dEVHTCBpcyBkZXN0cm95ZWQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omdl dEVHTENvbmZpZyk6IE1ha2UgdGhlIGF0dHJpYnV0ZXMgbGlzdCBzdGF0aWMuCisgICAgICAgIChX ZWJDb3JlOjpHTENvbnRleHRFR0w6OmNyZWF0ZVBpeG1hcENvbnRleHQpOiBVc2UgWFVuaXF1ZVBp eG1hcAorICAgICAgICBhbmQgdHJhbnNmZXIgdGhlIG93bmVyc2hpcCB0byB0aGUgY29udGV4dCBi eSB1c2luZyB0aGUgbmV3CisgICAgICAgIGNvbnN0cnVjdG9yIHRoYXQgcmVjZWl2ZXMgYSBYVW5p cXVlUGl4bWFwJiYuCisgICAgICAgIChXZWJDb3JlOjpHTENvbnRleHRFR0w6OmNyZWF0ZUNvbnRl eHQpOiBjcmVhdGVQaXhtYXBDb250ZXh0KCkgaXMKKyAgICAgICAgbm93IG9ubHkgZGVmaW5lZCBm b3IgWDExLgorICAgICAgICAoV2ViQ29yZTo6R0xDb250ZXh0RUdMOjpHTENvbnRleHRFR0wpOiBO ZXcgY29uc3RydWN0b3IgdGhhdAorICAgICAgICByZWNlaXZlcyBhIFhVbmlxdWVQaXhtYXAmJi4K KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmg6IEFkZCBuZXcg Y29uc3RydWN0b3IgYW5kCisgICAgICAgIGluaXRpYWxpemUgdGhlIGNhaXJvIGRldmljZSB3aGVu IGRlZmluZWQgdG8gc2ltcGxpZnkgY29uc3RydWN0b3JzLgorCiAyMDE1LTA1LTA4ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbWDExXSBBZGQg WFVuaXF1ZVB0ciBhbmQgWFVuaXF1ZVJlc291cmNlIHRvIGF1dG9tYXRpY2FsbHkgZnJlZSBYIHJl c291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWds L0dMQ29udGV4dEVHTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wv R0xDb250ZXh0RUdMLmNwcAppbmRleCAwZDE1NGM3Li41NTE1ODI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcApAQCAt NjMsNyArNjMsNyBAQCBzdGF0aWMgY29uc3QgRUdMaW50IGdDb250ZXh0QXR0cmlidXRlc1tdID0g ewogCiBzdGF0aWMgYm9vbCBnZXRFR0xDb25maWcoRUdMQ29uZmlnKiBjb25maWcsIEdMQ29udGV4 dEVHTDo6RUdMU3VyZmFjZVR5cGUgc3VyZmFjZVR5cGUpCiB7Ci0gICAgRUdMaW50IGF0dHJpYnV0 ZUxpc3RbXSA9IHsKKyAgICBzdGF0aWMgRUdMaW50IGF0dHJpYnV0ZUxpc3RbXSA9IHsKICNpZiBV U0UoT1BFTkdMX0VTXzIpCiAgICAgICAgIEVHTF9SRU5ERVJBQkxFX1RZUEUsIEVHTF9PUEVOR0xf RVMyX0JJVCwKICNlbHNlCkBAIC0xNDMsOSArMTQzLDkgQEAgc3RkOjp1bmlxdWVfcHRyPEdMQ29u dGV4dEVHTD4gR0xDb250ZXh0RUdMOjpjcmVhdGVQYnVmZmVyQ29udGV4dChFR0xDb250ZXh0IHNo YXIKICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxHTENvbnRleHRFR0w+KGNvbnRleHQsIHN1 cmZhY2UsIFBidWZmZXJTdXJmYWNlKTsKIH0KIAorI2lmIFBMQVRGT1JNKFgxMSkKIHN0ZDo6dW5p cXVlX3B0cjxHTENvbnRleHRFR0w+IEdMQ29udGV4dEVHTDo6Y3JlYXRlUGl4bWFwQ29udGV4dChF R0xDb250ZXh0IHNoYXJpbmdDb250ZXh0KQogewotI2lmIFBMQVRGT1JNKFgxMSkKICAgICBFR0xE aXNwbGF5IGRpc3BsYXkgPSBzaGFyZWRFR0xEaXNwbGF5KCk7CiAgICAgaWYgKGRpc3BsYXkgPT0g RUdMX05PX0RJU1BMQVkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwpAQCAtMTY1LDI1ICsxNjUs MjEgQEAgc3RkOjp1bmlxdWVfcHRyPEdMQ29udGV4dEVHTD4gR0xDb250ZXh0RUdMOjpjcmVhdGVQ aXhtYXBDb250ZXh0KEVHTENvbnRleHQgc2hhcmkKICAgICB9CiAKICAgICBEaXNwbGF5KiB4MTFE aXNwbGF5ID0gZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDExPihQbGF0Zm9ybURpc3BsYXk6OnNo YXJlZERpc3BsYXkoKSkubmF0aXZlKCk7Ci0gICAgUGl4bWFwIHBpeG1hcCA9IFhDcmVhdGVQaXht YXAoeDExRGlzcGxheSwgRGVmYXVsdFJvb3RXaW5kb3coeDExRGlzcGxheSksIDEsIDEsIGRlcHRo KTsKKyAgICBYVW5pcXVlUGl4bWFwIHBpeG1hcCA9IFhDcmVhdGVQaXhtYXAoeDExRGlzcGxheSwg RGVmYXVsdFJvb3RXaW5kb3coeDExRGlzcGxheSksIDEsIDEsIGRlcHRoKTsKICAgICBpZiAoIXBp eG1hcCkgewogICAgICAgICBlZ2xEZXN0cm95Q29udGV4dChkaXNwbGF5LCBjb250ZXh0KTsKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgRUdMU3VyZmFjZSBzdXJmYWNlID0g ZWdsQ3JlYXRlUGl4bWFwU3VyZmFjZShkaXNwbGF5LCBjb25maWcsIHBpeG1hcCwgMCk7Ci0KKyAg ICBFR0xTdXJmYWNlIHN1cmZhY2UgPSBlZ2xDcmVhdGVQaXhtYXBTdXJmYWNlKGRpc3BsYXksIGNv bmZpZywgcGl4bWFwLmdldCgpLCAwKTsKICAgICBpZiAoc3VyZmFjZSA9PSBFR0xfTk9fU1VSRkFD RSkgewotICAgICAgICBYRnJlZVBpeG1hcCh4MTFEaXNwbGF5LCBwaXhtYXApOwogICAgICAgICBl Z2xEZXN0cm95Q29udGV4dChkaXNwbGF5LCBjb250ZXh0KTsKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAgICAgfQogCi0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8R0xDb250ZXh0RUdMPihj b250ZXh0LCBzdXJmYWNlLCBQaXhtYXBTdXJmYWNlKTsKLSNlbHNlCi0gICAgcmV0dXJuIG51bGxw dHI7Ci0jZW5kaWYKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxHTENvbnRleHRFR0w+KGNv bnRleHQsIHN1cmZhY2UsIFdURjo6bW92ZShwaXhtYXApKTsKIH0KKyNlbmRpZiAvLyBQTEFURk9S TShYMTEpCiAKIHN0ZDo6dW5pcXVlX3B0cjxHTENvbnRleHRFR0w+IEdMQ29udGV4dEVHTDo6Y3Jl YXRlQ29udGV4dChFR0xOYXRpdmVXaW5kb3dUeXBlIHdpbmRvdywgR0xDb250ZXh0KiBzaGFyaW5n Q29udGV4dCkKIHsKQEAgLTIwMywxMiArMTk5LDEzIEBAIHN0ZDo6dW5pcXVlX3B0cjxHTENvbnRl eHRFR0w+IEdMQ29udGV4dEVHTDo6Y3JlYXRlQ29udGV4dChFR0xOYXRpdmVXaW5kb3dUeXBlIHdp CiAKICAgICBFR0xDb250ZXh0IGVnbFNoYXJpbmdDb250ZXh0ID0gc2hhcmluZ0NvbnRleHQgPyBz dGF0aWNfY2FzdDxHTENvbnRleHRFR0wqPihzaGFyaW5nQ29udGV4dCktPm1fY29udGV4dCA6IDA7 CiAgICAgYXV0byBjb250ZXh0ID0gd2luZG93ID8gY3JlYXRlV2luZG93Q29udGV4dCh3aW5kb3cs IHNoYXJpbmdDb250ZXh0KSA6IG51bGxwdHI7CisjaWYgUExBVEZPUk0oWDExKQogICAgIGlmICgh Y29udGV4dCkKICAgICAgICAgY29udGV4dCA9IGNyZWF0ZVBpeG1hcENvbnRleHQoZWdsU2hhcmlu Z0NvbnRleHQpOwotCisjZW5kaWYKICAgICBpZiAoIWNvbnRleHQpCiAgICAgICAgIGNvbnRleHQg PSBjcmVhdGVQYnVmZmVyQ29udGV4dChlZ2xTaGFyaW5nQ29udGV4dCk7Ci0gICAgCisKICAgICBy ZXR1cm4gV1RGOjptb3ZlKGNvbnRleHQpOwogfQogCkBAIC0yMTYsOSArMjEzLDE1IEBAIEdMQ29u dGV4dEVHTDo6R0xDb250ZXh0RUdMKEVHTENvbnRleHQgY29udGV4dCwgRUdMU3VyZmFjZSBzdXJm YWNlLCBFR0xTdXJmYWNlVHlwCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fc3Vy ZmFjZShzdXJmYWNlKQogICAgICwgbV90eXBlKHR5cGUpCi0jaWYgVVNFKENBSVJPKQotICAgICwg bV9jYWlyb0RldmljZSgwKQotI2VuZGlmCit7CisgICAgQVNTRVJUKHR5cGUgIT0gUGl4bWFwU3Vy ZmFjZSk7Cit9CisKK0dMQ29udGV4dEVHTDo6R0xDb250ZXh0RUdMKEVHTENvbnRleHQgY29udGV4 dCwgRUdMU3VyZmFjZSBzdXJmYWNlLCBYVW5pcXVlUGl4bWFwJiYgcGl4bWFwKQorICAgIDogbV9j b250ZXh0KGNvbnRleHQpCisgICAgLCBtX3N1cmZhY2Uoc3VyZmFjZSkKKyAgICAsIG1fdHlwZShQ aXhtYXBTdXJmYWNlKQorICAgICwgbV9waXhtYXAoV1RGOjptb3ZlKHBpeG1hcCkpCiB7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9HTENvbnRl eHRFR0wuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9HTENvbnRleHRF R0wuaAppbmRleCA1M2M5OGNkLi4zOTY5NGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5oCkBAIC0yMyw5ICsyMywxMiBAQAog I2lmIFVTRShFR0wpCiAKICNpbmNsdWRlICJHTENvbnRleHQuaCIKLQogI2luY2x1ZGUgPEVHTC9l Z2wuaD4KIAorI2lmIFBMQVRGT1JNKFgxMSkKKyNpbmNsdWRlICJYVW5pcXVlUmVzb3VyY2UuaCIK KyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEdMQ29udGV4dEVHTCA6IHB1 YmxpYyBHTENvbnRleHQgewpAQCAtMzYsNiArMzksNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHN0 ZDo6dW5pcXVlX3B0cjxHTENvbnRleHRFR0w+IGNyZWF0ZVdpbmRvd0NvbnRleHQoRUdMTmF0aXZl V2luZG93VHlwZSwgR0xDb250ZXh0KiBzaGFyaW5nQ29udGV4dCk7CiAKICAgICBHTENvbnRleHRF R0woRUdMQ29udGV4dCwgRUdMU3VyZmFjZSwgRUdMU3VyZmFjZVR5cGUpOworICAgIEdMQ29udGV4 dEVHTChFR0xDb250ZXh0LCBFR0xTdXJmYWNlLCBYVW5pcXVlUGl4bWFwJiYpOwogICAgIHZpcnR1 YWwgfkdMQ29udGV4dEVHTCgpOwogICAgIHZpcnR1YWwgYm9vbCBtYWtlQ29udGV4dEN1cnJlbnQo KTsKICAgICB2aXJ0dWFsIHZvaWQgc3dhcEJ1ZmZlcnMoKTsKQEAgLTUzLDcgKzU3LDkgQEAgcHVi bGljOgogCiBwcml2YXRlOgogICAgIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8R0xDb250ZXh0RUdM PiBjcmVhdGVQYnVmZmVyQ29udGV4dChFR0xDb250ZXh0IHNoYXJpbmdDb250ZXh0KTsKKyNpZiBQ TEFURk9STShYMTEpCiAgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxHTENvbnRleHRFR0w+IGNy ZWF0ZVBpeG1hcENvbnRleHQoRUdMQ29udGV4dCBzaGFyaW5nQ29udGV4dCk7CisjZW5kaWYKIAog ICAgIHN0YXRpYyB2b2lkIGFkZEFjdGl2ZUNvbnRleHQoR0xDb250ZXh0RUdMKik7CiAgICAgc3Rh dGljIHZvaWQgY2xlYW51cFNoYXJlZEVHTERpc3BsYXkodm9pZCk7CkBAIC02MSw4ICs2NywxMSBA QCBwcml2YXRlOgogICAgIEVHTENvbnRleHQgbV9jb250ZXh0OwogICAgIEVHTFN1cmZhY2UgbV9z dXJmYWNlOwogICAgIEVHTFN1cmZhY2VUeXBlIG1fdHlwZTsKKyNpZiBQTEFURk9STShYMTEpCisg ICAgWFVuaXF1ZVBpeG1hcCBtX3BpeG1hcDsKKyNlbmRpZgogI2lmIFVTRShDQUlSTykKLSAgICBj YWlyb19kZXZpY2VfdCogbV9jYWlyb0RldmljZTsKKyAgICBjYWlyb19kZXZpY2VfdCogbV9jYWly b0RldmljZSB7IG51bGxwdHIgfTsKICNlbmRpZgogfTsKIAo=