36980 2010-04-01 14:03:49 -0700 Add object addresses to debug showLayerTree() output. 2010-04-01 16:46:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser darin oldest_to_newest 207392 0 simon.fraser 2010-04-01 14:03:49 -0700 It would be useful if showLayerTree() when called from gdb showed the object addresses. 207401 1 52334 simon.fraser 2010-04-01 14:18:46 -0700 Created attachment 52334 Patch 207467 2 52334 darin 2010-04-01 16:16:39 -0700 Comment on attachment 52334 Patch > + if (behavior & RenderAsTextShowAddresses) > + ts << " " << static_cast<const void*>(&o); What happens if you don't do the static_cast? Does it fail to compile? Can you leave the cast out? r=me 207490 3 simon.fraser 2010-04-01 16:46:20 -0700 I was able to remove the casts! http://trac.webkit.org/changeset/56948 52334 2010-04-01 14:18:46 -0700 2010-04-01 16:16:39 -0700 Patch bug-36980-20100401141845.patch text/plain 7449 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODhmNmU3Ny4uMGMxYWMxMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNC0wMSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzY5ODAKKyAgICAgICAgQWRkIG9iamVjdCBhZGRyZXNzZXMgdG8gZGVidWcgc2hvd0xheWVy VHJlZSgpIG91dHB1dC4KKyAgICAgICAgCisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBwcmlu dCBSZW5kZXJMYXllciBhbmQgUmVuZGVyT2JqZWN0IGFkZHJlc3NlcyBpbiB0aGUgc2hvd0xheWVy VHJlZSgpCisgICAgICAgIG91dHB1dC4KKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvVGV4dFN0 cmVhbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0U3RyZWFtOjpvcGVyYXRvcjw8KToKKyAg ICAgICAgKiBwbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoc2hvd0xheWVyVHJlZSk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVSZW5k ZXJPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGUpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUcmVlQXNUZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDEwLTA0LTAx ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0U3Ry ZWFtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0U3RyZWFtLmNwcAppbmRleCBiYWFh OGI5Li40Mzg2MDU5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dFN0cmVh bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uY3BwCkBAIC05MCw3 ICs5MCw3IEBAIFRleHRTdHJlYW0mIFRleHRTdHJlYW06Om9wZXJhdG9yPDwoY29uc3QgY2hhciog c3RyaW5nKQogICAgIHJldHVybiAqdGhpczsKIH0KIAotVGV4dFN0cmVhbSYgVGV4dFN0cmVhbTo6 b3BlcmF0b3I8PCh2b2lkKiBwKQorVGV4dFN0cmVhbSYgVGV4dFN0cmVhbTo6b3BlcmF0b3I8PChj b25zdCB2b2lkKiBwKQogewogICAgIGNoYXIgYnVmZmVyW3ByaW50QnVmZmVyU2l6ZV07CiAgICAg c25wcmludGYoYnVmZmVyLCBzaXplb2YoYnVmZmVyKSAtIDEsICIlcCIsIHApOwpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uaCBiL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9UZXh0U3RyZWFtLmgKaW5kZXggZGZhYTA0OC4uZDY5ZTM0YiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L1RleHRTdHJlYW0uaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3Rl eHQvVGV4dFN0cmVhbS5oCkBAIC00Myw3ICs0Myw3IEBAIHB1YmxpYzoKICAgICBUZXh0U3RyZWFt JiBvcGVyYXRvcjw8KGZsb2F0KTsKICAgICBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KGRvdWJsZSk7 CiAgICAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChjb25zdCBjaGFyKik7Ci0gICAgVGV4dFN0cmVh bSYgb3BlcmF0b3I8PCh2b2lkKik7CisgICAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChjb25zdCB2 b2lkKik7CiAgICAgVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChjb25zdCBTdHJpbmcmKTsKICNpZiBP UyhXSU5ET1dTKSAmJiBQTEFURk9STShYODZfNjQpICYmIENPTVBJTEVSKE1TVkMpCiAgICAgVGV4 dFN0cmVhbSYgb3BlcmF0b3I8PCh1bnNpZ25lZCBfX2ludDY0KTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCBhNjBkYTI2Li43Y2NkYTI0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCkBAIC0zNTEzLDcgKzM1MTMsNyBAQCB2b2lkIHNob3dMYXllclRyZWUoY29uc3QgV2ViQ29y ZTo6UmVuZGVyTGF5ZXIqIGxheWVyKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoV2ViQ29y ZTo6RnJhbWUqIGZyYW1lID0gbGF5ZXItPnJlbmRlcmVyKCktPmRvY3VtZW50KCktPmZyYW1lKCkp IHsKLSAgICAgICAgV2ViQ29yZTo6U3RyaW5nIG91dHB1dCA9IGV4dGVybmFsUmVwcmVzZW50YXRp b24oZnJhbWUsIFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dBbGxMYXllcnMgfCBXZWJDb3JlOjpS ZW5kZXJBc1RleHRTaG93TGF5ZXJOZXN0aW5nIHwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0U2hvd0Nv bXBvc2l0ZWRMYXllcnMpOworICAgICAgICBXZWJDb3JlOjpTdHJpbmcgb3V0cHV0ID0gZXh0ZXJu YWxSZXByZXNlbnRhdGlvbihmcmFtZSwgV2ViQ29yZTo6UmVuZGVyQXNUZXh0U2hvd0FsbExheWVy cyB8IFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dMYXllck5lc3RpbmcgfCBXZWJDb3JlOjpSZW5k ZXJBc1RleHRTaG93Q29tcG9zaXRlZExheWVycyB8IFdlYkNvcmU6OlJlbmRlckFzVGV4dFNob3dB ZGRyZXNzZXMpOwogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzXG4iLCBvdXRwdXQudXRmOCgp LmRhdGEoKSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VHJlZUFzVGV4dC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcApp bmRleCBmZTNkNmE1Li4xY2M0OGVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUcmVlQXNUZXh0LmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmNwcApAQCAtMTc3LDEwICsxNzcsMTMgQEAgU3RyaW5nIHF1b3RlQW5kRXNjYXBlTm9uUHJpbnRh Ymxlcyhjb25zdCBTdHJpbmcmIHMpCiAgICAgcmV0dXJuIFN0cmluZzo6YWRvcHQocmVzdWx0KTsK IH0KIAotc3RhdGljIFRleHRTdHJlYW0gJm9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIGNvbnN0 IFJlbmRlck9iamVjdCYgbykKK3N0YXRpYyB2b2lkIHdyaXRlUmVuZGVyT2JqZWN0KFRleHRTdHJl YW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG8sIFJlbmRlckFzVGV4dEJlaGF2aW9yIGJlaGF2 aW9yKQogewogICAgIHRzIDw8IG8ucmVuZGVyTmFtZSgpOwogCisgICAgaWYgKGJlaGF2aW9yICYg UmVuZGVyQXNUZXh0U2hvd0FkZHJlc3NlcykKKyAgICAgICAgdHMgPDwgIiAiIDw8IHN0YXRpY19j YXN0PGNvbnN0IHZvaWQqPigmbyk7CisKICAgICBpZiAoby5zdHlsZSgpICYmIG8uc3R5bGUoKS0+ ekluZGV4KCkpCiAgICAgICAgIHRzIDw8ICIgekk6ICIgPDwgby5zdHlsZSgpLT56SW5kZXgoKTsK IApAQCAtMjUzLDcgKzI1Niw3IEBAIHN0YXRpYyBUZXh0U3RyZWFtICZvcGVyYXRvcjw8KFRleHRT dHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG8pCiAgICAgICAgICAgICB0cyA8PCAiIFt0 ZXh0U3Ryb2tlV2lkdGg9IiA8PCBvLnN0eWxlKCktPnRleHRTdHJva2VXaWR0aCgpIDw8ICJdIjsK IAogICAgICAgICBpZiAoIW8uaXNCb3hNb2RlbE9iamVjdCgpKQotICAgICAgICAgICAgcmV0dXJu IHRzOworICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGNvbnN0IFJlbmRlckJveE1vZGVs T2JqZWN0JiBib3ggPSAqdG9SZW5kZXJCb3hNb2RlbE9iamVjdCgmbyk7CiAgICAgICAgIGlmIChi b3guYm9yZGVyVG9wKCkgfHwgYm94LmJvcmRlclJpZ2h0KCkgfHwgYm94LmJvcmRlckJvdHRvbSgp IHx8IGJveC5ib3JkZXJMZWZ0KCkpIHsKQEAgLTM2Niw4ICszNjksNiBAQCBzdGF0aWMgVGV4dFN0 cmVhbSAmb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvKQog ICAgICAgICB9CiAgICAgfQogI2VuZGlmCi0KLSAgICByZXR1cm4gdHM7CiB9CiAKIHN0YXRpYyB2 b2lkIHdyaXRlVGV4dFJ1bihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyVGV4dCYgbywgY29u c3QgSW5saW5lVGV4dEJveCYgcnVuKQpAQCAtMzg3LDcgKzM4OCw3IEBAIHN0YXRpYyB2b2lkIHdy aXRlVGV4dFJ1bihUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyVGV4dCYgbywgY29uc3QgSW5s aW5lVGV4dEJvCiAgICAgICAgIDw8ICJcbiI7CiB9CiAKLXZvaWQgd3JpdGUoVGV4dFN0cmVhbSYg dHMsIGNvbnN0IFJlbmRlck9iamVjdCYgbywgaW50IGluZGVudCkKK3ZvaWQgd3JpdGUoVGV4dFN0 cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9iamVjdCYgbywgaW50IGluZGVudCwgUmVuZGVyQXNUZXh0 QmVoYXZpb3IgYmVoYXZpb3IpCiB7CiAjaWYgRU5BQkxFKFNWRykKICAgICBpZiAoby5pc1JlbmRl clBhdGgoKSkgewpAQCAtNDIxLDcgKzQyMiw4IEBAIHZvaWQgd3JpdGUoVGV4dFN0cmVhbSYgdHMs IGNvbnN0IFJlbmRlck9iamVjdCYgbywgaW50IGluZGVudCkKIAogICAgIHdyaXRlSW5kZW50KHRz LCBpbmRlbnQpOwogCi0gICAgdHMgPDwgbyA8PCAiXG4iOworICAgIHdyaXRlUmVuZGVyT2JqZWN0 KHRzLCBvLCBiZWhhdmlvcik7CisgICAgdHMgPDwgIlxuIjsKIAogICAgIGlmIChvLmlzVGV4dCgp ICYmICFvLmlzQlIoKSkgewogICAgICAgICBjb25zdCBSZW5kZXJUZXh0JiB0ZXh0ID0gKnRvUmVu ZGVyVGV4dCgmbyk7CkBAIC00MzQsNyArNDM2LDcgQEAgdm9pZCB3cml0ZShUZXh0U3RyZWFtJiB0 cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBpbnQgaW5kZW50KQogICAgIGZvciAoUmVuZGVyT2Jq ZWN0KiBjaGlsZCA9IG8uZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNp YmxpbmcoKSkgewogICAgICAgICBpZiAoY2hpbGQtPmhhc0xheWVyKCkpCiAgICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgd3JpdGUodHMsICpjaGlsZCwgaW5kZW50ICsgMSk7CisgICAgICAg IHdyaXRlKHRzLCAqY2hpbGQsIGluZGVudCArIDEsIGJlaGF2aW9yKTsKICAgICB9CiAKICAgICBp ZiAoby5pc1dpZGdldCgpKSB7CkBAIC00NDYsNyArNDQ4LDcgQEAgdm9pZCB3cml0ZShUZXh0U3Ry ZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBpbnQgaW5kZW50KQogICAgICAgICAgICAg ICAgIHZpZXctPmxheW91dCgpOwogICAgICAgICAgICAgICAgIFJlbmRlckxheWVyKiBsID0gcm9v dC0+bGF5ZXIoKTsKICAgICAgICAgICAgICAgICBpZiAobCkKLSAgICAgICAgICAgICAgICAgICAg d3JpdGVMYXllcnModHMsIGwsIGwsIEludFJlY3QobC0+eCgpLCBsLT55KCksIGwtPndpZHRoKCks IGwtPmhlaWdodCgpKSwgaW5kZW50ICsgMSk7CisgICAgICAgICAgICAgICAgICAgIHdyaXRlTGF5 ZXJzKHRzLCBsLCBsLCBJbnRSZWN0KGwtPngoKSwgbC0+eSgpLCBsLT53aWR0aCgpLCBsLT5oZWln aHQoKSksIGluZGVudCArIDEsIGJlaGF2aW9yKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgIH0KQEAgLTQ2NCw3ICs0NjYsMTIgQEAgc3RhdGljIHZvaWQgd3JpdGUoVGV4dFN0cmVhbSYg dHMsIFJlbmRlckxheWVyJiBsLAogewogICAgIHdyaXRlSW5kZW50KHRzLCBpbmRlbnQpOwogCi0g ICAgdHMgPDwgImxheWVyICIgPDwgbGF5ZXJCb3VuZHM7CisgICAgdHMgPDwgImxheWVyICI7Cisg ICAgCisgICAgaWYgKGJlaGF2aW9yICYgUmVuZGVyQXNUZXh0U2hvd0FkZHJlc3NlcykKKyAgICAg ICAgdHMgPDwgc3RhdGljX2Nhc3Q8Y29uc3Qgdm9pZCo+KCZsKSA8PCAiICI7CisgICAgICAKKyAg ICB0cyA8PCBsYXllckJvdW5kczsKIAogICAgIGlmICghbGF5ZXJCb3VuZHMuaXNFbXB0eSgpKSB7 CiAgICAgICAgIGlmICghYmFja2dyb3VuZENsaXBSZWN0LmNvbnRhaW5zKGxheWVyQm91bmRzKSkK QEAgLTUwMyw3ICs1MTAsNyBAQCBzdGF0aWMgdm9pZCB3cml0ZShUZXh0U3RyZWFtJiB0cywgUmVu ZGVyTGF5ZXImIGwsCiAgICAgdHMgPDwgIlxuIjsKIAogICAgIGlmIChwYWludFBoYXNlICE9IExh eWVyUGFpbnRQaGFzZUJhY2tncm91bmQpCi0gICAgICAgIHdyaXRlKHRzLCAqbC5yZW5kZXJlcigp LCBpbmRlbnQgKyAxKTsKKyAgICAgICAgd3JpdGUodHMsICpsLnJlbmRlcmVyKCksIGluZGVudCAr IDEsIGJlaGF2aW9yKTsKIH0KIAogc3RhdGljIHZvaWQgd3JpdGVMYXllcnMoVGV4dFN0cmVhbSYg dHMsIGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsIFJlbmRlckxheWVyKiBsLApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5oIGIvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5oCmluZGV4IDEzNTI1ZTcuLjFmY2ZlYzEgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuaAorKysgYi9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmgKQEAgLTM4LDEyICszOCwxMyBAQCBlbnVtIFJlbmRl ckFzVGV4dEJlaGF2aW9yRmxhZ3MgewogICAgIFJlbmRlckFzVGV4dEJlaGF2aW9yTm9ybWFsID0g MCwKICAgICBSZW5kZXJBc1RleHRTaG93QWxsTGF5ZXJzID0gMSA8PCAwLCAvLyBEdW1wIGFsbCBs YXllcnMsIG5vdCBqdXN0IHRob3NlIHRoYXQgd291bGQgcGFpbnQuCiAgICAgUmVuZGVyQXNUZXh0 U2hvd0xheWVyTmVzdGluZyA9IDEgPDwgMSwgLy8gQW5ub3RhdGUgdGhlIGxheWVyIGxpc3RzLgot ICAgIFJlbmRlckFzVGV4dFNob3dDb21wb3NpdGVkTGF5ZXJzID0gMSA8PCAyIC8vIFNob3cgd2hp Y2ggbGF5ZXJzIGFyZSBjb21wb3NpdGVkLgorICAgIFJlbmRlckFzVGV4dFNob3dDb21wb3NpdGVk TGF5ZXJzID0gMSA8PCAyLCAvLyBTaG93IHdoaWNoIGxheWVycyBhcmUgY29tcG9zaXRlZC4KKyAg ICBSZW5kZXJBc1RleHRTaG93QWRkcmVzc2VzID0gMSA8PCAzIC8vIFNob3cgbGF5ZXIgYW5kIHJl bmRlcmVyIGFkZHJlc3Nlcy4KIH07CiB0eXBlZGVmIHVuc2lnbmVkIFJlbmRlckFzVGV4dEJlaGF2 aW9yOwogCiBTdHJpbmcgZXh0ZXJuYWxSZXByZXNlbnRhdGlvbihGcmFtZSosIFJlbmRlckFzVGV4 dEJlaGF2aW9yID0gUmVuZGVyQXNUZXh0QmVoYXZpb3JOb3JtYWwpOwotdm9pZCB3cml0ZShUZXh0 U3RyZWFtJiwgY29uc3QgUmVuZGVyT2JqZWN0JiwgaW50IGluZGVudCA9IDApOwordm9pZCB3cml0 ZShUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyT2JqZWN0JiwgaW50IGluZGVudCA9IDAsIFJlbmRl ckFzVGV4dEJlaGF2aW9yID0gUmVuZGVyQXNUZXh0QmVoYXZpb3JOb3JtYWwpOwogCiAvLyBIZWxw ZXIgZnVuY3Rpb24gc2hhcmVkIHdpdGggU1ZHUmVuZGVyVHJlZUFzVGV4dAogU3RyaW5nIHF1b3Rl QW5kRXNjYXBlTm9uUHJpbnRhYmxlcyhjb25zdCBTdHJpbmcmKTsK