63210 2011-06-22 18:06:17 -0700 Tighten type usage in the Shadow tree code 2011-06-22 19:26:43 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix dglazkov webkit.review.bot oldest_to_newest 425806 0 jchaffraix 2011-06-22 18:06:17 -0700 While looking at the code, I found out that the type of shadowRoot() was not strictly enforced. The API should make it obvious what is expected as an argument. Patch forthcoming. 425816 1 98281 jchaffraix 2011-06-22 18:12:52 -0700 Created attachment 98281 Proposed change: tighten the types, rename one variable, make a method public as it should. 425886 2 98281 webkit.review.bot 2011-06-22 19:26:39 -0700 Comment on attachment 98281 Proposed change: tighten the types, rename one variable, make a method public as it should. Clearing flags on attachment: 98281 Committed r89521: <http://trac.webkit.org/changeset/89521> 425887 3 webkit.review.bot 2011-06-22 19:26:43 -0700 All reviewed patches have been landed. Closing bug. 98281 2011-06-22 18:12:52 -0700 2011-06-22 19:26:39 -0700 Proposed change: tighten the types, rename one variable, make a method public as it should. bug-63210-20110622181250.patch text/plain 7306 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogODk0ODMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMjQxYTFiY2NlNTYyMjcx MTZiYTY2YmY1M2RlZDM2ZWYwNjU5ZjNiLi5hYjdkYjE5NGI5NWZlMmUwNDgwZTI3N2FlNGI0MzJj YzVlOTM5YmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDYtMjIgIEp1bGll biBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGlnaHRlbiB0eXBlIHVzYWdlIGluIHRoZSBT aGFkb3cgdHJlZSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02MzIxMAorCisgICAgICAgIFJlZmFjdG9yaW5nIG9ubHksIG5vIG5ldyB0ZXN0IHJl cXVpcmVkLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpidWlsZEFjY2Vzc0tleU1hcCk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6 CisgICAgICAgIENoYW5nZWQgdGhlIGFyZ3VtZW50IG9mIGJ1aWxkQWNjZXNzS2V5TWFwIHRvIFRy ZWVTY29wZS4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVsZW1lbnQ6OmF0dGFjaCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpyZW1vdmVTaGFk b3dSb290KToKKyAgICAgICAgKiBodG1sL0NvbG9ySW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNvbG9ySW5wdXRUeXBlOjpzaGFkb3dDb2xvclN3YXRjaCk6CisgICAgICAgICogaHRt bC9IVE1MS2V5Z2VuRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MS2V5Z2VuRWxl bWVudDo6c2hhZG93U2VsZWN0KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2xpZGVyVGh1bWJFbGVtZW50T2YpOgorICAg ICAgICBVc2UgU2hhZG93Um9vdCBmb3IgdGhlIHByZXZpb3VzIGNhbGwgc2l0ZXMgYXMgdGhpcyBp cyB3aGF0IGlzCisgICAgICAgIHJldHVybmVkIGJ5IHNoYWRvd1Jvb3QoKS4KKworICAgICAgICAq IGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRyYXZlcnNlVHJlZUFuZE1hcmspOiBS ZW5hbWVkIHRoZSBwYXJhbWV0ZXIgaGVyZSBhcyBpdCBpcyBub3QKKyAgICAgICAgZXhwZWN0ZWQg dG8gYmUgYSBzaGFkb3cgb2JqZWN0LiBKdXN0IHRoZSByb290Tm9kZSBvZiBvdXIgdHJhdmVyc2Fs LgorCisgICAgICAgICogZG9tL1NoYWRvd1Jvb3QuaDogTWFkZSBhdHRhY2goKSBwdWJsaWMgYXMg aXQgaXMgcHVibGljIGluIENvbnRhaW5lck5vZGUKKyAgICAgICAgYW5kIHdlIHdvdWxkIGRvIHNv bWUgY2FzdGluZyB0byBhdm9pZCB0aGUgcHJpdmF0ZSBhdHRyaWJ1dGUgaW4gU2hhZG93Um9vdC4K KwogMjAxMS0wNi0yMiAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4 IDEwZDNiYWI5Nzc0ODFiMDM2ZWNiNzYxYzI3OWVmOGRkNzU5ZWIwOWUuLjg5M2ZjMTc5MWNhOWU1 ODQ3NWQ0NjhmNGIxZWNmNmExYzQxNTNmNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAt NjE3LDcgKzYxNyw3IEBAIEVsZW1lbnQqIERvY3VtZW50OjpnZXRFbGVtZW50QnlBY2Nlc3NLZXko Y29uc3QgU3RyaW5nJiBrZXkpCiAgICAgcmV0dXJuIG1fZWxlbWVudHNCeUFjY2Vzc0tleS5nZXQo a2V5LmltcGwoKSk7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6OmJ1aWxkQWNjZXNzS2V5TWFwKENvbnRh aW5lck5vZGUqIHJvb3QpCit2b2lkIERvY3VtZW50OjpidWlsZEFjY2Vzc0tleU1hcChUcmVlU2Nv cGUqIHJvb3QpCiB7CiAgICAgIGZvciAoTm9kZSogbiA9IHJvb3Q7IG47IG4gPSBuLT50cmF2ZXJz ZU5leHROb2RlKHJvb3QpKSB7CiAgICAgICAgIGlmICghbi0+aXNFbGVtZW50Tm9kZSgpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuaAppbmRleCA2ZTUwMDM3ODBmZmFjZGM5ZjhjODkwMTE5YjE5NjVhODRkYjQ4 ZGM3Li44NGE5YWVjYjUwZjliMTUwMjEyY2RhM2QzOWRjYmJkYjM0NmI2Y2FhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaApAQCAtMTEyNyw3ICsxMTI3LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgY2Fj aGVEb2N1bWVudEVsZW1lbnQoKSBjb25zdDsKIAotICAgIHZvaWQgYnVpbGRBY2Nlc3NLZXlNYXAo Q29udGFpbmVyTm9kZSogcm9vdCk7CisgICAgdm9pZCBidWlsZEFjY2Vzc0tleU1hcChUcmVlU2Nv cGUqIHJvb3QpOwogCiAgICAgdm9pZCBjcmVhdGVTdHlsZVNlbGVjdG9yKCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50LmNwcAppbmRleCBhYmQyMDgyMTVkMjRiMGUyYjY2ZWVhNDUxODRjYzg0NjYxNThlMWM0 Li5kMTkwZTU2NzI2MGI3MDg1Njk5OTI4MDQwNDJhOTc1NmE0MGQ1MTM4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Vs ZW1lbnQuY3BwCkBAIC0xMDE5LDcgKzEwMTksNyBAQCB2b2lkIEVsZW1lbnQ6OmF0dGFjaCgpCiAg ICAgICAgIHBhcmVudFB1c2hlci5wdXNoKCk7CiAgICAgQ29udGFpbmVyTm9kZTo6YXR0YWNoKCk7 CiAKLSAgICBpZiAoTm9kZSogc2hhZG93ID0gc2hhZG93Um9vdCgpKSB7CisgICAgaWYgKFNoYWRv d1Jvb3QqIHNoYWRvdyA9IHNoYWRvd1Jvb3QoKSkgewogICAgICAgICBwYXJlbnRQdXNoZXIucHVz aCgpOwogICAgICAgICBzaGFkb3ctPmF0dGFjaCgpOwogICAgIH0KQEAgLTEyMTcsNyArMTIxNyw3 IEBAIHZvaWQgRWxlbWVudDo6cmVtb3ZlU2hhZG93Um9vdCgpCiAgICAgICAgIHJldHVybjsKIAog ICAgIEVsZW1lbnRSYXJlRGF0YSogZGF0YSA9IHJhcmVEYXRhKCk7Ci0gICAgaWYgKFJlZlB0cjxO b2RlPiBvbGRSb290ID0gZGF0YS0+bV9zaGFkb3dSb290KSB7CisgICAgaWYgKFJlZlB0cjxTaGFk b3dSb290PiBvbGRSb290ID0gZGF0YS0+bV9zaGFkb3dSb290KSB7CiAgICAgICAgIGRhdGEtPm1f c2hhZG93Um9vdCA9IDA7CiAgICAgICAgIGRvY3VtZW50KCktPnJlbW92ZUZvY3VzZWROb2RlT2ZT dWJ0cmVlKG9sZFJvb3QuZ2V0KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggZjU3NjY5ZjBhNDkw NjgxZmI5NDRkMWU4MWU4OGFmYzZhYzhkMWNhZS4uMzVmNzYyMjkxNDM2NDM2ZWVlMzczMGI4ZTBl MjNhYWE3NTA1ZDQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMjMxOCwxNCArMjMxOCwxNCBAQCBz dGF0aWMgdm9pZCB0cmF2ZXJzZVRyZWVBbmRNYXJrKGNvbnN0IFN0cmluZyYgYmFzZUluZGVudCwg Y29uc3QgTm9kZSogcm9vdE5vZGUsCiAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiJXMiLCBpbmRl bnQudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIG5vZGUtPnNob3dOb2RlKCk7CiAKLSAgICAgICAg Q29udGFpbmVyTm9kZSogc2hhZG93ID0gc2hhZG93Um9vdChjb25zdF9jYXN0PE5vZGUqPihub2Rl KSk7CisgICAgICAgIENvbnRhaW5lck5vZGUqIHJvb3ROb2RlID0gc2hhZG93Um9vdChjb25zdF9j YXN0PE5vZGUqPihub2RlKSk7CiAKLSAgICAgICAgaWYgKCFzaGFkb3cgJiYgbm9kZS0+cmVuZGVy ZXIoKSAmJiBub2RlLT5yZW5kZXJlcigpLT5pc1RleHRDb250cm9sKCkpCi0gICAgICAgICAgICBz aGFkb3cgPSBzdGF0aWNfY2FzdDxSZW5kZXJUZXh0Q29udHJvbCo+KG5vZGUtPnJlbmRlcmVyKCkp LT5pbm5lclRleHRFbGVtZW50KCk7CisgICAgICAgIGlmICghcm9vdE5vZGUgJiYgbm9kZS0+cmVu ZGVyZXIoKSAmJiBub2RlLT5yZW5kZXJlcigpLT5pc1RleHRDb250cm9sKCkpCisgICAgICAgICAg ICByb290Tm9kZSA9IHN0YXRpY19jYXN0PFJlbmRlclRleHRDb250cm9sKj4obm9kZS0+cmVuZGVy ZXIoKSktPmlubmVyVGV4dEVsZW1lbnQoKTsKIAotICAgICAgICBpZiAoc2hhZG93KSB7CisgICAg ICAgIGlmIChyb290Tm9kZSkgewogICAgICAgICAgICAgaW5kZW50ICs9ICJcdCI7Ci0gICAgICAg ICAgICB0cmF2ZXJzZVRyZWVBbmRNYXJrKGluZGVudCwgc2hhZG93LCBtYXJrZWROb2RlMSwgbWFy a2VkTGFiZWwxLCBtYXJrZWROb2RlMiwgbWFya2VkTGFiZWwyKTsKKyAgICAgICAgICAgIHRyYXZl cnNlVHJlZUFuZE1hcmsoaW5kZW50LCByb290Tm9kZSwgbWFya2VkTm9kZTEsIG1hcmtlZExhYmVs MSwgbWFya2VkTm9kZTIsIG1hcmtlZExhYmVsMik7CiAgICAgICAgIH0KICAgICB9CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oIGIvU291cmNlL1dlYkNvcmUv ZG9tL1NoYWRvd1Jvb3QuaAppbmRleCBjZThlYjBmMWE1OWI4MWZlN2IwNjg5ODllNWJkMTY1NmRh N2M1NGEzLi40MTI4OGIzNDJkYzBjZGE1YmIwODMzYzc4MjE0YzRhMTQ1NTMwMzUyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Um9vdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9TaGFkb3dSb290LmgKQEAgLTQ0LDYgKzQ0LDggQEAgcHVibGljOgogICAgIENvbnRhaW5l ck5vZGUqIGFjdGl2ZUNvbnRlbnRDb250YWluZXIoKTsKICAgICB2b2lkIGhvc3RDaGlsZHJlbkNo YW5nZWQoKTsKIAorICAgIHZpcnR1YWwgdm9pZCBhdHRhY2goKTsKKwogcHJpdmF0ZToKICAgICBT aGFkb3dSb290KERvY3VtZW50Kik7CiAgICAgdmlydHVhbCB+U2hhZG93Um9vdCgpOwpAQCAtNTMs NyArNTUsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxOb2RlPiBjbG9uZU5v ZGUoYm9vbCBkZWVwKTsKICAgICB2aXJ0dWFsIGJvb2wgY2hpbGRUeXBlQWxsb3dlZChOb2RlVHlw ZSkgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGFwcGx5QXV0aG9yU2hlZXRzKCkgY29uc3Q7Ci0g ICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOwogCiAgICAgYm9vbCBoYXNDb250ZW50RWxlbWVudCgp IGNvbnN0OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvQ29sb3JJbnB1dFR5 cGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9Db2xvcklucHV0VHlwZS5jcHAKaW5kZXggMGU5 ODA1YjFiNDFjYTljNDVkZDUyYmViYzdhNTQ3MGM3NjcyYTZkYS4uMDcxYWFhMTA1MDY2ODk4ZTM3 ODQxOWQwNjA3MDgxMjEwNDM1MDIyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9D b2xvcklucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9Db2xvcklucHV0VHlw ZS5jcHAKQEAgLTEyMCw3ICsxMjAsNyBAQCB2b2lkIENvbG9ySW5wdXRUeXBlOjp1cGRhdGVDb2xv clN3YXRjaCgpCiAKIEhUTUxFbGVtZW50KiBDb2xvcklucHV0VHlwZTo6c2hhZG93Q29sb3JTd2F0 Y2goKSBjb25zdAogewotICAgIE5vZGUqIHNoYWRvdyA9IGVsZW1lbnQoKS0+c2hhZG93Um9vdCgp OworICAgIFNoYWRvd1Jvb3QqIHNoYWRvdyA9IGVsZW1lbnQoKS0+c2hhZG93Um9vdCgpOwogICAg IHJldHVybiBzaGFkb3cgPyB0b0hUTUxFbGVtZW50KHNoYWRvdy0+Zmlyc3RDaGlsZCgpLT5maXJz dENoaWxkKCkpIDogMDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M S2V5Z2VuRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxLZXlnZW5FbGVtZW50 LmNwcAppbmRleCA0MWIzYWMzMjhmNTYzNDYxODYxZTA3M2RiZDM2YzNhN2UwMGEzZDdjLi5lYjY4 YzUwOWEwMGU1M2NkOTJjNjVjNWJmMTY2ZmFhYTQwNTI1MjM1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxLZXlnZW5FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxLZXlnZW5FbGVtZW50LmNwcApAQCAtMTMyLDcgKzEzMiw3IEBAIHZvaWQgSFRNTEtl eWdlbkVsZW1lbnQ6OnJlc2V0KCkKIAogSFRNTFNlbGVjdEVsZW1lbnQqIEhUTUxLZXlnZW5FbGVt ZW50OjpzaGFkb3dTZWxlY3QoKSBjb25zdAogewotICAgIE5vZGUqIHNoYWRvdyA9IHNoYWRvd1Jv b3QoKTsKKyAgICBTaGFkb3dSb290KiBzaGFkb3cgPSBzaGFkb3dSb290KCk7CiAgICAgQVNTRVJU KHNoYWRvdyk7CiAgICAgcmV0dXJuIHNoYWRvdyA/IHN0YXRpY19jYXN0PEhUTUxTZWxlY3RFbGVt ZW50Kj4oc2hhZG93LT5maXJzdENoaWxkKCkpIDogMDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCmluZGV4IDgzNTA4MmJkZjg1YTVl ZDA5MzZjMjFlY2FhNWNkYzllZTJkMTVhYWIuLjJjNmI0ODgxNGNiODFkYWI0MGMwNjRiMmM0YTlj YzcwZjU0MDhhNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRl clRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVy VGh1bWJFbGVtZW50LmNwcApAQCAtNjYsNyArNjYsNyBAQCBpbmxpbmUgc3RhdGljIGJvb2wgaGFz VmVydGljYWxBcHBlYXJhbmNlKEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0KQogU2xpZGVyVGh1bWJF bGVtZW50KiBzbGlkZXJUaHVtYkVsZW1lbnRPZihOb2RlKiBub2RlKQogewogICAgIEFTU0VSVChu b2RlKTsKLSAgICBOb2RlKiBzaGFkb3cgPSBub2RlLT50b0lucHV0RWxlbWVudCgpLT5zaGFkb3dS b290KCk7CisgICAgU2hhZG93Um9vdCogc2hhZG93ID0gbm9kZS0+dG9JbnB1dEVsZW1lbnQoKS0+ c2hhZG93Um9vdCgpOwogICAgIEFTU0VSVChzaGFkb3cpOwogICAgIE5vZGUqIHRodW1iID0gc2hh ZG93LT5maXJzdENoaWxkKCktPmZpcnN0Q2hpbGQoKS0+Zmlyc3RDaGlsZCgpOwogICAgIEFTU0VS VCh0aHVtYik7Cg==