28376 2009-08-16 22:05:07 -0700 [Cleanup] isAfterContent() implemented twice, should be member of RenderObject 2009-08-17 17:58:21 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED EasyFix P3 Trivial --- 1 rolandsteiner webkit-unassigned eric oldest_to_newest 140653 0 rolandsteiner 2009-08-16 22:05:07 -0700 The function isAfterContent() is implemented twice, once in RenderInline as a static function, once in RenderBox. Both implementations are equal. Also, there is nothing in the implementation that would prevent having this functionality available as a member on RenderObject. 140657 1 34949 rolandsteiner 2009-08-16 22:09:37 -0700 Created attachment 34949 [patch] move implementation of isAfterContent to RenderObject Moved implementation of isAfterContent to RenderObject, remove from RenderBox and RenderInline. All layout tests passed. 140895 2 34949 eric 2009-08-17 17:13:52 -0700 Comment on attachment 34949 [patch] move implementation of isAfterContent to RenderObject LGTM. 140944 3 34949 eric 2009-08-17 17:58:17 -0700 Comment on attachment 34949 [patch] move implementation of isAfterContent to RenderObject Clearing flags on attachment: 34949 Committed r47403: <http://trac.webkit.org/changeset/47403> 140945 4 eric 2009-08-17 17:58:21 -0700 All reviewed patches have been landed. Closing bug. 34949 2009-08-16 22:09:37 -0700 2009-08-17 17:58:16 -0700 [patch] move implementation of isAfterContent to RenderObject isAfterContent.patch text/plain 3993 rolandsteiner SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NzM0NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDgtMTYgIFJvbGFuZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5l ckBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1vdmVkIGltcGxlbWVudGF0aW9uIG9mIGlzQWZ0ZXJDb250ZW50IHRvIFJlbmRlck9i amVjdAorICAgICAgICAoYXMgaW5saW5lIG1ldGhvZCB0byBhdm9pZCBwb3RlbnRpYWwgcGVyZm9y bWFuY2UgcmVncmVzc2lvbnMpLgorCisgICAgICAgIEJVRyAyODM3NiAtICBbQ2xlYW51cF0gaXNB ZnRlckNvbnRlbnQoKSBpbXBsZW1lbnRlZCB0d2ljZSwgc2hvdWxkIGJlIG1lbWJlciBvZiBSZW5k ZXJPYmplY3QKKyAgICAgICAgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yODM3NikKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJPYmplY3Q6OmlzQWZ0ZXJDb250ZW50KToKKwogMjAwOS0wOC0xNiAgTmlrb2xh cyBaaW1tZXJtYW5uICA8bmlrb2xhcy56aW1tZXJtYW5uQHRvcmNobW9iaWxlLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBHZW9yZ2UgU3RhaWtvcy4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmNwcAkocmV2aXNpb24gNDczNDcpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNjU1LDExICsyNjU1LDYgQEAgaW50IFJlbmRlckJveDo6bGVm dG1vc3RQb3NpdGlvbihib29sIC8qaQogICAgIHJldHVybiBsZWZ0OwogfQogCi1ib29sIFJlbmRl ckJveDo6aXNBZnRlckNvbnRlbnQoUmVuZGVyT2JqZWN0KiBjaGlsZCkgY29uc3QKLXsKLSAgICBy ZXR1cm4gKGNoaWxkICYmIGNoaWxkLT5zdHlsZSgpLT5zdHlsZVR5cGUoKSA9PSBBRlRFUiAmJiAo IWNoaWxkLT5pc1RleHQoKSB8fCBjaGlsZC0+aXNCUigpKSk7Ci19Ci0KIFZpc2libGVQb3NpdGlv biBSZW5kZXJCb3g6OnBvc2l0aW9uRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIHBvaW50KQogewog ICAgIC8vIG5vIGNoaWxkcmVuLi4ucmV0dXJuIHRoaXMgcmVuZGVyIG9iamVjdCdzIGVsZW1lbnQs IGlmIHRoZXJlIGlzIG9uZSwgYW5kIG9mZnNldCAwCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAko cmV2aXNpb24gNDczNDcpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAkod29ya2lu ZyBjb3B5KQpAQCAtMzM0LDkgKzMzNCw2IEBAIHByaXZhdGU6CiAgICAgLy8gVGhlc2UgaW5jbHVk ZSB0YWJsZXMsIHBvc2l0aW9uZWQgb2JqZWN0cywgZmxvYXRzIGFuZCBmbGV4aWJsZSBib3hlcy4K ICAgICB2aXJ0dWFsIHZvaWQgY2FsY1ByZWZXaWR0aHMoKSB7IHNldFByZWZXaWR0aHNEaXJ0eShm YWxzZSk7IH0KIAotcHJvdGVjdGVkOgotICAgIGJvb2wgaXNBZnRlckNvbnRlbnQoUmVuZGVyT2Jq ZWN0KiBjaGlsZCkgY29uc3Q7Ci0KIHByaXZhdGU6CiAgICAgLy8gVGhlIHdpZHRoL2hlaWdodCBv ZiB0aGUgY29udGVudHMgKyBib3JkZXJzICsgcGFkZGluZy4gIFRoZSB4L3kgbG9jYXRpb24gaXMg cmVsYXRpdmUgdG8gb3VyIGNvbnRhaW5lciAod2hpY2ggaXMgbm90IGFsd2F5cyBvdXIgcGFyZW50 KS4KICAgICBJbnRSZWN0IG1fZnJhbWVSZWN0OwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVySW5saW5lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxp bmUuY3BwCShyZXZpc2lvbiA0NzM0NykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGlu ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMSwxOCArMTMxLDYgQEAgdm9pZCBSZW5kZXJJbmxp bmU6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRAogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSBib29s IGlzQWZ0ZXJDb250ZW50KFJlbmRlck9iamVjdCogY2hpbGQpCi17Ci0gICAgaWYgKCFjaGlsZCkK LSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChjaGlsZC0+c3R5bGUoKS0+c3R5bGVUeXBl KCkgIT0gQUZURVIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAvLyBUZXh0IG5vZGVzIGRv bid0IGhhdmUgdGhlaXIgb3duIHN0eWxlcywgc28gaWdub3JlIHRoZSBzdHlsZSBvbiBhIHRleHQg bm9kZS4KLSAgICBpZiAoY2hpbGQtPmlzVGV4dCgpICYmICFjaGlsZC0+aXNCUigpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgUmVuZGVySW5saW5l OjphZGRDaGlsZChSZW5kZXJPYmplY3QqIG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNo aWxkKQogewogICAgIGlmIChjb250aW51YXRpb24oKSkKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5oCShyZXZpc2lvbiA0NzM0NykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODUsNiArMjg1LDkgQEAgcHVibGljOgogCiAgICAgYm9v bCBpc0hUTUxNYXJxdWVlKCkgY29uc3Q7CiAKKyAgICBpbmxpbmUgYm9vbCBpc0FmdGVyQ29udGVu dCgpIGNvbnN0OworICAgIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0FmdGVyQ29udGVudChjb25zdCBS ZW5kZXJPYmplY3QqIG9iaikgeyByZXR1cm4gb2JqICYmIG9iai0+aXNBZnRlckNvbnRlbnQoKTsg fQorCiAgICAgYm9vbCBjaGlsZHJlbklubGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fY2hpbGRyZW5J bmxpbmU7IH0KICAgICB2b2lkIHNldENoaWxkcmVuSW5saW5lKGJvb2wgYiA9IHRydWUpIHsgbV9j aGlsZHJlbklubGluZSA9IGI7IH0KICAgICBib29sIGhhc0NvbHVtbnMoKSBjb25zdCB7IHJldHVy biBtX2hhc0NvbHVtbnM7IH0KQEAgLTg1OCw2ICs4NjEsMTYgQEAgaW5saW5lIGJvb2wgUmVuZGVy T2JqZWN0Ojpkb2N1bWVudEJlaW5nRAogICAgIHJldHVybiAhZG9jdW1lbnQoKS0+cmVuZGVyZXIo KTsKIH0KIAoraW5saW5lIGJvb2wgUmVuZGVyT2JqZWN0Ojppc0FmdGVyQ29udGVudCgpIGNvbnN0 Cit7CisgICAgaWYgKHN0eWxlKCktPnN0eWxlVHlwZSgpICE9IEFGVEVSKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgLy8gVGV4dCBub2RlcyBkb24ndCBoYXZlIHRoZWlyIG93biBzdHlsZXMs IHNvIGlnbm9yZSB0aGUgc3R5bGUgb24gYSB0ZXh0IG5vZGUuCisgICAgaWYgKGlzVGV4dCgpICYm ICFpc0JSKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwog aW5saW5lIHZvaWQgUmVuZGVyT2JqZWN0OjpzZXROZWVkc0xheW91dChib29sIGIsIGJvb2wgbWFy a1BhcmVudHMpCiB7CiAgICAgYm9vbCBhbHJlYWR5TmVlZGVkTGF5b3V0ID0gbV9uZWVkc0xheW91 dDsK