56871 2011-03-22 15:35:27 -0700 Clean up: Rename HTMLFrameSetElement::{noresize, frameborder, and frameBorderSet} to conform to the WebKit Code style guidelines 2023-12-28 08:27:14 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates annevk darin webkit-bug-importer oldest_to_newest 371727 0 dbates 2011-03-22 15:35:27 -0700 We should prefix the instance variables HTMLFrameSetElement::{noresize, frameborder, and frameBorderSet} with "m_" to conform to the WebKit Code style guidelines. 371732 1 86525 dbates 2011-03-22 15:39:30 -0700 Created attachment 86525 Patch Renamed HTMLFrameSetElement::frameBorderSet to HTMLFrameSetElement::m_frameborderSet since frameborder to match the name of the HTML attribute that corresponds to this instance variable. 372264 2 dbates 2011-03-23 10:58:57 -0700 Committed r81787: <http://trac.webkit.org/changeset/81787> 372265 3 darin 2011-03-23 11:00:01 -0700 Nice to add an m and underscore but also would be great to give these better names. 372277 4 dbates 2011-03-23 11:26:46 -0700 (In reply to comment #3) > Nice to add an m and underscore but also would be great to give these better names. I agree. I was not very satisfied with these names or the names, but I couldn't think of any better names at the time. I am open to suggestions. Let me know if you would like me to roll out changeset 81787 <http://trac.webkit.org/changeset/81787> and/or feel free to roll it out. For frameBorderSet, I was originally thinking m_hasFrameborderSet, m_isFrameborderSet, or m_wasFrameborderAttributeSpecified. Similarly, I thought to rename frameborder to m_hasFrameBorder to be consistent with the getter of the same name. Note, I am also unhappy about the names of the existing instance variables m_borderSet, m_border, or m_borderColorSet. We should come up with some convention so that we can rename m_borderSet, m_border, m_borderColorSet, m_frameborder, m_frameborderSet, and m_noresize. At the time I wrote this patch, I chose to defer more descriptive renames and make frameborder, frameBorderSet, and noresize more consistent to the names of the existing instance variables m_border, m_borderSet because I was unsure of the naming convention I would use for renaming m_borderSet, m_border, and m_borderColorSet and was worried that committing subsequent patches that would change the convention would be noisy. 372281 5 dbates 2011-03-23 11:28:28 -0700 (In reply to comment #4) > (In reply to comment #3) > > Nice to add an m and underscore but also would be great to give these better names. > > I agree. I was not very satisfied with these names or the names, but I couldn't think of any better names This should read: I agree. I was not very satisfied with these names, but I couldn't think of a better naming convention at the time. 381586 6 86525 dbates 2011-04-07 12:43:12 -0700 Comment on attachment 86525 Patch Clearing review flag and marking as obsolete so as to remove this patch from the commit queue. We should still think about a better naming convention for these variables. 2002147 7 annevk 2023-12-28 08:26:40 -0800 These seem okay as-is, especially given it's a legacy element. Might as well name the members in a way that matches the specification. 2002148 8 webkit-bug-importer 2023-12-28 08:27:14 -0800 <rdar://problem/120248244> 86525 2011-03-22 15:39:30 -0700 2011-04-07 12:43:12 -0700 Patch bug56871.patch text/plain 4938 dbates SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNzA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDMtMjIgIERhbmllbCBC YXRlcyAgPGRiYXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENsZWFuIHVwOiBSZW5hbWUgSFRNTEZyYW1lU2V0RWxlbWVudDo6e25v cmVzaXplLCBmcmFtZWJvcmRlciwgYW5kIGZyYW1lQm9yZGVyU2V0fQorICAgICAgICB0byBjb25m b3JtIHRvIHRoZSBXZWJLaXQgQ29kZSBzdHlsZSBndWlkZWxpbmVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njg3MQorCisgICAgICAgIE5vIGZ1bmN0 aW9uYWxpdHkgY2hhbmdlZC4gU28sIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIGh0bWwvSFRN TEZyYW1lU2V0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRnJhbWVTZXRFbGVt ZW50OjpIVE1MRnJhbWVTZXRFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGcmFtZVNl dEVsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxG cmFtZVNldEVsZW1lbnQ6OmF0dGFjaCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRnJhbWVTZXRF bGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKToKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZVNl dEVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGcmFtZVNldEVsZW1lbnQ6Omhhc0Zy YW1lQm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGcmFtZVNldEVsZW1lbnQ6Om5vUmVz aXplKToKKwogMjAxMS0wMy0yMiAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTEZyYW1lU2V0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRnJhbWVTZXRFbGVtZW50LmNwcAkocmV2aXNpb24gODE2NzgpCisrKyBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxGcmFtZVNldEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OSw5 ICs0OSw5IEBAIEhUTUxGcmFtZVNldEVsZW1lbnQ6OkhUTUxGcmFtZVNldEVsZW1lbnQKICAgICAs IG1fYm9yZGVyKDYpCiAgICAgLCBtX2JvcmRlclNldChmYWxzZSkKICAgICAsIG1fYm9yZGVyQ29s b3JTZXQoZmFsc2UpCi0gICAgLCBmcmFtZWJvcmRlcih0cnVlKQotICAgICwgZnJhbWVCb3JkZXJT ZXQoZmFsc2UpCi0gICAgLCBub3Jlc2l6ZShmYWxzZSkKKyAgICAsIG1fZnJhbWVib3JkZXIodHJ1 ZSkKKyAgICAsIG1fZnJhbWVib3JkZXJTZXQoZmFsc2UpCisgICAgLCBtX25vcmVzaXplKGZhbHNl KQogewogICAgIEFTU0VSVChoYXNUYWdOYW1lKGZyYW1lc2V0VGFnKSk7CiB9CkBAIC04NywyMSAr ODcsMjEgQEAgdm9pZCBIVE1MRnJhbWVTZXRFbGVtZW50OjpwYXJzZU1hcHBlZEF0dAogICAgICAg ICBpZiAoIWF0dHItPmlzTnVsbCgpKSB7CiAgICAgICAgICAgICAvLyBmYWxzZSBvciAibm8iIG9y ICIwIi4uCiAgICAgICAgICAgICBpZiAoYXR0ci0+dmFsdWUoKS50b0ludCgpID09IDApIHsKLSAg ICAgICAgICAgICAgICBmcmFtZWJvcmRlciA9IGZhbHNlOworICAgICAgICAgICAgICAgIG1fZnJh bWVib3JkZXIgPSBmYWxzZTsKICAgICAgICAgICAgICAgICBtX2JvcmRlciA9IDA7CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICBmcmFtZUJvcmRlclNldCA9IHRydWU7CisgICAgICAgICAgICBt X2ZyYW1lYm9yZGVyU2V0ID0gdHJ1ZTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGZy YW1lYm9yZGVyID0gZmFsc2U7Ci0gICAgICAgICAgICBmcmFtZUJvcmRlclNldCA9IGZhbHNlOwor ICAgICAgICAgICAgbV9mcmFtZWJvcmRlciA9IGZhbHNlOworICAgICAgICAgICAgbV9mcmFtZWJv cmRlclNldCA9IGZhbHNlOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChhdHRyLT5uYW1lKCkg PT0gbm9yZXNpemVBdHRyKSB7Ci0gICAgICAgIG5vcmVzaXplID0gdHJ1ZTsKKyAgICAgICAgbV9u b3Jlc2l6ZSA9IHRydWU7CiAgICAgfSBlbHNlIGlmIChhdHRyLT5uYW1lKCkgPT0gYm9yZGVyQXR0 cikgewogICAgICAgICBpZiAoIWF0dHItPmlzTnVsbCgpKSB7CiAgICAgICAgICAgICBtX2JvcmRl ciA9IGF0dHItPnZhbHVlKCkudG9JbnQoKTsKICAgICAgICAgICAgIGlmICghbV9ib3JkZXIpCi0g ICAgICAgICAgICAgICAgZnJhbWVib3JkZXIgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBtX2Zy YW1lYm9yZGVyID0gZmFsc2U7CiAgICAgICAgICAgICBtX2JvcmRlclNldCA9IHRydWU7CiAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgbV9ib3JkZXJTZXQgPSBmYWxzZTsKQEAgLTE2OSwxNiAr MTY5LDE2IEBAIHZvaWQgSFRNTEZyYW1lU2V0RWxlbWVudDo6YXR0YWNoKCkKICAgICBmb3IgKENv bnRhaW5lck5vZGUqIG5vZGUgPSBwYXJlbnROb2RlKCk7IG5vZGU7IG5vZGUgPSBub2RlLT5wYXJl bnROb2RlKCkpIHsKICAgICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoZnJhbWVzZXRUYWcpKSB7 CiAgICAgICAgICAgICBIVE1MRnJhbWVTZXRFbGVtZW50KiBmcmFtZXNldCA9IHN0YXRpY19jYXN0 PEhUTUxGcmFtZVNldEVsZW1lbnQqPihub2RlKTsKLSAgICAgICAgICAgIGlmICghZnJhbWVCb3Jk ZXJTZXQpCi0gICAgICAgICAgICAgICAgZnJhbWVib3JkZXIgPSBmcmFtZXNldC0+aGFzRnJhbWVC b3JkZXIoKTsKLSAgICAgICAgICAgIGlmIChmcmFtZWJvcmRlcikgeworICAgICAgICAgICAgaWYg KCFtX2ZyYW1lYm9yZGVyU2V0KQorICAgICAgICAgICAgICAgIG1fZnJhbWVib3JkZXIgPSBmcmFt ZXNldC0+aGFzRnJhbWVCb3JkZXIoKTsKKyAgICAgICAgICAgIGlmIChtX2ZyYW1lYm9yZGVyKSB7 CiAgICAgICAgICAgICAgICAgaWYgKCFtX2JvcmRlclNldCkKICAgICAgICAgICAgICAgICAgICAg bV9ib3JkZXIgPSBmcmFtZXNldC0+Ym9yZGVyKCk7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2Jv cmRlckNvbG9yU2V0KQogICAgICAgICAgICAgICAgICAgICBtX2JvcmRlckNvbG9yU2V0ID0gZnJh bWVzZXQtPmhhc0JvcmRlckNvbG9yKCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAo IW5vcmVzaXplKQotICAgICAgICAgICAgICAgIG5vcmVzaXplID0gZnJhbWVzZXQtPm5vUmVzaXpl KCk7CisgICAgICAgICAgICBpZiAoIW1fbm9yZXNpemUpCisgICAgICAgICAgICAgICAgbV9ub3Jl c2l6ZSA9IGZyYW1lc2V0LT5ub1Jlc2l6ZSgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KICAgICB9CkBAIC0xODgsNyArMTg4LDcgQEAgdm9pZCBIVE1MRnJhbWVTZXRFbGVtZW50Ojph dHRhY2goKQogCiB2b2lkIEhUTUxGcmFtZVNldEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIo RXZlbnQqIGV2dCkKIHsKLSAgICBpZiAoZXZ0LT5pc01vdXNlRXZlbnQoKSAmJiAhbm9yZXNpemUg JiYgcmVuZGVyZXIoKSAmJiByZW5kZXJlcigpLT5pc0ZyYW1lU2V0KCkpIHsKKyAgICBpZiAoZXZ0 LT5pc01vdXNlRXZlbnQoKSAmJiAhbV9ub3Jlc2l6ZSAmJiByZW5kZXJlcigpICYmIHJlbmRlcmVy KCktPmlzRnJhbWVTZXQoKSkgewogICAgICAgICBpZiAodG9SZW5kZXJGcmFtZVNldChyZW5kZXJl cigpKS0+dXNlclJlc2l6ZShzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZ0KSkpIHsKICAgICAg ICAgICAgIGV2dC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAgICAgIHJldHVybjsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZyYW1lU2V0RWxlbWVudC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZyYW1lU2V0RWxlbWVudC5oCShyZXZpc2lvbiA4 MTY3OCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZyYW1lU2V0RWxlbWVudC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw4ICszMyw4IEBAIGNsYXNzIEhUTUxGcmFtZVNldEVsZW1lbnQgOiBw dWJsaWMgSFRNTEUKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIVE1MRnJhbWVTZXRF bGVtZW50PiBjcmVhdGUoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Kik7CiAKLSAgICBi b29sIGhhc0ZyYW1lQm9yZGVyKCkgY29uc3QgeyByZXR1cm4gZnJhbWVib3JkZXI7IH0KLSAgICBi b29sIG5vUmVzaXplKCkgY29uc3QgeyByZXR1cm4gbm9yZXNpemU7IH0KKyAgICBib29sIGhhc0Zy YW1lQm9yZGVyKCkgY29uc3QgeyByZXR1cm4gbV9mcmFtZWJvcmRlcjsgfQorICAgIGJvb2wgbm9S ZXNpemUoKSBjb25zdCB7IHJldHVybiBtX25vcmVzaXplOyB9CiAKICAgICBpbnQgdG90YWxSb3dz KCkgY29uc3QgeyByZXR1cm4gbV90b3RhbFJvd3M7IH0KICAgICBpbnQgdG90YWxDb2xzKCkgY29u c3QgeyByZXR1cm4gbV90b3RhbENvbHM7IH0KQEAgLTkyLDkgKzkyLDkgQEAgcHJpdmF0ZToKICAg ICAKICAgICBib29sIG1fYm9yZGVyQ29sb3JTZXQ7CiAKLSAgICBib29sIGZyYW1lYm9yZGVyOwot ICAgIGJvb2wgZnJhbWVCb3JkZXJTZXQ7Ci0gICAgYm9vbCBub3Jlc2l6ZTsKKyAgICBib29sIG1f ZnJhbWVib3JkZXI7CisgICAgYm9vbCBtX2ZyYW1lYm9yZGVyU2V0OworICAgIGJvb2wgbV9ub3Jl c2l6ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK