43424 2010-08-03 09:09:10 -0700 [GTK] Remove a memory leak from CusorGtk.cpp 2010-08-03 10:02:53 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 259494 0 mrobinson 2010-08-03 09:09:10 -0700 In r64526, I inadvertently introduced a memory leak into CursorGtk.cpp, by rereffing GdkCursors via GRefPtr. This bug tracks the removal of that memory leak. 259509 1 63342 mrobinson 2010-08-03 09:42:44 -0700 Created attachment 63342 Remove the memory leak 259521 2 mrobinson 2010-08-03 10:02:53 -0700 Committed r64561: <http://trac.webkit.org/changeset/64561> 63342 2010-08-03 09:42:44 -0700 2010-08-03 09:58:09 -0700 Remove the memory leak bug-43424-20100803094243.patch text/plain 6768 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmY5N2ExMjYyZGMzN2NiODNiYzUzYzU3NjE1ZGNhYmJkMWNiMDM0OC4uNTNiNzgzYmRhMWE4MDc5 N2Y4Y2FhNzI2Njk4OGEzNGI0MTRkZDc5ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOC0wMyAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUmVtb3ZlIGEgbWVtb3J5IGxlYWsg ZnJvbSBDdXNvckd0ay5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQzNDI0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU5hbWVkQ3Vyc29yKToKKyAgICAgICAgKFdlYkNvcmU6 OmNyZWF0ZUN1c3RvbUN1cnNvcik6CisgICAgICAgIChXZWJDb3JlOjpDdXJzb3I6OmVuc3VyZVBs YXRmb3JtQ3Vyc29yKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvS2V5RXZlbnRHdGsuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6a2V5SWRlbnRpZmllckZvckdka0tleUNvZGUpOgorCiAyMDEwLTA4 LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5v dCByZXZpZXdlZDogc3BlY3VsYXRpdmUgY2hyb21pdW0gdGVzdHMgZml4LgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0N1cnNvckd0ay5jcHAKaW5kZXggMDUwZGIwYzM2MTFiMjE4NWE0NDZjZTgzNTgzNmRmYjg4NWFl ODQ0Zi4uNmE1YmY4ZTE1YTAwNGNlMTJhZmFjOGUzYjVkMmM0NWU2MmQ3YjA2NCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2d0ay9DdXJzb3JHdGsuY3BwCkBAIC0zNyw3ICszNyw3IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotc3RhdGljIEdka0N1cnNvciogY3JlYXRlTmFtZWRDdXJzb3IoQ3VzdG9tQ3Vyc29y VHlwZSBjdXJzb3JUeXBlKQorc3RhdGljIEdSZWZQdHI8R2RrQ3Vyc29yPiBjcmVhdGVOYW1lZEN1 cnNvcihDdXN0b21DdXJzb3JUeXBlIGN1cnNvclR5cGUpCiB7CiAgICAgQ3VzdG9tQ3Vyc29yIGN1 cnNvciA9IEN1c3RvbUN1cnNvcnNbY3Vyc29yVHlwZV07CiAgICAgR2RrQ3Vyc29yKiBjID0gZ2Rr X2N1cnNvcl9uZXdfZnJvbV9uYW1lKGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCksIGN1cnNvci5u YW1lKTsKQEAgLTQ4LDE0ICs0OCwxNCBAQCBzdGF0aWMgR2RrQ3Vyc29yKiBjcmVhdGVOYW1lZEN1 cnNvcihDdXN0b21DdXJzb3JUeXBlIGN1cnNvclR5cGUpCiAgICAgY29uc3QgR2RrQ29sb3IgYmcg PSB7IDY1NTM1LCA2NTUzNSwgNjU1MzUsIDY1NTM1IH07CiAgICAgR1JlZlB0cjxHZGtQaXhtYXA+ IHNvdXJjZSA9IGFkb3B0R1JlZihnZGtfYml0bWFwX2NyZWF0ZV9mcm9tX2RhdGEoMCwgY3Vyc29y LmJpdHMsIDMyLCAzMikpOwogICAgIEdSZWZQdHI8R2RrUGl4bWFwPiBtYXNrID0gYWRvcHRHUmVm KGdka19iaXRtYXBfY3JlYXRlX2Zyb21fZGF0YSgwLCBjdXJzb3IubWFza19iaXRzLCAzMiwgMzIp KTsKLSAgICByZXR1cm4gZ2RrX2N1cnNvcl9uZXdfZnJvbV9waXhtYXAoc291cmNlLmdldCgpLCBt YXNrLmdldCgpLCAmZmcsICZiZywgY3Vyc29yLmhvdF94LCBjdXJzb3IuaG90X3kpOworICAgIHJl dHVybiBhZG9wdEdSZWYoZ2RrX2N1cnNvcl9uZXdfZnJvbV9waXhtYXAoc291cmNlLmdldCgpLCBt YXNrLmdldCgpLCAmZmcsICZiZywgY3Vyc29yLmhvdF94LCBjdXJzb3IuaG90X3kpKTsKIH0KIAot c3RhdGljIEdka0N1cnNvciogY3JlYXRlQ3VzdG9tQ3Vyc29yKEltYWdlKiBpbWFnZSwgY29uc3Qg SW50UG9pbnQmIGhvdFNwb3QpCitzdGF0aWMgR1JlZlB0cjxHZGtDdXJzb3I+IGNyZWF0ZUN1c3Rv bUN1cnNvcihJbWFnZSogaW1hZ2UsIGNvbnN0IEludFBvaW50JiBob3RTcG90KQogewogICAgIElu dFBvaW50IGVmZmVjdGl2ZUhvdFNwb3QgPSBkZXRlcm1pbmVIb3RTcG90KGltYWdlLCBob3RTcG90 KTsKICAgICBHUmVmUHRyPEdka1BpeGJ1Zj4gcGl4YnVmID0gYWRvcHRHUmVmKGltYWdlLT5nZXRH ZGtQaXhidWYoKSk7Ci0gICAgcmV0dXJuIGdka19jdXJzb3JfbmV3X2Zyb21fcGl4YnVmKGdka19k aXNwbGF5X2dldF9kZWZhdWx0KCksIHBpeGJ1Zi5nZXQoKSwgZWZmZWN0aXZlSG90U3BvdC54KCks IGVmZmVjdGl2ZUhvdFNwb3QueSgpKTsKKyAgICByZXR1cm4gYWRvcHRHUmVmKGdka19jdXJzb3Jf bmV3X2Zyb21fcGl4YnVmKGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCksIHBpeGJ1Zi5nZXQoKSwg ZWZmZWN0aXZlSG90U3BvdC54KCksIGVmZmVjdGl2ZUhvdFNwb3QueSgpKSk7CiB9CiAKIHZvaWQg Q3Vyc29yOjplbnN1cmVQbGF0Zm9ybUN1cnNvcigpIGNvbnN0CkBAIC02OSw3NyArNjksNzcgQEAg dm9pZCBDdXJzb3I6OmVuc3VyZVBsYXRmb3JtQ3Vyc29yKCkgY29uc3QKICAgICAgICAgbV9wbGF0 Zm9ybUN1cnNvciA9IDA7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpDcm9zczoK LSAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGdka19jdXJzb3JfbmV3KEdES19DUk9TUyk7Cisg ICAgICAgIG1fcGxhdGZvcm1DdXJzb3IgPSBhZG9wdEdSZWYoZ2RrX2N1cnNvcl9uZXcoR0RLX0NS T1NTKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpIYW5kOgotICAgICAgICBt X3BsYXRmb3JtQ3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RLX0hBTkQyKTsKKyAgICAgICAgbV9w bGF0Zm9ybUN1cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vyc29yX25ldyhHREtfSEFORDIpKTsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBDdXJzb3I6OklCZWFtOgotICAgICAgICBtX3BsYXRmb3Jt Q3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RLX1hURVJNKTsKKyAgICAgICAgbV9wbGF0Zm9ybUN1 cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vyc29yX25ldyhHREtfWFRFUk0pKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBDdXJzb3I6OldhaXQ6Ci0gICAgICAgIG1fcGxhdGZvcm1DdXJzb3IgPSBn ZGtfY3Vyc29yX25ldyhHREtfV0FUQ0gpOworICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gYWRv cHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19XQVRDSCkpOwogICAgICAgICBicmVhazsKICAgICBj YXNlIEN1cnNvcjo6SGVscDoKLSAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGdka19jdXJzb3Jf bmV3KEdES19RVUVTVElPTl9BUlJPVyk7CisgICAgICAgIG1fcGxhdGZvcm1DdXJzb3IgPSBhZG9w dEdSZWYoZ2RrX2N1cnNvcl9uZXcoR0RLX1FVRVNUSU9OX0FSUk9XKSk7CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgQ3Vyc29yOjpNb3ZlOgogICAgIGNhc2UgQ3Vyc29yOjpNaWRkbGVQYW5uaW5n OgotICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RLX0ZMRVVSKTsK KyAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vyc29yX25ldyhHREtf RkxFVVIpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDdXJzb3I6OkVhc3RSZXNpemU6CiAg ICAgY2FzZSBDdXJzb3I6OkVhc3RQYW5uaW5nOgotICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0g Z2RrX2N1cnNvcl9uZXcoR0RLX1JJR0hUX1NJREUpOworICAgICAgICBtX3BsYXRmb3JtQ3Vyc29y ID0gYWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19SSUdIVF9TSURFKSk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpOb3J0aFJlc2l6ZToKICAgICBjYXNlIEN1cnNvcjo6Tm9y dGhQYW5uaW5nOgotICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RL X1RPUF9TSURFKTsKKyAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vy c29yX25ldyhHREtfVE9QX1NJREUpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDdXJzb3I6 Ok5vcnRoRWFzdFJlc2l6ZToKICAgICBjYXNlIEN1cnNvcjo6Tm9ydGhFYXN0UGFubmluZzoKLSAg ICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGdka19jdXJzb3JfbmV3KEdES19MRUZUX1NJREUpOwor ICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gYWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19M RUZUX1NJREUpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDdXJzb3I6Ok5vcnRoV2VzdFJl c2l6ZToKICAgICBjYXNlIEN1cnNvcjo6Tm9ydGhXZXN0UGFubmluZzoKLSAgICAgICAgbV9wbGF0 Zm9ybUN1cnNvciA9IGdka19jdXJzb3JfbmV3KEdES19UT1BfTEVGVF9DT1JORVIpOworICAgICAg ICBtX3BsYXRmb3JtQ3Vyc29yID0gYWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19UT1BfTEVG VF9DT1JORVIpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDdXJzb3I6OlNvdXRoUmVzaXpl OgogICAgIGNhc2UgQ3Vyc29yOjpTb3V0aFBhbm5pbmc6Ci0gICAgICAgIG1fcGxhdGZvcm1DdXJz b3IgPSBnZGtfY3Vyc29yX25ldyhHREtfQk9UVE9NX1NJREUpOworICAgICAgICBtX3BsYXRmb3Jt Q3Vyc29yID0gYWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19CT1RUT01fU0lERSkpOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIEN1cnNvcjo6U291dGhFYXN0UmVzaXplOgogICAgIGNhc2Ug Q3Vyc29yOjpTb3V0aEVhc3RQYW5uaW5nOgotICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gZ2Rr X2N1cnNvcl9uZXcoR0RLX0JPVFRPTV9SSUdIVF9DT1JORVIpOworICAgICAgICBtX3BsYXRmb3Jt Q3Vyc29yID0gYWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19CT1RUT01fUklHSFRfQ09STkVS KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpTb3V0aFdlc3RSZXNpemU6CiAg ICAgY2FzZSBDdXJzb3I6OlNvdXRoV2VzdFBhbm5pbmc6Ci0gICAgICAgIG1fcGxhdGZvcm1DdXJz b3IgPSBnZGtfY3Vyc29yX25ldyhHREtfQk9UVE9NX0xFRlRfQ09STkVSKTsKKyAgICAgICAgbV9w bGF0Zm9ybUN1cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vyc29yX25ldyhHREtfQk9UVE9NX0xFRlRf Q09STkVSKSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpXZXN0UmVzaXplOgot ICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RLX0xFRlRfU0lERSk7 CisgICAgICAgIG1fcGxhdGZvcm1DdXJzb3IgPSBhZG9wdEdSZWYoZ2RrX2N1cnNvcl9uZXcoR0RL X0xFRlRfU0lERSkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEN1cnNvcjo6Tm9ydGhTb3V0 aFJlc2l6ZToKLSAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGdka19jdXJzb3JfbmV3KEdES19U T1BfVEVFKTsKKyAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vyc29y X25ldyhHREtfVE9QX1RFRSkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEN1cnNvcjo6RWFz dFdlc3RSZXNpemU6CiAgICAgY2FzZSBDdXJzb3I6Oldlc3RQYW5uaW5nOgotICAgICAgICBtX3Bs YXRmb3JtQ3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RLX0xFRlRfU0lERSk7CisgICAgICAgIG1f cGxhdGZvcm1DdXJzb3IgPSBhZG9wdEdSZWYoZ2RrX2N1cnNvcl9uZXcoR0RLX0xFRlRfU0lERSkp OwogICAgICAgICBicmVhazsKICAgICBjYXNlIEN1cnNvcjo6Tm9ydGhFYXN0U291dGhXZXN0UmVz aXplOgogICAgIGNhc2UgQ3Vyc29yOjpOb3J0aFdlc3RTb3V0aEVhc3RSZXNpemU6Ci0gICAgICAg IG1fcGxhdGZvcm1DdXJzb3IgPSBnZGtfY3Vyc29yX25ldyhHREtfU0laSU5HKTsKKyAgICAgICAg bV9wbGF0Zm9ybUN1cnNvciA9IGFkb3B0R1JlZihnZGtfY3Vyc29yX25ldyhHREtfU0laSU5HKSk7 CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpDb2x1bW5SZXNpemU6Ci0gICAgICAg IG1fcGxhdGZvcm1DdXJzb3IgPSBnZGtfY3Vyc29yX25ldyhHREtfU0JfSF9ET1VCTEVfQVJST1cp OworICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gYWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdE S19TQl9IX0RPVUJMRV9BUlJPVykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEN1cnNvcjo6 Um93UmVzaXplOgotICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0gZ2RrX2N1cnNvcl9uZXcoR0RL X1NCX1ZfRE9VQkxFX0FSUk9XKTsKKyAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGFkb3B0R1Jl ZihnZGtfY3Vyc29yX25ldyhHREtfU0JfVl9ET1VCTEVfQVJST1cpKTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBDdXJzb3I6OlZlcnRpY2FsVGV4dDoKICAgICAgICAgbV9wbGF0Zm9ybUN1cnNv ciA9IGNyZWF0ZU5hbWVkQ3Vyc29yKEN1c3RvbUN1cnNvclZlcnRpY2FsVGV4dCk7CiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgQ3Vyc29yOjpDZWxsOgotICAgICAgICBtX3BsYXRmb3JtQ3Vyc29y ID0gZ2RrX2N1cnNvcl9uZXcoR0RLX1BMVVMpOworICAgICAgICBtX3BsYXRmb3JtQ3Vyc29yID0g YWRvcHRHUmVmKGdka19jdXJzb3JfbmV3KEdES19QTFVTKSk7CiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgQ3Vyc29yOjpDb250ZXh0TWVudToKICAgICAgICAgbV9wbGF0Zm9ybUN1cnNvciA9IGNy ZWF0ZU5hbWVkQ3Vyc29yKEN1c3RvbUN1cnNvckNvbnRleHRNZW51KTsK